From 8af5fac78c6e6bddf0a505b15e5c9453cbf0f3d7 Mon Sep 17 00:00:00 2001 From: TeoV Date: Tue, 10 Jul 2018 06:26:35 -0400 Subject: [PATCH] Update test with new updates --- engine/loader_csv_test.go | 5 ++++- general_tests/acntacts_test.go | 3 ++- general_tests/auth_test.go | 3 ++- general_tests/costs1_test.go | 2 +- general_tests/datachrg1_test.go | 2 +- general_tests/ddazmbl1_test.go | 3 ++- general_tests/ddazmbl2_test.go | 3 ++- general_tests/ddazmbl3_test.go | 3 ++- general_tests/smschrg1_test.go | 2 +- 9 files changed, 17 insertions(+), 9 deletions(-) diff --git a/engine/loader_csv_test.go b/engine/loader_csv_test.go index c117969ff..125a345af 100644 --- a/engine/loader_csv_test.go +++ b/engine/loader_csv_test.go @@ -302,6 +302,9 @@ cgrates.org,SPP_1,,,,,supplier1,,,,ResGroup4,Stat3,10,,, #Tenant,ID,Contexts,FilterIDs,ActivationInterval,FieldName,Initial,Substitute,Append,Weight cgrates.org,ALS1,con1,FLTR_1,2014-07-29T15:00:00Z,Field1,Initial1,Sub1,true,20 cgrates.org,ALS1,con2;con3,,,Field2,Initial2,Sub2,false, +` + chargerProfiles = ` + ` ) @@ -310,7 +313,7 @@ var csvr *TpReader func init() { csvr = NewTpReader(dm.dataDB, NewStringCSVStorage(',', destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, - cdrStats, users, aliases, resProfiles, stats, thresholds, filters, sppProfiles, attributeProfiles), testTPID, "") + cdrStats, users, aliases, resProfiles, stats, thresholds, filters, sppProfiles, attributeProfiles, chargerProfiles), testTPID, "") if err := csvr.LoadDestinations(); err != nil { log.Print("error in LoadDestinations:", err) diff --git a/general_tests/acntacts_test.go b/general_tests/acntacts_test.go index 0501674d3..353daf966 100644 --- a/general_tests/acntacts_test.go +++ b/general_tests/acntacts_test.go @@ -58,10 +58,11 @@ ENABLE_ACNT,*enable_account,,,,,,,,,,,,,,false,false,10` filters := `` suppliers := `` aliasProfiles := `` + chargerProfiles := `` csvr := engine.NewTpReader(dbAcntActs.DataDB(), engine.NewStringCSVStorage(',', destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats, - users, aliases, resLimits, stats, thresholds, filters, suppliers, aliasProfiles), "", "") + users, aliases, resLimits, stats, thresholds, filters, suppliers, aliasProfiles, chargerProfiles), "", "") if err := csvr.LoadAll(); err != nil { t.Fatal(err) } diff --git a/general_tests/auth_test.go b/general_tests/auth_test.go index 6a595f7dd..9cca5de88 100644 --- a/general_tests/auth_test.go +++ b/general_tests/auth_test.go @@ -65,9 +65,10 @@ RP_ANY,DR_ANY_1CNT,*any,10` filters := `` suppliers := `` aliasProfiles := `` + chargerProfiles := `` csvr := engine.NewTpReader(dbAuth.DataDB(), engine.NewStringCSVStorage(',', destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, - derivedCharges, cdrStats, users, aliases, resLimits, stats, thresholds, filters, suppliers, aliasProfiles), "", "") + derivedCharges, cdrStats, users, aliases, resLimits, stats, thresholds, filters, suppliers, aliasProfiles, chargerProfiles), "", "") if err := csvr.LoadAll(); err != nil { t.Fatal(err) } diff --git a/general_tests/costs1_test.go b/general_tests/costs1_test.go index b7316650e..ac21b7193 100644 --- a/general_tests/costs1_test.go +++ b/general_tests/costs1_test.go @@ -51,7 +51,7 @@ RP_SMS1,DR_SMS_1,ALWAYS,10` *out,cgrates.org,data,*any,2012-01-01T00:00:00Z,RP_DATA1,, *out,cgrates.org,sms,*any,2012-01-01T00:00:00Z,RP_SMS1,,` csvr := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(',', dests, timings, rates, destinationRates, ratingPlans, ratingProfiles, - "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""), "", "") + "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""), "", "") if err := csvr.LoadTimings(); err != nil { t.Fatal(err) diff --git a/general_tests/datachrg1_test.go b/general_tests/datachrg1_test.go index ab94d5b8c..fd110de9f 100644 --- a/general_tests/datachrg1_test.go +++ b/general_tests/datachrg1_test.go @@ -42,7 +42,7 @@ DR_DATA_2,*any,RT_DATA_1c,*up,4,0,` RP_DATA1,DR_DATA_2,TM2,10` ratingProfiles := `*out,cgrates.org,data,*any,2012-01-01T00:00:00Z,RP_DATA1,,` csvr := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(',', "", timings, rates, destinationRates, ratingPlans, ratingProfiles, - "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""), "", "") + "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""), "", "") if err := csvr.LoadTimings(); err != nil { t.Fatal(err) } diff --git a/general_tests/ddazmbl1_test.go b/general_tests/ddazmbl1_test.go index 5c5d87ea1..f20a92025 100644 --- a/general_tests/ddazmbl1_test.go +++ b/general_tests/ddazmbl1_test.go @@ -65,12 +65,13 @@ TOPUP10_AT,TOPUP10_AC1,ASAP,10` filters := `` suppliers := `` aliasProfiles := `` + chargerProfiles := `` csvr := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(',', destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats, users, aliases, resLimits, stats, - thresholds, filters, suppliers, aliasProfiles), "", "") + thresholds, filters, suppliers, aliasProfiles, chargerProfiles), "", "") if err := csvr.LoadDestinations(); err != nil { t.Fatal(err) } diff --git a/general_tests/ddazmbl2_test.go b/general_tests/ddazmbl2_test.go index 369535bea..dcc897e3a 100644 --- a/general_tests/ddazmbl2_test.go +++ b/general_tests/ddazmbl2_test.go @@ -65,10 +65,11 @@ TOPUP10_AT,TOPUP10_AC1,ASAP,10` filters := `` suppliers := `` aliasProfiles := `` + chargerProfiles := `` csvr := engine.NewTpReader(dataDB2.DataDB(), engine.NewStringCSVStorage(',', destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats, users, aliases, resLimits, - stats, thresholds, filters, suppliers, aliasProfiles), "", "") + stats, thresholds, filters, suppliers, aliasProfiles, chargerProfiles), "", "") if err := csvr.LoadDestinations(); err != nil { t.Fatal(err) } diff --git a/general_tests/ddazmbl3_test.go b/general_tests/ddazmbl3_test.go index 34e0d0fed..1ecfdc93e 100644 --- a/general_tests/ddazmbl3_test.go +++ b/general_tests/ddazmbl3_test.go @@ -63,10 +63,11 @@ RP_UK,DR_UK_Mobile_BIG5,ALWAYS,10` filters := `` suppliers := `` aliasProfiles := `` + chargerProfiles := `` csvr := engine.NewTpReader(dataDB3.DataDB(), engine.NewStringCSVStorage(',', destinations, timings, rates, destinationRates, ratingPlans, ratingProfiles, sharedGroups, lcrs, actions, actionPlans, actionTriggers, accountActions, derivedCharges, cdrStats, users, aliases, resLimits, stats, - thresholds, filters, suppliers, aliasProfiles), "", "") + thresholds, filters, suppliers, aliasProfiles, chargerProfiles), "", "") if err := csvr.LoadDestinations(); err != nil { t.Fatal(err) } diff --git a/general_tests/smschrg1_test.go b/general_tests/smschrg1_test.go index 8afa97c83..7090cc134 100644 --- a/general_tests/smschrg1_test.go +++ b/general_tests/smschrg1_test.go @@ -40,7 +40,7 @@ func TestSMSLoadCsvTpSmsChrg1(t *testing.T) { ratingPlans := `RP_SMS1,DR_SMS_1,ALWAYS,10` ratingProfiles := `*out,cgrates.org,sms,*any,2012-01-01T00:00:00Z,RP_SMS1,,` csvr := engine.NewTpReader(dataDB.DataDB(), engine.NewStringCSVStorage(',', "", timings, rates, destinationRates, ratingPlans, ratingProfiles, - "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""), "", "") + "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", ""), "", "") if err := csvr.LoadTimings(); err != nil { t.Fatal(err) }