uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-14 20:59:53 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fixed integration tests

Browse Source
This commit is contained in:
andronache98
2022-02-09 17:47:08 +02:00
committed by Dan Christian Bogos
parent ffb41e083b
commit 51362f35e7
10 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apis/loaders_it_test.go
View File

@@ -200,8 +200,8 @@ cgrates.org,1002,,;30,,VoiceBalance,,;10,*voice,14,fltr3&fltr4;150;fltr5;250,,fl
// Create and populate ActionProfiles.csv
if err := writeFile(utils.ActionsCsv, `
#Tenant,ID,FilterIDs,Weight,Schedule,TargetType,TargetIDs,ActionID,ActionFilterIDs,ActionBlocker,ActionTTL,ActionType,ActionOpts,ActionPath,ActionValue
cgrates.org,ONE_TIME_ACT,,10,*asap,*accounts,1001;1002,TOPUP,,false,0s,*add_balance,,*balance.TestBalance.Value,10
#Tenant,ID,FilterIDs,Weights,Schedule,TargetType,TargetIDs,ActionID,ActionFilterIDs,ActionBlocker,ActionTTL,ActionType,ActionOpts,ActionPath,ActionValue
cgrates.org,ONE_TIME_ACT,,;10,*asap,*accounts,1001;1002,TOPUP,,false,0s,*add_balance,,*balance.TestBalance.Value,10
cgrates.org,ONE_TIME_ACT,,,,,,SET_BALANCE_TEST_DATA,,false,0s,*set_balance,,*balance.TestDataBalance.Type,*data
cgrates.org,ONE_TIME_ACT,,,,,,TOPUP_TEST_DATA,,false,0s,*add_balance,,*balance.TestDataBalance.Value,1024
cgrates.org,ONE_TIME_ACT,,,,,,SET_BALANCE_TEST_VOICE,,false,0s,*set_balance,,*balance.TestVoiceBalance.Type,*voice
@@ -324,7 +324,7 @@ cgrates.org,TestStats3,*string:~*req.Account:1003,;20,100,1s,2,*sum#~*req.Value;
cgrates.org,TH1,*string:~*req.Account:1001;*string:~*req.RunID:*default,;10,12,10,1s,true,ACT_PRF1,true
cgrates.org,TH1,,,,,,,,
cgrates.org,TH2,,,,,,,,
cgrates.org,TH2,*string:~*req.Account:1002,5,,,,true,,true
cgrates.org,TH2,*string:~*req.Account:1002,,,,,true,,true
cgrates.org,TH2,,;5,10,8,1s,true,ACT_PRF2,true
`); err != nil {
t.Fatal(err)

6
apis/thresholds_it_test.go
View File

@@ -208,7 +208,7 @@ func testThresholdsSetThresholdProfiles(t *testing.T) {
MinHits: 0,
Weights: utils.DynamicWeights{
{
Weight: 10,
Weight: 20,
},
},
},
@@ -280,7 +280,7 @@ func testThresholdsGetThresholdAfterSet(t *testing.T) {
MinHits: 0,
Weights: utils.DynamicWeights{
{
Weight: 10,
Weight: 20,
},
},
}
@@ -382,7 +382,7 @@ func testThresholdsGetThresholdProfiles(t *testing.T) {
return (ths)[i].ID < (ths)[j].ID
})
if !reflect.DeepEqual(ths, exp) {
t.Errorf("expected: <%+v>, \nreceived: <%+v>", exp, ths)
t.Errorf("expected: <%+v>, \nreceived: <%+v>", utils.ToJSON(exp), utils.ToJSON(ths))
}
}
}

4
data/tariffplans/loadRateTest/Actions.csv
View File

