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

Fix errors caused by merge

Browse Source
This commit is contained in:
ionutboangiu
2021-10-18 11:00:39 +03:00
committed by Dan Christian Bogos
parent 28e769cdb8
commit ed64f5f7a0
3 changed files with 16 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
config/attributescfg_test.go
View File

@@ -287,7 +287,7 @@ func TestDiffAttributeSJsonCfg(t *testing.T) {
SuffixIndexedFields: &[]string{},
NestedFields: true,
Opts: &AttributesOpts{
AttributeIDs: []*utils.DynamicStringSliceOpt{
IDs: []*utils.DynamicStringSliceOpt{
{
Tenant: "cgrates.org",
Value: []string{"prf1"},
@@ -325,7 +325,7 @@ func TestDiffAttributeSJsonCfg(t *testing.T) {
SuffixIndexedFields: nil,
NestedFields: false,
Opts: &AttributesOpts{
AttributeIDs: []*utils.DynamicStringSliceOpt{
IDs: []*utils.DynamicStringSliceOpt{
{
Tenant: "cgrates.net",
Value: []string{"prf2"},
@@ -363,7 +363,7 @@ func TestDiffAttributeSJsonCfg(t *testing.T) {
Suffix_indexed_fields: nil,
Nested_fields: utils.BoolPointer(false),
Opts: &AttributesOptsJson{
AttributeIDs: []*utils.DynamicStringSliceOpt{
IDs: []*utils.DynamicStringSliceOpt{
{
Tenant: "cgrates.net",
Value: []string{"prf2"},

9
config/stordbcfg_test.go
View File

@@ -98,16 +98,17 @@ func TestStoreDbCfgloadFromJsonCfgCase1(t *testing.T) {
SQLConnMaxLifetime: utils.StringPointer("error"),
}
if err = jsonCfg.storDbCfg.loadFromJSONCfg(newCfgJSON); err != nil {
t.Error(err)
experr := `time: invalid duration "error"`
if err = jsonCfg.storDbCfg.loadFromJSONCfg(newCfgJSON); err == nil || err.Error() != experr {
t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err)
}
newCfgJSON.Opts = &DBOptsJson{
MongoQueryTimeout: utils.StringPointer("error"),
}
if err = jsonCfg.storDbCfg.loadFromJSONCfg(newCfgJSON); err != nil {
t.Error(err)
if err = jsonCfg.storDbCfg.loadFromJSONCfg(newCfgJSON); err == nil || err.Error() != experr {
t.Errorf("expected: <%+v>, \nreceived: <%+v>", experr, err)
}
}

16
engine/attributes_test.go
View File

@@ -1284,8 +1284,8 @@ func TestAttributesProcessEventProfileIgnoreFilters(t *testing.T) {
"Attribute": "testAttrValue",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesAttributeIDs: []string{"AC1"},
utils.MetaProfileIgnoreFilters: false,
utils.OptsAttributesIDs: []string{"AC1"},
utils.MetaProfileIgnoreFilters: false,
},
}
eNM := utils.MapStorage{
@@ -1304,8 +1304,8 @@ func TestAttributesProcessEventProfileIgnoreFilters(t *testing.T) {
"Attribute": "testAttrValue",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesAttributeIDs: []string{"AC1"},
utils.MetaProfileIgnoreFilters: false,
utils.OptsAttributesIDs: []string{"AC1"},
utils.MetaProfileIgnoreFilters: false,
},
},
}
@@ -1322,8 +1322,8 @@ func TestAttributesProcessEventProfileIgnoreFilters(t *testing.T) {
"Attribute": "testAttrValue2",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesAttributeIDs: []string{"AC1"},
utils.MetaProfileIgnoreFilters: true,
utils.OptsAttributesIDs: []string{"AC1"},
utils.MetaProfileIgnoreFilters: true,
},
}
eNM2 := utils.MapStorage{
@@ -1342,8 +1342,8 @@ func TestAttributesProcessEventProfileIgnoreFilters(t *testing.T) {
"Attribute": "testAttrValue2",
},
APIOpts: map[string]interface{}{
utils.OptsAttributesAttributeIDs: []string{"AC1"},
utils.MetaProfileIgnoreFilters: true,
utils.OptsAttributesIDs: []string{"AC1"},
utils.MetaProfileIgnoreFilters: true,
},
},
}