From 81dea47d61c797722bf336582619eea45daa6ce0 Mon Sep 17 00:00:00 2001 From: adragusin Date: Wed, 8 Apr 2020 11:49:31 +0300 Subject: [PATCH] Updated tests after time layout change --- config/config_it_test.go | 46 ++++++++++++++++++------------------ config/multifiles_it_test.go | 6 +++++ engine/cdr.go | 5 ++-- engine/cdr_test.go | 3 +-- migrator/tp_chargers.go | 2 +- 5 files changed, 33 insertions(+), 29 deletions(-) diff --git a/config/config_it_test.go b/config/config_it_test.go index 5464c0015..357e884b3 100644 --- a/config/config_it_test.go +++ b/config/config_it_test.go @@ -430,17 +430,17 @@ func testCGRConfigReloadERs(t *testing.T) { flags, _ := utils.FlagsWithParamsFromSlice([]string{"*dryrun"}) flagsDefault, _ := utils.FlagsWithParamsFromSlice([]string{}) content := []*FCTemplate{ - &FCTemplate{Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.2", true, utils.INFIELD_SEP), Mandatory: true}, - &FCTemplate{Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.3", true, utils.INFIELD_SEP), Mandatory: true}, - &FCTemplate{Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.4", true, utils.INFIELD_SEP), Mandatory: true}, - &FCTemplate{Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.6", true, utils.INFIELD_SEP), Mandatory: true}, - &FCTemplate{Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", true, utils.INFIELD_SEP), Mandatory: true}, - &FCTemplate{Tag: utils.Account, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", true, utils.INFIELD_SEP), Mandatory: true}, - &FCTemplate{Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", true, utils.INFIELD_SEP), Mandatory: true}, - &FCTemplate{Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.10", true, utils.INFIELD_SEP), Mandatory: true}, - &FCTemplate{Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.11", true, utils.INFIELD_SEP), Mandatory: true}, - &FCTemplate{Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.12", true, utils.INFIELD_SEP), Mandatory: true}, - &FCTemplate{Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.13", true, utils.INFIELD_SEP), Mandatory: true}, + &FCTemplate{Tag: utils.ToR, Path: utils.MetaCgreq + utils.NestingSep + utils.ToR, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.2", true, utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + &FCTemplate{Tag: utils.OriginID, Path: utils.MetaCgreq + utils.NestingSep + utils.OriginID, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.3", true, utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + &FCTemplate{Tag: utils.RequestType, Path: utils.MetaCgreq + utils.NestingSep + utils.RequestType, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.4", true, utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + &FCTemplate{Tag: utils.Tenant, Path: utils.MetaCgreq + utils.NestingSep + utils.Tenant, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.6", true, utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + &FCTemplate{Tag: utils.Category, Path: utils.MetaCgreq + utils.NestingSep + utils.Category, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.7", true, utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + &FCTemplate{Tag: utils.Account, Path: utils.MetaCgreq + utils.NestingSep + utils.Account, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.8", true, utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + &FCTemplate{Tag: utils.Subject, Path: utils.MetaCgreq + utils.NestingSep + utils.Subject, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.9", true, utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + &FCTemplate{Tag: utils.Destination, Path: utils.MetaCgreq + utils.NestingSep + utils.Destination, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.10", true, utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + &FCTemplate{Tag: utils.SetupTime, Path: utils.MetaCgreq + utils.NestingSep + utils.SetupTime, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.11", true, utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + &FCTemplate{Tag: utils.AnswerTime, Path: utils.MetaCgreq + utils.NestingSep + utils.AnswerTime, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.12", true, utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, + &FCTemplate{Tag: utils.Usage, Path: utils.MetaCgreq + utils.NestingSep + utils.Usage, Type: utils.MetaVariable, Value: NewRSRParsersMustCompile("~*req.13", true, utils.INFIELD_SEP), Mandatory: true, Layout: time.RFC3339}, } expAttr := &ERsCfg{ Enabled: true, @@ -477,7 +477,7 @@ func testCGRConfigReloadERs(t *testing.T) { }, } if !reflect.DeepEqual(expAttr, cfg.ERsCfg()) { - t.Errorf("Expected %s , received: %s ", utils.ToJSON(expAttr), utils.ToJSON(cfg.ERsCfg())) + t.Errorf("Expected %s,\n received: %s ", utils.ToJSON(expAttr), utils.ToJSON(cfg.ERsCfg())) } } @@ -561,7 +561,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { "CostShiftDigits": 0, "Path": "*cgreq.ToR", "Filters": nil, - "Layout": "", + "Layout": time.RFC3339, "Mandatory": true, "MaskDestID": "", "MaskLen": 0, @@ -586,7 +586,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { "CostShiftDigits": 0, "Path": "*cgreq.OriginID", "Filters": nil, - "Layout": "", + "Layout": time.RFC3339, "Mandatory": true, "MaskDestID": "", "MaskLen": 0, @@ -611,7 +611,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { "CostShiftDigits": 0, "Path": "*cgreq.RequestType", "Filters": nil, - "Layout": "", + "Layout": time.RFC3339, "Mandatory": true, "MaskDestID": "", "MaskLen": 0, @@ -636,7 +636,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { "CostShiftDigits": 0, "Path": "*cgreq.Tenant", "Filters": nil, - "Layout": "", + "Layout": time.RFC3339, "Mandatory": true, "MaskDestID": "", "MaskLen": 0, @@ -661,7 +661,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { "CostShiftDigits": 0, "Path": "*cgreq.Category", "Filters": nil, - "Layout": "", + "Layout": time.RFC3339, "Mandatory": true, "MaskDestID": "", "MaskLen": 0, @@ -686,7 +686,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { "CostShiftDigits": 0, "Path": "*cgreq.Account", "Filters": nil, - "Layout": "", + "Layout": time.RFC3339, "Mandatory": true, "MaskDestID": "", "MaskLen": 0, @@ -711,7 +711,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { "CostShiftDigits": 0, "Path": "*cgreq.Subject", "Filters": nil, - "Layout": "", + "Layout": time.RFC3339, "Mandatory": true, "MaskDestID": "", "MaskLen": 0, @@ -736,7 +736,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { "CostShiftDigits": 0, "Path": "*cgreq.Destination", "Filters": nil, - "Layout": "", + "Layout": time.RFC3339, "Mandatory": true, "MaskDestID": "", "MaskLen": 0, @@ -761,7 +761,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { "CostShiftDigits": 0, "Path": "*cgreq.SetupTime", "Filters": nil, - "Layout": "", + "Layout": time.RFC3339, "Mandatory": true, "MaskDestID": "", "MaskLen": 0, @@ -786,7 +786,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { "CostShiftDigits": 0, "Path": "*cgreq.AnswerTime", "Filters": nil, - "Layout": "", + "Layout": time.RFC3339, "Mandatory": true, "MaskDestID": "", "MaskLen": 0, @@ -811,7 +811,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { "CostShiftDigits": 0, "Path": "*cgreq.Usage", "Filters": nil, - "Layout": "", + "Layout": time.RFC3339, "Mandatory": true, "MaskDestID": "", "MaskLen": 0, diff --git a/config/multifiles_it_test.go b/config/multifiles_it_test.go index d3ac41c4e..4fd3fb838 100644 --- a/config/multifiles_it_test.go +++ b/config/multifiles_it_test.go @@ -135,6 +135,7 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { Type: "*constant", Value: NewRSRParsersMustCompile("1", true, utils.INFIELD_SEP), Mandatory: true, + Layout: time.RFC3339, }}, }, { @@ -150,6 +151,7 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { Type: "*constant", Value: NewRSRParsersMustCompile("*pseudoprepaid", true, utils.INFIELD_SEP), Mandatory: true, + Layout: time.RFC3339, }, }, ReplyFields: []*FCTemplate{ @@ -159,6 +161,7 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { Type: "*constant", Value: NewRSRParsersMustCompile("1", true, utils.INFIELD_SEP), Mandatory: true, + Layout: time.RFC3339, }, }, }, @@ -173,6 +176,7 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { Type: "*constant", Value: NewRSRParsersMustCompile("*pseudoprepaid", true, utils.INFIELD_SEP), Mandatory: true, + Layout: time.RFC3339, }}, ReplyFields: []*FCTemplate{{ Tag: "CDR_ID", @@ -180,6 +184,7 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { Type: "*variable", Value: NewRSRParsersMustCompile("~*req.CDR_ID", true, utils.INFIELD_SEP), Mandatory: true, + Layout: time.RFC3339, }}, }, }, @@ -201,6 +206,7 @@ func TestMfHttpAgentMultipleFields(t *testing.T) { Type: "*constant", Value: NewRSRParsersMustCompile("*data", true, utils.INFIELD_SEP), Mandatory: true, + Layout: time.RFC3339, }, }, ReplyFields: []*FCTemplate{}, diff --git a/engine/cdr.go b/engine/cdr.go index 7c7360571..f9fd9de7b 100644 --- a/engine/cdr.go +++ b/engine/cdr.go @@ -316,9 +316,8 @@ func (cdr *CDR) exportFieldValue(cfgCdrFld *config.FCTemplate, filterS *FilterS) var roundDec int switch cfgCdrFld.Path { case utils.MetaExp + utils.NestingSep + utils.COST: - if cfgCdrFld.RoundingDecimals == nil { - roundDec = config.CgrConfig().GeneralCfg().RoundingDecimals - } else { + roundDec = config.CgrConfig().GeneralCfg().RoundingDecimals + if cfgCdrFld.RoundingDecimals != nil { roundDec = *cfgCdrFld.RoundingDecimals } cdrVal = cdr.FormatCost(cfgCdrFld.CostShiftDigits, roundDec) diff --git a/engine/cdr_test.go b/engine/cdr_test.go index 8ebfdd789..3779abd33 100644 --- a/engine/cdr_test.go +++ b/engine/cdr_test.go @@ -1139,7 +1139,7 @@ func TestCDRexportFieldValue(t *testing.T) { } cfgCdrFld := &config.FCTemplate{Path: "*exp.SetupTime", Type: utils.META_COMPOSED, - Value: config.NewRSRParsersMustCompile("~SetupTime", true, utils.INFIELD_SEP),Layout: time.RFC3339} + Value: config.NewRSRParsersMustCompile("~SetupTime", true, utils.INFIELD_SEP), Layout: time.RFC3339} eVal := "2013-11-07T08:42:20Z" if val, err := cdr.exportFieldValue(cfgCdrFld, nil); err != nil { @@ -1176,7 +1176,6 @@ func TestCDReRoundingDecimals(t *testing.T) { Path: "*exp.Cost", Type: utils.META_COMPOSED, Value: config.NewRSRParsersMustCompile("~SetupTime", true, utils.INFIELD_SEP), - // RoundingDecimals: utils.IntPointer(0), } //5 is the default value for rounding decimals diff --git a/migrator/tp_chargers.go b/migrator/tp_chargers.go index 6332d5c3d..5bab3c7a5 100755 --- a/migrator/tp_chargers.go +++ b/migrator/tp_chargers.go @@ -54,7 +54,7 @@ func (m *Migrator) migrateCurrentTPChargers() (err error) { return err } } - m.stats[utils.TpChargers] ++ + m.stats[utils.TpChargers]++ } } return