uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-22 07:38:45 +05:00
Code Issues Packages Projects Releases Wiki Activity

Avoid data overlapping in tests

Browse Source
This commit is contained in:
DanB
2017-05-07 17:03:20 +02:00
parent 6d51ed24ab
commit 9f9ad80e1b
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
engine/loader_csv_test.go
View File

@@ -268,11 +268,10 @@ cgrates.org,mas,true,another,value,10
resLimits = `
#Id,FilterType,FilterFieldName,FilterFieldValues,ActivationTime,Weight,Limit,ActionTriggers
ResGroup1,*string,Account,1001;1002,2014-07-29T15:00:00Z,10,2,
ResGroup1,*string_prefix,Destination,10;20,2014-07-29T15:00:00Z,10,,
ResGroup1,*cdr_stats,,CDRST1:*min_ASR:34;CDRST_1001:*min_ASR:20,,,,
ResGroup1,*rsr_fields,,Subject(~^1.*1$);Destination(1002),,,,
ResGroup2,*destinations,Destination,DST_FS,2014-07-29T15:00:00Z,10,2,
ResGroup21,*string,HdrAccount,1001;1002,2014-07-29T15:00:00Z,10,2,
ResGroup21,*string_prefix,HdrDestination,10;20,2014-07-29T15:00:00Z,10,,
ResGroup21,*rsr_fields,,HdrSubject(~^1.*1$);HdrDestination(1002),,,,
ResGroup22,*destinations,HdrDestination,DST_FS,2014-07-29T15:00:00Z,10,2,
`
)
@@ -1377,24 +1376,23 @@ func TestLoadReverseAliases(t *testing.T) {
func TestLoadResourceLimits(t *testing.T) {
eResLimits := map[string]*utils.TPResourceLimit{
"ResGroup1": &utils.TPResourceLimit{
"ResGroup21": &utils.TPResourceLimit{
TPid: testTPID,
ID: "ResGroup1",
ID: "ResGroup21",
Filters: []*utils.TPRequestFilter{
&utils.TPRequestFilter{Type: MetaString, FieldName: "Account", Values: []string{"1001", "1002"}},
&utils.TPRequestFilter{Type: MetaStringPrefix, FieldName: "Destination", Values: []string{"10", "20"}},
&utils.TPRequestFilter{Type: MetaCDRStats, Values: []string{"CDRST1:*min_ASR:34", "CDRST_1001:*min_ASR:20"}},
&utils.TPRequestFilter{Type: MetaRSRFields, Values: []string{"Subject(~^1.*1$)", "Destination(1002)"}},
&utils.TPRequestFilter{Type: MetaString, FieldName: "HdrAccount", Values: []string{"1001", "1002"}},
&utils.TPRequestFilter{Type: MetaStringPrefix, FieldName: "HdrDestination", Values: []string{"10", "20"}},
&utils.TPRequestFilter{Type: MetaRSRFields, Values: []string{"HdrSubject(~^1.*1$)", "HdrDestination(1002)"}},
},
ActivationTime: "2014-07-29T15:00:00Z",
Weight: 10,
Limit: "2",
},
"ResGroup2": &utils.TPResourceLimit{
"ResGroup22": &utils.TPResourceLimit{
TPid: testTPID,
ID: "ResGroup2",
ID: "ResGroup22",
Filters: []*utils.TPRequestFilter{
&utils.TPRequestFilter{Type: MetaDestinations, FieldName: "Destination", Values: []string{"DST_FS"}},
&utils.TPRequestFilter{Type: MetaDestinations, FieldName: "HdrDestination", Values: []string{"DST_FS"}},
},
ActivationTime: "2014-07-29T15:00:00Z",
Weight: 10,

3
engine/reslimiter_test.go
View File

@@ -286,7 +286,8 @@ func TestRLsMatchingResourceLimitsForEvent(t *testing.T) {
Usage: make(map[string]*ResourceUsage),
},
}
if resLimits, err := rLS.matchingResourceLimitsForEvent(map[string]interface{}{"Account": "1002", "Subject": "dan", "Destination": "1002"}); err != nil {
if resLimits, err := rLS.matchingResourceLimitsForEvent(
map[string]interface{}{"Account": "1002", "Subject": "dan", "Destination": "1002"}); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eResLimits[0].Filters[0], resLimits[0].Filters[0]) {
t.Errorf("Expecting: %+v, received: %+v", eResLimits, resLimits)