Remove manual adding of charger in sessions and agents integration tests

This commit is contained in:
TeoV
2019-05-03 10:46:09 +03:00
committed by Dan Christian Bogos
parent cead68b435
commit d5e5cdd972
9 changed files with 10 additions and 110 deletions

View File

@@ -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) {

View File

@@ -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) {

View File

@@ -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 {

View File

@@ -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) {

View File

@@ -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))
}
}

View File

@@ -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) {

View File

@@ -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

View File

@@ -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) {

View File

@@ -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) {