From 8dd1d2652bcacd5140766eba933b32afd52f2751 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Mon, 25 Nov 2019 15:34:23 +0200 Subject: [PATCH] Updated apier integration tests --- apier/v1/apier2_it_test.go | 3 +++ apier/v1/apier_it_test.go | 4 ++++ apier/v1/dispatchersv1_it_test.go | 4 ++++ apier/v1/dm_remote_it_test.go | 7 +++++++ apier/v1/schedulers_it_test.go | 1 + apier/v1/suppliers_it_test.go | 3 +++ .../remote_replication/internal_gob/cgrates.json | 13 +++++++++---- gob_integration_test.sh | 4 ++-- 8 files changed, 33 insertions(+), 6 deletions(-) diff --git a/apier/v1/apier2_it_test.go b/apier/v1/apier2_it_test.go index 223648381..e20975d69 100644 --- a/apier/v1/apier2_it_test.go +++ b/apier/v1/apier2_it_test.go @@ -147,6 +147,9 @@ func testAPIerVerifyAttributesAfterLoad(t *testing.T) { Weight: 20.0, }, } + if *encoding == utils.MetaGOBrpc { + eAttrPrf.Attributes[0].FilterIDs = nil // in gob emtpty slice is encoded as nil + } eAttrPrf.Compile() var attrReply *engine.AttributeProfile if err := apierRPC.Call(utils.AttributeSv1GetAttributeForEvent, diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index 93636e0e8..4193412c9 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -1577,6 +1577,10 @@ func TestApierGetCallCostLog(t *testing.T) { Rates: engine.ChargedRates{}, Timings: engine.ChargedTimings{}, } + if *encoding == utils.MetaGOBrpc { + expected.Usage = nil // 0 value are encoded as nil in gob + expected.Cost = nil + } attrs.CgrId = "Cdr1" attrs.RunId = "" if err := rater.Call(utils.ApierV1GetEventCost, attrs, &cc); err != nil { diff --git a/apier/v1/dispatchersv1_it_test.go b/apier/v1/dispatchersv1_it_test.go index 6898acf88..bcf6d63a5 100644 --- a/apier/v1/dispatchersv1_it_test.go +++ b/apier/v1/dispatchersv1_it_test.go @@ -159,6 +159,10 @@ func testDspDspv1GetProfileForEvent(t *testing.T) { }, }, } + if *encoding == utils.MetaGOBrpc { // in gob emtpty slice is encoded as nil + expected.Hosts[0].FilterIDs = nil + expected.Hosts[1].FilterIDs = nil + } expected.Hosts.Sort() if err := dspRPC.Call(utils.DispatcherSv1GetProfileForEvent, &arg, &reply); err != nil { t.Error(err) diff --git a/apier/v1/dm_remote_it_test.go b/apier/v1/dm_remote_it_test.go index 13ff5a1e3..2655f0a27 100644 --- a/apier/v1/dm_remote_it_test.go +++ b/apier/v1/dm_remote_it_test.go @@ -256,6 +256,9 @@ func testInternalRemoteITGetAttribute(t *testing.T) { utils.TenantIDWithArgDispatcher{TenantID: &utils.TenantID{Tenant: "cgrates.org", ID: "ATTR_1001_SIMPLEAUTH"}}, &reply); err != nil { t.Fatal(err) } + if *encoding == utils.MetaGOBrpc { // in gob emtpty slice is encoded as nil + alsPrf.AttributeProfile.Attributes[0].FilterIDs = nil + } reply.Compile() if !reflect.DeepEqual(alsPrf.AttributeProfile, reply) { t.Errorf("Expecting : %+v, received: %+v", utils.ToJSON(alsPrf.AttributeProfile), utils.ToJSON(reply)) @@ -443,6 +446,10 @@ func testInternalRemoteITGetSupplier(t *testing.T) { }, Weight: 20, } + if *encoding == utils.MetaGOBrpc { // in gob emtpty slice is encoded as nil + splPrf.SortingParameters = nil + splPrf2.SortingParameters = nil + } if err := internalRPC.Call(utils.ApierV1GetSupplierProfile, &utils.TenantID{Tenant: "cgrates.org", ID: "SPL_ACNT_1001"}, &reply); err != nil { diff --git a/apier/v1/schedulers_it_test.go b/apier/v1/schedulers_it_test.go index 8f399f29f..95e5924a2 100644 --- a/apier/v1/schedulers_it_test.go +++ b/apier/v1/schedulers_it_test.go @@ -172,6 +172,7 @@ func testSchedVeifyAccount1001(t *testing.T) { 10, rply) } + acnt = nil // in case of gob ( it doesn't update the empty fields) attrs = &utils.AttrGetAccount{ Tenant: "cgrates.org", Account: "1002", diff --git a/apier/v1/suppliers_it_test.go b/apier/v1/suppliers_it_test.go index b224278aa..69bbbc3ff 100644 --- a/apier/v1/suppliers_it_test.go +++ b/apier/v1/suppliers_it_test.go @@ -953,6 +953,9 @@ func testV1SplSGetSupplierForEvent(t *testing.T) { }, Weight: 50, } + if *encoding == utils.MetaGOBrpc { // in gob emtpty slice is encoded as nil + expected.SortingParameters = nil + } var supProf []*engine.SupplierProfile if err := splSv1Rpc.Call(utils.SupplierSv1GetSupplierProfilesForEvent, ev, &supProf); err != nil { diff --git a/data/conf/samples/remote_replication/internal_gob/cgrates.json b/data/conf/samples/remote_replication/internal_gob/cgrates.json index dcf95fabe..a4d8de1a0 100644 --- a/data/conf/samples/remote_replication/internal_gob/cgrates.json +++ b/data/conf/samples/remote_replication/internal_gob/cgrates.json @@ -75,8 +75,13 @@ ], }, - "stats": { - "enabled": false, - "store_interval": "-1", - } +"stats": { + "enabled": false, + "store_interval": "-1", +}, + +"scheduler": { + "enabled": true, +}, + } diff --git a/gob_integration_test.sh b/gob_integration_test.sh index 9f70d0a00..28f025cc8 100755 --- a/gob_integration_test.sh +++ b/gob_integration_test.sh @@ -2,10 +2,10 @@ go clean --cache ./test.sh gen=$? -echo 'go test github.com/cgrates/cgrates/apier/v1 -tags=integration' +echo 'go test github.com/cgrates/cgrates/apier/v1 -tags=integration -rpc=*gob' go test github.com/cgrates/cgrates/apier/v1 -tags=integration -rpc=*gob ap1=$? -echo 'go test github.com/cgrates/cgrates/apier/v2 -tags=integration' +echo 'go test github.com/cgrates/cgrates/apier/v2 -tags=integration -rpc=*gob' go test github.com/cgrates/cgrates/apier/v2 -tags=integration -rpc=*gob ap2=$? # echo 'go test github.com/cgrates/cgrates/engine -tags=integration'