From ed64f5f7a0c0be34f085039056ce3134eb4ab967 Mon Sep 17 00:00:00 2001
From: ionutboangiu <ionut.boangiu@itsyscom.com>
Date: Mon, 18 Oct 2021 11:00:39 +0300
Subject: [PATCH] Fix errors caused by merge

---
 config/attributescfg_test.go |  6 +++---
 config/stordbcfg_test.go     |  9 +++++----
 engine/attributes_test.go    | 16 ++++++++--------
 3 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/config/attributescfg_test.go b/config/attributescfg_test.go
index d4a901a78..7ea22e431 100644
--- a/config/attributescfg_test.go
+++ b/config/attributescfg_test.go
@@ -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"},
diff --git a/config/stordbcfg_test.go b/config/stordbcfg_test.go
index 3533f27be..017aca330 100644
--- a/config/stordbcfg_test.go
+++ b/config/stordbcfg_test.go
@@ -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)
 	}
 
 }
diff --git a/engine/attributes_test.go b/engine/attributes_test.go
index 123766a0c..09fe2952d 100644
--- a/engine/attributes_test.go
+++ b/engine/attributes_test.go
@@ -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,
 			},
 		},
 	}