@@ -1,5 +1,5 @@
#Tenant,ID,FilterIDs,Weight,Schedule,TargetType,TargetIDs,ActionID,ActionFilterIDs,ActionBlocker,ActionTTL,ActionType,ActionOpts,ActionPath,ActionValue
cgrates.org,ONE_TIME_ACT,,10,*asap,*accounts,1001;1002,TOPUP,,false,0s,*add_balance,,*balance.TestBalance.Units,10
#Tenant,ID,FilterIDs,Weights,Schedule,TargetType,TargetIDs,ActionID,ActionFilterIDs,ActionBlocker,ActionTTL,ActionType,ActionOpts,ActionPath,ActionValue
cgrates.org,ONE_TIME_ACT,,;10,*asap,*accounts,1001;1002,TOPUP,,false,0s,*add_balance,,*balance.TestBalance.Units,10
cgrates.org,ONE_TIME_ACT,,,,,,SET_BALANCE_TEST_DATA,,false,0s,*set_balance,,*balance.TestDataBalance.Type,*data
cgrates.org,ONE_TIME_ACT,,,,,,TOPUP_TEST_DATA,,false,0s,*add_balance,,*balance.TestDataBalance.Units,1024
cgrates.org,ONE_TIME_ACT,,,,,,SET_BALANCE_TEST_VOICE,,false,0s,*set_balance,,*balance.TestVoiceBalance.Type,*voice
1 #Tenant ID FilterIDs Weight Weights Schedule TargetType TargetIDs ActionID ActionFilterIDs ActionBlocker ActionTTL ActionType ActionOpts ActionPath ActionValue
2 cgrates.org ONE_TIME_ACT 10 ;10 *asap *accounts 1001;1002 TOPUP false 0s *add_balance *balance.TestBalance.Units 10
3 cgrates.org ONE_TIME_ACT SET_BALANCE_TEST_DATA false 0s *set_balance *balance.TestDataBalance.Type *data
4 cgrates.org ONE_TIME_ACT TOPUP_TEST_DATA false 0s *add_balance *balance.TestDataBalance.Units 1024
5 cgrates.org ONE_TIME_ACT SET_BALANCE_TEST_VOICE false 0s *set_balance *balance.TestVoiceBalance.Type *voice

4
data/tariffplans/testit/Actions.csv
View File

@@ -1,5 +1,5 @@
#Tenant,ID,FilterIDs,Weight,Schedule,TargetType,TargetIDs,ActionID,ActionFilterIDs,ActionBlocker,ActionTTL,ActionType,ActionOpts,ActionPath,ActionValue
cgrates.org,ONE_TIME_ACT,,10,*asap,*accounts,1001;1002,TOPUP,,false,0s,*add_balance,,*balance.TestBalance.Units,10
#Tenant,ID,FilterIDs,Weights,Schedule,TargetType,TargetIDs,ActionID,ActionFilterIDs,ActionBlocker,ActionTTL,ActionType,ActionOpts,ActionPath,ActionValue
cgrates.org,ONE_TIME_ACT,,;10,*asap,*accounts,1001;1002,TOPUP,,false,0s,*add_balance,,*balance.TestBalance.Units,10
cgrates.org,ONE_TIME_ACT,,,,,,SET_BALANCE_TEST_DATA,,false,0s,*set_balance,,*balance.TestDataBalance.Type,*data
cgrates.org,ONE_TIME_ACT,,,,,,TOPUP_TEST_DATA,,false,0s,*add_balance,,*balance.TestDataBalance.Units,1024
cgrates.org,ONE_TIME_ACT,,,,,,SET_BALANCE_TEST_VOICE,,false,0s,*set_balance,,*balance.TestVoiceBalance.Type,*voice
1 #Tenant ID FilterIDs Weight Weights Schedule TargetType TargetIDs ActionID ActionFilterIDs ActionBlocker ActionTTL ActionType ActionOpts ActionPath ActionValue
2 cgrates.org ONE_TIME_ACT 10 ;10 *asap *accounts 1001;1002 TOPUP false 0s *add_balance *balance.TestBalance.Units 10
3 cgrates.org ONE_TIME_ACT SET_BALANCE_TEST_DATA false 0s *set_balance *balance.TestDataBalance.Type *data
4 cgrates.org ONE_TIME_ACT TOPUP_TEST_DATA false 0s *add_balance *balance.TestDataBalance.Units 1024
5 cgrates.org ONE_TIME_ACT SET_BALANCE_TEST_VOICE false 0s *set_balance *balance.TestVoiceBalance.Type *voice

