From d61ed4c890f3d3246d0dbbcb06037133925c70fd Mon Sep 17 00:00:00 2001
From: TeoV <teofil.voivozeanu@itsyscom.com>
Date: Tue, 27 Aug 2019 06:01:09 -0400
Subject: [PATCH] Testing config.dfltEvRdr population

---
 config/config_test.go | 62 ++++++++++++++++++++++++++++++++++++++-----
 config/erscfg.go      | 10 ++++---
 config/erscfg_test.go |  4 +--
 3 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/config/config_test.go b/config/config_test.go
index d81c169d2..cfccd68fb 100755
--- a/config/config_test.go
+++ b/config/config_test.go
@@ -1699,13 +1699,13 @@ func TestCfgTlsCfg(t *testing.T) {
 	JSN_CFG := `
 	{
 	"tls":{
-		"server_certificate" : "path/To/Server/Cert",			
-		"server_key":"path/To/Server/Key",					
-		"client_certificate" : "path/To/Client/Cert",			
-		"client_key":"path/To/Client/Key",					
-		"ca_certificate":"path/To/CA/Cert",							
+		"server_certificate" : "path/To/Server/Cert",
+		"server_key":"path/To/Server/Key",
+		"client_certificate" : "path/To/Client/Cert",
+		"client_key":"path/To/Client/Key",
+		"ca_certificate":"path/To/CA/Cert",
 		"server_name":"TestServerName",
-		"server_policy":3,					
+		"server_policy":3,
 		},
 	}`
 	eCgrCfg, _ := NewDefaultCGRConfig()
@@ -1822,7 +1822,7 @@ func TestCgrCdfEventReader(t *testing.T) {
 				ProcessedPath:  "/var/spool/cgrates/cdrc/out",
 				XmlRootPath:    utils.EmptyString,
 				SourceID:       "ers_csv",
-				Tenant:         NewRSRParsersMustCompile("", true, utils.INFIELD_SEP),
+				Tenant:         nil,
 				Timezone:       utils.EmptyString,
 				Filters:        []string{},
 				Flags:          utils.FlagsWithParams{},
@@ -1859,3 +1859,51 @@ func TestCgrCdfEventReader(t *testing.T) {
 		t.Errorf("received: %+v,\n expecting: %+v", utils.ToJSON(cgrCfg.ersCfg), utils.ToJSON(eCfg))
 	}
 }
+
+func TestCgrCfgEventReaderDefault(t *testing.T) {
+	eCfg := &EventReaderCfg{
+		ID:             utils.MetaDefault,
+		Type:           utils.MetaFileCSV,
+		FieldSep:       ",",
+		RunDelay:       time.Duration(0),
+		ConcurrentReqs: 1024,
+		SourcePath:     "/var/spool/cgrates/cdrc/in",
+		ProcessedPath:  "/var/spool/cgrates/cdrc/out",
+		XmlRootPath:    utils.EmptyString,
+		SourceID:       "ers_csv",
+		Tenant:         nil,
+		Timezone:       utils.EmptyString,
+		Filters:        nil,
+		Flags:          utils.FlagsWithParams{},
+		Header_fields:  make([]*FCTemplate, 0),
+		Content_fields: []*FCTemplate{
+			{Tag: "TOR", FieldId: "ToR", Type: utils.META_COMPOSED,
+				Value: NewRSRParsersMustCompile("~2", true, utils.INFIELD_SEP), Mandatory: true},
+			{Tag: "OriginID", FieldId: "OriginID", Type: utils.META_COMPOSED,
+				Value: NewRSRParsersMustCompile("~3", true, utils.INFIELD_SEP), Mandatory: true},
+			{Tag: "RequestType", FieldId: "RequestType", Type: utils.META_COMPOSED,
+				Value: NewRSRParsersMustCompile("~4", true, utils.INFIELD_SEP), Mandatory: true},
+			{Tag: "Tenant", FieldId: "Tenant", Type: utils.META_COMPOSED,
+				Value: NewRSRParsersMustCompile("~6", true, utils.INFIELD_SEP), Mandatory: true},
+			{Tag: "Category", FieldId: "Category", Type: utils.META_COMPOSED,
+				Value: NewRSRParsersMustCompile("~7", true, utils.INFIELD_SEP), Mandatory: true},
+			{Tag: "Account", FieldId: "Account", Type: utils.META_COMPOSED,
+				Value: NewRSRParsersMustCompile("~8", true, utils.INFIELD_SEP), Mandatory: true},
+			{Tag: "Subject", FieldId: "Subject", Type: utils.META_COMPOSED,
+				Value: NewRSRParsersMustCompile("~9", true, utils.INFIELD_SEP), Mandatory: true},
+			{Tag: "Destination", FieldId: "Destination", Type: utils.META_COMPOSED,
+				Value: NewRSRParsersMustCompile("~10", true, utils.INFIELD_SEP), Mandatory: true},
+			{Tag: "SetupTime", FieldId: "SetupTime", Type: utils.META_COMPOSED,
+				Value: NewRSRParsersMustCompile("~11", true, utils.INFIELD_SEP), Mandatory: true},
+			{Tag: "AnswerTime", FieldId: "AnswerTime", Type: utils.META_COMPOSED,
+				Value: NewRSRParsersMustCompile("~12", true, utils.INFIELD_SEP), Mandatory: true},
+			{Tag: "Usage", FieldId: "Usage", Type: utils.META_COMPOSED,
+				Value: NewRSRParsersMustCompile("~13", true, utils.INFIELD_SEP), Mandatory: true},
+		},
+		Trailer_fields: make([]*FCTemplate, 0),
+	}
+	if !reflect.DeepEqual(cgrCfg.dfltEvRdr, eCfg) {
+		t.Errorf("received: %+v,\n expecting: %+v", utils.ToJSON(cgrCfg.dfltEvRdr), utils.ToJSON(eCfg))
+	}
+
+}
diff --git a/config/erscfg.go b/config/erscfg.go
index 448e7b007..065926e90 100644
--- a/config/erscfg.go
+++ b/config/erscfg.go
@@ -175,10 +175,12 @@ func (er *EventReaderCfg) Clone() (cln *EventReaderCfg) {
 	cln.ProcessedPath = er.ProcessedPath
 	cln.XmlRootPath = er.XmlRootPath
 	cln.SourceID = er.SourceID
-	cln.Tenant = make(RSRParsers, len(er.Tenant))
-	for idx, val := range er.Tenant {
-		clnVal := *val
-		cln.Tenant[idx] = &clnVal
+	if len(er.Tenant) != 0 {
+		cln.Tenant = make(RSRParsers, len(er.Tenant))
+		for idx, val := range er.Tenant {
+			clnVal := *val
+			cln.Tenant[idx] = &clnVal
+		}
 	}
 	cln.Timezone = er.Timezone
 	if len(er.Filters) != 0 {
diff --git a/config/erscfg_test.go b/config/erscfg_test.go
index a77f4dbbb..4eab5da4b 100644
--- a/config/erscfg_test.go
+++ b/config/erscfg_test.go
@@ -54,7 +54,7 @@ func TestEventRedearClone(t *testing.T) {
 	}
 	cloned := orig.Clone()
 	if !reflect.DeepEqual(cloned, orig) {
-		t.Errorf("expected: %s ,received: %s", utils.ToJSON(orig), utils.ToJSON(cloned))
+		t.Errorf("expected: %s \n,received: %s", utils.ToJSON(orig), utils.ToJSON(cloned))
 	}
 	initialOrig := &EventReaderCfg{
 		ID:            utils.MetaDefault,
@@ -94,6 +94,6 @@ func TestEventRedearClone(t *testing.T) {
 		},
 	}
 	if !reflect.DeepEqual(cloned, initialOrig) {
-		t.Errorf("expected: %s ,received: %s", utils.ToJSON(initialOrig), utils.ToJSON(cloned))
+		t.Errorf("expected: %s \n,received: %s", utils.ToJSON(initialOrig), utils.ToJSON(cloned))
 	}
 }