From 1ff60ca1b51a17018ce4ddd351c72554ff3ee67d Mon Sep 17 00:00:00 2001
From: porosnicuadrian <adrian.porosnicu@itsyscom.com>
Date: Mon, 21 Sep 2020 14:53:47 +0300
Subject: [PATCH] Updated filterscfg AsMapInterface method

---
 config/filterscfg.go      |  5 +++--
 config/filterscfg_test.go | 36 +++++++++++++++++++++++-------------
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/config/filterscfg.go b/config/filterscfg.go
index 2388ce994..06b0a0050 100644
--- a/config/filterscfg.go
+++ b/config/filterscfg.go
@@ -66,10 +66,11 @@ func (fSCfg *FilterSCfg) loadFromJsonCfg(jsnCfg *FilterSJsonCfg) (err error) {
 	return
 }
 
-func (fSCfg *FilterSCfg) AsMapInterface() map[string]interface{} {
-	return map[string]interface{}{
+func (fSCfg *FilterSCfg) AsMapInterface() (initialMP map[string]interface{}) {
+	initialMP = map[string]interface{}{
 		utils.StatSConnsCfg:     fSCfg.StatSConns,
 		utils.ResourceSConnsCfg: fSCfg.ResourceSConns,
 		utils.ApierSConnsCfg:    fSCfg.ApierSConns,
 	}
+	return
 }
diff --git a/config/filterscfg_test.go b/config/filterscfg_test.go
index fe259da49..55ecab732 100644
--- a/config/filterscfg_test.go
+++ b/config/filterscfg_test.go
@@ -56,27 +56,37 @@ func TestFilterSCfgloadFromJsonCfg(t *testing.T) {
 }
 
 func TestFilterSCfgAsMapInterface(t *testing.T) {
-	var fscfg FilterSCfg
 	cfgJSONStr := `{
 		"filters": {								
 			"stats_conns": ["*localhost"],						
-			"resources_conns": [],					
-			"apiers_conns": [],						
+			"resources_conns": ["*conn1", "*conn2"],
 	},
 }`
-	var emptySlice []string
 	eMap := map[string]interface{}{
-		"stats_conns":     []string{"*localhost"},
-		"resources_conns": emptySlice,
-		"apiers_conns":    emptySlice,
+		utils.StatSConnsCfg:     []string{utils.MetaLocalHost},
+		utils.ResourceSConnsCfg: []string{"*conn1", "*conn2"},
+		utils.ApierSConnsCfg:    []string{},
 	}
-	if jsnCfg, err := NewCgrJsonCfgFromBytes([]byte(cfgJSONStr)); err != nil {
+	if cgrCfg, err := NewCGRConfigFromJsonStringWithDefaults(cfgJSONStr); err != nil {
 		t.Error(err)
-	} else if jsnFsCfg, err := jsnCfg.FilterSJsonCfg(); err != nil {
+	} else if rcv := cgrCfg.filterSCfg.AsMapInterface(); !reflect.DeepEqual(rcv, eMap) {
+		t.Errorf("Expected %+v, received %+v", eMap, rcv)
+	}
+
+}
+
+func TestFilterSCfgAsMapInterface2(t *testing.T) {
+	cfgJSONStr := `{
+      "filters": {}
+}`
+	eMap := map[string]interface{}{
+		utils.StatSConnsCfg:     []string{},
+		utils.ResourceSConnsCfg: []string{},
+		utils.ApierSConnsCfg:    []string{},
+	}
+	if cgrCfg, err := NewCGRConfigFromJsonStringWithDefaults(cfgJSONStr); err != nil {
 		t.Error(err)
-	} else if err = fscfg.loadFromJsonCfg(jsnFsCfg); err != nil {
-		t.Error(err)
-	} else if rcv := fscfg.AsMapInterface(); reflect.DeepEqual(eMap, rcv) {
-		t.Errorf("Expected: %+v ,\n recived: %+v", utils.ToJSON(eMap), utils.ToJSON(rcv))
+	} else if rcv := cgrCfg.filterSCfg.AsMapInterface(); !reflect.DeepEqual(rcv, eMap) {
+		t.Errorf("Expected %+v, received %+v", eMap, rcv)
 	}
 }