From d5e5cdd972cce5a4ad32548c36b5d0471710618c Mon Sep 17 00:00:00 2001 From: TeoV Date: Fri, 3 May 2019 10:46:09 +0300 Subject: [PATCH] Remove manual adding of charger in sessions and agents integration tests --- agents/httpagent_it_test.go | 14 -------------- agents/radagent_it_test.go | 15 --------------- dispatchers/chargers_it_test.go | 13 ++++++++----- general_tests/sessionrefund_it_test.go | 15 --------------- general_tests/tut_smgeneric_it_test.go | 3 ++- sessions/sessions_birpc_it_test.go | 15 --------------- sessions/sessions_data_it_test.go | 15 --------------- sessions/sessions_rpl_it_test.go | 15 --------------- sessions/sessions_voice_it_test.go | 15 --------------- 9 files changed, 10 insertions(+), 110 deletions(-) diff --git a/agents/httpagent_it_test.go b/agents/httpagent_it_test.go index 56dcef7f2..718e30aa1 100644 --- a/agents/httpagent_it_test.go +++ b/agents/httpagent_it_test.go @@ -149,20 +149,6 @@ func testHAitTPFromFolder(t *testing.T) { t.Error(err) } time.Sleep(time.Duration(*waitRater) * time.Millisecond) // Give time for scheduler to execute topups - //add a default charger - chargerProfile := &engine.ChargerProfile{ - Tenant: "cgrates.org", - ID: "Default", - RunID: utils.MetaDefault, - AttributeIDs: []string{"*none"}, - Weight: 20, - } - var result string - if err := haRPC.Call("ApierV1.SetChargerProfile", chargerProfile, &result); err != nil { - t.Error(err) - } else if result != utils.OK { - t.Error("Unexpected reply returned", result) - } } func testHAitAuthDryRun(t *testing.T) { diff --git a/agents/radagent_it_test.go b/agents/radagent_it_test.go index 3821a8952..ab3360803 100644 --- a/agents/radagent_it_test.go +++ b/agents/radagent_it_test.go @@ -149,21 +149,6 @@ func testRAitTPFromFolder(t *testing.T) { testRadiusitTPLoadData(t) } time.Sleep(time.Duration(*waitRater) * time.Millisecond) // Give time for scheduler to execute topups - - //add a default charger - chargerProfile := &engine.ChargerProfile{ - Tenant: "cgrates.org", - ID: "Default", - RunID: utils.MetaDefault, - AttributeIDs: []string{"*none"}, - Weight: 20, - } - var result string - if err := raRPC.Call("ApierV1.SetChargerProfile", chargerProfile, &result); err != nil { - t.Error(err) - } else if result != utils.OK { - t.Error("Unexpected reply returned", result) - } } func testRadiusitTPLoadData(t *testing.T) { diff --git a/dispatchers/chargers_it_test.go b/dispatchers/chargers_it_test.go index 67fbdc19b..c62e3b749 100755 --- a/dispatchers/chargers_it_test.go +++ b/dispatchers/chargers_it_test.go @@ -107,8 +107,10 @@ func testDspCppGetChtgFailover(t *testing.T) { } var reply *engine.ChargerProfiles if err := dispEngine.RCP.Call(utils.ChargerSv1GetChargersForEvent, - args, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { - t.Errorf("Expected error NOT_FOUND but recived %v and reply %v\n", err, reply) + args, &reply); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(eChargers, reply) { + t.Errorf("Expecting : %+v, received: %+v", utils.ToJSON(eChargers), utils.ToJSON(reply)) } allEngine2.stopEngine(t) @@ -223,10 +225,11 @@ func testDspCppGetChtgRoundRobin(t *testing.T) { var reply *engine.ChargerProfiles // To ALL2 if err := dispEngine.RCP.Call(utils.ChargerSv1GetChargersForEvent, - args, &reply); err == nil || err.Error() != utils.ErrNotFound.Error() { - t.Errorf("Expected error NOT_FOUND but recived %v and reply %v\n", err, reply) + args, &reply); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(eChargers, reply) { + t.Errorf("Expecting : %+v, received: %+v", utils.ToJSON(eChargers), utils.ToJSON(reply)) } - // To ALL if err := dispEngine.RCP.Call(utils.ChargerSv1GetChargersForEvent, args, &reply); err != nil { diff --git a/general_tests/sessionrefund_it_test.go b/general_tests/sessionrefund_it_test.go index 341806d20..099aa2e23 100644 --- a/general_tests/sessionrefund_it_test.go +++ b/general_tests/sessionrefund_it_test.go @@ -80,21 +80,6 @@ func TestSrItLoadFromFolder(t *testing.T) { t.Error(err) } time.Sleep(500 * time.Millisecond) - - //add a default charger - chargerProfile := &engine.ChargerProfile{ - Tenant: "cgrates.org", - ID: "Default", - RunID: utils.MetaDefault, - AttributeIDs: []string{"*none"}, - Weight: 20, - } - var result string - if err := srrpc.Call("ApierV1.SetChargerProfile", chargerProfile, &result); err != nil { - t.Error(err) - } else if result != utils.OK { - t.Error("Unexpected reply returned", result) - } } func testAccountBalance(t *testing.T, sracc, srten, balType string, expected float64) { diff --git a/general_tests/tut_smgeneric_it_test.go b/general_tests/tut_smgeneric_it_test.go index 3fe3020f7..a54ea8bbf 100644 --- a/general_tests/tut_smgeneric_it_test.go +++ b/general_tests/tut_smgeneric_it_test.go @@ -124,10 +124,11 @@ func TestTutSMGCacheStats(t *testing.T) { expectedStats[utils.MetaDefault].Items = 1 expectedStats[utils.CacheActionTriggers].Items = 1 expectedStats[utils.CacheLoadIDs].Items = 20 + expectedStats[utils.CacheChargerProfiles].Items = 1 if err := tutSMGRpc.Call("CacheSv1.GetCacheStats", nil, &rcvStats); err != nil { t.Error("Got error on CacheSv1.GetCacheStats: ", err.Error()) } else if !reflect.DeepEqual(expectedStats, rcvStats) { - t.Errorf("Calling ApierV2.CacheSv1 expected: %+v, received: %+v", utils.ToJSON(expectedStats), utils.ToJSON(rcvStats)) + t.Errorf("Calling ApierV2.CacheSv1 expected: %+v,\n received: %+v", utils.ToJSON(expectedStats), utils.ToJSON(rcvStats)) } } diff --git a/sessions/sessions_birpc_it_test.go b/sessions/sessions_birpc_it_test.go index 72dbf54b4..5a6588e21 100644 --- a/sessions/sessions_birpc_it_test.go +++ b/sessions/sessions_birpc_it_test.go @@ -105,21 +105,6 @@ func TestSessionsBiRPCTPFromFolder(t *testing.T) { t.Error(err) } time.Sleep(time.Duration(*waitRater) * time.Millisecond) // Give time for scheduler to execute topups - - //add a default charger - chargerProfile := &engine.ChargerProfile{ - Tenant: "cgrates.org", - ID: "Default", - RunID: utils.MetaDefault, - AttributeIDs: []string{"*none"}, - Weight: 20, - } - var result string - if err := sessionsRPC.Call("ApierV1.SetChargerProfile", chargerProfile, &result); err != nil { - t.Error(err) - } else if result != utils.OK { - t.Error("Unexpected reply returned", result) - } } func TestSessionsBiRPCSessionAutomaticDisconnects(t *testing.T) { diff --git a/sessions/sessions_data_it_test.go b/sessions/sessions_data_it_test.go index 57ed7dc7d..94a5ebf7e 100644 --- a/sessions/sessions_data_it_test.go +++ b/sessions/sessions_data_it_test.go @@ -75,21 +75,6 @@ func TestSessionsDataApierRpcConn(t *testing.T) { if err != nil { t.Fatal(err) } - - //add a default charger - chargerProfile := &engine.ChargerProfile{ - Tenant: "cgrates.org", - ID: "Default", - RunID: utils.MetaDefault, - AttributeIDs: []string{"*none"}, - Weight: 20, - } - var result string - if err := sDataRPC.Call("ApierV1.SetChargerProfile", chargerProfile, &result); err != nil { - t.Error(err) - } else if result != utils.OK { - t.Error("Unexpected reply returned", result) - } } // Load the tariff plan, creating accounts and their balances diff --git a/sessions/sessions_rpl_it_test.go b/sessions/sessions_rpl_it_test.go index 3443893be..f38beb4bc 100644 --- a/sessions/sessions_rpl_it_test.go +++ b/sessions/sessions_rpl_it_test.go @@ -86,21 +86,6 @@ func TestSessionSRplTPFromFolder(t *testing.T) { t.Error(err) } time.Sleep(time.Duration(*waitRater) * time.Millisecond) // Give time for scheduler to execute topups - - //add a default charger - chargerProfile := &engine.ChargerProfile{ - Tenant: "cgrates.org", - ID: "Default", - RunID: utils.MetaDefault, - AttributeIDs: []string{"*none"}, - Weight: 20, - } - var result string - if err := smgRplcMstrRPC.Call("ApierV1.SetChargerProfile", chargerProfile, &result); err != nil { - t.Error(err) - } else if result != utils.OK { - t.Error("Unexpected reply returned", result) - } } func TestSessionSRplInitiate(t *testing.T) { diff --git a/sessions/sessions_voice_it_test.go b/sessions/sessions_voice_it_test.go index b1ba14e83..0370defc0 100644 --- a/sessions/sessions_voice_it_test.go +++ b/sessions/sessions_voice_it_test.go @@ -89,21 +89,6 @@ func TestSessionsVoiceTPFromFolder(t *testing.T) { t.Error(err) } time.Sleep(time.Duration(*waitRater) * time.Millisecond) // Give time for scheduler to execute topups - - //add a default charger - chargerProfile := &engine.ChargerProfile{ - Tenant: "cgrates.org", - ID: "Default", - RunID: utils.MetaDefault, - AttributeIDs: []string{"*none"}, - Weight: 20, - } - var result string - if err := sessionsRPC.Call("ApierV1.SetChargerProfile", chargerProfile, &result); err != nil { - t.Error(err) - } else if result != utils.OK { - t.Error("Unexpected reply returned", result) - } } func TestSessionsVoiceMonetaryRefund(t *testing.T) {