diff --git a/apier/apier_local_test.go b/apier/apier_local_test.go index e05a7d853..d83610b5b 100644 --- a/apier/apier_local_test.go +++ b/apier/apier_local_test.go @@ -1192,6 +1192,21 @@ func TestApierLoadTariffPlanFromFolder(t *testing.T) { } } +// Make sure balance was topped-up +// Bug reported by DigiDaz over IRC +func TestApierGetAccountAfterLoad(t *testing.T) { + if !*testLocal { + return + } + var reply *engine.Account + attrs := &AttrGetAccount{Tenant: "cgrates.org", Account: "1001", BalanceType: "*monetary", Direction: "*out"} + if err := rater.Call("ApierV1.GetAccount", attrs, &reply); err != nil { + t.Error("Got error on ApierV1.GetAccount: ", err.Error()) + } else if reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue() != 11 { // We expect 11.5 since we have added in the previous test 1.5 + t.Errorf("Calling ApierV1.GetBalance expected: 11, received: %f", reply.BalanceMap[attrs.BalanceType+attrs.Direction].GetTotalValue()) + } +} + // Test here ResponderGetCost func TestResponderGetCost(t *testing.T) { if !*testLocal { diff --git a/apier/tutfscsv_local_test.go b/apier/tutfscsv_local_test.go index b8b66cf32..58db9ed8b 100644 --- a/apier/tutfscsv_local_test.go +++ b/apier/tutfscsv_local_test.go @@ -153,7 +153,7 @@ func TestFsCsvLoadTariffPlans(t *testing.T) { t.Error("Calling ApierV1.LoadTariffPlanFromFolder got reply: ", reply) } var rcvStats *utils.CacheStats - expectedStats := &utils.CacheStats{Destinations: 3, RatingPlans: 1, RatingProfiles: 1, Actions: 1} + expectedStats := &utils.CacheStats{Destinations: 3, RatingPlans: 1, RatingProfiles: 1, Actions: 2} var args utils.AttrCacheStats if err := rater.Call("ApierV1.GetCacheStats", args, &rcvStats); err != nil { t.Error("Got error on ApierV1.GetCacheStats: ", err.Error()) diff --git a/data/tariffplans/prepaid1centpsec/ActionPlans.csv b/data/tariffplans/prepaid1centpsec/ActionPlans.csv index 24f63c8a8..756ee2ede 100644 --- a/data/tariffplans/prepaid1centpsec/ActionPlans.csv +++ b/data/tariffplans/prepaid1centpsec/ActionPlans.csv @@ -1,2 +1,3 @@ #Tag,ActionsTag,TimingTag,Weight PREPAID_10,PREPAID_10,ASAP,10 +PREPAID_10,BONUS_1,ASAP,10 diff --git a/data/tariffplans/prepaid1centpsec/Actions.csv b/data/tariffplans/prepaid1centpsec/Actions.csv index de000504c..0aa5146c1 100644 --- a/data/tariffplans/prepaid1centpsec/Actions.csv +++ b/data/tariffplans/prepaid1centpsec/Actions.csv @@ -1,2 +1,3 @@ -#ActionsTag,Action,BalanceType,Direction,Units,ExpiryTime,DestinationTag,RatingSubject,SharedGroup,BalanceWeight,ExtraParameters,Weight -PREPAID_10,*topup_reset,*monetary,*out,10,*unlimited,*any,,,10,,10 +#ActionsTag,Action,BalanceType,Direction,Units,ExpiryTime,DestinationTag,RatingSubject,BalanceWeight,SharedGroup,ExtraParameters,Weight +PREPAID_10,*topup_reset,*monetary,*out,10,*unlimited,*any,,10,,,10 +BONUS_1,*topup,*monetary,*out,1,*unlimited,*any,,,10,,10 diff --git a/data/tutorials/fs_csv/cgrates/tariffplans/Actions.csv b/data/tutorials/fs_csv/cgrates/tariffplans/Actions.csv index 03b881baa..103d4070f 100644 --- a/data/tutorials/fs_csv/cgrates/tariffplans/Actions.csv +++ b/data/tutorials/fs_csv/cgrates/tariffplans/Actions.csv @@ -1,3 +1,3 @@ -#ActionsTag,Action,BalanceType,Direction,Units,ExpiryTime,DestinationTag,RatingSubject,SharedGroup,BalanceWeight,ExtraParameters,Weight -PREPAID_10,*topup_reset,*monetary,*out,10,*unlimited,*any,,,10,,10 +#ActionsTag,Action,BalanceType,Direction,Units,ExpiryTime,DestinationTag,RatingSubject,BalanceWeight,SharedGroup,ExtraParameters,Weight +PREPAID_10,*topup_reset,*monetary,*out,10,*unlimited,*any,,10,,,10 LOG_WARNING,*log,,,,,,,,,,10