uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-11 18:16:24 +05:00
Code Issues Packages Projects Releases Wiki Activity

Attributes integration tests compiling

Browse Source
This commit is contained in:
DanB
2018-07-23 04:47:01 +02:00
parent d66dcd527c
commit ad555cbde1
4 changed files with 26 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
apier/v1/attributes_it_test.go
View File

@@ -47,11 +47,11 @@ var sTestsAlsPrf = []func(t *testing.T){
testAttributeSInitCfg,
testAttributeSInitDataDb,
testAttributeSResetStorDb,
testAttributeSStartEngine,
//testAttributeSStartEngine,
testAttributeSRPCConn,
testAttributeSLoadFromFolder,
testAttributeSGetAttributeForEvent,
testAttributeSGetAttributeForEventNotFound,
/*testAttributeSGetAttributeForEventNotFound,
testAttributeSGetAttributeForEventWithMetaAnyContext,
testAttributeSProcessEvent,
testAttributeSProcessEventWithNoneSubstitute,
@@ -63,6 +63,7 @@ var sTestsAlsPrf = []func(t *testing.T){
testAttributeSRemAlsPrf,
testAttributeSPing,
testAttributeSKillEngine,
*/
}
//Test start here
@@ -165,25 +166,26 @@ func testAttributeSGetAttributeForEvent(t *testing.T) {
&engine.Attribute{
FieldName: utils.Account,
Initial: utils.ANY,
Substitute: utils.RSRFields{&utils.RSRField{Id: "1001", RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile("1001", true),
Append: false,
},
&engine.Attribute{
FieldName: utils.Subject,
Initial: utils.ANY,
Substitute: utils.RSRFields{&utils.RSRField{Id: "1001", RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile("1001", true),
Append: true,
},
},
Weight: 10.0,
}
eAttrPrf.Compile()
var attrReply *engine.AttributeProfile
if err := attrSRPC.Call(utils.AttributeSv1GetAttributeForEvent,
ev, &attrReply); err != nil {
t.Error(err)
} else if !reflect.DeepEqual(eAttrPrf, attrReply) {
t.Errorf("Expecting: %s, received: %s", utils.ToJSON(eAttrPrf), utils.ToJSON(attrReply))
} else if !reflect.DeepEqual(eAttrPrf.Attributes[0].Substitute[0], attrReply.Attributes[0].Substitute[0]) {
t.Errorf("Expecting: %s, received: %s", utils.ToJSON(eAttrPrf.Attributes[0].Substitute), utils.ToJSON(attrReply.Attributes[0].Substitute))
}
}
@@ -208,7 +210,7 @@ func testAttributeSGetAttributeForEventNotFound(t *testing.T) {
&engine.Attribute{
FieldName: utils.Account,
Initial: utils.ANY,
Substitute: utils.RSRFields{&utils.RSRField{Id: "1001", RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile("1001", true),
Append: false,
},
},
@@ -255,7 +257,7 @@ func testAttributeSGetAttributeForEventWithMetaAnyContext(t *testing.T) {
&engine.Attribute{
FieldName: utils.Account,
Initial: utils.ANY,
Substitute: utils.RSRFields{&utils.RSRField{Id: "1001", RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile("1001", true),
Append: false,
},
},
@@ -355,13 +357,13 @@ func testAttributeSProcessEventWithNoneSubstitute(t *testing.T) {
&engine.Attribute{
FieldName: utils.Account,
Initial: "1008",
Substitute: utils.RSRFields{&utils.RSRField{Id: "1001", RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile("1001", true),
Append: false,
},
&engine.Attribute{
FieldName: utils.Subject,
Initial: utils.ANY,
Substitute: utils.RSRFields{&utils.RSRField{Id: utils.META_NONE, RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile(utils.META_NONE, true),
Append: true,
},
},
@@ -434,13 +436,13 @@ func testAttributeSProcessEventWithNoneSubstitute2(t *testing.T) {
&engine.Attribute{
FieldName: utils.Account,
Initial: "1008",
Substitute: utils.RSRFields{&utils.RSRField{Id: "1001", RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile("1001", true),
Append: false,
},
&engine.Attribute{
FieldName: utils.Subject,
Initial: utils.ANY,
Substitute: utils.RSRFields{&utils.RSRField{Id: utils.META_NONE, RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile(utils.META_NONE, true),
Append: false,
},
},
@@ -512,13 +514,13 @@ func testAttributeSProcessEventWithNoneSubstitute3(t *testing.T) {
&engine.Attribute{
FieldName: utils.Account,
Initial: "1008",
Substitute: utils.RSRFields{&utils.RSRField{Id: "1001", RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile("1001", true),
Append: false,
},
&engine.Attribute{
FieldName: utils.Subject,
Initial: "1008",
Substitute: utils.RSRFields{&utils.RSRField{Id: utils.META_NONE, RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile(utils.META_NONE, true),
Append: false,
},
},
@@ -581,7 +583,7 @@ func testAttributeSSetAlsPrf(t *testing.T) {
&engine.Attribute{
FieldName: "FL1",
Initial: "In1",
Substitute: utils.RSRFields{&utils.RSRField{Id: "Al1", RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile("Al1", true),
Append: true,
},
},
@@ -607,13 +609,13 @@ func testAttributeSUpdateAlsPrf(t *testing.T) {
&engine.Attribute{
FieldName: "FL1",
Initial: "In1",
Substitute: utils.RSRFields{&utils.RSRField{Id: "Al1", RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile("Al1", true),
Append: true,
},
&engine.Attribute{
FieldName: "FL2",
Initial: "In2",
Substitute: utils.RSRFields{&utils.RSRField{Id: "Al2", RSRules: []*utils.ReSearchReplace{}}},
Substitute: utils.NewRSRParsersMustCompile("Al2", true),
Append: false,
},
}

4
apier/v1/filter_indexes_it_test.go
View File

@@ -1426,7 +1426,7 @@ func testV1FIdxSetAttributeProfileIndexes(t *testing.T) {
&engine.Attribute{
FieldName: "FL1",
Initial: "In1",
Substitute: utils.RSRFields{&utils.RSRField{Id: "Al1"}},
Substitute: utils.NewRSRParsersMustCompile("Al1", true),
Append: true,
},
},
@@ -1545,7 +1545,7 @@ func testV1FIdxSetSecondAttributeProfileIndexes(t *testing.T) {
&engine.Attribute{
FieldName: "FL1",
Initial: "In1",
Substitute: utils.RSRFields{&utils.RSRField{Id: "Al1"}},
Substitute: utils.NewRSRParsersMustCompile("Al1", true),
Append: true,
},
},

8
apier/v1/filterindexecache_it_test.go
View File

@@ -1013,13 +1013,13 @@ func testV1FIdxCaSetAttributeProfile(t *testing.T) {
&engine.Attribute{
FieldName: utils.Account,
Initial: utils.META_ANY,
Substitute: utils.RSRFields{&utils.RSRField{Id: "1001"}},
Substitute: utils.NewRSRParsersMustCompile("1001", true),
Append: false,
},
&engine.Attribute{
FieldName: utils.Subject,
Initial: utils.META_ANY,
Substitute: utils.RSRFields{&utils.RSRField{Id: "1001"}},
Substitute: utils.NewRSRParsersMustCompile("1001", true),
Append: true,
},
},
@@ -1129,13 +1129,13 @@ func testV1FIdxCaUpdateAttributeProfile(t *testing.T) {
&engine.Attribute{
FieldName: utils.Account,
Initial: utils.META_ANY,
Substitute: utils.RSRFields{&utils.RSRField{Id: "1001"}},
Substitute: utils.NewRSRParsersMustCompile("1001", true),
Append: false,
},
&engine.Attribute{
FieldName: utils.Subject,
Initial: "*any",
Substitute: utils.RSRFields{&utils.RSRField{Id: "1001"}},
Substitute: utils.NewRSRParsersMustCompile("1001", true),
Append: true,
},
},

2
utils/rsrparser.go
View File

@@ -93,7 +93,7 @@ func NewRSRParser(parserRules string, allFiltersMatch bool) (rsrParser *RSRParse
if len(parserRules) == 0 {
return
}
rsrParser = &RSRParser{Rules: parserRules}
rsrParser = &RSRParser{Rules: parserRules, AllFiltersMatch: allFiltersMatch}
if strings.HasSuffix(parserRules, FILTER_VAL_END) { // Has filter, populate the var
fltrStart := strings.LastIndex(parserRules, FILTER_VAL_START)
if fltrStart < 1 {