4
data/tariffplans/tutactions/Actions.csv
View File

@@ -1,5 +1,5 @@
#Tenant,ID,FilterIDs,Weight,Schedule,TargetType,TargetIDs,ActionID,ActionFilterIDs,ActionBlocker,ActionTTL,ActionType,ActionOpts,ActionPath,ActionValue
cgrates.org,ONE_TIME_ACT,,10,*asap,*accounts,1001;1002,TOPUP,,false,0s,*add_balance,,*balance.TestBalance.Units,10
#Tenant,ID,FilterIDs,Weights,Schedule,TargetType,TargetIDs,ActionID,ActionFilterIDs,ActionBlocker,ActionTTL,ActionType,ActionOpts,ActionPath,ActionValue
cgrates.org,ONE_TIME_ACT,,;10,*asap,*accounts,1001;1002,TOPUP,,false,0s,*add_balance,,*balance.TestBalance.Units,10
cgrates.org,ONE_TIME_ACT,,,,,,SET_BALANCE_TEST_DATA,,false,0s,*set_balance,,*balance.TestDataBalance.Type,*data
cgrates.org,ONE_TIME_ACT,,,,,,TOPUP_TEST_DATA,,false,0s,*add_balance,,*balance.TestDataBalance.Units,1024
cgrates.org,ONE_TIME_ACT,,,,,,SET_BALANCE_TEST_VOICE,,false,0s,*set_balance,,*balance.TestVoiceBalance.Type,*voice
1 #Tenant ID FilterIDs Weight Weights Schedule TargetType TargetIDs ActionID ActionFilterIDs ActionBlocker ActionTTL ActionType ActionOpts ActionPath ActionValue
2 cgrates.org ONE_TIME_ACT 10 ;10 *asap *accounts 1001;1002 TOPUP false 0s *add_balance *balance.TestBalance.Units 10
3 cgrates.org ONE_TIME_ACT SET_BALANCE_TEST_DATA false 0s *set_balance *balance.TestDataBalance.Type *data
4 cgrates.org ONE_TIME_ACT TOPUP_TEST_DATA false 0s *add_balance *balance.TestDataBalance.Units 1024
5 cgrates.org ONE_TIME_ACT SET_BALANCE_TEST_VOICE false 0s *set_balance *balance.TestVoiceBalance.Type *voice

2
engine/model_helpers.go
View File

@@ -558,7 +558,7 @@ func (tps ThresholdMdls) AsTPThreshold() (result []*utils.TPThresholdProfile) {
}
actionMap[tenID].AddSlice(strings.Split(tp.ActionProfileIDs, utils.InfieldSep))
}
if tp.Weights != ";0" {
if tp.Weights != "" {
th.Weights = tp.Weights
}
if tp.FilterIDs != utils.EmptyString {

2
engine/model_helpers_test.go
View File

@@ -4245,7 +4245,7 @@ func TestThresholdMdlsAsTPThresholdActivationTime(t *testing.T) {
MinHits: 0,
MinSleep: "",
Blocker: false,
Weights: ";0",
Weights: "",
ActionProfileIDs: "",
Async: false,
},

2
general_tests/all_cfg_rld_it_test.go
View File

File diff suppressed because one or more lines are too long

2
general_tests/all_sections_cfg_rld_it_test.go
View File

File diff suppressed because one or more lines are too long

2
general_tests/attributes_filters_index_it_test.go
View File

@@ -146,7 +146,7 @@ func testAttributeSetProfile(t *testing.T) {
FilterIDs: []string{"FLTR_1"},
Attributes: []*engine.Attribute{{
Path: "*req.FL1",
Value: config.NewRSRParsersMustCompile("Ali1", utils.InfieldSep),
Value: config.NewRSRParsersMustCompile("Al1", utils.InfieldSep),
}},
Weights: utils.DynamicWeights{
{