diff --git a/apier/v1/apier_it_test.go b/apier/v1/apier_it_test.go index f0e380504..f41062d55 100644 --- a/apier/v1/apier_it_test.go +++ b/apier/v1/apier_it_test.go @@ -1358,9 +1358,10 @@ func TestApierResetDataAfterLoadFromFolder(t *testing.T) { expStats := engine.GetDefaultEmptyCacheStats() expStats[utils.CacheAccountActionPlans].Items = 13 expStats[utils.CacheActionPlans].Items = 7 - expStats[utils.CacheActions].Items = 6 + expStats[utils.CacheActions].Items = 5 expStats[utils.CacheDestinations].Items = 3 expStats[utils.CacheLoadIDs].Items = 14 + expStats[utils.CacheRPCConnections].Items = 2 if err := rater.Call(utils.CacheSv1GetCacheStats, new(utils.AttrCacheIDsWithArgDispatcher), &rcvStats); err != nil { t.Error("Got error on CacheSv1.GetCacheStats: ", err.Error()) } else if !reflect.DeepEqual(expStats, rcvStats) { @@ -1403,8 +1404,8 @@ func TestApierGetAccountAfterLoad(t *testing.T) { attrs := &utils.AttrGetAccount{Tenant: "cgrates.org", Account: "1001"} if err := rater.Call(utils.ApierV2GetAccount, attrs, &reply); err != nil { t.Error("Got error on ApierV1.GetAccount: ", err.Error()) - } else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 11 { - t.Errorf("Calling ApierV1.GetBalance expected: 11, received: %v \n\n for:%s", reply.BalanceMap[utils.MONETARY].GetTotalValue(), utils.ToJSON(reply)) + } else if reply.BalanceMap[utils.MONETARY].GetTotalValue() != 13 { + t.Errorf("Calling ApierV1.GetBalance expected: 13, received: %v \n\n for:%s", reply.BalanceMap[utils.MONETARY].GetTotalValue(), utils.ToJSON(reply)) } } diff --git a/apier/v1/caches_it_test.go b/apier/v1/caches_it_test.go index 40f74c68d..ccf9c4fd6 100644 --- a/apier/v1/caches_it_test.go +++ b/apier/v1/caches_it_test.go @@ -126,9 +126,10 @@ func testCacheSAfterLoadFromFolder(t *testing.T) { expStats := engine.GetDefaultEmptyCacheStats() expStats[utils.CacheAccountActionPlans].Items = 13 expStats[utils.CacheActionPlans].Items = 7 - expStats[utils.CacheActions].Items = 6 + expStats[utils.CacheActions].Items = 5 expStats[utils.CacheDestinations].Items = 3 expStats[utils.CacheLoadIDs].Items = 14 + expStats[utils.CacheRPCConnections].Items = 2 if err := chcRPC.Call(utils.CacheSv1GetCacheStats, &utils.AttrCacheIDsWithArgDispatcher{}, &rcvStats); err != nil { t.Error("Got error on CacheSv1.GetCacheStats: ", err.Error()) } else if !reflect.DeepEqual(expStats, rcvStats) { diff --git a/data/tariffplans/testtp/ActionPlans.csv b/data/tariffplans/testtp/ActionPlans.csv index 7433cfc52..29fbdc73a 100644 --- a/data/tariffplans/testtp/ActionPlans.csv +++ b/data/tariffplans/testtp/ActionPlans.csv @@ -1,6 +1,6 @@ #Tag,ActionsTag,TimingTag,Weight PREPAID_10,PREPAID_10,ASAP,10 -PREPAID_10,BONUS_1,ASAP,10 +PREPAID_10,BONUS_3,ASAP,10 TEST_EXE,TOPUP_EXE,ALWAYS,10 TEST_DATA_r,TOPUP_DATA_r,ASAP,10 TEST_VOICE,TOPUP_VOICE,ASAP,10 diff --git a/data/tariffplans/testtp/Actions.csv b/data/tariffplans/testtp/Actions.csv index 8a0380f4d..b3edd608d 100644 --- a/data/tariffplans/testtp/Actions.csv +++ b/data/tariffplans/testtp/Actions.csv @@ -1,6 +1,6 @@ #ActionsId[0],Action[1],ExtraParameters[2],Filter[3],BalanceId[4],BalanceType[5],Categories[6],DestinationIds[7],RatingSubject[8],SharedGroup[9],ExpiryTime[10],TimingIds[11],Units[12],BalanceWeight[13],BalanceBlocker[14],BalanceDisabled[15],Weight[16] -PREPAID_10,*topup,,,,*monetary,,*any,,,*unlimited,,10,10,false,false,10 -BONUS_1,*topup,,,,*monetary,,*any,,,*unlimited,,1,10,false,false,10 +PREPAID_10,*topup,,,,*monetary,,*any,,,*unlimited,,10,10,false,false,20 +BONUS_3,*topup,,,,*monetary,,*any,,,*unlimited,,3,10,false,false,10 LOG_BALANCE,*log,,,,,,,,,,,,,false,false,10 CDRST_WARN_HTTP,*call_url,http://localhost:8080,,,,,,,,,,,,false,false,10 CDRST_LOG,*log,,,,,,,,,,,,,false,false,10 diff --git a/dispatchers/caches_it_test.go b/dispatchers/caches_it_test.go index c13ac54ee..92e5c1681 100644 --- a/dispatchers/caches_it_test.go +++ b/dispatchers/caches_it_test.go @@ -93,6 +93,7 @@ func testDspChcLoadAfterFolder(t *testing.T) { expStats[utils.CacheActions].Items = 1 expStats[utils.CacheDestinations].Items = 4 expStats[utils.CacheLoadIDs].Items = 17 + expStats[utils.CacheRPCConnections].Items = 2 args := utils.AttrCacheIDsWithArgDispatcher{ ArgDispatcher: &utils.ArgDispatcher{ APIKey: utils.StringPointer("chc12345"),