From 39b0c33ed81335ff40b2ad8f386b485471ec27fd Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Wed, 13 Apr 2022 18:41:06 +0300 Subject: [PATCH] Fix tests after stats change --- apis/actions_it_test.go | 2 +- apis/stats_it_test.go | 4 ++-- engine/statmetrics_test.go | 18 +++++++++--------- general_tests/attributes_it_test.go | 16 ++++++++++------ general_tests/route_stats_it_test.go | 6 ++---- general_tests/routes_cases_it_test.go | 1 - 6 files changed, 24 insertions(+), 23 deletions(-) diff --git a/apis/actions_it_test.go b/apis/actions_it_test.go index d4169a832..02fa97c5e 100644 --- a/apis/actions_it_test.go +++ b/apis/actions_it_test.go @@ -549,10 +549,10 @@ func testActionsStatProcessEvent(t *testing.T) { ID: "StatsEventTest", Event: map[string]interface{}{ utils.AccountField: "1001", - utils.Usage: 30 * time.Second, }, APIOpts: map[string]interface{}{ utils.OptsStatsProfileIDs: []string{"SQ_ID"}, + utils.MetaUsage: 30 * time.Second, }, } expected := []string{"SQ_ID"} diff --git a/apis/stats_it_test.go b/apis/stats_it_test.go index 6b077a48a..0914721e8 100644 --- a/apis/stats_it_test.go +++ b/apis/stats_it_test.go @@ -816,14 +816,14 @@ func testStatsProcessEvent(t *testing.T) { ID: "StatsEventTest", Event: map[string]interface{}{ utils.AccountField: "1001", - utils.Usage: 30 * time.Second, }, APIOpts: map[string]interface{}{ utils.OptsStatsProfileIDs: []string{"SQ_3"}, + utils.MetaUsage: 30 * time.Second, }, } expected := []string{"SQ_3"} - expBody := `{"*opts":{"*actProfileIDs":["actPrfID"],"*eventType":"StatUpdate","*statsProfileIDs":["SQ_3"],"*thdProfileIDs":["THD_ID"]},"*req":{"*tcd":30000000000,"EventType":"StatUpdate","StatID":"SQ_3"}}` + expBody := `{"*opts":{"*actProfileIDs":["actPrfID"],"*eventType":"StatUpdate","*statsProfileIDs":["SQ_3"],"*thdProfileIDs":["THD_ID"],"*usage":30000000000},"*req":{"*tcd":30000000000,"EventType":"StatUpdate","StatID":"SQ_3"}}` var reply []string if err := sqRPC.Call(context.Background(), utils.StatSv1ProcessEvent, args, &reply); err != nil { diff --git a/engine/statmetrics_test.go b/engine/statmetrics_test.go index aeea71502..b56163934 100644 --- a/engine/statmetrics_test.go +++ b/engine/statmetrics_test.go @@ -1584,7 +1584,7 @@ func TestPDDGetStringValue(t *testing.T) { ev5 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_5", Event: map[string]interface{}{utils.PDD: 10 * time.Second}, } - pdd.AddEvent(ev4.ID, utils.MapStorage{utils.MetaOpts: ev4.APIOpts, utils.MetaReq: ev.Event}) + pdd.AddEvent(ev4.ID, utils.MapStorage{utils.MetaOpts: ev4.APIOpts, utils.MetaReq: ev4.Event}) if strVal := pdd.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != utils.NotAvailable { t.Errorf("wrong pdd value: %s", strVal) } @@ -1744,7 +1744,7 @@ func TestPDDGetValue(t *testing.T) { utils.MetaStartTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), utils.MetaUsage: 8 * time.Second}} ev3 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_3"} - if err := pdd.AddEvent(ev2.ID, utils.MapStorage{utils.MetaOpts: ev2.APIOpts, utils.MetaReq: ev.Event}); err != nil { + if err := pdd.AddEvent(ev2.ID, utils.MapStorage{utils.MetaOpts: ev2.APIOpts, utils.MetaReq: ev2.Event}); err != nil { t.Error(err) } if err := pdd.AddEvent(ev3.ID, utils.MapStorage{utils.MetaOpts: ev3.APIOpts}); err == nil || err.Error() != "NOT_FOUND:PDD" { @@ -1909,8 +1909,8 @@ func TestDDCGetStringValue(t *testing.T) { Event: map[string]interface{}{utils.Destination: "1001"}, APIOpts: map[string]interface{}{ utils.MetaStartTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC)}} - ddc.AddEvent(ev2.ID, utils.MapStorage{utils.MetaOpts: ev2.APIOpts, utils.MetaReq: ev.Event}) - ddc.AddEvent(ev3.ID, utils.MapStorage{utils.MetaOpts: ev3.APIOpts, utils.MetaReq: ev.Event}) + ddc.AddEvent(ev2.ID, utils.MapStorage{utils.MetaOpts: ev2.APIOpts, utils.MetaReq: ev2.Event}) + ddc.AddEvent(ev3.ID, utils.MapStorage{utils.MetaOpts: ev3.APIOpts, utils.MetaReq: ev3.Event}) if strVal := ddc.GetStringValue(config.CgrConfig().GeneralCfg().RoundingDecimals); strVal != "2" { t.Errorf("wrong ddc value: %s", strVal) } @@ -1958,11 +1958,11 @@ func TestDDCGetFloat64Value(t *testing.T) { utils.MetaStartTime: time.Date(2015, 7, 14, 14, 25, 0, 0, time.UTC), }, } - ddc.AddEvent(ev4.ID, utils.MapStorage{utils.MetaOpts: ev4.APIOpts, utils.MetaReq: ev.Event}) + ddc.AddEvent(ev4.ID, utils.MapStorage{utils.MetaOpts: ev4.APIOpts, utils.MetaReq: ev4.Event}) if strVal := ddc.GetValue(); strVal.Compare(utils.NewDecimalFromFloat64(2)) != 0 { t.Errorf("wrong ddc value: %v", strVal) } - ddc.AddEvent(ev5.ID, utils.MapStorage{utils.MetaOpts: ev5.APIOpts, utils.MetaReq: ev.Event}) + ddc.AddEvent(ev5.ID, utils.MapStorage{utils.MetaOpts: ev5.APIOpts, utils.MetaReq: ev5.Event}) if strVal := ddc.GetValue(); strVal.Compare(utils.NewDecimalFromFloat64(3)) != 0 { t.Errorf("wrong ddc value: %v", strVal) } @@ -2800,9 +2800,9 @@ func TestStatDistinctCompress(t *testing.T) { Event: map[string]interface{}{utils.Destination: "1001"}} ev3 := &utils.CGREvent{Tenant: "cgrates.org", ID: "EVENT_3", Event: map[string]interface{}{utils.Destination: "1002"}} - ddc.AddEvent(ev1.ID, utils.MapStorage{utils.MetaEvent: ev1.Event}) - ddc.AddEvent(ev2.ID, utils.MapStorage{utils.MetaEvent: ev2.Event}) - ddc.AddEvent(ev3.ID, utils.MapStorage{utils.MetaEvent: ev3.Event}) + ddc.AddEvent(ev1.ID, utils.MapStorage{utils.MetaReq: ev1.Event}) + ddc.AddEvent(ev2.ID, utils.MapStorage{utils.MetaReq: ev2.Event}) + ddc.AddEvent(ev3.ID, utils.MapStorage{utils.MetaReq: ev3.Event}) expIDs := []string{"EVENT_1", "EVENT_3"} rply := ddc.Compress(10, "EVENT_3") sort.Strings(rply) diff --git a/general_tests/attributes_it_test.go b/general_tests/attributes_it_test.go index 28d946e82..17174c973 100644 --- a/general_tests/attributes_it_test.go +++ b/general_tests/attributes_it_test.go @@ -332,9 +332,11 @@ func testAttributeSProcessEventWithStat(t *testing.T) { ID: "event1", Event: map[string]interface{}{ utils.AccountField: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 11 * time.Second, - utils.Cost: 10.0, + }, + APIOpts: map[string]interface{}{ + utils.MetaStartTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.MetaUsage: 11 * time.Second, + utils.MetaCost: 10, }, } if err := attrRPC.Call(context.Background(), utils.StatSv1ProcessEvent, &ev1, &reply); err != nil { @@ -349,9 +351,11 @@ func testAttributeSProcessEventWithStat(t *testing.T) { ID: "event2", Event: map[string]interface{}{ utils.AccountField: "1001", - utils.AnswerTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), - utils.Usage: 11 * time.Second, - utils.Cost: 10.5, + }, + APIOpts: map[string]interface{}{ + utils.MetaStartTime: time.Date(2014, 7, 14, 14, 25, 0, 0, time.UTC), + utils.MetaUsage: 11 * time.Second, + utils.MetaCost: 10.5, }, } if err := attrRPC.Call(context.Background(), utils.StatSv1ProcessEvent, &ev1, &reply); err != nil { diff --git a/general_tests/route_stats_it_test.go b/general_tests/route_stats_it_test.go index 8392f1e83..4bb9908a3 100644 --- a/general_tests/route_stats_it_test.go +++ b/general_tests/route_stats_it_test.go @@ -131,7 +131,6 @@ func testV1RtStatsProcessStatsValid(t *testing.T) { utils.AccountField: "1010", utils.Destination: "1021", utils.Category: "call", - utils.Usage: "1m20s", }, APIOpts: map[string]interface{}{ utils.MetaCost: 1.8, @@ -160,11 +159,10 @@ func testV1RtStatsProcessStatsNotAnswered(t *testing.T) { Event: map[string]interface{}{ utils.AccountField: "1010", utils.Destination: "1021", - utils.Usage: "26s", }, APIOpts: map[string]interface{}{ utils.MetaCost: 1.8, - utils.MetaUsage: "1m20s", + utils.MetaUsage: "26s", }, } // we will process this two times @@ -199,7 +197,7 @@ func testV1RtStatsProcessStatsNotAnswered(t *testing.T) { }, APIOpts: map[string]interface{}{ utils.MetaCost: 1.8, - utils.MetaUsage: "1m20s", + utils.MetaUsage: "50s", utils.MetaStartTime: "2022-04-01T05:00:00Z", }, } diff --git a/general_tests/routes_cases_it_test.go b/general_tests/routes_cases_it_test.go index 9ef5c8efb..86aedcacd 100644 --- a/general_tests/routes_cases_it_test.go +++ b/general_tests/routes_cases_it_test.go @@ -744,7 +744,6 @@ func testV1RtsCasesSortingRoutesLCSetStatsAndResForMatching(t *testing.T) { Tenant: "cgrates.org", ID: "event1", Event: map[string]interface{}{ - utils.Usage: "2m30s", utils.AccountField: "1004", utils.Category: "vendor2", },