From 711d7d5a1a0317ebf90a48679d40f96e07c6cdd0 Mon Sep 17 00:00:00 2001 From: porosnicuadrian Date: Fri, 27 Nov 2020 17:47:15 +0200 Subject: [PATCH] Removed error from NewDefaultCGRConfig signature's function --- agents/agentreq_test.go | 70 +-- agents/fsevent_test.go | 12 +- agents/libdiam_test.go | 2 +- analyzers/analyzers_test.go | 38 +- analyzers/codec_test.go | 7 +- analyzers/connector_test.go | 8 +- apier/v1/accounts_test.go | 2 +- apier/v1/debit_test.go | 4 +- cmd/cgr-migrator/cgr-migrator.go | 2 +- cmd/cgr-tester/cgr-tester.go | 2 +- config/analyzerscfg_test.go | 15 +- config/apiercfg_test.go | 5 +- config/attributescfg_test.go | 5 +- config/cachecfg_test.go | 20 +- config/cdrscfg_test.go | 10 +- config/chargerscfg_test.go | 5 +- config/config.go | 21 +- config/config_it_test.go | 170 +++--- config/config_test.go | 766 ++++++++++++---------------- config/configs_test.go | 11 +- config/configsanity_test.go | 93 ++-- config/datadbcfg_test.go | 20 +- config/diametercfg_test.go | 10 +- config/dispatcherhcfg_test.go | 10 +- config/dispatcherscfg_test.go | 5 +- config/dnsagentcfg_test.go | 21 +- config/eescfg_test.go | 41 +- config/erscfg_test.go | 66 +-- config/fctemplate_test.go | 5 +- config/filterscfg_test.go | 5 +- config/generalcfg_test.go | 35 +- config/httpagntcfg_test.go | 27 +- config/httpcfg_test.go | 5 +- config/kamagentcfg_test.go | 5 +- config/listencfg_test.go | 5 +- config/loadercgrcfg_test.go | 5 +- config/loaderscfg_test.go | 31 +- config/mailercfg_test.go | 5 +- config/migratorcfg_test.go | 5 +- config/radiuscfg_test.go | 10 +- config/ralscfg_test.go | 10 +- config/ratescfg_test.go | 5 +- config/resourcescfg_test.go | 10 +- config/routescfg_test.go | 5 +- config/rpcconn_test.go | 18 +- config/schedulercfg_test.go | 5 +- config/sessionscfg_test.go | 80 ++- config/sipagentcfg_test.go | 15 +- config/statscfg_test.go | 10 +- config/stordbcfg_test.go | 26 +- config/suretaxcfg_test.go | 90 ++-- config/thresholdscfg_test.go | 10 +- config/tlscfg_test.go | 5 +- dispatcherh/dispatcherh_test.go | 5 +- dispatcherh/libdispatcherh_test.go | 11 +- engine/actions_test.go | 2 +- engine/caps_test.go | 2 +- engine/cdr_test.go | 13 +- engine/chargers_test.go | 2 +- engine/filters_test.go | 14 +- engine/fscdr_test.go | 74 +-- engine/mapevent_test.go | 6 +- engine/routes_test.go | 2 +- engine/safevent_test.go | 2 +- engine/stats_test.go | 2 +- engine/suretax_test.go | 2 +- engine/thresholds_test.go | 2 +- engine/z_attributes_test.go | 38 +- engine/z_datamanager_it_test.go | 2 +- engine/z_filterindexer_it_test.go | 2 +- engine/z_onstor_it_test.go | 2 +- engine/z_poster_it_test.go | 18 +- engine/z_resources_test.go | 4 +- engine/z_stordb_it_test.go | 4 +- ers/ers_test.go | 4 +- ers/readers_test.go | 8 +- general_tests/filters_test.go | 2 +- general_tests/smschrg1_test.go | 2 +- rates/rates_test.go | 14 +- services/apiers_it_test.go | 8 +- services/asteriskagent_it_test.go | 8 +- services/attributes_it_test.go | 8 +- services/cdrs_it_test.go | 8 +- services/chargers_it_test.go | 10 +- services/datadb_it_test.go | 8 +- services/diameteragent_it_test.go | 8 +- services/dispatchers_it_test.go | 10 +- services/dnsagent_it_test.go | 8 +- services/ees_it_test.go | 8 +- services/ers_it_test.go | 8 +- services/freeswitchagent_it_test.go | 8 +- services/globalvars_test.go | 8 +- services/kamailioagent_it_test.go | 8 +- services/radiusagent_it_test.go | 8 +- services/rals_it_test.go | 8 +- services/rates_it_test.go | 8 +- services/resources_it_test.go | 10 +- services/routes_it_test.go | 8 +- services/schedulers_it_test.go | 8 +- services/sessions_it_test.go | 8 +- services/sipagent_it_test.go | 8 +- services/stats_it_test.go | 10 +- services/thresholds_it_test.go | 10 +- sessions/sessions_test.go | 22 +- 104 files changed, 938 insertions(+), 1398 deletions(-) diff --git a/agents/agentreq_test.go b/agents/agentreq_test.go index 3d2a7667b..c8fd45879 100644 --- a/agents/agentreq_test.go +++ b/agents/agentreq_test.go @@ -38,7 +38,7 @@ import ( ) func TestAgReqSetFields(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -142,7 +142,7 @@ func TestAgentRequestSetFields(t *testing.T) { utils.Account: 1009, utils.Tenant: "cgrates.org", } - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) ar := NewAgentRequest(utils.MapStorage(req), nil, @@ -490,7 +490,7 @@ func TestAgentRequestSetFields(t *testing.T) { } func TestAgReqMaxCost(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -536,7 +536,7 @@ func TestAgReqParseFieldDiameter(t *testing.T) { }}) //create diameterDataProvider dP := newDADataProvider(nil, m) - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -589,7 +589,7 @@ func TestAgReqParseFieldRadius(t *testing.T) { } //create radiusDataProvider dP := newRADataProvider(pkt) - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -632,7 +632,7 @@ Host: api.cgrates.org } //create radiusDataProvider dP, _ := newHTTPUrlDP(req) - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -703,7 +703,7 @@ func TestAgReqParseFieldHttpXml(t *testing.T) { } //create radiusDataProvider dP, _ := newHTTPXmlDP(req) - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) @@ -733,7 +733,7 @@ func TestAgReqParseFieldHttpXml(t *testing.T) { } func TestAgReqEmptyFilter(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -778,7 +778,7 @@ func TestAgReqEmptyFilter(t *testing.T) { } func TestAgReqMetaExponent(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -805,7 +805,7 @@ func TestAgReqMetaExponent(t *testing.T) { } func TestAgReqFieldAsNone(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -845,7 +845,7 @@ func TestAgReqFieldAsNone(t *testing.T) { } func TestAgReqFieldAsNone2(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -888,7 +888,7 @@ func TestAgReqFieldAsNone2(t *testing.T) { } func TestAgReqSetField2(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -949,7 +949,7 @@ func TestAgReqSetField2(t *testing.T) { } func TestAgReqFieldAsInterface(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -996,7 +996,7 @@ func TestAgReqFieldAsInterface(t *testing.T) { } func TestAgReqNewARWithCGRRplyAndRply(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1047,7 +1047,7 @@ func TestAgReqNewARWithCGRRplyAndRply(t *testing.T) { } func TestAgReqSetCGRReplyWithError(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1089,7 +1089,7 @@ func (ev myEv) AsNavigableMap() utils.NavigableMap2 { } func TestAgReqSetCGRReplyWithoutError(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1154,7 +1154,7 @@ func TestAgReqParseFieldMetaCCUsage(t *testing.T) { }}) //create diameterDataProvider dP := newDADataProvider(nil, m) - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1238,7 +1238,7 @@ func TestAgReqParseFieldMetaUsageDifference(t *testing.T) { }}) //create diameterDataProvider dP := newDADataProvider(nil, m) - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1304,7 +1304,7 @@ func TestAgReqParseFieldMetaSum(t *testing.T) { }}) //create diameterDataProvider dP := newDADataProvider(nil, m) - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1348,7 +1348,7 @@ func TestAgReqParseFieldMetaDifference(t *testing.T) { }}) //create diameterDataProvider dP := newDADataProvider(nil, m) - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1392,7 +1392,7 @@ func TestAgReqParseFieldMetaMultiply(t *testing.T) { }}) //create diameterDataProvider dP := newDADataProvider(nil, m) - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1436,7 +1436,7 @@ func TestAgReqParseFieldMetaDivide(t *testing.T) { }}) //create diameterDataProvider dP := newDADataProvider(nil, m) - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1480,7 +1480,7 @@ func TestAgReqParseFieldMetaValueExponent(t *testing.T) { }}) //create diameterDataProvider dP := newDADataProvider(nil, m) - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1534,7 +1534,7 @@ func TestAgReqParseFieldMetaValueExponent(t *testing.T) { } func TestAgReqOverwrite(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1586,7 +1586,7 @@ func TestAgReqOverwrite(t *testing.T) { } func TestAgReqGroupType(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1630,7 +1630,7 @@ func TestAgReqGroupType(t *testing.T) { } func TestAgReqSetFieldsInTmp(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1664,7 +1664,7 @@ func TestAgReqSetFieldsInTmp(t *testing.T) { } func TestAgReqSetFieldsIp2Hex(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1692,7 +1692,7 @@ func TestAgReqSetFieldsIp2Hex(t *testing.T) { } func TestAgReqSetFieldsString2Hex(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1720,7 +1720,7 @@ func TestAgReqSetFieldsString2Hex(t *testing.T) { } func TestAgReqSetFieldsWithRemove(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1858,7 +1858,7 @@ func TestAgReqSetFieldsWithRemove(t *testing.T) { } func TestAgReqSetFieldsInCache(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1899,7 +1899,7 @@ func TestAgReqSetFieldsInCache(t *testing.T) { } func TestAgReqSetFieldsInCacheWithTimeOut(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -1994,7 +1994,7 @@ func TestAgReqFiltersInsideField(t *testing.T) { }), }}) //create diameterDataProvider - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -2025,7 +2025,7 @@ func TestAgReqFiltersInsideField(t *testing.T) { } func TestAgReqDynamicPath(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -2099,7 +2099,7 @@ func TestAgReqDynamicPath(t *testing.T) { } func TestAgReqRoundingDecimals(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) @@ -2151,7 +2151,7 @@ PASS ok github.com/cgrates/cgrates/agents 36.788s */ func BenchmarkAgReqSetField(b *testing.B) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) diff --git a/agents/fsevent_test.go b/agents/fsevent_test.go index d811a7703..f071fa8f4 100644 --- a/agents/fsevent_test.go +++ b/agents/fsevent_test.go @@ -408,7 +408,7 @@ Task-ID: 2 Task-Desc: heartbeat Task-Group: core Task-Runtime: 1349437318` - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() config.SetCgrConfig(cfg) ev := NewFSEvent(body) setupTime, _ := ev.GetSetupTime("Event-Date-Local", "") @@ -460,7 +460,7 @@ Task-Runtime: 1349437318` } func TestParseFsHangup(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() config.SetCgrConfig(cfg) ev := NewFSEvent(hangupEv) setupTime, _ := ev.GetSetupTime(utils.MetaDefault, "") @@ -489,7 +489,7 @@ func TestParseFsHangup(t *testing.T) { } func TestParseEventValue(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() config.SetCgrConfig(cfg) ev := NewFSEvent(hangupEv) if tor, _ := ev.ParseEventValue(config.NewRSRParserMustCompile(utils.DynamicDataPrefix+utils.ToR), ""); tor != utils.VOICE { @@ -575,7 +575,7 @@ func TestFsEvAsCGREvent(t *testing.T) { } func TestFsEvAsMapStringInterface(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() config.SetCgrConfig(cfg) ev := NewFSEvent(hangupEv) setupTime, _ := utils.ParseTimeDetectLayout("1436280728", "") @@ -605,7 +605,7 @@ func TestFsEvAsMapStringInterface(t *testing.T) { } func TestFsEvGetExtraFields(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() var err error err = nil cfg.FsAgentCfg().ExtraFields, err = config.NewRSRParsersFromSlice([]string{ @@ -953,7 +953,7 @@ variable_rtp_audio_rtcp_packet_count: 0 variable_rtp_audio_rtcp_octet_count: 0` var fsCdrCfg *config.CGRConfig timezone := config.CgrConfig().GeneralCfg().DefaultTimezone - fsCdrCfg, _ = config.NewDefaultCGRConfig() + fsCdrCfg = config.NewDefaultCGRConfig() newReader := bytes.NewReader(body) fsCdr, err := engine.NewFSCdr(newReader, fsCdrCfg) if err != nil { diff --git a/agents/libdiam_test.go b/agents/libdiam_test.go index 5df2fb16d..098700a90 100644 --- a/agents/libdiam_test.go +++ b/agents/libdiam_test.go @@ -1146,7 +1146,7 @@ func TestFilterWithDiameterDP(t *testing.T) { diam.NewAVP(432, avp.Mbit, 0, datatype.Unsigned32(99)), }}) dP := newDADataProvider(nil, avps) - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) filterS := engine.NewFilterS(cfg, nil, dm) diff --git a/analyzers/analyzers_test.go b/analyzers/analyzers_test.go index 100992f3f..d333453e6 100644 --- a/analyzers/analyzers_test.go +++ b/analyzers/analyzers_test.go @@ -35,15 +35,12 @@ import ( ) func TestNewAnalyzerService(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() cfg.AnalyzerSCfg().DBPath = "/tmp/analyzers" if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { t.Fatal(err) } - if err = os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { + if err := os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { t.Fatal(err) } anz, err := NewAnalyzerService(cfg) @@ -69,16 +66,14 @@ func TestNewAnalyzerService(t *testing.T) { } func TestAnalyzerSLogTraffic(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + cfg.AnalyzerSCfg().DBPath = "/tmp/analyzers" cfg.AnalyzerSCfg().TTL = 30 * time.Minute if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { t.Fatal(err) } - if err = os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { + if err := os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { t.Fatal(err) } anz, err := NewAnalyzerService(cfg) @@ -125,16 +120,14 @@ func TestAnalyzerSLogTraffic(t *testing.T) { } func TestAnalyzersDeleteHits(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + cfg.AnalyzerSCfg().DBPath = "/tmp/analyzers" cfg.AnalyzerSCfg().TTL = 30 * time.Minute if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { t.Fatal(err) } - if err = os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { + if err := os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { t.Fatal(err) } anz, err := NewAnalyzerService(cfg) @@ -150,16 +143,14 @@ func TestAnalyzersDeleteHits(t *testing.T) { } func TestAnalyzersListenAndServe(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + cfg.AnalyzerSCfg().DBPath = "/tmp/analyzers" cfg.AnalyzerSCfg().TTL = 30 * time.Minute if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { t.Fatal(err) } - if err = os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { + if err := os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { t.Fatal(err) } anz, err := NewAnalyzerService(cfg) @@ -188,16 +179,13 @@ func TestAnalyzersListenAndServe(t *testing.T) { } func TestAnalyzersV1Search(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() cfg.AnalyzerSCfg().DBPath = "/tmp/analyzers" cfg.AnalyzerSCfg().TTL = 30 * time.Minute if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { t.Fatal(err) } - if err = os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { + if err := os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { t.Fatal(err) } dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), cfg.CacheCfg(), nil) diff --git a/analyzers/codec_test.go b/analyzers/codec_test.go index eae5a1fd8..6be3683f7 100644 --- a/analyzers/codec_test.go +++ b/analyzers/codec_test.go @@ -47,16 +47,13 @@ func (c *mockServerCodec) WriteResponse(r *rpc.Response, x interface{}) error { func (c *mockServerCodec) Close() error { return nil } func TestNewServerCodec(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() cfg.AnalyzerSCfg().DBPath = "/tmp/analyzers" cfg.AnalyzerSCfg().TTL = 30 * time.Minute if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { t.Fatal(err) } - if err = os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { + if err := os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { t.Fatal(err) } anz, err := NewAnalyzerService(cfg) diff --git a/analyzers/connector_test.go b/analyzers/connector_test.go index 7c09c17d0..565aafb8d 100644 --- a/analyzers/connector_test.go +++ b/analyzers/connector_test.go @@ -35,15 +35,13 @@ func (c *mockConnector) Call(_ string, _, _ interface{}) (err error) { return errors.New("error") } func TestNewAnalyzeConnector(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + cfg.AnalyzerSCfg().DBPath = "/tmp/analyzers" if err := os.RemoveAll(cfg.AnalyzerSCfg().DBPath); err != nil { t.Fatal(err) } - if err = os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { + if err := os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil { t.Fatal(err) } anz, err := NewAnalyzerService(cfg) diff --git a/apier/v1/accounts_test.go b/apier/v1/accounts_test.go index 105338df9..b25a762f4 100644 --- a/apier/v1/accounts_test.go +++ b/apier/v1/accounts_test.go @@ -32,7 +32,7 @@ var ( ) func init() { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() apierAcntsAcntStorage = engine.NewInternalDB(nil, nil, true) apierAcnts = &APIerSv1{ DataManager: engine.NewDataManager(apierAcntsAcntStorage, config.CgrConfig().CacheCfg(), nil), diff --git a/apier/v1/debit_test.go b/apier/v1/debit_test.go index a7a0a2aa8..92a1c682f 100644 --- a/apier/v1/debit_test.go +++ b/apier/v1/debit_test.go @@ -35,7 +35,7 @@ var ( ) func init() { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() config.SetCgrConfig(cfg) apierDebitStorage = engine.NewInternalDB(nil, nil, true) @@ -50,7 +50,7 @@ func init() { } func TestDebitUsageWithOptionsSetConfig(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() config.SetCgrConfig(cfg) apierDebitStorage = engine.NewInternalDB(nil, nil, true) responder := &engine.Responder{MaxComputedUsage: cfg.RalsCfg().MaxComputedUsage} diff --git a/cmd/cgr-migrator/cgr-migrator.go b/cmd/cgr-migrator/cgr-migrator.go index 8f1a1e090..deefe580b 100755 --- a/cmd/cgr-migrator/cgr-migrator.go +++ b/cmd/cgr-migrator/cgr-migrator.go @@ -41,7 +41,7 @@ var ( storDBIn migrator.MigratorStorDB storDBOut migrator.MigratorStorDB err error - dfltCfg, _ = config.NewDefaultCGRConfig() + dfltCfg = config.NewDefaultCGRConfig() cfgPath = cgrMigratorFlags.String("config_path", "", "Configuration directory path.") diff --git a/cmd/cgr-tester/cgr-tester.go b/cmd/cgr-tester/cgr-tester.go index a97c55101..4f53b1ce1 100644 --- a/cmd/cgr-tester/cgr-tester.go +++ b/cmd/cgr-tester/cgr-tester.go @@ -37,7 +37,7 @@ import ( var ( cgrTesterFlags = flag.NewFlagSet("cgr-tester", flag.ContinueOnError) - cgrConfig, _ = config.NewDefaultCGRConfig() + cgrConfig = config.NewDefaultCGRConfig() tstCfg = config.CgrConfig() cpuprofile = cgrTesterFlags.String("cpuprofile", "", "write cpu profile to file") memprofile = cgrTesterFlags.String("memprofile", "", "write memory profile to this file") diff --git a/config/analyzerscfg_test.go b/config/analyzerscfg_test.go index f8852f04d..7455b0631 100644 --- a/config/analyzerscfg_test.go +++ b/config/analyzerscfg_test.go @@ -36,9 +36,8 @@ func TestAnalyzerSCfgloadFromJsonCfg(t *testing.T) { IndexType: utils.MetaScorch, TTL: 24 * time.Hour, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.analyzerSCfg.loadFromJSONCfg(jsonCfg); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.analyzerSCfg.loadFromJSONCfg(jsonCfg); err != nil { t.Error(err) } else if !reflect.DeepEqual(jsnCfg.analyzerSCfg, expected) { t.Errorf("Expected %+v \n, received %+v", expected, jsnCfg.analyzerSCfg) @@ -89,17 +88,15 @@ func TestAnalyzerSCfgloadFromJsonCfgErr(t *testing.T) { jsonCfg := &AnalyzerSJsonCfg{ Cleanup_interval: utils.StringPointer("24ha"), } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.analyzerSCfg.loadFromJSONCfg(jsonCfg); err == nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.analyzerSCfg.loadFromJSONCfg(jsonCfg); err == nil { t.Errorf("Expected error received nil") } jsonCfg = &AnalyzerSJsonCfg{ Ttl: utils.StringPointer("24ha"), } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.analyzerSCfg.loadFromJSONCfg(jsonCfg); err == nil { + jsnCfg = NewDefaultCGRConfig() + if err = jsnCfg.analyzerSCfg.loadFromJSONCfg(jsonCfg); err == nil { t.Errorf("Expected error received nil") } } diff --git a/config/apiercfg_test.go b/config/apiercfg_test.go index 77b7353c9..45c96b24c 100644 --- a/config/apiercfg_test.go +++ b/config/apiercfg_test.go @@ -39,9 +39,8 @@ func TestApierCfgloadFromJsonCfg(t *testing.T) { AttributeSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes), "*conn1"}, EEsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaEEs), "*conn1"}, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.apier.loadFromJSONCfg(jsonCfg); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.apier.loadFromJSONCfg(jsonCfg); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsnCfg.apier) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.apier)) diff --git a/config/attributescfg_test.go b/config/attributescfg_test.go index c04d311d7..2ba079fff 100644 --- a/config/attributescfg_test.go +++ b/config/attributescfg_test.go @@ -49,9 +49,8 @@ func TestAttributeSCfgloadFromJsonCfg(t *testing.T) { ProcessRuns: 1, NestedFields: true, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.attributeSCfg.loadFromJSONCfg(jsonCfg); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.attributeSCfg.loadFromJSONCfg(jsonCfg); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsnCfg.attributeSCfg) { t.Errorf("Expected %+v, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.attributeSCfg)) diff --git a/config/cachecfg_test.go b/config/cachecfg_test.go index 2fc6c62b5..b0f54e658 100644 --- a/config/cachecfg_test.go +++ b/config/cachecfg_test.go @@ -69,9 +69,8 @@ func TestCacheCfgloadFromJsonCfg(t *testing.T) { }, ReplicationConns: []string{"conn1", "conn2"}, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.cacheCfg.loadFromJSONCfg(nil); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.cacheCfg.loadFromJSONCfg(nil); err != nil { t.Error(err) } else if err = jsnCfg.cacheCfg.loadFromJSONCfg(jsonCfg); err != nil { t.Error(err) @@ -90,9 +89,8 @@ func TestReplicationConnsLoadFromJsonCfg(t *testing.T) { Replication_conns: &[]string{utils.MetaInternal}, } expErrMessage := "replication connection ID needs to be different than *internal" - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.cacheCfg.loadFromJSONCfg(jsonCfg); err == nil || err.Error() != expErrMessage { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.cacheCfg.loadFromJSONCfg(jsonCfg); err == nil || err.Error() != expErrMessage { t.Errorf("Expected %+v , recevied %+v", expErrMessage, err) } } @@ -129,9 +127,8 @@ func TestCacheParamCfgloadFromJsonCfg2(t *testing.T) { }, } expErrMessage := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.cacheCfg.loadFromJSONCfg(jsonCfg); err == nil || err.Error() != expErrMessage { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.cacheCfg.loadFromJSONCfg(jsonCfg); err == nil || err.Error() != expErrMessage { t.Errorf("Expected %+v \n, recevied %+v", expErrMessage, err) } } @@ -149,9 +146,8 @@ func TestAddTmpCaches(t *testing.T) { Partitions: map[string]*CacheParamCfg{}, } expected.AddTmpCaches() - if json, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = json.cacheCfg.loadFromJSONCfg(cfgJSON); err != nil { + json := NewDefaultCGRConfig() + if err = json.cacheCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected.Partitions[utils.CacheRatingProfilesTmp], json.cacheCfg.Partitions[utils.CacheRatingProfilesTmp]) { diff --git a/config/cdrscfg_test.go b/config/cdrscfg_test.go index 7ebab2caf..67f5e3c1d 100644 --- a/config/cdrscfg_test.go +++ b/config/cdrscfg_test.go @@ -52,9 +52,8 @@ func TestCdrsCfgloadFromJsonCfg(t *testing.T) { EEsConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaEEs), "*conn1"}, ExtraFields: RSRParsers{}, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.cdrsCfg.loadFromJSONCfg(jsonCfg); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.cdrsCfg.loadFromJSONCfg(jsonCfg); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsnCfg.cdrsCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.cdrsCfg)) @@ -66,9 +65,8 @@ func TestExtraFieldsinloadFromJsonCfg(t *testing.T) { Extra_fields: &[]string{utils.EmptyString}, } expectedErrMessage := "emtpy RSRParser in rule: <>" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.cdrsCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expectedErrMessage { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.cdrsCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expectedErrMessage { t.Errorf("Expected %+v, received %+v", expectedErrMessage, err) } } diff --git a/config/chargerscfg_test.go b/config/chargerscfg_test.go index 44d544688..b60896cba 100644 --- a/config/chargerscfg_test.go +++ b/config/chargerscfg_test.go @@ -43,9 +43,8 @@ func TestChargerSCfgloadFromJsonCfg(t *testing.T) { SuffixIndexedFields: &[]string{"*req.Field1", "*req.Field2"}, NestedFields: true, } - if jsncfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsncfg.chargerSCfg.loadFromJSONCfg(jsonCfg); err != nil { + jsncfg := NewDefaultCGRConfig() + if err = jsncfg.chargerSCfg.loadFromJSONCfg(jsonCfg); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsncfg.chargerSCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsncfg.chargerSCfg)) diff --git a/config/config.go b/config/config.go index 832c65954..3dbd58917 100644 --- a/config/config.go +++ b/config/config.go @@ -117,7 +117,7 @@ func (dbDflt dbDefaults) dbPass(dbType string, flagInput string) string { } func init() { - cgrCfg, _ = NewDefaultCGRConfig() + cgrCfg = NewDefaultCGRConfig() dbDefaultsCfg = newDbDefaults() } @@ -132,7 +132,12 @@ func SetCgrConfig(cfg *CGRConfig) { } // NewDefaultCGRConfig returns the default configuration -func NewDefaultCGRConfig() (cfg *CGRConfig, err error) { +func NewDefaultCGRConfig() (cfg *CGRConfig) { + cfg, _ = newCGRConfig([]byte(CGRATES_CFG_JSON)) + return +} + +func newCGRConfig(config []byte) (cfg *CGRConfig, err error) { cfg = new(CGRConfig) cfg.initChanels() cfg.DataFolderPath = "/usr/share/cgrates/" @@ -195,7 +200,7 @@ func NewDefaultCGRConfig() (cfg *CGRConfig, err error) { cfg.coreSCfg = new(CoreSCfg) var cgrJSONCfg *CgrJsonCfg - if cgrJSONCfg, err = NewCgrJsonCfgFromBytes([]byte(CGRATES_CFG_JSON)); err != nil { + if cgrJSONCfg, err = NewCgrJsonCfgFromBytes(config); err != nil { return } if err = cfg.loadFromJSONCfg(cgrJSONCfg); err != nil { @@ -228,7 +233,7 @@ func NewDefaultCGRConfig() (cfg *CGRConfig, err error) { // NewCGRConfigFromJSONStringWithDefaults returns the given config with the default option loaded func NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr string) (cfg *CGRConfig, err error) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() jsnCfg := new(CgrJsonCfg) if err = NewRjReaderFromBytes([]byte(cfgJSONStr)).Decode(jsnCfg); err != nil { return @@ -240,9 +245,7 @@ func NewCGRConfigFromJSONStringWithDefaults(cfgJSONStr string) (cfg *CGRConfig, // NewCGRConfigFromPath reads all json files out of a folder/subfolders and loads them up in lexical order func NewCGRConfigFromPath(path string) (cfg *CGRConfig, err error) { - if cfg, err = NewDefaultCGRConfig(); err != nil { - return - } + cfg = NewDefaultCGRConfig() cfg.ConfigPath = path if err = cfg.loadConfigFromPath(path, []func(*CgrJsonCfg) error{cfg.loadFromJSONCfg}, false); err != nil { @@ -255,9 +258,7 @@ func NewCGRConfigFromPath(path string) (cfg *CGRConfig, err error) { // newCGRConfigFromPathWithoutEnv reads all json files out of a folder/subfolders and loads them up in lexical order // it will not read *env variables and will not checkConfigSanity as it is not needed for configs func newCGRConfigFromPathWithoutEnv(path string) (cfg *CGRConfig, err error) { - if cfg, err = NewDefaultCGRConfig(); err != nil { - return - } + cfg = NewDefaultCGRConfig() cfg.ConfigPath = path err = cfg.loadConfigFromPath(path, []func(*CgrJsonCfg) error{cfg.loadFromJSONCfg}, true) diff --git a/config/config_it_test.go b/config/config_it_test.go index 8fd9181e6..0755f337d 100644 --- a/config/config_it_test.go +++ b/config/config_it_test.go @@ -83,10 +83,8 @@ func TestCGRConfig(t *testing.T) { func testNewCgrJsonCfgFromHttp(t *testing.T) { addr := "https://raw.githubusercontent.com/cgrates/cgrates/master/data/conf/samples/tutmongo/cgrates.json" - expVal, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + expVal := NewDefaultCGRConfig() + err = expVal.loadConfigFromPath(path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), []func(*CgrJsonCfg) error{expVal.loadFromJSONCfg}, false) if err != nil { @@ -97,10 +95,7 @@ func testNewCgrJsonCfgFromHttp(t *testing.T) { return } - rply, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + rply := NewDefaultCGRConfig() if err = rply.loadConfigFromPath(addr, []func(*CgrJsonCfg) error{rply.loadFromJSONCfg}, false); err != nil { t.Error(err) } else if !reflect.DeepEqual(expVal, rply) { @@ -133,10 +128,8 @@ func testNewCGRConfigFromPath(t *testing.T) { } func testCGRConfigReloadAttributeS(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + var reply string if err = cfg.V1ReloadConfig(&ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), @@ -163,10 +156,8 @@ func testCGRConfigReloadAttributeS(t *testing.T) { } func testCGRConfigReloadChargerSDryRun(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + var reply string if err = cfg.V1ReloadConfig(&ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), @@ -177,7 +168,7 @@ func testCGRConfigReloadChargerSDryRun(t *testing.T) { } else if reply != utils.OK { t.Errorf("Expected OK received: %s", reply) } - ecfg, _ := NewDefaultCGRConfig() + ecfg := NewDefaultCGRConfig() if !reflect.DeepEqual(ecfg.ChargerSCfg(), cfg.ChargerSCfg()) { t.Errorf("Expected %s , received: %s ", utils.ToJSON(ecfg.ChargerSCfg()), utils.ToJSON(cfg.ChargerSCfg())) @@ -185,10 +176,8 @@ func testCGRConfigReloadChargerSDryRun(t *testing.T) { } func testCGRConfigReloadChargerS(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + var reply string if err = cfg.V1ReloadConfig(&ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), @@ -212,10 +201,8 @@ func testCGRConfigReloadChargerS(t *testing.T) { } func testCGRConfigReloadThresholdS(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + var reply string if err = cfg.V1ReloadConfig(&ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), @@ -238,10 +225,8 @@ func testCGRConfigReloadThresholdS(t *testing.T) { } func testCGRConfigReloadStatS(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + var reply string if err = cfg.V1ReloadConfig(&ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), @@ -265,10 +250,8 @@ func testCGRConfigReloadStatS(t *testing.T) { } func testCGRConfigReloadResourceS(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + var reply string if err = cfg.V1ReloadConfig(&ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), @@ -292,10 +275,8 @@ func testCGRConfigReloadResourceS(t *testing.T) { } func testCGRConfigReloadSupplierS(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + var reply string if err = cfg.V1ReloadConfig(&ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), @@ -324,10 +305,8 @@ func testCGRConfigReloadSupplierS(t *testing.T) { } func testCGRConfigV1ReloadConfigFromPathInvalidSection(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfg := NewDefaultCGRConfig() + expectedErr := "Invalid section: " var reply string if err := cfg.V1ReloadConfig(&ReloadArgs{ @@ -348,9 +327,8 @@ func testCGRConfigV1ReloadConfigFromPathInvalidSection(t *testing.T) { func testV1ReloadConfigFromPathConfigSanity(t *testing.T) { expectedErr := " not enabled but requested by component" var reply string - if cfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfg.V1ReloadConfig(&ReloadArgs{ + cfg := NewDefaultCGRConfig() + if err := cfg.V1ReloadConfig(&ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutinternal"), Section: ChargerSCfgJson}, &reply); err == nil || err.Error() != expectedErr { t.Errorf("Expected %+v, received %+v", expectedErr, err) @@ -358,10 +336,8 @@ func testV1ReloadConfigFromPathConfigSanity(t *testing.T) { } func testLoadConfigFromHTTPValidURL(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfg := NewDefaultCGRConfig() + url := "https://raw.githubusercontent.com/cgrates/cgrates/master/data/conf/samples/multifiles/a.json" if err := cfg.loadConfigFromHTTP(url, nil); err != nil { t.Error(err) @@ -369,10 +345,8 @@ func testLoadConfigFromHTTPValidURL(t *testing.T) { } func testCGRConfigReloadSchedulerS(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + var reply string if err = cfg.V1ReloadConfig(&ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo2"), @@ -395,10 +369,8 @@ func testCGRConfigReloadSchedulerS(t *testing.T) { } func testCGRConfigReloadCDRs(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + cfg.RalsCfg().Enabled = true var reply string if err = cfg.V1ReloadConfig(&ReloadArgs{ @@ -432,10 +404,8 @@ func testCGRConfigReloadCDRs(t *testing.T) { } func testCGRConfigReloadRALs(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + blMap := cfg.RalsCfg().BalanceRatingSubject maxComp := cfg.RalsCfg().MaxComputedUsage var reply string @@ -465,10 +435,8 @@ func testCGRConfigReloadRALs(t *testing.T) { } func testCGRConfigReloadSessionS(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + cfg.RalsCfg().Enabled = true cfg.ChargerSCfg().Enabled = true cfg.CdrsCfg().Enabled = true @@ -520,10 +488,8 @@ func testCGRConfigReloadERs(t *testing.T) { } } - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + cfg.SessionSCfg().Enabled = true var reply string if err = cfg.V1ReloadConfig(&ReloadArgs{ @@ -597,10 +563,8 @@ func testCGRConfigReloadERs(t *testing.T) { } func testCGRConfigReloadDNSAgent(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + cfg.SessionSCfg().Enabled = true var reply string if err = cfg.V1ReloadConfig(&ReloadArgs{ @@ -625,10 +589,8 @@ func testCGRConfigReloadDNSAgent(t *testing.T) { } func testCGRConfigReloadFreeswitchAgent(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + cfg.SessionSCfg().Enabled = true var reply string if err = cfg.V1ReloadConfig(&ReloadArgs{ @@ -800,7 +762,7 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { }, } - cfg, _ := NewDefaultCGRConfig() + cfg := NewDefaultCGRConfig() var reply string var rcv map[string]interface{} @@ -830,10 +792,8 @@ func testCgrCfgV1ReloadConfigSection(t *testing.T) { } func testCGRConfigReloadConfigFromJSONSessionS(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + cfg.RalsCfg().Enabled = true cfg.ChargerSCfg().Enabled = true cfg.CdrsCfg().Enabled = true @@ -885,10 +845,8 @@ func testCGRConfigReloadConfigFromJSONSessionS(t *testing.T) { } func testCGRConfigReloadConfigFromStringSessionS(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + cfg.RalsCfg().Enabled = true cfg.ChargerSCfg().Enabled = true cfg.CdrsCfg().Enabled = true @@ -945,10 +903,8 @@ func testCGRConfigReloadConfigFromStringSessionS(t *testing.T) { } func testCGRConfigReloadAll(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + cfg.RalsCfg().Enabled = true cfg.ChargerSCfg().Enabled = true cfg.CdrsCfg().Enabled = true @@ -1105,10 +1061,8 @@ func testHttpHandlerConfigSForFolder(t *testing.T) { } func testLoadConfigFromFolderFileNotFound(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + expected := "file :NOT_FOUND:ENV_VAR:DOCKER_IP" if err = cfg.loadConfigFromFolder("/usr/share/cgrates/conf/samples/", []func(jsonCfg *CgrJsonCfg) error{cfg.loadFromJSONCfg}, @@ -1122,10 +1076,8 @@ func testLoadConfigFromFolderOpenError(t *testing.T) { if err = os.MkdirAll(newDir, 755); err != nil { t.Fatal(err) } - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + expected := "open /tmp/testLoadConfigFromFolderOpenError/notes.json: no such file or directory" if err = cfg.loadConfigFromFile(path.Join(newDir, "notes.json"), []func(jsonCfg *CgrJsonCfg) error{cfg.loadFromJSONCfg}, @@ -1142,10 +1094,8 @@ func testLoadConfigFromFolderNoConfigFound(t *testing.T) { if err = os.MkdirAll(newDir, 755); err != nil { t.Fatal(err) } - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + if err = cfg.loadConfigFromFolder(newDir, []func(jsonCfg *CgrJsonCfg) error{cfg.loadFromJSONCfg}, false); err == nil || err != filepath.ErrBadPattern { @@ -1157,10 +1107,8 @@ func testLoadConfigFromFolderNoConfigFound(t *testing.T) { } func testLoadConfigFromPathInvalidArgument(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + expected := "stat /\x00: invalid argument" if err = cfg.loadConfigFromPath("/\x00", []func(jsonCfg *CgrJsonCfg) error{cfg.loadFromJSONCfg}, @@ -1174,10 +1122,8 @@ func testLoadConfigFromPathValidPath(t *testing.T) { if err = os.MkdirAll(newDir, 755); err != nil { t.Fatal(err) } - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + expected := "No config file found on path /tmp/randomDir" if err = cfg.loadConfigFromPath(newDir, []func(jsonCfg *CgrJsonCfg) error{cfg.loadFromJSONCfg}, @@ -1194,10 +1140,8 @@ func testLoadConfigFromPathFile(t *testing.T) { if err = os.MkdirAll(newDir, 755); err != nil { t.Fatal(err) } - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + expected := "No config file found on path /tmp/randomDir" if err = cfg.loadConfigFromPath(newDir, []func(jsonCfg *CgrJsonCfg) error{cfg.loadFromJSONCfg}, diff --git a/config/config_test.go b/config/config_test.go index a34159f47..0be664763 100644 --- a/config/config_test.go +++ b/config/config_test.go @@ -35,7 +35,7 @@ var cfg *CGRConfig var err error func TestCgrCfgConfigSharing(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() SetCgrConfig(cfg) cfgReturn := CgrConfig() if !reflect.DeepEqual(cfgReturn, cfg) { @@ -55,7 +55,7 @@ func TestCgrCfgLoadWithDefaults(t *testing.T) { }, }` - eCgrCfg, err := NewDefaultCGRConfig() + eCgrCfg := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -204,7 +204,7 @@ func TestHttpAgentCfg(t *testing.T) { ], } ` - eCgrCfg, _ := NewDefaultCGRConfig() + eCgrCfg := NewDefaultCGRConfig() eCgrCfg.httpAgentCfg = []*HTTPAgentCfg{ { ID: "conecto1", @@ -223,13 +223,6 @@ func TestHttpAgentCfg(t *testing.T) { } } -func TestCgrCfgLoadJSONDefaults(t *testing.T) { - cgrCfg, err = NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } -} - func TestCgrCfgJSONDefaultsGeneral(t *testing.T) { if cgrCfg.GeneralCfg().RoundingDecimals != 5 { t.Errorf("Expected: 5, received: %+v", cgrCfg.GeneralCfg().RoundingDecimals) @@ -1060,7 +1053,7 @@ func TestLoadRPCConnsError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field RPCConnsJson.PoolSize of type int" - cgrCfg, err := NewDefaultCGRConfig() + cgrCfg := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1085,7 +1078,7 @@ func TestLoadGeneralCfgError(t *testing.T) { } }` expected := "json: cannot unmarshal array into Go struct field GeneralJsonCfg.Max_call_duration of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1103,7 +1096,7 @@ func TestLoadCacheCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal number into Go struct field CacheJsonCfg.Replication_conns of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1121,7 +1114,7 @@ func TestLoadListenCfgError(t *testing.T) { } }` expected := "json: cannot unmarshal number into Go struct field ListenJsonCfg.Http_tls of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1139,7 +1132,7 @@ func TestLoadHTTPCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field HTTPJsonCfg.Auth_users of type map[string]string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1157,7 +1150,7 @@ func TestLoadDataDBCfgErrorCase1(t *testing.T) { } }` expected := "json: cannot unmarshal number into Go struct field DbJsonCfg.Db_host of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1175,7 +1168,7 @@ func TestLoadDataDBCfgErrorCase2(t *testing.T) { } }` expected := "Remote connection ID needs to be different than *internal" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1197,7 +1190,7 @@ func TestLoadStorDbCfgError(t *testing.T) { } }` expected := "json: cannot unmarshal string into Go struct field DbJsonCfg.Db_port of type int" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1215,7 +1208,7 @@ func TestLoadFilterSCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field FilterSJsonCfg.Stats_conns of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1233,7 +1226,7 @@ func TestLoadRalSCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field RalsJsonCfg.Stats_conns of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1251,7 +1244,7 @@ func TestLoadSchedulerCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field SchedulerJsonCfg.Filters of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1269,7 +1262,7 @@ func TestLoadCdrsCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field CdrsJsonCfg.Ees_conns of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1287,7 +1280,7 @@ func TestLoadSessionSCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal number into Go struct field SessionSJsonCfg.Session_ttl_usage of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1305,7 +1298,7 @@ func TestLoadFreeswitchAgentCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field FreeswitchAgentJsonCfg.Sessions_conns of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1323,7 +1316,7 @@ func TestLoadKamAgentCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal number into Go struct field KamAgentJsonCfg.Timezone of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1341,7 +1334,7 @@ func TestLoadAsteriskAgentCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field AsteriskAgentJsonCfg.Sessions_conns of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1363,7 +1356,7 @@ func TestLoadDiameterAgentCfgError(t *testing.T) { } }` expected := "json: cannot unmarshal number into Go struct field ReqProcessorJsnCfg.Request_processors.ID of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1381,7 +1374,7 @@ func TestLoadRadiusAgentCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal number into Go struct field RadiusAgentJsonCfg.Listen_auth of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1399,7 +1392,7 @@ func TestLoadDNSAgentCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal number into Go struct field DNSAgentJsonCfg.Listen of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1419,7 +1412,7 @@ func TestLoadHttpAgentCfgError(t *testing.T) { ], }` expected := "json: cannot unmarshal array into Go struct field HttpAgentJsonCfg.Id of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1437,7 +1430,7 @@ func TestLoadAttributeSCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field AttributeSJsonCfg.Process_runs of type int" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1455,7 +1448,7 @@ func TestLoadChargerSCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field ChargerSJsonCfg.Prefix_indexed_fields of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1473,7 +1466,7 @@ func TestLoadResourceSCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field ResourceSJsonCfg.String_indexed_fields of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1491,7 +1484,7 @@ func TestLoadStatSCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field StatServJsonCfg.String_indexed_fields of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1509,7 +1502,7 @@ func TestLoadThresholdSCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal number into Go struct field ThresholdSJsonCfg.Store_interval of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1529,7 +1522,7 @@ func TestLoadLoaderSCfgError(t *testing.T) { ], }` expected := "json: cannot unmarshal number into Go struct field LoaderJsonCfg.Run_delay of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1547,7 +1540,7 @@ func TestLoadRouteSCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field RouteSJsonCfg.String_indexed_fields of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1565,7 +1558,7 @@ func TestLoadMailerCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal number into Go struct field MailerJsonCfg.Server of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1583,7 +1576,7 @@ func TestLoadSureTaxCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal number into Go struct field SureTaxJsonCfg.Sales_type_code of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1601,7 +1594,7 @@ func TestLoadDispatcherSCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field DispatcherSJsonCfg.Attributes_conns of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1619,7 +1612,7 @@ func TestLoadDispatcherHCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal number into Go struct field DispatcherHJsonCfg.Register_interval of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1637,7 +1630,7 @@ func TestLoadLoaderCgrCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field LoaderCfgJson.Caches_conns of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1655,7 +1648,7 @@ func TestLoadMigratorCgrCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field MigratorCfgJson.Users_filters of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1673,7 +1666,7 @@ func TestLoadTlsCgrCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field TlsJsonCfg.Server_policy of type int" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1692,7 +1685,7 @@ func TestLoadAnalyzerCgrCfgError(t *testing.T) { } }` expected := "json: cannot unmarshal number into Go struct field AnalyzerSJsonCfg.Enabled of type bool" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1710,7 +1703,7 @@ func TestLoadAPIBanCgrCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field APIBanJsonCfg.Enabled of type bool" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1728,7 +1721,7 @@ func TestLoadApierCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field ApierJsonCfg.Scheduler_conns of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1746,7 +1739,7 @@ func TestLoadErsCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field ERsJsonCfg.Sessions_conns of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1764,7 +1757,7 @@ func TestLoadEesCfgError(t *testing.T) { } }` expected := "json: cannot unmarshal string into Go struct field EEsJsonCfg.Attributes_conns of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1782,7 +1775,7 @@ func TestLoadCoreSCfgError(t *testing.T) { } }` expected := "json: cannot unmarshal string into Go struct field CoreSJsonCfg.Caps of type int" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1800,7 +1793,7 @@ func TestLoadRateSCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal string into Go struct field RateSJsonCfg.String_indexed_fields of type []string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1822,7 +1815,7 @@ func TestLoadSIPAgentCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal number into Go struct field ReqProcessorJsnCfg.Request_processors.ID of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1844,7 +1837,7 @@ func TestLoadTemplateSCfgError(t *testing.T) { } }` expected := "json: cannot unmarshal number into Go struct field FcTemplateJsonCfg.Tag of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1878,7 +1871,7 @@ func TestLoadConfigsCfgError(t *testing.T) { }, }` expected := "json: cannot unmarshal number into Go struct field ConfigSCfgJson.Url of type string" - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1922,7 +1915,7 @@ func TestSuretaxConfig(t *testing.T) { SalesTypeCode: NewRSRParsersMustCompile("R", utils.INFIELD_SEP), TaxExemptionCodeList: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1950,7 +1943,7 @@ func TestDiameterAgentConfig(t *testing.T) { ForcedDisconnect: "*none", RequestProcessors: nil, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1971,7 +1964,7 @@ func TestRadiusAgentConfig(t *testing.T) { SessionSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaSessionS)}, RequestProcessors: nil, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -1990,7 +1983,7 @@ func TestDNSAgentConfig(t *testing.T) { Timezone: "", RequestProcessors: nil, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2012,7 +2005,7 @@ func TestAttributeSConfig(t *testing.T) { ProcessRuns: 1, NestedFields: false, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2031,7 +2024,7 @@ func TestChargersConfig(t *testing.T) { SuffixIndexedFields: &[]string{}, NestedFields: false, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2051,7 +2044,7 @@ func TestResourceSConfig(t *testing.T) { SuffixIndexedFields: &[]string{}, NestedFields: false, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2072,7 +2065,7 @@ func TestStatSConfig(t *testing.T) { SuffixIndexedFields: &[]string{}, NestedFields: false, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2091,7 +2084,7 @@ func TestThresholdSConfig(t *testing.T) { SuffixIndexedFields: &[]string{}, NestedFields: false, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2115,7 +2108,7 @@ func TestRouteSConfig(t *testing.T) { DefaultRatio: 1, NestedFields: false, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2155,7 +2148,7 @@ func TestSessionSConfig(t *testing.T) { PublicKeyPath: "", }, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2185,7 +2178,7 @@ func TestFsAgentConfig(t *testing.T) { }, }, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2203,7 +2196,7 @@ func TestKamAgentConfig(t *testing.T) { EvapiConns: []*KamConnCfg{{Address: "127.0.0.1:8448", Reconnects: 5, Alias: ""}}, Timezone: "", } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2227,7 +2220,7 @@ func TestAsteriskAgentConfig(t *testing.T) { Reconnects: 5, }}, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2243,7 +2236,7 @@ func TestFilterSConfig(t *testing.T) { ResourceSConns: []string{}, ApierSConns: []string{}, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2271,7 +2264,7 @@ func TestLoaderConfig(t *testing.T) { Data: nil, }, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2291,7 +2284,7 @@ func TestDispatcherSConfig(t *testing.T) { AttributeSConns: []string{}, NestedFields: false, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2309,7 +2302,7 @@ func TestSchedulerConfig(t *testing.T) { StatSConns: []string{}, Filters: []string{}, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2327,7 +2320,7 @@ func TestAnalyzerConfig(t *testing.T) { IndexType: utils.MetaScorch, TTL: 24 * time.Hour, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2345,7 +2338,7 @@ func TestApierConfig(t *testing.T) { AttributeSConns: []string{}, EEsConns: []string{}, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2381,7 +2374,7 @@ func TestERSConfig(t *testing.T) { }, }, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2423,7 +2416,7 @@ func TestEEsNoLksConfig(t *testing.T) { }, }, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2445,7 +2438,7 @@ func TestRateSConfig(t *testing.T) { RateSuffixIndexedFields: &[]string{}, RateNestedFields: false, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2465,7 +2458,7 @@ func TestSIPAgentConfig(t *testing.T) { RetransmissionTimer: 1000000000, RequestProcessors: nil, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2502,7 +2495,7 @@ func TestRPCConnsConfig(t *testing.T) { }, }, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2559,7 +2552,7 @@ func TestTemplatesConfig(t *testing.T) { elem.ComputePath() } } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2578,7 +2571,7 @@ func TestConfigsConfig(t *testing.T) { URL: "/configs/", RootDir: "/var/spool/cgrates/configs", } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2593,7 +2586,7 @@ func TestAPIBanConfig(t *testing.T) { Enabled: false, Keys: []string{}, } - cgrConfig, err := NewDefaultCGRConfig() + cgrConfig := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2604,7 +2597,7 @@ func TestAPIBanConfig(t *testing.T) { } func TestRLockSections(t *testing.T) { - cgrCfg, err := NewDefaultCGRConfig() + cgrCfg := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2613,7 +2606,7 @@ func TestRLockSections(t *testing.T) { } func TestLockSections(t *testing.T) { - cgrCfg, err := NewDefaultCGRConfig() + cgrCfg := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -2622,7 +2615,7 @@ func TestLockSections(t *testing.T) { } func TestRLockAndRUnlock(t *testing.T) { - cgrCfg, err := NewDefaultCGRConfig() + cgrCfg := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -3456,7 +3449,7 @@ func TestCfgTlsCfg(t *testing.T) { "server_policy":3, }, }` - eCgrCfg, _ := NewDefaultCGRConfig() + eCgrCfg := NewDefaultCGRConfig() eCgrCfg.tlsCfg = &TLSCfg{ ServerCerificate: "path/To/Server/Cert", ServerKey: "path/To/Server/Key", @@ -3543,7 +3536,7 @@ func TestCgrCfgJSONDefaultRateCfg(t *testing.T) { func TestCgrCfgV1GetConfigAllConfig(t *testing.T) { var rcv map[string]interface{} - cgrCfg, err := NewDefaultCGRConfig() + cgrCfg := NewDefaultCGRConfig() if err != nil { t.Error(err) } @@ -3577,9 +3570,8 @@ func TestCgrCfgV1GetConfigSectionLoader(t *testing.T) { }, }, } - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfig(&SectionWithOpts{Section: LoaderJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfig(&SectionWithOpts{Section: LoaderJson}, &reply); err != nil { t.Error(err) } else if mp, can := reply[LoaderJson].([]map[string]interface{}); !can { t.Errorf("Unexpected type: %t", reply[LoaderJson]) @@ -3596,9 +3588,8 @@ func TestCgrCfgV1GetConfigSectionHTTPAgent(t *testing.T) { expected := map[string]interface{}{ HttpAgentJson: []map[string]interface{}{}, } - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfig(&SectionWithOpts{Section: HttpAgentJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfig(&SectionWithOpts{Section: HttpAgentJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, reply) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -3615,9 +3606,8 @@ func TestCgrCfgV1GetConfigSectionCoreS(t *testing.T) { utils.ShutdownTimeoutCfg: "1s", }, } - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfig(&SectionWithOpts{Section: CoreSCfgJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfig(&SectionWithOpts{Section: CoreSCfgJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, reply) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -3724,9 +3714,8 @@ func TestV1GetConfigDataDB(t *testing.T) { expected = map[string]interface{}{ DATADB_JSN: expected, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: DATADB_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: DATADB_JSN}, &reply); err != nil { t.Error(err) } else if mp, can := reply[DATADB_JSN].(map[string]interface{}); !can { t.Errorf("Unexpected type: %t", reply[DATADB_JSN]) @@ -3739,13 +3728,10 @@ func TestV1GetConfigDataDB(t *testing.T) { } expectedErr := "strconv.Atoi: parsing \"6579s\": invalid syntax" - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { + cfgCgr = NewDefaultCGRConfig() + cfgCgr.dataDbCfg.DataDbPort = "6579s" + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: DATADB_JSN}, &reply); err == nil || err.Error() != expectedErr { t.Error(err) - } else { - cfgCgr.dataDbCfg.DataDbPort = "6579s" - if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: DATADB_JSN}, &reply); err == nil || err.Error() != expectedErr { - t.Error(err) - } } } @@ -3775,9 +3761,8 @@ func TestV1GetConfigStorDB(t *testing.T) { expected = map[string]interface{}{ STORDB_JSN: expected, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: STORDB_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: STORDB_JSN}, &reply); err != nil { t.Error(err) } else if mp, can := reply[STORDB_JSN].(map[string]interface{}); !can { t.Errorf("Unexpected type: %t", reply[STORDB_JSN]) @@ -3802,9 +3787,8 @@ func TestV1GetConfigTLS(t *testing.T) { utils.CaCertificateCfg: "", }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: TlsCfgJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: TlsCfgJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -3819,9 +3803,8 @@ func TestV1GetConfigCache(t *testing.T) { utils.ReplicationConnsCfg: []string{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: CACHE_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: CACHE_JSN}, &reply); err != nil { t.Error(err) } else if mp, can := reply[CACHE_JSN].(map[string]interface{}); !can { t.Errorf("Unexpected type: %t", reply[CACHE_JSN]) @@ -3862,9 +3845,8 @@ func TestV1GetConfigHTTP(t *testing.T) { }, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: HTTP_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: HTTP_JSN}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -3880,9 +3862,8 @@ func TestV1GetConfigFilterS(t *testing.T) { utils.ApierSConnsCfg: []string{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: FilterSjsn}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: FilterSjsn}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -3914,9 +3895,8 @@ func TestV1GetConfigRals(t *testing.T) { utils.DynaprepaidActionplansCfg: []string{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: RALS_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: RALS_JSN}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -3934,9 +3914,8 @@ func TestV1GetConfigScheduler(t *testing.T) { utils.FiltersCfg: []string{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: SCHEDULER_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: SCHEDULER_JSN}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -3961,9 +3940,8 @@ func TestV1GetConfigCdrs(t *testing.T) { utils.EEsConnsCfg: []string{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: CDRS_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: CDRS_JSN}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4004,9 +3982,8 @@ func TestV1GetConfigSessionS(t *testing.T) { }, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: SessionSJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: SessionSJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4035,9 +4012,8 @@ func TestV1GetConfigFsAgent(t *testing.T) { }, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: FreeSWITCHAgentJSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: FreeSWITCHAgentJSN}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4061,9 +4037,8 @@ func TestV1GetConfigKamailioAgent(t *testing.T) { }, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: KamailioAgentJSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: KamailioAgentJSN}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4089,9 +4064,8 @@ func TestV1GetConfigAsteriskAgent(t *testing.T) { }, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: AsteriskAgentJSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: AsteriskAgentJSN}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4119,9 +4093,8 @@ func TestV1GetConfigDiameterAgent(t *testing.T) { utils.RequestProcessorsCfg: []map[string]interface{}{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: DA_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: DA_JSN}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4146,9 +4119,8 @@ func TestV1GetConfigRadiusAgent(t *testing.T) { utils.RequestProcessorsCfg: []map[string]interface{}{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: RA_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: RA_JSN}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4167,9 +4139,8 @@ func TestV1GetConfigDNSAgent(t *testing.T) { utils.RequestProcessorsCfg: []map[string]interface{}{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: DNSAgentJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: DNSAgentJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4191,9 +4162,8 @@ func TestV1GetConfigAttribute(t *testing.T) { utils.ProcessRunsCfg: 1, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: ATTRIBUTE_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: ATTRIBUTE_JSN}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4212,9 +4182,8 @@ func TestV1GetConfigChargers(t *testing.T) { utils.SuffixIndexedFieldsCfg: []string{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: ChargerSCfgJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: ChargerSCfgJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4234,9 +4203,8 @@ func TestV1GetConfigResourceS(t *testing.T) { utils.NestedFieldsCfg: false, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: RESOURCES_JSON}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: RESOURCES_JSON}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4257,9 +4225,8 @@ func TestV1GetConfigStats(t *testing.T) { utils.NestedFieldsCfg: false, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: STATS_JSON}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: STATS_JSON}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4278,9 +4245,8 @@ func TestV1GetConfigThresholds(t *testing.T) { utils.NestedFieldsCfg: false, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: THRESHOLDS_JSON}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: THRESHOLDS_JSON}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4304,9 +4270,8 @@ func TestV1GetConfigRoutes(t *testing.T) { utils.DefaultRatioCfg: 1, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: RouteSJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: RouteSJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4345,15 +4310,12 @@ func TestV1GetConfigSuretax(t *testing.T) { utils.TaxExemptionCodeListCfg: utils.EmptyString, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Fatal(err) - } else { - cfgCgr.SureTaxCfg().Timezone = time.UTC - if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: SURETAX_JSON}, &reply); err != nil { - t.Error(err) - } else if !reflect.DeepEqual(reply, expected) { - t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) - } + cfgCgr := NewDefaultCGRConfig() + cfgCgr.SureTaxCfg().Timezone = time.UTC + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: SURETAX_JSON}, &reply); err != nil { + t.Error(err) + } else if !reflect.DeepEqual(reply, expected) { + t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) } } @@ -4369,9 +4331,8 @@ func TestV1GetConfigDispatcherS(t *testing.T) { utils.AttributeSConnsCfg: []string{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: DispatcherSJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: DispatcherSJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4388,9 +4349,8 @@ func TestV1GetConfigDispatcherH(t *testing.T) { utils.RegisterIntervalCfg: "5m0s", }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: DispatcherHJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: DispatcherHJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4411,9 +4371,8 @@ func TestV1GetConfigSectionLoader(t *testing.T) { utils.GapiTokenCfg: json.RawMessage(`".gapi/token.json"`), }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: CgrLoaderCfgJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: CgrLoaderCfgJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4451,9 +4410,8 @@ func TestV1GetConfigSectionMigrator(t *testing.T) { }, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: CgrMigratorCfgJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: CgrMigratorCfgJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4471,9 +4429,8 @@ func TestV1GetConfigSectionApierS(t *testing.T) { utils.EEsConnsCfg: []string{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: ApierS}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: ApierS}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4515,9 +4472,8 @@ func TestV1GetConfigSectionEES(t *testing.T) { }, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: EEsJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: EEsJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4556,9 +4512,8 @@ func TestV1GetConfigSectionERS(t *testing.T) { }, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: ERsJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: ERsJson}, &reply); err != nil { t.Error(err) } else if mp, can := reply[ERsJson].(map[string]interface{}); !can { t.Errorf("Unexpected type: %t", reply[ERsJson]) @@ -4600,9 +4555,8 @@ func TestV1GetConfigSectionRPConns(t *testing.T) { }, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: RPCConnsJsonName}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: RPCConnsJsonName}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4622,9 +4576,8 @@ func TestV1GetConfigSectionSIPAgent(t *testing.T) { utils.RequestProcessorsCfg: []map[string]interface{}{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: SIPAgentJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: SIPAgentJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4662,9 +4615,8 @@ func TestV1GetConfigSectionTemplates(t *testing.T) { "*errSip": {}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: TemplatesJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: TemplatesJson}, &reply); err != nil { t.Error(err) } else if mp, can := reply[TemplatesJson].(map[string][]map[string]interface{}); !can { t.Errorf("Unexpected type: %t", reply[TemplatesJson]) @@ -4687,10 +4639,7 @@ func TestV1GetConfigSectionConfigs(t *testing.T) { utils.RootDirCfg: "/var/spool/cgrates/configs", }, } - cfgCgr, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfgCgr := NewDefaultCGRConfig() cfgCgr.ConfigSCfg().Enabled = true if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: ConfigSJson}, &reply); err != nil { t.Error(err) @@ -4699,19 +4648,17 @@ func TestV1GetConfigSectionConfigs(t *testing.T) { } var result string - if cfgCgr2, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = cfgCgr2.V1SetConfig(&SetConfigArgs{Config: reply, DryRun: true}, &result); err != nil { + cfgCgr2 := NewDefaultCGRConfig() + if err = cfgCgr2.V1SetConfig(&SetConfigArgs{Config: reply, DryRun: true}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Errorf("Unexpected result") - } else if cfgCgr, _ := NewDefaultCGRConfig(); !reflect.DeepEqual(cfgCgr.ConfigSCfg(), cfgCgr2.ConfigSCfg()) { + } else if cfgCgr := NewDefaultCGRConfig(); !reflect.DeepEqual(cfgCgr.ConfigSCfg(), cfgCgr2.ConfigSCfg()) { t.Errorf("Expected %+v, received %+v", utils.ToJSON(cfgCgr.ConfigSCfg()), utils.ToJSON(cfgCgr2.ConfigSCfg())) } - if cfgCgr2, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = cfgCgr2.V1SetConfig(&SetConfigArgs{Config: reply}, &result); err != nil { + cfgCgr2 = NewDefaultCGRConfig() + if err = cfgCgr2.V1SetConfig(&SetConfigArgs{Config: reply}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Errorf("Unexpected result") @@ -4728,9 +4675,8 @@ func TestV1GetConfigSectionAPIBans(t *testing.T) { utils.KeysCfg: []string{}, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: APIBanCfgJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: APIBanCfgJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4747,9 +4693,8 @@ func TestV1GetConfigSectionMailer(t *testing.T) { utils.MailerFromAddrCfg: "cgr-mailer@localhost.localdomain", }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: MAILER_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: MAILER_JSN}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4767,9 +4712,8 @@ func TestV1GetConfigSectionAnalyzer(t *testing.T) { utils.TTLCfg: "24h0m0s", }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: AnalyzerCfgJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: AnalyzerCfgJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4791,9 +4735,8 @@ func TestV1GetConfigSectionRateS(t *testing.T) { utils.RateNestedFieldsCfg: false, }, } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: RateSJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: RateSJson}, &reply); err != nil { t.Error(err) } else if !reflect.DeepEqual(reply, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(reply)) @@ -4803,18 +4746,16 @@ func TestV1GetConfigSectionRateS(t *testing.T) { func TestV1GetConfigSectionInvalidSection(t *testing.T) { var reply map[string]interface{} expected := "Invalid section" - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: "invalidSection"}, &reply); err == nil || err.Error() != expected { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfig(&SectionWithOpts{Section: "invalidSection"}, &reply); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } func TestV1ReloadConfigEmptyConfig(t *testing.T) { var reply string - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1SetConfig(&SetConfigArgs{}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1SetConfig(&SetConfigArgs{}, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Unexpected output: %+v", reply) @@ -4824,9 +4765,8 @@ func TestV1ReloadConfigEmptyConfig(t *testing.T) { func TestV1ReloadConfigUnmarshalError(t *testing.T) { var reply string expected := "json: unsupported type: chan int" - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1SetConfig(&SetConfigArgs{ + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1SetConfig(&SetConfigArgs{ Config: map[string]interface{}{ "randomValue": make(chan int), }, @@ -4842,9 +4782,8 @@ func TestV1ReloadConfigJSONWithLocks(t *testing.T) { "inexistentSection": map[string]interface{}{}, } expected := "Invalid section: " - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1SetConfig(&SetConfigArgs{Config: section}, &reply); err == nil || err.Error() != expected { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1SetConfig(&SetConfigArgs{Config: section}, &reply); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -4891,9 +4830,8 @@ func TestV1GetConfigAsJSONGeneral(t *testing.T) { func TestV1GetConfigAsJSONDataDB(t *testing.T) { var reply string expected := `{"data_db":{"db_host":"127.0.0.1","db_name":"10","db_password":"","db_port":6379,"db_type":"*redis","db_user":"cgrates","items":{"*account_action_plans":{"remote":false,"replicate":false},"*accounts":{"remote":false,"replicate":false},"*action_plans":{"remote":false,"replicate":false},"*action_triggers":{"remote":false,"replicate":false},"*actions":{"remote":false,"replicate":false},"*attribute_profiles":{"remote":false,"replicate":false},"*charger_profiles":{"remote":false,"replicate":false},"*destinations":{"remote":false,"replicate":false},"*dispatcher_hosts":{"remote":false,"replicate":false},"*dispatcher_profiles":{"remote":false,"replicate":false},"*filters":{"remote":false,"replicate":false},"*indexes":{"remote":false,"replicate":false},"*load_ids":{"remote":false,"replicate":false},"*rate_profiles":{"remote":false,"replicate":false},"*rating_plans":{"remote":false,"replicate":false},"*rating_profiles":{"remote":false,"replicate":false},"*resource_profiles":{"remote":false,"replicate":false},"*resources":{"remote":false,"replicate":false},"*reverse_destinations":{"remote":false,"replicate":false},"*route_profiles":{"remote":false,"replicate":false},"*shared_groups":{"remote":false,"replicate":false},"*statqueue_profiles":{"remote":false,"replicate":false},"*statqueues":{"remote":false,"replicate":false},"*threshold_profiles":{"remote":false,"replicate":false},"*thresholds":{"remote":false,"replicate":false},"*timings":{"remote":false,"replicate":false}},"opts":{"query_timeout":"10s","redis_ca_certificate":"","redis_client_certificate":"","redis_client_key":"","redis_cluster":false,"redis_cluster_ondown_delay":"0","redis_cluster_sync":"5s","redis_sentinel":"","redis_tls":false},"remote_conns":[],"replication_conns":[]}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: DATADB_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: DATADB_JSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -4903,22 +4841,18 @@ func TestV1GetConfigAsJSONDataDB(t *testing.T) { func TestV1GetConfigAsJSONDataDBError(t *testing.T) { var reply string expectedErr := "strconv.Atoi: parsing \"6579s\": invalid syntax" - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { + cfgCgr := NewDefaultCGRConfig() + cfgCgr.dataDbCfg.DataDbPort = "6579s" + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: DATADB_JSN}, &reply); err == nil || err.Error() != expectedErr { t.Error(err) - } else { - cfgCgr.dataDbCfg.DataDbPort = "6579s" - if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: DATADB_JSN}, &reply); err == nil || err.Error() != expectedErr { - t.Error(err) - } } } func TestV1GetConfigAsJSONStorDB(t *testing.T) { var reply string expected := `{"stor_db":{"db_host":"127.0.0.1","db_name":"cgrates","db_password":"","db_port":3306,"db_type":"*mysql","db_user":"cgrates","items":{"*cdrs":{"remote":false,"replicate":false},"*session_costs":{"remote":false,"replicate":false},"*tp_account_actions":{"remote":false,"replicate":false},"*tp_action_plans":{"remote":false,"replicate":false},"*tp_action_triggers":{"remote":false,"replicate":false},"*tp_actions":{"remote":false,"replicate":false},"*tp_attributes":{"remote":false,"replicate":false},"*tp_chargers":{"remote":false,"replicate":false},"*tp_destination_rates":{"remote":false,"replicate":false},"*tp_destinations":{"remote":false,"replicate":false},"*tp_dispatcher_hosts":{"remote":false,"replicate":false},"*tp_dispatcher_profiles":{"remote":false,"replicate":false},"*tp_filters":{"remote":false,"replicate":false},"*tp_rate_profiles":{"remote":false,"replicate":false},"*tp_rates":{"remote":false,"replicate":false},"*tp_rating_plans":{"remote":false,"replicate":false},"*tp_rating_profiles":{"remote":false,"replicate":false},"*tp_resources":{"remote":false,"replicate":false},"*tp_routes":{"remote":false,"replicate":false},"*tp_shared_groups":{"remote":false,"replicate":false},"*tp_stats":{"remote":false,"replicate":false},"*tp_thresholds":{"remote":false,"replicate":false},"*tp_timings":{"remote":false,"replicate":false},"*versions":{"remote":false,"replicate":false}},"opts":{"conn_max_lifetime":0,"max_idle_conns":10,"max_open_conns":100,"query_timeout":"10s","sslmode":"disable"},"prefix_indexed_fields":[],"remote_conns":null,"replication_conns":null,"string_indexed_fields":[]}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: STORDB_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: STORDB_JSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -4928,9 +4862,8 @@ func TestV1GetConfigAsJSONStorDB(t *testing.T) { func TestV1GetConfigAsJSONTls(t *testing.T) { var reply string expected := `{"tls":{"ca_certificate":"","client_certificate":"","client_key":"","server_certificate":"","server_key":"","server_name":"","server_policy":4}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: TlsCfgJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: TlsCfgJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -4940,9 +4873,8 @@ func TestV1GetConfigAsJSONTls(t *testing.T) { func TestV1GetConfigAsJSONTCache(t *testing.T) { var reply string expected := `{"caches":{"partitions":{"*account_action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*accounts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*action_triggers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*actions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*apiban":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2m0s"},"*attribute_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*attribute_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*caps_events":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*cdr_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10m0s"},"*cdrs":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*charger_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*charger_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*closed_sessions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*diameter_messages":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*dispatcher_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_hosts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_loads":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatcher_routes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*dispatchers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*event_charges":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"10s"},"*event_resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*filters":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*load_ids":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_profile_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rate_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rating_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rating_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resource_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resource_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*reverse_destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*reverse_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*route_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*route_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rpc_connections":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*rpc_responses":{"limit":0,"precache":false,"replicate":false,"static_ttl":false,"ttl":"2s"},"*session_costs":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*shared_groups":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*stat_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*statqueue_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*statqueues":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*stir":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*threshold_filter_indexes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*threshold_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*thresholds":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*timings":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_account_actions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_action_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_action_triggers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_actions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_attributes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_chargers":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_destination_rates":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_destinations":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_dispatcher_hosts":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_dispatcher_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_filters":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rate_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rates":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rating_plans":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_rating_profiles":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_resources":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_routes":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_shared_groups":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_stats":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_thresholds":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*tp_timings":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""},"*uch":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"3h0m0s"},"*versions":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":""}},"replication_conns":[]}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: CACHE_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: CACHE_JSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -4952,9 +4884,8 @@ func TestV1GetConfigAsJSONTCache(t *testing.T) { func TestV1GetConfigAsJSONTListen(t *testing.T) { var reply string expected := `{"listen":{"http":"127.0.0.1:2080","http_tls":"127.0.0.1:2280","rpc_gob":"127.0.0.1:2013","rpc_gob_tls":"127.0.0.1:2023","rpc_json":"127.0.0.1:2012","rpc_json_tls":"127.0.0.1:2022"}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: LISTEN_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: LISTEN_JSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -4964,9 +4895,8 @@ func TestV1GetConfigAsJSONTListen(t *testing.T) { func TestV1GetConfigAsJSONHTTP(t *testing.T) { var reply string expected := `{"http":{"auth_users":{},"client_opts":{"dialFallbackDelay":"300ms","dialKeepAlive":"30s","dialTimeout":"30s","disableCompression":false,"disableKeepAlives":false,"expectContinueTimeout":"0","forceAttemptHttp2":true,"idleConnTimeout":"90s","maxConnsPerHost":0,"maxIdleConns":100,"maxIdleConnsPerHost":2,"responseHeaderTimeout":"0","skipTlsVerify":false,"tlsHandshakeTimeout":"10s"},"dispatchers_registrar_url":"/dispatchers_registrar","freeswitch_cdrs_url":"/freeswitch_json","http_cdrs":"/cdr_http","json_rpc_url":"/jsonrpc","use_basic_auth":false,"ws_url":"/ws"}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: HTTP_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: HTTP_JSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -4976,9 +4906,8 @@ func TestV1GetConfigAsJSONHTTP(t *testing.T) { func TestV1GetConfigAsJSONFilterS(t *testing.T) { var reply string expected := `{"filters":{"apiers_conns":[],"resources_conns":[],"stats_conns":[]}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: FilterSjsn}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: FilterSjsn}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -4988,9 +4917,8 @@ func TestV1GetConfigAsJSONFilterS(t *testing.T) { func TestV1GetConfigAsJSONRals(t *testing.T) { var reply string expected := `{"rals":{"balance_rating_subject":{"*any":"*zero1ns","*voice":"*zero1s"},"caches_conns":["*internal"],"dynaprepaid_actionplans":[],"enabled":false,"max_computed_usage":{"*any":"189h0m0s","*data":"107374182400","*mms":"10000","*sms":"10000","*voice":"72h0m0s"},"max_increments":1000000,"remove_expired":true,"rp_subject_prefix_matching":false,"stats_conns":[],"thresholds_conns":[]}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: RALS_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: RALS_JSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5000,9 +4928,8 @@ func TestV1GetConfigAsJSONRals(t *testing.T) { func TestV1GetConfigAsJSONScheduler(t *testing.T) { var reply string expected := `{"schedulers":{"cdrs_conns":[],"enabled":false,"filters":[],"stats_conns":[],"thresholds_conns":[]}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: SCHEDULER_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: SCHEDULER_JSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5012,9 +4939,8 @@ func TestV1GetConfigAsJSONScheduler(t *testing.T) { func TestV1GetConfigAsJSONCdrs(t *testing.T) { var reply string expected := `{"cdrs":{"attributes_conns":[],"chargers_conns":[],"ees_conns":[],"enabled":false,"extra_fields":[],"online_cdr_exports":[],"rals_conns":[],"scheduler_conns":[],"session_cost_retries":5,"stats_conns":[],"store_cdrs":true,"thresholds_conns":[]}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: CDRS_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: CDRS_JSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5024,9 +4950,8 @@ func TestV1GetConfigAsJSONCdrs(t *testing.T) { func TestV1GetConfigAsJSONSessionS(t *testing.T) { var reply string expected := `{"sessions":{"alterable_fields":[],"attributes_conns":[],"cdrs_conns":[],"channel_sync_interval":"0","chargers_conns":[],"client_protocol":1,"debit_interval":"0","enabled":false,"listen_bijson":"127.0.0.1:2014","min_dur_low_balance":"0","rals_conns":[],"replication_conns":[],"resources_conns":[],"routes_conns":[],"scheduler_conns":[],"session_indexes":[],"session_ttl":"0","stats_conns":[],"stir":{"allowed_attest":["*any"],"default_attest":"A","payload_maxduration":"-1","privatekey_path":"","publickey_path":""},"store_session_costs":false,"terminate_attempts":5,"thresholds_conns":[]}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: SessionSJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: SessionSJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5036,9 +4961,8 @@ func TestV1GetConfigAsJSONSessionS(t *testing.T) { func TestV1GetConfigAsJSONFreeSwitchAgent(t *testing.T) { var reply string expected := `{"freeswitch_agent":{"create_cdr":false,"empty_balance_ann_file":"","empty_balance_context":"","enabled":false,"event_socket_conns":[{"address":"127.0.0.1:8021","alias":"127.0.0.1:8021","password":"ClueCon","reconnects":5}],"extra_fields":"","low_balance_ann_file":"","max_wait_connection":"2s","sessions_conns":["*internal"],"subscribe_park":true}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: FreeSWITCHAgentJSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: FreeSWITCHAgentJSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5048,9 +4972,8 @@ func TestV1GetConfigAsJSONFreeSwitchAgent(t *testing.T) { func TestV1GetConfigAsJSONFKamailioAgent(t *testing.T) { var reply string expected := `{"kamailio_agent":{"create_cdr":false,"enabled":false,"evapi_conns":[{"address":"127.0.0.1:8448","alias":"","reconnects":5}],"sessions_conns":["*internal"],"timezone":""}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: KamailioAgentJSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: KamailioAgentJSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5060,9 +4983,8 @@ func TestV1GetConfigAsJSONFKamailioAgent(t *testing.T) { func TestV1GetConfigAsJSONAsteriskAgent(t *testing.T) { var reply string expected := `{"asterisk_agent":{"asterisk_conns":[{"address":"127.0.0.1:8088","alias":"","connect_attempts":3,"password":"CGRateS.org","reconnects":5,"user":"cgrates"}],"create_cdr":false,"enabled":false,"sessions_conns":["*internal"]}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: AsteriskAgentJSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: AsteriskAgentJSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5072,9 +4994,8 @@ func TestV1GetConfigAsJSONAsteriskAgent(t *testing.T) { func TestV1GetConfigAsJSONADiameterAgent(t *testing.T) { var reply string expected := `{"diameter_agent":{"asr_template":"","concurrent_requests":-1,"dictionaries_path":"/usr/share/cgrates/diameter/dict/","enabled":false,"forced_disconnect":"*none","listen":"127.0.0.1:3868","listen_net":"tcp","origin_host":"CGR-DA","origin_realm":"cgrates.org","product_name":"CGRateS","rar_template":"","request_processors":[],"sessions_conns":["*internal"],"synced_conn_requests":false,"vendor_id":0}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: DA_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: DA_JSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5084,9 +5005,8 @@ func TestV1GetConfigAsJSONADiameterAgent(t *testing.T) { func TestV1GetConfigAsJSONARadiusAgent(t *testing.T) { var reply string expected := `{"radius_agent":{"client_dictionaries":{"*default":"/usr/share/cgrates/radius/dict/"},"client_secrets":{"*default":"CGRateS.org"},"enabled":false,"listen_acct":"127.0.0.1:1813","listen_auth":"127.0.0.1:1812","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"]}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: RA_JSN}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: RA_JSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5096,9 +5016,8 @@ func TestV1GetConfigAsJSONARadiusAgent(t *testing.T) { func TestV1GetConfigAsJSONDNSAgent(t *testing.T) { var reply string expected := `{"dns_agent":{"enabled":false,"listen":"127.0.0.1:2053","listen_net":"udp","request_processors":[],"sessions_conns":["*internal"],"timezone":""}}` - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: DNSAgentJson}, &reply); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.V1GetConfigAsJSON(&SectionWithOpts{Section: DNSAgentJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5108,9 +5027,8 @@ func TestV1GetConfigAsJSONDNSAgent(t *testing.T) { func TestV1GetConfigAsJSONAttributes(t *testing.T) { var reply string expected := `{"attributes":{"apiers_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"process_runs":1,"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: ATTRIBUTE_JSN}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: ATTRIBUTE_JSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5120,9 +5038,8 @@ func TestV1GetConfigAsJSONAttributes(t *testing.T) { func TestV1GetConfigAsJSONChargerS(t *testing.T) { var reply string expected := `{"chargers":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: ChargerSCfgJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: ChargerSCfgJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5132,9 +5049,8 @@ func TestV1GetConfigAsJSONChargerS(t *testing.T) { func TestV1GetConfigAsJSONResourceS(t *testing.T) { var reply string expected := `{"resources":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[],"thresholds_conns":[]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: RESOURCES_JSON}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: RESOURCES_JSON}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5144,9 +5060,8 @@ func TestV1GetConfigAsJSONResourceS(t *testing.T) { func TestV1GetConfigAsJSONStatS(t *testing.T) { var reply string expected := `{"stats":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","store_uncompressed_limit":0,"suffix_indexed_fields":[],"thresholds_conns":[]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: STATS_JSON}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: STATS_JSON}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5156,9 +5071,8 @@ func TestV1GetConfigAsJSONStatS(t *testing.T) { func TestV1GetConfigAsJSONThresholdS(t *testing.T) { var reply string expected := `{"thresholds":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"store_interval":"","suffix_indexed_fields":[]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: THRESHOLDS_JSON}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: THRESHOLDS_JSON}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5168,9 +5082,8 @@ func TestV1GetConfigAsJSONThresholdS(t *testing.T) { func TestV1GetConfigAsJSONRouteS(t *testing.T) { var reply string expected := `{"routes":{"attributes_conns":[],"default_ratio":1,"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rals_conns":[],"rates_conns":[],"resources_conns":[],"stats_conns":[],"suffix_indexed_fields":[]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: RouteSJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: RouteSJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5180,10 +5093,8 @@ func TestV1GetConfigAsJSONRouteS(t *testing.T) { func TestV1GetConfigAsJSONSureTax(t *testing.T) { var reply string expected := `{"suretax":{"bill_to_number":"","business_unit":"","client_number":"","client_tracking":"~*req.CGRID","customer_number":"~*req.Subject","include_local_cost":false,"orig_number":"~*req.Subject","p2pplus4":"","p2pzipcode":"","plus4":"","regulatory_code":"03","response_group":"03","response_type":"D4","return_file_code":"0","sales_type_code":"R","tax_exemption_code_list":"","tax_included":"0","tax_situs_rule":"04","term_number":"~*req.Destination","timezone":"UTC","trans_type_code":"010101","unit_type":"00","units":"1","url":"","validation_key":"","zipcode":""}}` - cgrCfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cgrCfg := NewDefaultCGRConfig() + cgrCfg.SureTaxCfg().Timezone = time.UTC if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: SURETAX_JSON}, &reply); err != nil { t.Error(err) @@ -5195,9 +5106,8 @@ func TestV1GetConfigAsJSONSureTax(t *testing.T) { func TestV1GetConfigAsJSONDispatcherS(t *testing.T) { var reply string expected := `{"dispatchers":{"attributes_conns":[],"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"suffix_indexed_fields":[]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: DispatcherSJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: DispatcherSJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5207,9 +5117,8 @@ func TestV1GetConfigAsJSONDispatcherS(t *testing.T) { func TestV1GetConfigAsJSONDispatcherH(t *testing.T) { var reply string expected := `{"dispatcherh":{"dispatchers_conns":[],"enabled":false,"hosts":{},"register_interval":"5m0s"}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: DispatcherHJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: DispatcherHJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5219,9 +5128,8 @@ func TestV1GetConfigAsJSONDispatcherH(t *testing.T) { func TestV1GetConfigAsJSONLoaders(t *testing.T) { var reply string expected := `{"loaders":[{"caches_conns":["*internal"],"data":[{"fields":[{"mandatory":true,"path":"Tenant","tag":"TenantID","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ProfileID","type":"*variable","value":"~*req.1"},{"path":"Contexts","tag":"Contexts","type":"*variable","value":"~*req.2"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.3"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.4"},{"path":"AttributeFilterIDs","tag":"AttributeFilterIDs","type":"*variable","value":"~*req.5"},{"path":"Path","tag":"Path","type":"*variable","value":"~*req.6"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.7"},{"path":"Value","tag":"Value","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.10"}],"file_name":"Attributes.csv","flags":null,"type":"*attributes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Type","tag":"Type","type":"*variable","value":"~*req.2"},{"path":"Element","tag":"Element","type":"*variable","value":"~*req.3"},{"path":"Values","tag":"Values","type":"*variable","value":"~*req.4"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.5"}],"file_name":"Filters.csv","flags":null,"type":"*filters"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"UsageTTL","tag":"TTL","type":"*variable","value":"~*req.4"},{"path":"Limit","tag":"Limit","type":"*variable","value":"~*req.5"},{"path":"AllocationMessage","tag":"AllocationMessage","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.8"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.9"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.10"}],"file_name":"Resources.csv","flags":null,"type":"*resources"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"QueueLength","tag":"QueueLength","type":"*variable","value":"~*req.4"},{"path":"TTL","tag":"TTL","type":"*variable","value":"~*req.5"},{"path":"MinItems","tag":"MinItems","type":"*variable","value":"~*req.6"},{"path":"MetricIDs","tag":"MetricIDs","type":"*variable","value":"~*req.7"},{"path":"MetricFilterIDs","tag":"MetricFilterIDs","type":"*variable","value":"~*req.8"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.9"},{"path":"Stored","tag":"Stored","type":"*variable","value":"~*req.10"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.11"},{"path":"ThresholdIDs","tag":"ThresholdIDs","type":"*variable","value":"~*req.12"}],"file_name":"Stats.csv","flags":null,"type":"*stats"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"MaxHits","tag":"MaxHits","type":"*variable","value":"~*req.4"},{"path":"MinHits","tag":"MinHits","type":"*variable","value":"~*req.5"},{"path":"MinSleep","tag":"MinSleep","type":"*variable","value":"~*req.6"},{"path":"Blocker","tag":"Blocker","type":"*variable","value":"~*req.7"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.8"},{"path":"ActionIDs","tag":"ActionIDs","type":"*variable","value":"~*req.9"},{"path":"Async","tag":"Async","type":"*variable","value":"~*req.10"}],"file_name":"Thresholds.csv","flags":null,"type":"*thresholds"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"Sorting","tag":"Sorting","type":"*variable","value":"~*req.4"},{"path":"SortingParameters","tag":"SortingParameters","type":"*variable","value":"~*req.5"},{"path":"RouteID","tag":"RouteID","type":"*variable","value":"~*req.6"},{"path":"RouteFilterIDs","tag":"RouteFilterIDs","type":"*variable","value":"~*req.7"},{"path":"RouteAccountIDs","tag":"RouteAccountIDs","type":"*variable","value":"~*req.8"},{"path":"RouteRatingPlanIDs","tag":"RouteRatingPlanIDs","type":"*variable","value":"~*req.9"},{"path":"RouteResourceIDs","tag":"RouteResourceIDs","type":"*variable","value":"~*req.10"},{"path":"RouteStatIDs","tag":"RouteStatIDs","type":"*variable","value":"~*req.11"},{"path":"RouteWeight","tag":"RouteWeight","type":"*variable","value":"~*req.12"},{"path":"RouteBlocker","tag":"RouteBlocker","type":"*variable","value":"~*req.13"},{"path":"RouteParameters","tag":"RouteParameters","type":"*variable","value":"~*req.14"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.15"}],"file_name":"Routes.csv","flags":null,"type":"*routes"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"RunID","tag":"RunID","type":"*variable","value":"~*req.4"},{"path":"AttributeIDs","tag":"AttributeIDs","type":"*variable","value":"~*req.5"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.6"}],"file_name":"Chargers.csv","flags":null,"type":"*chargers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Contexts","tag":"Contexts","type":"*variable","value":"~*req.2"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.3"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.4"},{"path":"Strategy","tag":"Strategy","type":"*variable","value":"~*req.5"},{"path":"StrategyParameters","tag":"StrategyParameters","type":"*variable","value":"~*req.6"},{"path":"ConnID","tag":"ConnID","type":"*variable","value":"~*req.7"},{"path":"ConnFilterIDs","tag":"ConnFilterIDs","type":"*variable","value":"~*req.8"},{"path":"ConnWeight","tag":"ConnWeight","type":"*variable","value":"~*req.9"},{"path":"ConnBlocker","tag":"ConnBlocker","type":"*variable","value":"~*req.10"},{"path":"ConnParameters","tag":"ConnParameters","type":"*variable","value":"~*req.11"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.12"}],"file_name":"DispatcherProfiles.csv","flags":null,"type":"*dispatchers"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"Address","tag":"Address","type":"*variable","value":"~*req.2"},{"path":"Transport","tag":"Transport","type":"*variable","value":"~*req.3"},{"path":"TLS","tag":"TLS","type":"*variable","value":"~*req.4"}],"file_name":"DispatcherHosts.csv","flags":null,"type":"*dispatcher_hosts"},{"fields":[{"mandatory":true,"path":"Tenant","tag":"Tenant","type":"*variable","value":"~*req.0"},{"mandatory":true,"path":"ID","tag":"ID","type":"*variable","value":"~*req.1"},{"path":"FilterIDs","tag":"FilterIDs","type":"*variable","value":"~*req.2"},{"path":"ActivationInterval","tag":"ActivationInterval","type":"*variable","value":"~*req.3"},{"path":"Weight","tag":"Weight","type":"*variable","value":"~*req.4"},{"path":"ConnectFee","tag":"ConnectFee","type":"*variable","value":"~*req.5"},{"path":"RoundingMethod","tag":"RoundingMethod","type":"*variable","value":"~*req.6"},{"path":"RoundingDecimals","tag":"RoundingDecimals","type":"*variable","value":"~*req.7"},{"path":"MinCost","tag":"MinCost","type":"*variable","value":"~*req.8"},{"path":"MaxCost","tag":"MaxCost","type":"*variable","value":"~*req.9"},{"path":"MaxCostStrategy","tag":"MaxCostStrategy","type":"*variable","value":"~*req.10"},{"path":"RateID","tag":"RateID","type":"*variable","value":"~*req.11"},{"path":"RateFilterIDs","tag":"RateFilterIDs","type":"*variable","value":"~*req.12"},{"path":"RateActivationStart","tag":"RateActivationStart","type":"*variable","value":"~*req.13"},{"path":"RateWeight","tag":"RateWeight","type":"*variable","value":"~*req.14"},{"path":"RateBlocker","tag":"RateBlocker","type":"*variable","value":"~*req.15"},{"path":"RateIntervalStart","tag":"RateIntervalStart","type":"*variable","value":"~*req.16"},{"path":"RateValue","tag":"RateValue","type":"*variable","value":"~*req.17"},{"path":"RateUnit","tag":"RateUnit","type":"*variable","value":"~*req.18"},{"path":"RateIncrement","tag":"RateIncrement","type":"*variable","value":"~*req.19"}],"file_name":"RateProfiles.csv","flags":null,"type":"*rate_profiles"}],"dry_run":false,"enabled":false,"field_separator":",","id":"*default","lock_filename":".cgr.lck","run_delay":"0","tenant":"","tp_in_dir":"/var/spool/cgrates/loader/in","tp_out_dir":"/var/spool/cgrates/loader/out"}]}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: LoaderJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: LoaderJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5231,9 +5139,8 @@ func TestV1GetConfigAsJSONLoaders(t *testing.T) { func TestV1GetConfigAsJSONCgrLoader(t *testing.T) { var reply string expected := `{"loader":{"caches_conns":["*localhost"],"data_path":"./","disable_reverse":false,"field_separator":",","gapi_credentials":".gapi/credentials.json","gapi_token":".gapi/token.json","scheduler_conns":["*localhost"],"tpid":""}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: CgrLoaderCfgJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: CgrLoaderCfgJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5243,9 +5150,8 @@ func TestV1GetConfigAsJSONCgrLoader(t *testing.T) { func TestV1GetConfigAsJSONCgrMigrator(t *testing.T) { var reply string expected := `{"migrator":{"out_datadb_encoding":"msgpack","out_datadb_host":"127.0.0.1","out_datadb_name":"10","out_datadb_opts":{"redis_ca_certificate":"","redis_client_certificate":"","redis_client_key":"","redis_cluster":false,"redis_cluster_ondown_delay":"0","redis_cluster_sync":"5s","redis_sentinel":"","redis_tls":false},"out_datadb_password":"","out_datadb_port":"6379","out_datadb_type":"redis","out_datadb_user":"cgrates","out_stordb_host":"127.0.0.1","out_stordb_name":"cgrates","out_stordb_opts":{},"out_stordb_password":"","out_stordb_port":"3306","out_stordb_type":"mysql","out_stordb_user":"cgrates","users_filters":[]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: CgrMigratorCfgJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: CgrMigratorCfgJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5255,9 +5161,8 @@ func TestV1GetConfigAsJSONCgrMigrator(t *testing.T) { func TestV1GetConfigAsJSONApierS(t *testing.T) { var reply string expected := `{"apiers":{"attributes_conns":[],"caches_conns":["*internal"],"ees_conns":[],"enabled":false,"scheduler_conns":[]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: ApierS}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: ApierS}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5267,9 +5172,8 @@ func TestV1GetConfigAsJSONApierS(t *testing.T) { func TestV1GetConfigAsJSONCfgEES(t *testing.T) { var reply string expected := `{"ees":{"attributes_conns":[],"cache":{"*file_csv":{"limit":-1,"precache":false,"replicate":false,"static_ttl":false,"ttl":"5s"}},"enabled":false,"exporters":[{"attempts":1,"attribute_context":"","attribute_ids":[],"export_path":"/var/spool/cgrates/ees","field_separator":",","fields":[],"filters":[],"flags":[],"id":"*default","opts":{},"synchronous":false,"tenant":"","timezone":"","type":"*none"}]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: EEsJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: EEsJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5279,9 +5183,8 @@ func TestV1GetConfigAsJSONCfgEES(t *testing.T) { func TestV1GetConfigAsJSONCfgERS(t *testing.T) { var reply string expected := `{"ers":{"enabled":false,"readers":[{"cache_dump_fields":[],"concurrent_requests":1024,"failed_calls_prefix":"","field_separator":",","fields":[{"mandatory":true,"path":"*cgreq.ToR","tag":"ToR","type":"*variable","value":"~*req.2"},{"mandatory":true,"path":"*cgreq.OriginID","tag":"OriginID","type":"*variable","value":"~*req.3"},{"mandatory":true,"path":"*cgreq.RequestType","tag":"RequestType","type":"*variable","value":"~*req.4"},{"mandatory":true,"path":"*cgreq.Tenant","tag":"Tenant","type":"*variable","value":"~*req.6"},{"mandatory":true,"path":"*cgreq.Category","tag":"Category","type":"*variable","value":"~*req.7"},{"mandatory":true,"path":"*cgreq.Account","tag":"Account","type":"*variable","value":"~*req.8"},{"mandatory":true,"path":"*cgreq.Subject","tag":"Subject","type":"*variable","value":"~*req.9"},{"mandatory":true,"path":"*cgreq.Destination","tag":"Destination","type":"*variable","value":"~*req.10"},{"mandatory":true,"path":"*cgreq.SetupTime","tag":"SetupTime","type":"*variable","value":"~*req.11"},{"mandatory":true,"path":"*cgreq.AnswerTime","tag":"AnswerTime","type":"*variable","value":"~*req.12"},{"mandatory":true,"path":"*cgreq.Usage","tag":"Usage","type":"*variable","value":"~*req.13"}],"filters":[],"flags":[],"header_define_character":":","id":"*default","opts":{},"partial_cache_expiry_action":"","partial_record_cache":"0","processed_path":"/var/spool/cgrates/ers/out","row_length":0,"run_delay":"0","source_path":"/var/spool/cgrates/ers/in","tenant":"","timezone":"","type":"*none","xml_root_path":[""]}],"sessions_conns":["*internal"]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: ERsJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: ERsJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5291,9 +5194,8 @@ func TestV1GetConfigAsJSONCfgERS(t *testing.T) { func TestV1GetConfigAsJSONSIPAgent(t *testing.T) { var reply string expected := `{"sip_agent":{"enabled":false,"listen":"127.0.0.1:5060","listen_net":"udp","request_processors":[],"retransmission_timer":1000000000,"sessions_conns":["*internal"],"timezone":""}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: SIPAgentJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: SIPAgentJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5303,9 +5205,8 @@ func TestV1GetConfigAsJSONSIPAgent(t *testing.T) { func TestV1GetConfigAsJSONConfigS(t *testing.T) { var reply string expected := `{"configs":{"enabled":false,"root_dir":"/var/spool/cgrates/configs","url":"/configs/"}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: ConfigSJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: ConfigSJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5315,9 +5216,8 @@ func TestV1GetConfigAsJSONConfigS(t *testing.T) { func TestV1GetConfigAsJSONApiBan(t *testing.T) { var reply string expected := `{"apiban":{"enabled":false,"keys":[]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: APIBanCfgJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: APIBanCfgJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5327,9 +5227,8 @@ func TestV1GetConfigAsJSONApiBan(t *testing.T) { func TestV1GetConfigAsJSONRPCConns(t *testing.T) { var reply string expected := `{"rpc_conns":{"*internal":{"conns":[{"TLS":false,"address":"*internal","synchronous":false,"transport":""}],"poolSize":0,"strategy":"*first"},"*localhost":{"conns":[{"TLS":false,"address":"127.0.0.1:2012","synchronous":false,"transport":"*json"}],"poolSize":0,"strategy":"*first"}}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: RPCConnsJsonName}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: RPCConnsJsonName}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5339,9 +5238,8 @@ func TestV1GetConfigAsJSONRPCConns(t *testing.T) { func TestV1GetConfigAsJSONTemplates(t *testing.T) { var reply string expected := `{"templates":{"*asr":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"}],"*cca":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"path":"*rep.Result-Code","tag":"ResultCode","type":"*constant","value":"2001"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"},{"mandatory":true,"path":"*rep.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"mandatory":true,"path":"*rep.CC-Request-Type","tag":"CCRequestType","type":"*variable","value":"~*req.CC-Request-Type"},{"mandatory":true,"path":"*rep.CC-Request-Number","tag":"CCRequestNumber","type":"*variable","value":"~*req.CC-Request-Number"}],"*err":[{"mandatory":true,"path":"*rep.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*rep.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*vars.OriginHost"},{"mandatory":true,"path":"*rep.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*vars.OriginRealm"}],"*errSip":[{"mandatory":true,"path":"*rep.Request","tag":"Request","type":"*constant","value":"SIP/2.0 500 Internal Server Error"}],"*rar":[{"mandatory":true,"path":"*diamreq.Session-Id","tag":"SessionId","type":"*variable","value":"~*req.Session-Id"},{"mandatory":true,"path":"*diamreq.Origin-Host","tag":"OriginHost","type":"*variable","value":"~*req.Destination-Host"},{"mandatory":true,"path":"*diamreq.Origin-Realm","tag":"OriginRealm","type":"*variable","value":"~*req.Destination-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Realm","tag":"DestinationRealm","type":"*variable","value":"~*req.Origin-Realm"},{"mandatory":true,"path":"*diamreq.Destination-Host","tag":"DestinationHost","type":"*variable","value":"~*req.Origin-Host"},{"mandatory":true,"path":"*diamreq.Auth-Application-Id","tag":"AuthApplicationId","type":"*variable","value":"~*vars.*appid"},{"path":"*diamreq.Re-Auth-Request-Type","tag":"ReAuthRequestType","type":"*constant","value":"0"}]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: TemplatesJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: TemplatesJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5351,9 +5249,8 @@ func TestV1GetConfigAsJSONTemplates(t *testing.T) { func TestV1GetConfigAsJSONHTTPAgent(t *testing.T) { var reply string expected := `{"http_agent":[]}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: HttpAgentJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: HttpAgentJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5363,9 +5260,8 @@ func TestV1GetConfigAsJSONHTTPAgent(t *testing.T) { func TestV1GetConfigAsJSONMailer(t *testing.T) { var reply string expected := `{"mailer":{"auth_password":"CGRateS.org","auth_user":"cgrates","from_address":"cgr-mailer@localhost.localdomain","server":"localhost"}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: MAILER_JSN}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: MAILER_JSN}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5375,9 +5271,8 @@ func TestV1GetConfigAsJSONMailer(t *testing.T) { func TestV1GetConfigAsJSONAnalyzer(t *testing.T) { var reply string expected := `{"analyzers":{"cleanup_interval":"1h0m0s","db_path":"/var/spool/cgrates/analyzers","enabled":false,"index_type":"*scorch","ttl":"24h0m0s"}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: AnalyzerCfgJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: AnalyzerCfgJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5387,9 +5282,8 @@ func TestV1GetConfigAsJSONAnalyzer(t *testing.T) { func TestV1GetConfigAsJSONRateS(t *testing.T) { var reply string expected := `{"rates":{"enabled":false,"indexed_selects":true,"nested_fields":false,"prefix_indexed_fields":[],"rate_indexed_selects":true,"rate_nested_fields":false,"rate_prefix_indexed_fields":[],"rate_suffix_indexed_fields":[],"suffix_indexed_fields":[]}}` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: RateSJson}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: RateSJson}, &reply); err != nil { t.Error(err) } else if expected != reply { t.Errorf("Expected %+v \n, received %+v", expected, reply) @@ -5399,10 +5293,8 @@ func TestV1GetConfigAsJSONRateS(t *testing.T) { func TestV1GetConfigAsJSONCoreS(t *testing.T) { var reply string expected := `{"cores":{"caps":10,"caps_stats_interval":"0","caps_strategy":"*busy","shutdown_timeout":"1s"}}` - cgrCfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := NewDefaultCGRConfig() + cgrCfg.coreSCfg.Caps = 10 if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: CoreSCfgJson}, &reply); err != nil { t.Error(err) @@ -5411,18 +5303,16 @@ func TestV1GetConfigAsJSONCoreS(t *testing.T) { } var result string - if cfgCgr2, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = cfgCgr2.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: reply, DryRun: true}, &result); err != nil { + cfgCgr2 := NewDefaultCGRConfig() + if err = cfgCgr2.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: reply, DryRun: true}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Errorf("Unexpected result") - } else if cgrCfg, _ := NewDefaultCGRConfig(); !reflect.DeepEqual(cgrCfg.CoreSCfg(), cfgCgr2.CoreSCfg()) { + } else if cgrCfg := NewDefaultCGRConfig(); !reflect.DeepEqual(cgrCfg.CoreSCfg(), cfgCgr2.CoreSCfg()) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(cgrCfg.CoreSCfg()), utils.ToJSON(cfgCgr2.CoreSCfg())) } - if cfgCgr2, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = cfgCgr2.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: reply}, &result); err != nil { + + if err = cfgCgr2.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: reply}, &result); err != nil { t.Error(err) } else if result != utils.OK { t.Errorf("Unexpected result") @@ -5440,9 +5330,8 @@ func TestV1GetConfigAsJSONCheckConfigSanity(t *testing.T) { } }` expected := ` not enabled but requested by component` - if cfgCgr2, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = cfgCgr2.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: args}, &result); err == nil || err.Error() != expected { + cfgCgr2 := NewDefaultCGRConfig() + if err = cfgCgr2.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: args}, &result); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -5450,9 +5339,8 @@ func TestV1GetConfigAsJSONCheckConfigSanity(t *testing.T) { func TestV1GetConfigAsJSONInvalidSection(t *testing.T) { var reply string expected := `Invalid section` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: "InvalidSection"}, &reply); err == nil || err.Error() != expected { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: "InvalidSection"}, &reply); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -5480,21 +5368,17 @@ func TestV1GetConfigAsJSONAllConfig(t *testing.T) { func TestV1GetConfigAsJSONAllConfigError(t *testing.T) { var reply string expected := "strconv.Atoi: parsing \"6379s\": invalid syntax" - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else { - cgrCfg.dataDbCfg.DataDbPort = "6379s" - if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: utils.EmptyString}, &reply); err == nil || err.Error() != expected { - t.Errorf("Expected %+v, received %+v", expected, err) - } + cgrCfg := NewDefaultCGRConfig() + cgrCfg.dataDbCfg.DataDbPort = "6379s" + if err := cgrCfg.V1GetConfigAsJSON(&SectionWithOpts{Section: utils.EmptyString}, &reply); err == nil || err.Error() != expected { + t.Errorf("Expected %+v, received %+v", expected, err) } } func TestV1ReloadConfigFromJSONEmptyConfig(t *testing.T) { var reply string - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: utils.EmptyString}, &reply); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: utils.EmptyString}, &reply); err != nil { t.Error(err) } else if reply != utils.OK { t.Errorf("Unexpected reply") @@ -5504,9 +5388,8 @@ func TestV1ReloadConfigFromJSONEmptyConfig(t *testing.T) { func TestV1ReloadConfigFromJSONInvalidSection(t *testing.T) { var reply string expected := "invalid character 'I' looking for beginning of value around line 1 and position 1\n line: \"InvalidSection\"" - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: "InvalidSection"}, &reply); err == nil || err.Error() != expected { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.V1SetConfigFromJSON(&SetConfigFromJSONArgs{Config: "InvalidSection"}, &reply); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -5719,10 +5602,8 @@ func TestCgrCfgJSONDefaultsConfigS(t *testing.T) { } func TestLoadConfigFromHTTP(t *testing.T) { - cfgCgr, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfgCgr := NewDefaultCGRConfig() + url := "inexistentURL" expected := "parse \"inexistentURL\": invalid URI for request" if err := cfgCgr.loadConfigFromHTTP(url, nil); err == nil || err.Error() != expected { @@ -5736,10 +5617,8 @@ func TestReloadSections(t *testing.T) { ChargerSCfgJson, RESOURCES_JSON, STATS_JSON, THRESHOLDS_JSON, RouteSJson, LoaderJson, DispatcherSJson, RateSJson, ApierS}) subsystemsThatNeedStorDB := utils.NewStringSet([]string{RALS_JSN, CDRS_JSN, ApierS}) - cfgCgr, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfgCgr := NewDefaultCGRConfig() + for _, section := range []string{RPCConnsJsonName, HTTP_JSN, SCHEDULER_JSN, RALS_JSN, CDRS_JSN, ERsJson, SessionSJson, AsteriskAgentJSN, FreeSWITCHAgentJSN, KamailioAgentJSN, DA_JSN, RA_JSN, HttpAgentJson, DNSAgentJson, ATTRIBUTE_JSN, ChargerSCfgJson, RESOURCES_JSON, STATS_JSON, THRESHOLDS_JSON, RouteSJson, @@ -5768,43 +5647,39 @@ func TestReloadSections(t *testing.T) { } func TestReloadSectionsSpecialCase(t *testing.T) { - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else { - cgrCfg.reloadSections(RPCConnsJsonName, RALS_JSN) + cgrCfg = NewDefaultCGRConfig() + cgrCfg.reloadSections(RPCConnsJsonName, RALS_JSN) - // the chan should be populated - if len(cgrCfg.GetReloadChan(RPCConnsJsonName)) != 1 { - t.Fatalf("Section <%s> reload didn't happen", RPCConnsJsonName) - } - <-cgrCfg.GetReloadChan(RPCConnsJsonName) - // the chan should be populated - if len(cgrCfg.GetReloadChan(RALS_JSN)) != 1 { - t.Fatalf("Section <%s> reload didn't happen", RALS_JSN) - } - <-cgrCfg.GetReloadChan(RALS_JSN) - - // the chan should be populated - if len(cgrCfg.GetReloadChan(DATADB_JSN)) != 1 { - t.Fatalf("Section <%s> didn't reload the %s", RALS_JSN, DATADB_JSN) - } - <-cgrCfg.GetReloadChan(DATADB_JSN) - // the chan should be populated - if len(cgrCfg.GetReloadChan(STORDB_JSN)) != 1 { - t.Fatalf("Section <%s> didn't reload the %s", RALS_JSN, STORDB_JSN) - } - <-cgrCfg.GetReloadChan(STORDB_JSN) + // the chan should be populated + if len(cgrCfg.GetReloadChan(RPCConnsJsonName)) != 1 { + t.Fatalf("Section <%s> reload didn't happen", RPCConnsJsonName) } + <-cgrCfg.GetReloadChan(RPCConnsJsonName) + // the chan should be populated + if len(cgrCfg.GetReloadChan(RALS_JSN)) != 1 { + t.Fatalf("Section <%s> reload didn't happen", RALS_JSN) + } + <-cgrCfg.GetReloadChan(RALS_JSN) + + // the chan should be populated + if len(cgrCfg.GetReloadChan(DATADB_JSN)) != 1 { + t.Fatalf("Section <%s> didn't reload the %s", RALS_JSN, DATADB_JSN) + } + <-cgrCfg.GetReloadChan(DATADB_JSN) + // the chan should be populated + if len(cgrCfg.GetReloadChan(STORDB_JSN)) != 1 { + t.Fatalf("Section <%s> didn't reload the %s", RALS_JSN, STORDB_JSN) + } + <-cgrCfg.GetReloadChan(STORDB_JSN) } func TestLoadConfigFromReaderError(t *testing.T) { expectedErrFile := "open randomfile.go: no such file or directory" file, err := os.Open("randomfile.go") expectedErr := "invalid argument" + cgrCfg := NewDefaultCGRConfig() if err == nil || err.Error() != expectedErrFile { t.Errorf("Expected %+v, receivewd %+v", expectedErrFile, err) - } else if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) } else if err := cgrCfg.loadConfigFromReader(file, []func(*CgrJsonCfg) error{cfg.loadFromJSONCfg}, true); err == nil || err.Error() != expectedErr { t.Errorf("Expected %+v, received %+v", expectedErr, err) } @@ -5817,9 +5692,8 @@ func TestLoadConfigFromReaderLoadFunctionsError(t *testing.T) { } }` expected := `json: cannot unmarshal number into Go struct field DbJsonCfg.Db_type of type string` - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.loadConfigFromReader(strings.NewReader(cfgJSONStr), + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.loadConfigFromReader(strings.NewReader(cfgJSONStr), []func(jsonCfg *CgrJsonCfg) error{cfg.loadDataDBCfg}, true); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) @@ -5828,24 +5702,22 @@ func TestLoadConfigFromReaderLoadFunctionsError(t *testing.T) { func TestCallOnCGRConfig(t *testing.T) { expected := "UNSUPPORTED_SERVICE_METHOD" - if cgrcfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrcfg.Call("inexistentMethod", nil, nil); err == nil || err.Error() != expected { + cgrcfg := NewDefaultCGRConfig() + if err := cgrcfg.Call("inexistentMethod", nil, nil); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } func TestLoadCfgFromJSONWithLocksInvalidSeciton(t *testing.T) { expected := "Invalid section: " - if cfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = cfg.loadCfgWithLocks("/random/path", "invalidSection"); err == nil || err.Error() != expected { + cfg := NewDefaultCGRConfig() + if err = cfg.loadCfgWithLocks("/random/path", "invalidSection"); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } func TestCGRConfigClone(t *testing.T) { - cfg, _ := NewDefaultCGRConfig() + cfg := NewDefaultCGRConfig() rcv := cfg.Clone() cfg.rldChans = nil rcv.rldChans = nil diff --git a/config/configs_test.go b/config/configs_test.go index 834934c43..654e88360 100644 --- a/config/configs_test.go +++ b/config/configs_test.go @@ -37,9 +37,8 @@ func TestConfigsloadFromJsonCfg(t *testing.T) { URL: "/randomURL/", RootDir: "/randomPath/", } - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.configSCfg.loadFromJSONCfg(jsonCfgs); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.configSCfg.loadFromJSONCfg(jsonCfgs); err != nil { t.Error(err) } else if !reflect.DeepEqual(cgrCfg.configSCfg, expectedCfg) { t.Errorf("Expected %+v, received %+v", expectedCfg, cgrCfg.configSCfg) @@ -88,10 +87,8 @@ func TestNewCGRConfigFromPathWithoutEnv(t *testing.T) { "node_id": "*env:NODE_ID", }, }` - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := NewDefaultCGRConfig() + if err = cfg.loadConfigFromReader(strings.NewReader(cfgsJSONStr), []func(*CgrJsonCfg) error{cfg.loadFromJSONCfg}, true); err != nil { t.Fatal(err) } diff --git a/config/configsanity_test.go b/config/configsanity_test.go index 0c9a6510a..76facd691 100644 --- a/config/configsanity_test.go +++ b/config/configsanity_test.go @@ -24,7 +24,7 @@ import ( ) func TestConfigSanityRater(t *testing.T) { - cfg, _ := NewDefaultCGRConfig() + cfg := NewDefaultCGRConfig() cfg.ralsCfg = &RalsCfg{ Enabled: true, @@ -53,7 +53,7 @@ func TestConfigSanityRater(t *testing.T) { } func TestConfigSanityCDRServer(t *testing.T) { - cfg, _ := NewDefaultCGRConfig() + cfg := NewDefaultCGRConfig() cfg.cdrsCfg = &CdrsCfg{ Enabled: true, @@ -139,7 +139,7 @@ func TestConfigSanityCDRServer(t *testing.T) { } func TestConfigSanityLoaders(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.loaderCfg = LoaderSCfgs{ &LoaderSCfg{ Enabled: true, @@ -225,7 +225,7 @@ func TestConfigSanityLoaders(t *testing.T) { } func TestConfigSanitySessionS(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.sessionSCfg = &SessionSCfg{ Enabled: true, TerminateAttempts: 0, @@ -360,7 +360,7 @@ func TestConfigSanitySessionS(t *testing.T) { } func TestConfigSanityFreeSWITCHAgent(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.fsAgentCfg = &FsAgentCfg{ Enabled: true, } @@ -386,7 +386,7 @@ func TestConfigSanityFreeSWITCHAgent(t *testing.T) { } func TestConfigSanityKamailioAgent(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.kamAgentCfg = &KamAgentCfg{ Enabled: true, } @@ -408,7 +408,7 @@ func TestConfigSanityKamailioAgent(t *testing.T) { } func TestConfigSanityAsteriskAgent(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.asteriskAgentCfg = &AsteriskAgentCfg{ Enabled: true, } @@ -430,7 +430,7 @@ func TestConfigSanityAsteriskAgent(t *testing.T) { } func TestConfigSanityDAgent(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.templates = FcTemplates{ utils.MetaEEs: { @@ -492,7 +492,7 @@ func TestConfigSanityDAgent(t *testing.T) { } func TestConfigSanityRadiusAgent(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.radiusAgentCfg = &RadiusAgentCfg{ Enabled: true, RequestProcessors: []*RequestProcessor{ @@ -540,7 +540,7 @@ func TestConfigSanityRadiusAgent(t *testing.T) { } func TestConfigSanityDNSAgent(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.dnsAgentCfg = &DNSAgentCfg{ Enabled: true, RequestProcessors: []*RequestProcessor{ @@ -588,10 +588,8 @@ func TestConfigSanityDNSAgent(t *testing.T) { } func TestConfigSanityHTTPAgent1(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfg := NewDefaultCGRConfig() + cfg.httpAgentCfg = HTTPAgentCfgs{ &HTTPAgentCfg{ SessionSConns: []string{utils.MetaInternal}, @@ -648,10 +646,8 @@ func TestConfigSanityHTTPAgent1(t *testing.T) { } func TestConfigSanitySipAgent(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfg := NewDefaultCGRConfig() + cfg.sipAgentCfg = &SIPAgentCfg{ Enabled: true, RequestProcessors: []*RequestProcessor{ @@ -699,10 +695,7 @@ func TestConfigSanitySipAgent(t *testing.T) { } func TestConfigSanityAttributesCfg(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfg := NewDefaultCGRConfig() cfg.attributeSCfg = &AttributeSCfg{ Enabled: true, @@ -715,10 +708,7 @@ func TestConfigSanityAttributesCfg(t *testing.T) { } func TestConfigSanityChargerS(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfg := NewDefaultCGRConfig() cfg.chargerSCfg = &ChargerSCfg{ Enabled: true, @@ -736,7 +726,7 @@ func TestConfigSanityChargerS(t *testing.T) { } func TestConfigSanityResourceLimiter(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.resourceSCfg = &ResourceSConfig{ Enabled: true, ThresholdSConns: []string{utils.MetaInternal}, @@ -753,7 +743,7 @@ func TestConfigSanityResourceLimiter(t *testing.T) { } func TestConfigSanityStatS(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.statsCfg = &StatSCfg{ Enabled: true, ThresholdSConns: []string{utils.MetaInternal}, @@ -770,7 +760,7 @@ func TestConfigSanityStatS(t *testing.T) { } func TestConfigSanityRouteS(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.routeSCfg.Enabled = true cfg.routeSCfg.ResourceSConns = []string{utils.MetaInternal} @@ -824,10 +814,7 @@ func TestConfigSanityRouteS(t *testing.T) { } func TestConfigSanityScheduler(t *testing.T) { - cfg, err = NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfg = NewDefaultCGRConfig() cfg.schedulerCfg.Enabled = true cfg.schedulerCfg.CDRsConns = []string{utils.MetaInternal} @@ -868,7 +855,7 @@ func TestConfigSanityScheduler(t *testing.T) { } func TestConfigSanityEventReader(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.ersCfg = &ERsCfg{ Enabled: true, SessionSConns: []string{"unexistedConn"}, @@ -977,10 +964,8 @@ func TestConfigSanityEventReader(t *testing.T) { } func TestConfigSanityEventExporter(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfg := NewDefaultCGRConfig() + cfg.eesCfg = &EEsCfg{ Enabled: true, AttributeSConns: []string{utils.MetaInternal}, @@ -1036,10 +1021,8 @@ func TestConfigSanityEventExporter(t *testing.T) { } func TestConfigSanityCache(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfg := NewDefaultCGRConfig() + cfg.cacheCfg = &CacheCfg{ ReplicationConns: []string{"test"}, } @@ -1056,10 +1039,8 @@ func TestConfigSanityCache(t *testing.T) { } func TestConfigSanityDispatcherH(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfg := NewDefaultCGRConfig() + cfg.dispatcherHCfg = &DispatcherHCfg{ Enabled: true, Hosts: map[string][]*DispatcherHRegistarCfg{ @@ -1126,7 +1107,7 @@ func TestConfigSanityDispatcherH(t *testing.T) { } func TestConfigSanityStorDB(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.storDbCfg = &StorDbCfg{ Type: utils.POSTGRES, Opts: map[string]interface{}{ @@ -1140,10 +1121,8 @@ func TestConfigSanityStorDB(t *testing.T) { } func TestConfigSanityAnalyzer(t *testing.T) { - cfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cfg := NewDefaultCGRConfig() + cfg.analyzerSCfg = &AnalyzerSCfg{ Enabled: true, DBPath: "/", @@ -1175,7 +1154,7 @@ func TestConfigSanityAnalyzer(t *testing.T) { } func TestConfigSanityDataDB(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.dataDbCfg.DataDbType = utils.INTERNAL cfg.cacheCfg = &CacheCfg{ @@ -1242,7 +1221,7 @@ func TestConfigSanityDataDB(t *testing.T) { } func TestConfigSanityAPIer(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.apier.AttributeSConns = []string{utils.MetaInternal} if err := cfg.checkConfigSanity(); err == nil || err.Error() != " not enabled but requested by component" { @@ -1268,7 +1247,7 @@ func TestConfigSanityAPIer(t *testing.T) { } func TestConfigSanityDispatcher(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.dispatcherSCfg = &DispatcherSCfg{ Enabled: true, AttributeSConns: []string{utils.MetaInternal}, @@ -1284,7 +1263,7 @@ func TestConfigSanityDispatcher(t *testing.T) { } func TestConfigSanityCacheS(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.cacheCfg.Partitions = map[string]*CacheParamCfg{"wrong_partition_name": {Limit: 10}} if err := cfg.checkConfigSanity(); err == nil || err.Error() != " partition not defined" { @@ -1298,7 +1277,7 @@ func TestConfigSanityCacheS(t *testing.T) { } func TestConfigSanityFilterS(t *testing.T) { - cfg, _ = NewDefaultCGRConfig() + cfg = NewDefaultCGRConfig() cfg.filterSCfg.StatSConns = []string{utils.MetaInternal} if err := cfg.checkConfigSanity(); err == nil || err.Error() != " not enabled but requested by component" { @@ -1337,7 +1316,7 @@ func TestConfigSanityFilterS(t *testing.T) { func TestCheckConfigSanity(t *testing.T) { // Rater checks - cfg, _ := NewDefaultCGRConfig() + cfg := NewDefaultCGRConfig() cfg.ralsCfg = &RalsCfg{ Enabled: true, StatSConns: []string{utils.MetaInternal}, diff --git a/config/datadbcfg_test.go b/config/datadbcfg_test.go index 9388b7e6c..616a02476 100644 --- a/config/datadbcfg_test.go +++ b/config/datadbcfg_test.go @@ -75,9 +75,8 @@ func TestDataDbCfgloadFromJsonCfg(t *testing.T) { utils.RedisSentinelNameCfg: "sentinel", }, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.dataDbCfg.loadFromJSONCfg(nil); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.dataDbCfg.loadFromJSONCfg(nil); err != nil { t.Error(err) } else if err = jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err != nil { t.Error(err) @@ -99,9 +98,8 @@ func TestConnsloadFromJsonCfg(t *testing.T) { Remote_conns: &[]string{"*internal"}, } expectedErrRmt := "Remote connection ID needs to be different than *internal" - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err == nil || err.Error() != expectedErrRmt { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err == nil || err.Error() != expectedErrRmt { t.Errorf("Expected %+v, received %+v", expectedErrRmt, err) } @@ -109,9 +107,8 @@ func TestConnsloadFromJsonCfg(t *testing.T) { Replication_conns: &[]string{"*internal"}, } expectedErrRpl := "Replication connection ID needs to be different than *internal" - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err == nil || err.Error() != expectedErrRpl { + jsnCfg = NewDefaultCGRConfig() + if err = jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err == nil || err.Error() != expectedErrRpl { t.Errorf("Expected %+v, received %+v", expectedErrRpl, err) } } @@ -570,9 +567,8 @@ func TestCloneDataDB(t *testing.T) { utils.RedisSentinelNameCfg: "sentinel", }, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.dataDbCfg.loadFromJSONCfg(jsonCfg); err != nil { t.Error(err) } else { rcv := jsnCfg.dataDbCfg.Clone() diff --git a/config/diametercfg_test.go b/config/diametercfg_test.go index 061f7190d..2147af84b 100644 --- a/config/diametercfg_test.go +++ b/config/diametercfg_test.go @@ -70,9 +70,8 @@ func TestDiameterAgentCfgloadFromJsonCfg(t *testing.T) { }, }, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.diameterAgentCfg.loadFromJSONCfg(jsonCFG, jsnCfg.generalCfg.RSRSep); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.diameterAgentCfg.loadFromJSONCfg(jsonCFG, jsnCfg.generalCfg.RSRSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsnCfg.diameterAgentCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.diameterAgentCfg)) @@ -88,9 +87,8 @@ func TestRequestProcessorloadFromJsonCfg1(t *testing.T) { }, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := jsonCfg.diameterAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err := jsonCfg.diameterAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } diff --git a/config/dispatcherhcfg_test.go b/config/dispatcherhcfg_test.go index c32f08276..13fd84358 100644 --- a/config/dispatcherhcfg_test.go +++ b/config/dispatcherhcfg_test.go @@ -84,9 +84,8 @@ func TestDispatcherHCfgloadFromJsonCfg(t *testing.T) { }, RegisterInterval: 5, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.dispatcherHCfg.loadFromJSONCfg(jsonCfg); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.dispatcherHCfg.loadFromJSONCfg(jsonCfg); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsnCfg.dispatcherHCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.dispatcherHCfg)) @@ -146,9 +145,8 @@ func TestDispatcherCfgParseWithNanoSec(t *testing.T) { Register_interval: utils.StringPointer("1ss"), } expErrMessage := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.dispatcherHCfg.loadFromJSONCfg(jsonCfg); err == nil || err.Error() != expErrMessage { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.dispatcherHCfg.loadFromJSONCfg(jsonCfg); err == nil || err.Error() != expErrMessage { t.Errorf("Expected %+v \n, recevied %+v", expErrMessage, err) } } diff --git a/config/dispatcherscfg_test.go b/config/dispatcherscfg_test.go index 3e351fb65..5ddb3dff4 100644 --- a/config/dispatcherscfg_test.go +++ b/config/dispatcherscfg_test.go @@ -44,9 +44,8 @@ func TestDispatcherSCfgloadFromJsonCfg(t *testing.T) { AttributeSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes), "*conn1"}, NestedFields: true, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.dispatcherSCfg.loadFromJSONCfg(jsonCfg); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.dispatcherSCfg.loadFromJSONCfg(jsonCfg); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsnCfg.dispatcherSCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.dispatcherSCfg)) diff --git a/config/dnsagentcfg_test.go b/config/dnsagentcfg_test.go index 4468890be..d8a1465b8 100644 --- a/config/dnsagentcfg_test.go +++ b/config/dnsagentcfg_test.go @@ -67,9 +67,8 @@ func TestDNSAgentCfgloadFromJsonCfg(t *testing.T) { for _, v := range expected.RequestProcessors[0].ReplyFields { v.ComputePath() } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.dnsAgentCfg.loadFromJSONCfg(jsnCfg, jsonCfg.generalCfg.RSRSep); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.dnsAgentCfg.loadFromJSONCfg(jsnCfg, jsonCfg.generalCfg.RSRSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(jsonCfg.dnsAgentCfg, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.dnsAgentCfg)) @@ -116,9 +115,8 @@ func TestRequestProcessorDNSAgentloadFromJsonCfg(t *testing.T) { }, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := jsonCfg.dnsAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err := jsonCfg.dnsAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -160,9 +158,9 @@ func TestRequestProcessorReplyFieldsloadFromJsonCfg(t *testing.T) { }, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := jsonCfg.dnsAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + + if err := jsonCfg.dnsAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -180,9 +178,8 @@ func TestRequestProcessorRequestFieldsloadFromJsonCfg(t *testing.T) { }, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := jsonCfg.dnsAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err := jsonCfg.dnsAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } diff --git a/config/eescfg_test.go b/config/eescfg_test.go index c0c222082..36bb4d7f5 100644 --- a/config/eescfg_test.go +++ b/config/eescfg_test.go @@ -212,9 +212,8 @@ func TestEventExporterFieldloadFromJsonCfg(t *testing.T) { }, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.eesCfg.loadFromJSONCfg(eventExporterJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvExp); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.eesCfg.loadFromJSONCfg(eventExporterJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvExp); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -232,18 +231,15 @@ func TestEventExporterFieldloadFromJsonCfg1(t *testing.T) { }, } expected := "no template with id: <>" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.eesCfg.loadFromJSONCfg(eventExporterJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvExp); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.eesCfg.loadFromJSONCfg(eventExporterJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvExp); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } func TestEventExporterloadFromJsonCfg(t *testing.T) { - jsonCfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + jsonCfg := NewDefaultCGRConfig() + eventExporter := new(EventExporterCfg) if err := eventExporter.loadFromJSONCfg(nil, jsonCfg.templates, jsonCfg.generalCfg.RSRSep); err != nil { t.Error(err) @@ -259,9 +255,8 @@ func TestEESCacheloadFromJsonCfg(t *testing.T) { }, } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.eesCfg.loadFromJSONCfg(eesCfg, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvExp); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.eesCfg.loadFromJSONCfg(eesCfg, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvExp); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -275,17 +270,15 @@ func TestEESExportersloadFromJsonCfg(t *testing.T) { }, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.eesCfg.loadFromJSONCfg(eesCfg, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvExp); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.eesCfg.loadFromJSONCfg(eesCfg, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvExp); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } eesCfgExporter := &EEsJsonCfg{ Exporters: nil, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.eesCfg.loadFromJSONCfg(eesCfgExporter, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvExp); err != nil { + jsonCfg = NewDefaultCGRConfig() + if err = jsonCfg.eesCfg.loadFromJSONCfg(eesCfgExporter, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvExp); err != nil { t.Error(err) } } @@ -482,9 +475,8 @@ func TestEEsCfgloadFromJsonCfgCase1(t *testing.T) { v.ComputePath() } } - if cgrCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cgrCfg.eesCfg.loadFromJSONCfg(nil, cgrCfg.templates, cgrCfg.generalCfg.RSRSep, cgrCfg.dfltEvExp); err != nil { + cgrCfg := NewDefaultCGRConfig() + if err := cgrCfg.eesCfg.loadFromJSONCfg(nil, cgrCfg.templates, cgrCfg.generalCfg.RSRSep, cgrCfg.dfltEvExp); err != nil { t.Error(err) } else if err := cgrCfg.eesCfg.loadFromJSONCfg(jsonCfg, cgrCfg.templates, cgrCfg.generalCfg.RSRSep, cgrCfg.dfltEvExp); err != nil { t.Error(err) @@ -627,9 +619,8 @@ func TestEEsCfgloadFromJsonCfgCase2(t *testing.T) { v.ComputePath() } } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.eesCfg.loadFromJSONCfg(jsonCfg, msgTemplates, jsnCfg.generalCfg.RSRSep, jsnCfg.dfltEvExp); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.eesCfg.loadFromJSONCfg(jsonCfg, msgTemplates, jsnCfg.generalCfg.RSRSep, jsnCfg.dfltEvExp); err != nil { t.Error(err) } else if !reflect.DeepEqual(expectedCfg, jsnCfg.eesCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expectedCfg), utils.ToJSON(jsnCfg.eesCfg)) diff --git a/config/erscfg_test.go b/config/erscfg_test.go index 0b1421206..9ff1a83cf 100644 --- a/config/erscfg_test.go +++ b/config/erscfg_test.go @@ -157,10 +157,8 @@ func TestERSClone(t *testing.T) { } func TestEventReaderloadFromJsonCfg(t *testing.T) { - jsonCfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + jsonCfg := NewDefaultCGRConfig() + eventReader := new(EventReaderCfg) if err = eventReader.loadFromJSONCfg(nil, jsonCfg.templates, jsonCfg.generalCfg.RSRSep); err != nil { t.Error(err) @@ -176,9 +174,8 @@ func TestEventReaderloadFromJsonCase1(t *testing.T) { }, } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsoncfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsoncfg.ersCfg.loadFromJSONCfg(cfgJSON, jsoncfg.templates, jsoncfg.generalCfg.RSRSep, jsoncfg.dfltEvRdr, jsoncfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsoncfg := NewDefaultCGRConfig() + if err = jsoncfg.ersCfg.loadFromJSONCfg(cfgJSON, jsoncfg.templates, jsoncfg.generalCfg.RSRSep, jsoncfg.dfltEvRdr, jsoncfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -192,9 +189,8 @@ func TestEventReaderloadFromJsonCase2(t *testing.T) { }, } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsoncfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsoncfg.ersCfg.loadFromJSONCfg(cfgJSON, jsoncfg.templates, jsoncfg.generalCfg.RSRSep, jsoncfg.dfltEvRdr, jsoncfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsoncfg := NewDefaultCGRConfig() + if err = jsoncfg.ersCfg.loadFromJSONCfg(cfgJSON, jsoncfg.templates, jsoncfg.generalCfg.RSRSep, jsoncfg.dfltEvRdr, jsoncfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -208,9 +204,8 @@ func TestEventReaderloadFromJsonCase3(t *testing.T) { }, } expected := "invalid converter terminator in rule: " - if jsoncfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsoncfg.ersCfg.loadFromJSONCfg(cfgJSON, jsoncfg.templates, jsoncfg.generalCfg.RSRSep, jsoncfg.dfltEvRdr, jsoncfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsoncfg := NewDefaultCGRConfig() + if err = jsoncfg.ersCfg.loadFromJSONCfg(cfgJSON, jsoncfg.templates, jsoncfg.generalCfg.RSRSep, jsoncfg.dfltEvRdr, jsoncfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -338,9 +333,8 @@ func TestERSloadFromJsonCfg(t *testing.T) { cfgJSON := &ERsJsonCfg{ Readers: nil, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err != nil { t.Error(err) } } @@ -358,9 +352,8 @@ func TestEventReaderFieldsloadFromJsonCfg(t *testing.T) { }, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -379,9 +372,8 @@ func TestERSloadFromJsonCase1(t *testing.T) { }, } expected := "no template with id: <>" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -399,9 +391,8 @@ func TestERSloadFromJsonCase2(t *testing.T) { }, } expected := "no template with id: <>" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -529,9 +520,8 @@ func TestERSloadFromJsonCase3(t *testing.T) { for _, v := range expectedERsCfg.Readers[0].Fields { v.ComputePath() } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, msgTemplates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, msgTemplates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(expectedERsCfg, jsonCfg.ersCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expectedERsCfg), utils.ToJSON(jsonCfg.ersCfg)) @@ -664,9 +654,8 @@ func TestERSloadFromJsonCase4(t *testing.T) { for _, v := range expectedERsCfg.Readers[0].Fields { v.ComputePath() } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, msgTemplates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, msgTemplates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(expectedERsCfg, jsonCfg.ersCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expectedERsCfg), utils.ToJSON(jsonCfg.ersCfg)) @@ -686,9 +675,8 @@ func TestEventReaderCacheDumpFieldsloadFromJsonCfg(t *testing.T) { }, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.ersCfg.loadFromJSONCfg(cfgJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep, jsonCfg.dfltEvRdr, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -1134,9 +1122,8 @@ func TestERsloadFromJsonCfg(t *testing.T) { v.ComputePath() } } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := cfgCgr.ersCfg.loadFromJSONCfg(cfgJSON, cfgCgr.templates, cfgCgr.generalCfg.RSRSep, cfgCgr.dfltEvRdr, cfgCgr.generalCfg.RSRSep); err != nil { + cfgCgr := NewDefaultCGRConfig() + if err := cfgCgr.ersCfg.loadFromJSONCfg(cfgJSON, cfgCgr.templates, cfgCgr.generalCfg.RSRSep, cfgCgr.dfltEvRdr, cfgCgr.generalCfg.RSRSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(cfgCgr.ersCfg, expectedERsCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expectedERsCfg), utils.ToJSON(cgrCfg.ersCfg)) @@ -1148,9 +1135,8 @@ func TestGetDefaultExporter(t *testing.T) { if dft := ees.GetDefaultExporter(); dft != nil { t.Fatalf("Expected no default cfg, received: %s", utils.ToJSON(dft)) } - if cfgCgr, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if dft := cfgCgr.EEsCfg().GetDefaultExporter(); dft == nil || dft.ID != utils.MetaDefault { + cfgCgr := NewDefaultCGRConfig() + if dft := cfgCgr.EEsCfg().GetDefaultExporter(); dft == nil || dft.ID != utils.MetaDefault { t.Fatalf("Unexpected default cfg returned: %s", utils.ToJSON(dft)) } } diff --git a/config/fctemplate_test.go b/config/fctemplate_test.go index a4dd09dd2..2bb5b9932 100644 --- a/config/fctemplate_test.go +++ b/config/fctemplate_test.go @@ -57,9 +57,8 @@ func TestFCTemplateInflateTemplate(t *testing.T) { }, } expected := "time: unknown unit \"sa\" in duration \"1sa\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if _, err := InflateTemplates(fcTemplate, jsonCfg.templates); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if _, err := InflateTemplates(fcTemplate, jsonCfg.templates); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } diff --git a/config/filterscfg_test.go b/config/filterscfg_test.go index a3f9d14da..a07e1379d 100644 --- a/config/filterscfg_test.go +++ b/config/filterscfg_test.go @@ -35,9 +35,8 @@ func TestFilterSCfgloadFromJsonCfg(t *testing.T) { ResourceSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaResources), "*conn1"}, ApierSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaApier), "*conn1"}, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.filterSCfg.loadFromJSONCfg(cfgJSONS); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.filterSCfg.loadFromJSONCfg(cfgJSONS); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsnCfg.filterSCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.filterSCfg)) diff --git a/config/generalcfg_test.go b/config/generalcfg_test.go index c5623382f..d582adaae 100644 --- a/config/generalcfg_test.go +++ b/config/generalcfg_test.go @@ -74,9 +74,8 @@ func TestGeneralCfgloadFromJsonCfg(t *testing.T) { DefaultCaching: utils.MetaReload, FailedPostsTTL: 2, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.generalCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.generalCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsnCfg.generalCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.generalCfg)) @@ -88,54 +87,48 @@ func TestGeneralParseDurationCfgloadFromJsonCfg(t *testing.T) { Connect_timeout: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.generalCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.generalCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %v", expected, err) } cfgJSON1 := &GeneralJsonCfg{ Reply_timeout: utils.StringPointer("1ss"), } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.generalCfg.loadFromJSONCfg(cfgJSON1); err == nil || err.Error() != expected { + jsonCfg = NewDefaultCGRConfig() + if err = jsonCfg.generalCfg.loadFromJSONCfg(cfgJSON1); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %v", expected, err) } cfgJSON2 := &GeneralJsonCfg{ Failed_posts_ttl: utils.StringPointer("1ss"), } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.generalCfg.loadFromJSONCfg(cfgJSON2); err == nil || err.Error() != expected { + jsonCfg = NewDefaultCGRConfig() + if err = jsonCfg.generalCfg.loadFromJSONCfg(cfgJSON2); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %v", expected, err) } cfgJSON3 := &GeneralJsonCfg{ Locking_timeout: utils.StringPointer("1ss"), } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.generalCfg.loadFromJSONCfg(cfgJSON3); err == nil || err.Error() != expected { + jsonCfg = NewDefaultCGRConfig() + if err = jsonCfg.generalCfg.loadFromJSONCfg(cfgJSON3); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %v", expected, err) } cfgJSON4 := &GeneralJsonCfg{ Min_call_duration: utils.StringPointer("1ss"), } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.generalCfg.loadFromJSONCfg(cfgJSON4); err == nil || err.Error() != expected { + jsonCfg = NewDefaultCGRConfig() + if err = jsonCfg.generalCfg.loadFromJSONCfg(cfgJSON4); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %v", expected, err) } cfgJSON5 := &GeneralJsonCfg{ Max_call_duration: utils.StringPointer("1ss"), } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.generalCfg.loadFromJSONCfg(cfgJSON5); err == nil || err.Error() != expected { + jsonCfg = NewDefaultCGRConfig() + if err = jsonCfg.generalCfg.loadFromJSONCfg(cfgJSON5); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %v", expected, err) } diff --git a/config/httpagntcfg_test.go b/config/httpagntcfg_test.go index 6d7e98512..b4b489a55 100644 --- a/config/httpagntcfg_test.go +++ b/config/httpagntcfg_test.go @@ -79,9 +79,8 @@ func TestHttpAgentCfgsloadFromJsonCfgCase1(t *testing.T) { }, } expected[0].RequestProcessors[0].ReplyFields[0].ComputePath() - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.httpAgentCfg.loadFromJSONCfg(cfgJSON, jsnCfg.generalCfg.RSRSep); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.httpAgentCfg.loadFromJSONCfg(cfgJSON, jsnCfg.generalCfg.RSRSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(&expected, &jsnCfg.httpAgentCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.httpAgentCfg)) @@ -220,9 +219,8 @@ func TestHttpAgentCfgsloadFromJsonCfgCase2(t *testing.T) { expected[0].RequestProcessors[0].ReplyFields[0].ComputePath() expected[0].RequestProcessors[1].ReplyFields[0].ComputePath() expected[0].RequestProcessors[1].RequestFields[0].ComputePath() - if cfgJsn, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = cfgJsn.httpAgentCfg.loadFromJSONCfg(cfgJSON, cfgJsn.generalCfg.RSRSep); err != nil { + cfgJsn := NewDefaultCGRConfig() + if err = cfgJsn.httpAgentCfg.loadFromJSONCfg(cfgJSON, cfgJsn.generalCfg.RSRSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, cfgJsn.httpAgentCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(cfgJsn.httpAgentCfg)) @@ -341,9 +339,8 @@ func TestHttpAgentCfgloadFromJsonCfgCase4(t *testing.T) { }, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.httpAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.httpAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -354,20 +351,16 @@ func TestHttpAgentCfgloadFromJsonCfgCase5(t *testing.T) { Request_processors: nil, }, } - jsonCfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + jsonCfg := NewDefaultCGRConfig() + if err := jsonCfg.httpAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err != nil { t.Error(err) } } func TestHttpAgentCfgloadFromJsonCfgCase6(t *testing.T) { - jsonCfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + jsonCfg := NewDefaultCGRConfig() + httpAgentCfg := new(HTTPAgentCfg) if err := httpAgentCfg.loadFromJSONCfg(nil, jsonCfg.generalCfg.RSRSep); err != nil { t.Error(err) diff --git a/config/httpcfg_test.go b/config/httpcfg_test.go index 7543e4de6..5881bf8a8 100644 --- a/config/httpcfg_test.go +++ b/config/httpcfg_test.go @@ -59,9 +59,8 @@ func TestHTTPCfgloadFromJsonCfg(t *testing.T) { utils.HTTPClientDialKeepAliveCfg: "30s", }, } - if cfgJsn, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = cfgJsn.httpCfg.loadFromJSONCfg(cfgJSONStr); err != nil { + cfgJsn := NewDefaultCGRConfig() + if err = cfgJsn.httpCfg.loadFromJSONCfg(cfgJSONStr); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, cfgJsn.httpCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(cfgJsn.httpCfg)) diff --git a/config/kamagentcfg_test.go b/config/kamagentcfg_test.go index 33559fd24..11a4798f4 100644 --- a/config/kamagentcfg_test.go +++ b/config/kamagentcfg_test.go @@ -45,9 +45,8 @@ func TestKamAgentCfgloadFromJsonCfg(t *testing.T) { EvapiConns: []*KamConnCfg{{Address: "127.0.0.1:8448", Reconnects: 10, Alias: "randomAlias"}}, Timezone: "Local", } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.kamAgentCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.kamAgentCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsnCfg.kamAgentCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.kamAgentCfg)) diff --git a/config/listencfg_test.go b/config/listencfg_test.go index be92eadc7..17a8ed890 100644 --- a/config/listencfg_test.go +++ b/config/listencfg_test.go @@ -41,9 +41,8 @@ func TestListenCfgloadFromJsonCfg(t *testing.T) { RPCGOBTLSListen: "127.0.0.1:2023", HTTPTLSListen: "127.0.0.1:2280", } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.listenCfg.loadFromJSONCfg(jsonCfg); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.listenCfg.loadFromJSONCfg(jsonCfg); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsnCfg.listenCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.listenCfg)) diff --git a/config/loadercgrcfg_test.go b/config/loadercgrcfg_test.go index b5208ec45..770a43117 100644 --- a/config/loadercgrcfg_test.go +++ b/config/loadercgrcfg_test.go @@ -46,9 +46,8 @@ func TestLoaderCgrCfgloadFromJsonCfg(t *testing.T) { GapiCredentials: json.RawMessage{12, 13, 60}, GapiToken: json.RawMessage{13, 16}, } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.loaderCgrCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.loaderCgrCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsnCfg.loaderCgrCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.loaderCgrCfg)) diff --git a/config/loaderscfg_test.go b/config/loaderscfg_test.go index a8faf8f4e..22600356f 100644 --- a/config/loaderscfg_test.go +++ b/config/loaderscfg_test.go @@ -106,9 +106,8 @@ func TestLoaderSCfgloadFromJsonCfgCase2(t *testing.T) { Tenant: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.loaderCfg[0].loadFromJSONCfg(nil, jsonCfg.templates, jsonCfg.generalCfg.RSRSep); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.loaderCfg[0].loadFromJSONCfg(nil, jsonCfg.templates, jsonCfg.generalCfg.RSRSep); err != nil { t.Error(err) } else if err = jsonCfg.loaderCfg[0].loadFromJSONCfg(cfgJSON, jsonCfg.templates, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) @@ -128,9 +127,8 @@ func TestLoaderSCfgloadFromJsonCfgCase3(t *testing.T) { }, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err := jsonCfg.loaderCfg[0].loadFromJSONCfg(cfg, jsonCfg.templates, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err := jsonCfg.loaderCfg[0].loadFromJSONCfg(cfg, jsonCfg.templates, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -148,9 +146,8 @@ func TestLoaderSCfgloadFromJsonCfgCase4(t *testing.T) { }, } expected := "no template with id: <>" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.loaderCfg[0].loadFromJSONCfg(cfg, jsonCfg.templates, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.loaderCfg[0].loadFromJSONCfg(cfg, jsonCfg.templates, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -198,9 +195,8 @@ func TestLoaderSCfgloadFromJsonCfgCase5(t *testing.T) { }, }, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.loaderCfg[0].loadFromJSONCfg(cfg, msgTemplates, jsonCfg.generalCfg.RSRSep); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.loaderCfg[0].loadFromJSONCfg(cfg, msgTemplates, jsonCfg.generalCfg.RSRSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(jsonCfg.loaderCfg[0].Data[0].Fields[0], expectedFields[0].Data[0].Fields[0]) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expectedFields[0].Data[0].Fields[0]), utils.ToJSON(jsonCfg.loaderCfg[0].Data[0].Fields[0])) @@ -211,18 +207,15 @@ func TestLoaderSCfgloadFromJsonCfgCase6(t *testing.T) { cfg := &LoaderJsonCfg{ Data: &[]*LoaderJsonDataType{nil}, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.loaderCfg[0].loadFromJSONCfg(cfg, jsonCfg.templates, jsonCfg.generalCfg.RSRSep); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.loaderCfg[0].loadFromJSONCfg(cfg, jsonCfg.templates, jsonCfg.generalCfg.RSRSep); err != nil { t.Error(err) } } func TestEnabledCase1(t *testing.T) { - jsonCfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + jsonCfg := NewDefaultCGRConfig() + if enabled := jsonCfg.loaderCfg.Enabled(); enabled { t.Errorf("Expected %+v", enabled) } diff --git a/config/mailercfg_test.go b/config/mailercfg_test.go index a08281f6f..e1470ac9d 100644 --- a/config/mailercfg_test.go +++ b/config/mailercfg_test.go @@ -37,9 +37,8 @@ func TestMailerCfgloadFromJsonCfg(t *testing.T) { MailerAuthPass: "CGRateS.org", MailerFromAddr: "cgr-mailer@localhost.localdomain", } - if jsnCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsnCfg.mailerCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsnCfg := NewDefaultCGRConfig() + if err = jsnCfg.mailerCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsnCfg.mailerCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsnCfg.mailerCfg)) diff --git a/config/migratorcfg_test.go b/config/migratorcfg_test.go index b36f46030..9a4c9b2ea 100644 --- a/config/migratorcfg_test.go +++ b/config/migratorcfg_test.go @@ -75,9 +75,8 @@ func TestMigratorCgrCfgloadFromJsonCfg(t *testing.T) { utils.RedisSentinelNameCfg: utils.EmptyString, }, } - if cfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = cfg.migratorCgrCfg.loadFromJSONCfg(cfgJSON); err != nil { + cfg := NewDefaultCGRConfig() + if err = cfg.migratorCgrCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, cfg.migratorCgrCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(cfg.migratorCgrCfg)) diff --git a/config/radiuscfg_test.go b/config/radiuscfg_test.go index 9acfd50c5..ca97816a9 100644 --- a/config/radiuscfg_test.go +++ b/config/radiuscfg_test.go @@ -87,9 +87,8 @@ func TestRadiusAgentCfgloadFromJsonCfgCase1(t *testing.T) { for _, r := range expected.RequestProcessors[0].ReplyFields { r.ComputePath() } - if cfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = cfg.radiusAgentCfg.loadFromJSONCfg(cfgJSON, cfg.generalCfg.RSRSep); err != nil { + cfg := NewDefaultCGRConfig() + if err = cfg.radiusAgentCfg.loadFromJSONCfg(cfgJSON, cfg.generalCfg.RSRSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, cfg.radiusAgentCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(cfg.radiusAgentCfg)) @@ -139,9 +138,8 @@ func TestRadiusAgentCfgloadFromJsonCfgCase3(t *testing.T) { }, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.radiusAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.radiusAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } diff --git a/config/ralscfg_test.go b/config/ralscfg_test.go index 35d6086a6..d9533334f 100644 --- a/config/ralscfg_test.go +++ b/config/ralscfg_test.go @@ -68,9 +68,8 @@ func TestRalsCfgFromJsonCfgCase1(t *testing.T) { }, DynaprepaidActionPlans: []string{"randomPlans"}, } - if cfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = cfg.ralsCfg.loadFromJSONCfg(cfgJSON); err != nil { + cfg := NewDefaultCGRConfig() + if err = cfg.ralsCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, cfg.ralsCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(cfg.ralsCfg)) @@ -84,9 +83,8 @@ func TestRalsCfgFromJsonCfgCase2(t *testing.T) { }, } expected := "time: unknown unit \"hh\" in duration \"189hh\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.ralsCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.ralsCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } diff --git a/config/ratescfg_test.go b/config/ratescfg_test.go index b6ce15944..6ebdb344a 100644 --- a/config/ratescfg_test.go +++ b/config/ratescfg_test.go @@ -52,9 +52,8 @@ func TestRateSConfigloadFromJsonCfg(t *testing.T) { RateSuffixIndexedFields: &[]string{"*req.index1"}, RateNestedFields: true, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.rateSCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.rateSCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsonCfg.rateSCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.rateSCfg)) diff --git a/config/resourcescfg_test.go b/config/resourcescfg_test.go index 940a43df3..c24e3e927 100644 --- a/config/resourcescfg_test.go +++ b/config/resourcescfg_test.go @@ -46,9 +46,8 @@ func TestResourceSConfigloadFromJsonCfgCase1(t *testing.T) { SuffixIndexedFields: &[]string{"*req.index1"}, NestedFields: true, } - if cfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = cfg.resourceSCfg.loadFromJSONCfg(cfgJSON); err != nil { + cfg := NewDefaultCGRConfig() + if err = cfg.resourceSCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, cfg.resourceSCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(cfg.resourceSCfg)) @@ -60,9 +59,8 @@ func TestResourceSConfigloadFromJsonCfgCase2(t *testing.T) { Store_interval: utils.StringPointer("2ss"), } expected := "time: unknown unit \"ss\" in duration \"2ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.resourceSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.resourceSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } diff --git a/config/routescfg_test.go b/config/routescfg_test.go index 99fc9728e..599f1f545 100644 --- a/config/routescfg_test.go +++ b/config/routescfg_test.go @@ -53,9 +53,8 @@ func TestRouteSCfgloadFromJsonCfg(t *testing.T) { DefaultRatio: 10, NestedFields: true, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.routeSCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.routeSCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsonCfg.routeSCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.routeSCfg)) diff --git a/config/rpcconn_test.go b/config/rpcconn_test.go index 027e076ec..14c7ceaf7 100644 --- a/config/rpcconn_test.go +++ b/config/rpcconn_test.go @@ -64,14 +64,13 @@ func TestRPCConnsloadFromJsonCfgCase1(t *testing.T) { }, }, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else { - jsonCfg.rpcConns[utils.MetaLocalHost].loadFromJSONCfg(cfgJSON) - if !reflect.DeepEqual(jsonCfg.rpcConns, expected) { - t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.rpcConns)) - } + jsonCfg := NewDefaultCGRConfig() + + jsonCfg.rpcConns[utils.MetaLocalHost].loadFromJSONCfg(cfgJSON) + if !reflect.DeepEqual(jsonCfg.rpcConns, expected) { + t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.rpcConns)) } + } func TestRPCConnsloadFromJsonCfgCase2(t *testing.T) { @@ -101,10 +100,7 @@ func TestRPCConnsloadFromJsonCfgCase2(t *testing.T) { }, }, } - jsonCfg, err := NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + jsonCfg := NewDefaultCGRConfig() jsonCfg.rpcConns[utils.MetaLocalHost].loadFromJSONCfg(nil) if !reflect.DeepEqual(expected, jsonCfg.rpcConns) { t.Errorf("Expected %+v, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.rpcConns)) diff --git a/config/schedulercfg_test.go b/config/schedulercfg_test.go index 9b6d50afa..c94292e7d 100644 --- a/config/schedulercfg_test.go +++ b/config/schedulercfg_test.go @@ -39,9 +39,8 @@ func TestSchedulerCfgloadFromJsonCfg(t *testing.T) { StatSConns: []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaStats), "*conn1"}, Filters: []string{"randomFilter"}, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.schedulerCfg.loadFromJSONCfg(cfgJSONS); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.schedulerCfg.loadFromJSONCfg(cfgJSONS); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsonCfg.schedulerCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.schedulerCfg)) diff --git a/config/sessionscfg_test.go b/config/sessionscfg_test.go index 45cf69916..b74789837 100644 --- a/config/sessionscfg_test.go +++ b/config/sessionscfg_test.go @@ -122,9 +122,8 @@ func TestSessionSCfgloadFromJsonCfgCase1(t *testing.T) { PublicKeyPath: "randomPath", }, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsonCfg.sessionSCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.sessionSCfg)) @@ -136,9 +135,8 @@ func TestSessionSCfgloadFromJsonCfgCase2(t *testing.T) { Replication_conns: &[]string{utils.MetaInternal}, } expected := "Replication connection ID needs to be different than *internal" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -148,9 +146,8 @@ func TestSessionSCfgloadFromJsonCfgCase3(t *testing.T) { Debit_interval: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -160,9 +157,8 @@ func TestSessionSCfgloadFromJsonCfgCase5(t *testing.T) { Session_ttl: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -172,9 +168,8 @@ func TestSessionSCfgloadFromJsonCfgCase7(t *testing.T) { Channel_sync_interval: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -184,9 +179,8 @@ func TestSessionSCfgloadFromJsonCfgCase8(t *testing.T) { Min_dur_low_balance: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -196,33 +190,29 @@ func TestSessionSCfgloadFromJsonCfgCase9(t *testing.T) { Session_ttl_last_usage: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } cfgJSON1 := &SessionSJsonCfg{ Session_ttl_last_used: utils.StringPointer("1ss"), } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON1); err == nil || err.Error() != expected { + jsonCfg = NewDefaultCGRConfig() + if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON1); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } cfgJSON2 := &SessionSJsonCfg{ Session_ttl_max_delay: utils.StringPointer("1ss"), } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON2); err == nil || err.Error() != expected { + jsonCfg = NewDefaultCGRConfig() + if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON2); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } cfgJSON3 := &SessionSJsonCfg{ Session_ttl_usage: utils.StringPointer("1ss"), } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON3); err == nil || err.Error() != expected { + jsonCfg = NewDefaultCGRConfig() + if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON3); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -268,9 +258,8 @@ func TestSessionSCfgloadFromJsonCfgCase10(t *testing.T) { SessionTTLLastUsed: utils.DurationPointer(10), SessionTTLUsage: utils.DurationPointer(1), } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(jsonCfg.sessionSCfg, expected) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.sessionSCfg)) @@ -284,9 +273,8 @@ func TestSessionSCfgloadFromJsonCfgCase11(t *testing.T) { }, } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sessionSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -482,9 +470,8 @@ func TestFsAgentCfgloadFromJsonCfgCase1(t *testing.T) { }, }, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.fsAgentCfg.loadFromJSONCfg(fsAgentJsnCfg); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.fsAgentCfg.loadFromJSONCfg(fsAgentJsnCfg); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsonCfg.fsAgentCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.fsAgentCfg)) @@ -496,9 +483,8 @@ func TestFsAgentCfgloadFromJsonCfgCase2(t *testing.T) { Max_wait_connection: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.fsAgentCfg.loadFromJSONCfg(fsAgentJsnCfg); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.fsAgentCfg.loadFromJSONCfg(fsAgentJsnCfg); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -508,9 +494,8 @@ func TestFsAgentCfgloadFromJsonCfgCase3(t *testing.T) { Extra_fields: &[]string{"a{*"}, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.fsAgentCfg.loadFromJSONCfg(fsAgentJsnCfg); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.fsAgentCfg.loadFromJSONCfg(fsAgentJsnCfg); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -686,9 +671,8 @@ func TestAsteriskAgentCfgloadFromJsonCfg(t *testing.T) { Reconnects: 5, }}, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.asteriskAgentCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.asteriskAgentCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsonCfg.asteriskAgentCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.asteriskAgentCfg)) diff --git a/config/sipagentcfg_test.go b/config/sipagentcfg_test.go index 769af0008..ba08b9cf8 100644 --- a/config/sipagentcfg_test.go +++ b/config/sipagentcfg_test.go @@ -80,9 +80,8 @@ func TestSIPAgentCfgloadFromJsonCfgCase1(t *testing.T) { for _, r := range expected.RequestProcessors[0].ReplyFields { r.ComputePath() } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sipAgentCfg.loadFromJSONCfg(cfgJSONS, jsonCfg.generalCfg.RSRSep); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sipAgentCfg.loadFromJSONCfg(cfgJSONS, jsonCfg.generalCfg.RSRSep); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsonCfg.sipAgentCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.sipAgentCfg)) @@ -94,9 +93,8 @@ func TestSIPAgentCfgloadFromJsonCfgCase2(t *testing.T) { Retransmission_timer: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sipAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sipAgentCfg.loadFromJSONCfg(cfgJSON, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -139,9 +137,8 @@ func TestSIPAgentCfgloadFromJsonCfgCase5(t *testing.T) { }}, } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sipAgentCfg.loadFromJSONCfg(sipAgent, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sipAgentCfg.loadFromJSONCfg(sipAgent, jsonCfg.generalCfg.RSRSep); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } diff --git a/config/statscfg_test.go b/config/statscfg_test.go index 964c61344..a4ac6b750 100644 --- a/config/statscfg_test.go +++ b/config/statscfg_test.go @@ -47,9 +47,8 @@ func TestStatSCfgloadFromJsonCfgCase1(t *testing.T) { SuffixIndexedFields: &[]string{"*req.index1", "*req.index2"}, NestedFields: true, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.statsCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.statsCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsonCfg.statsCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.statsCfg)) @@ -61,9 +60,8 @@ func TestStatSCfgloadFromJsonCfgCase2(t *testing.T) { Store_interval: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.statsCfg.loadFromJSONCfg(statscfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.statsCfg.loadFromJSONCfg(statscfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } diff --git a/config/stordbcfg_test.go b/config/stordbcfg_test.go index 5829d8b2b..66dcbbeb2 100644 --- a/config/stordbcfg_test.go +++ b/config/stordbcfg_test.go @@ -81,9 +81,8 @@ func TestStoreDbCfgloadFromJsonCfgCase1(t *testing.T) { utils.SSLModeCfg: "disable", }, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.storDbCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.storDbCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected.Items[utils.MetaSessionsCosts], jsonCfg.storDbCfg.Items[utils.MetaSessionsCosts]) { t.Errorf("Expected %+v \n, recevied %+v", utils.ToJSON(expected.Items[utils.MetaSessionsCosts]), @@ -102,9 +101,8 @@ func TestStoreDbCfgloadFromJsonCfgCase2(t *testing.T) { Replication_conns: &[]string{utils.MetaInternal}, } expected := "Replication connection ID needs to be different than *internal" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.storDbCfg.loadFromJSONCfg(storDbJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.storDbCfg.loadFromJSONCfg(storDbJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", storDbJSON, expected) } } @@ -114,21 +112,17 @@ func TestStoreDbCfgloadFromJsonCfgCase3(t *testing.T) { Remote_conns: &[]string{utils.MetaInternal}, } expected := "Remote connection ID needs to be different than *internal" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.storDbCfg.loadFromJSONCfg(storDbJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.storDbCfg.loadFromJSONCfg(storDbJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", storDbJSON, expected) } } func TestStoreDbCfgloadFromJsonCfgCase4(t *testing.T) { - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else { - clonedStoreDb := jsonCfg.storDbCfg.Clone() - if !reflect.DeepEqual(clonedStoreDb, jsonCfg.storDbCfg) { - t.Errorf("Expected %+v, received %+v", utils.ToJSON(clonedStoreDb), utils.ToJSON(jsonCfg.storDbCfg)) - } + jsonCfg := NewDefaultCGRConfig() + clonedStoreDb := jsonCfg.storDbCfg.Clone() + if !reflect.DeepEqual(clonedStoreDb, jsonCfg.storDbCfg) { + t.Errorf("Expected %+v, received %+v", utils.ToJSON(clonedStoreDb), utils.ToJSON(jsonCfg.storDbCfg)) } } diff --git a/config/suretaxcfg_test.go b/config/suretaxcfg_test.go index 869954346..6325b4fd5 100644 --- a/config/suretaxcfg_test.go +++ b/config/suretaxcfg_test.go @@ -87,9 +87,8 @@ func TestSureTaxCfgloadFromJsonCfgCase1(t *testing.T) { SalesTypeCode: NewRSRParsersMustCompile("R", utils.INFIELD_SEP), TaxExemptionCodeList: NewRSRParsersMustCompile(utils.EmptyString, utils.INFIELD_SEP), } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsonCfg.sureTaxCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.sureTaxCfg)) @@ -101,9 +100,8 @@ func TestSureTaxCfgloadFromJsonCfgCase2(t *testing.T) { Timezone: utils.StringPointer("/"), } expected := "time: invalid location name" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -113,9 +111,8 @@ func TestSureTaxCfgloadFromJsonCfgCase3(t *testing.T) { Client_tracking: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -125,9 +122,8 @@ func TestSureTaxCfgloadFromJsonCfgCase4(t *testing.T) { Customer_number: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -137,9 +133,8 @@ func TestSureTaxCfgloadFromJsonCfgCase5(t *testing.T) { Orig_number: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -149,9 +144,8 @@ func TestSureTaxCfgloadFromJsonCfgCase6(t *testing.T) { Term_number: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -161,9 +155,8 @@ func TestSureTaxCfgloadFromJsonCfgCase7(t *testing.T) { Bill_to_number: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -173,9 +166,8 @@ func TestSureTaxCfgloadFromJsonCfgCase8(t *testing.T) { Zipcode: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -185,9 +177,8 @@ func TestSureTaxCfgloadFromJsonCfgCase9(t *testing.T) { Plus4: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -197,9 +188,8 @@ func TestSureTaxCfgloadFromJsonCfgCase10(t *testing.T) { P2PZipcode: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -209,9 +199,8 @@ func TestSureTaxCfgloadFromJsonCfgCase11(t *testing.T) { P2PPlus4: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -221,9 +210,8 @@ func TestSureTaxCfgloadFromJsonCfgCase12(t *testing.T) { Units: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -233,9 +221,8 @@ func TestSureTaxCfgloadFromJsonCfgCase13(t *testing.T) { Unit_type: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -245,9 +232,8 @@ func TestSureTaxCfgloadFromJsonCfgCase14(t *testing.T) { Tax_included: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -257,9 +243,8 @@ func TestSureTaxCfgloadFromJsonCfgCase15(t *testing.T) { Tax_situs_rule: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -269,9 +254,8 @@ func TestSureTaxCfgloadFromJsonCfgCase16(t *testing.T) { Trans_type_code: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -281,9 +265,8 @@ func TestSureTaxCfgloadFromJsonCfgCase17(t *testing.T) { Sales_type_code: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } @@ -293,9 +276,8 @@ func TestSureTaxCfgloadFromJsonCfgCase18(t *testing.T) { Tax_exemption_code_list: utils.StringPointer("a{*"), } expected := "invalid converter terminator in rule: " - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.sureTaxCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } diff --git a/config/thresholdscfg_test.go b/config/thresholdscfg_test.go index 8c312a279..64df3b8c9 100644 --- a/config/thresholdscfg_test.go +++ b/config/thresholdscfg_test.go @@ -43,9 +43,8 @@ func TestThresholdSCfgloadFromJsonCfgCase1(t *testing.T) { SuffixIndexedFields: &[]string{"*req.index1"}, NestedFields: true, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.thresholdSCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.thresholdSCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsonCfg.thresholdSCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.thresholdSCfg)) @@ -57,9 +56,8 @@ func TestThresholdSCfgloadFromJsonCfgCase2(t *testing.T) { Store_interval: utils.StringPointer("1ss"), } expected := "time: unknown unit \"ss\" in duration \"1ss\"" - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.thresholdSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.thresholdSCfg.loadFromJSONCfg(cfgJSON); err == nil || err.Error() != expected { t.Errorf("Expected %+v, received %+v", expected, err) } } diff --git a/config/tlscfg_test.go b/config/tlscfg_test.go index 40f917bb6..25cc16b18 100644 --- a/config/tlscfg_test.go +++ b/config/tlscfg_test.go @@ -43,9 +43,8 @@ func TestTlsCfgloadFromJsonCfg(t *testing.T) { ServerName: "TestServerName", ServerPolicy: 3, } - if jsonCfg, err := NewDefaultCGRConfig(); err != nil { - t.Error(err) - } else if err = jsonCfg.tlsCfg.loadFromJSONCfg(cfgJSON); err != nil { + jsonCfg := NewDefaultCGRConfig() + if err = jsonCfg.tlsCfg.loadFromJSONCfg(cfgJSON); err != nil { t.Error(err) } else if !reflect.DeepEqual(expected, jsonCfg.tlsCfg) { t.Errorf("Expected %+v \n, received %+v", utils.ToJSON(expected), utils.ToJSON(jsonCfg.tlsCfg)) diff --git a/dispatcherh/dispatcherh_test.go b/dispatcherh/dispatcherh_test.go index 13a07aa2b..dfea9a86d 100644 --- a/dispatcherh/dispatcherh_test.go +++ b/dispatcherh/dispatcherh_test.go @@ -34,10 +34,7 @@ import ( func TestDispatcherHostsService(t *testing.T) { ts := httptest.NewServer(http.HandlerFunc(Registar)) defer ts.Close() - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() cfg.RPCConns()["conn1"] = &config.RPCConn{ Strategy: rpcclient.PoolFirst, diff --git a/dispatcherh/libdispatcherh_test.go b/dispatcherh/libdispatcherh_test.go index d20e76cb6..c92943b57 100644 --- a/dispatcherh/libdispatcherh_test.go +++ b/dispatcherh/libdispatcherh_test.go @@ -79,10 +79,7 @@ func TestRegisterArgsAsDispatcherHosts(t *testing.T) { } func TestGetConnPort(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() cfg.ListenCfg().RPCJSONTLSListen = ":2072" cfg.ListenCfg().RPCJSONListen = ":2012" @@ -234,10 +231,8 @@ func TestRegister(t *testing.T) { if x, ok := engine.Cache.Get(utils.CacheDispatcherHosts, host2.TenantID()); ok { t.Errorf("Expected to not find Host2 in cache %+v", x) } - errCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + errCfg := config.NewDefaultCGRConfig() + engine.NewConnManager(errCfg, map[string]chan rpcclient.ClientConnector{}) errCfg.CacheCfg().Partitions[utils.CacheDispatcherHosts].Replicate = true errCfg.RPCConns()["errCon"] = &config.RPCConn{ diff --git a/engine/actions_test.go b/engine/actions_test.go index 13dc65feb..6430dc359 100644 --- a/engine/actions_test.go +++ b/engine/actions_test.go @@ -2610,7 +2610,7 @@ func (r *RPCMock) Call(method string, args interface{}, rply interface{}) error func TestCdrLogAction(t *testing.T) { mock := RPCMock{} - dfltCfg, err := config.NewDefaultCGRConfig() + dfltCfg := config.NewDefaultCGRConfig() if err != nil { t.Fatal(err) } diff --git a/engine/caps_test.go b/engine/caps_test.go index 6410c79df..d7af7ec42 100644 --- a/engine/caps_test.go +++ b/engine/caps_test.go @@ -152,7 +152,7 @@ func TestCapsStatsGetAverageOnEvict(t *testing.T) { t.Error(err) } cs := &CapsStats{st: st} - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() cfg.CacheCfg().Partitions[utils.CacheCapsEvents] = &config.CacheParamCfg{Limit: 2} tmp := Cache Cache = NewCacheS(cfg, nil, cs) diff --git a/engine/cdr_test.go b/engine/cdr_test.go index 048fcca55..bc27311ed 100644 --- a/engine/cdr_test.go +++ b/engine/cdr_test.go @@ -678,7 +678,7 @@ func TestCDRAsExportRecord(t *testing.T) { } else if expRecord[0] != "1" { t.Errorf("Expecting:\n%s\nReceived:\n%s", "1", expRecord[0]) } - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmForCDR := NewDataManager(data, config.CgrConfig().CacheCfg(), nil) cfgCdrFld = &config.FCTemplate{ @@ -993,10 +993,8 @@ func TestCDRAddDefaults(t *testing.T) { OriginHost: "192.168.1.2", Account: "1001", } - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Errorf("Error: %+v", err) - } + cfg := config.NewDefaultCGRConfig() + eCDR := &CDR{ CGRID: "bf736fb56ce586357ab2f286b777187a1612c6e6", ToR: utils.VOICE, @@ -1244,10 +1242,7 @@ func TestCDRcombimedCdrFieldVal(t *testing.T) { Filters: []string{"*string:~*req.RunID:testRun1"}, Value: config.NewRSRParsersMustCompile("~*req.Cost", utils.INFIELD_SEP), } - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Errorf("Error: %+v", err) - } + cfg := config.NewDefaultCGRConfig() if out, err := cdr.combimedCdrFieldVal(tpFld, groupCDRs, &FilterS{cfg: cfg}); err != nil { t.Error(err) diff --git a/engine/chargers_test.go b/engine/chargers_test.go index 77207d450..5d1ed7ae9 100755 --- a/engine/chargers_test.go +++ b/engine/chargers_test.go @@ -104,7 +104,7 @@ var ( ) func TestChargerPopulateChargerService(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmCharger = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) chargerSrv, err = NewChargerService(dmCharger, diff --git a/engine/filters_test.go b/engine/filters_test.go index 4c283d3fb..1e5c824c0 100644 --- a/engine/filters_test.go +++ b/engine/filters_test.go @@ -678,7 +678,7 @@ func TestFilterNewRequestFilter(t *testing.T) { } func TestInlineFilterPassFiltersForEvent(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmFilterPass := NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := FilterS{ @@ -866,7 +866,7 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) { } func TestPassFiltersForEventWithEmptyFilter(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmFilterPass := NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := FilterS{ @@ -974,7 +974,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) { } func TestPassFilterMaxCost(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmFilterPass := NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := FilterS{ @@ -1026,7 +1026,7 @@ func TestPassFilterMaxCost(t *testing.T) { } func TestPassFilterMissingField(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmFilterPass := NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := FilterS{ @@ -1072,7 +1072,7 @@ func TestPassFilterMissingField(t *testing.T) { } func TestEventCostFilter(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmFilterPass := NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := FilterS{ @@ -1293,7 +1293,7 @@ func TestVerifyPrefixes(t *testing.T) { } func TestPassPartial(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmFilterPass := NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := FilterS{ @@ -1502,7 +1502,7 @@ func TestAPIBan(t *testing.T) { "IP2": "1.2.3.254", }, } - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmFilterPass := NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filterS := FilterS{ diff --git a/engine/fscdr_test.go b/engine/fscdr_test.go index 24242e04a..1bd802502 100644 --- a/engine/fscdr_test.go +++ b/engine/fscdr_test.go @@ -394,7 +394,7 @@ var body = []byte(`{ var fsCdrCfg *config.CGRConfig func TestFsCdrFirstNonEmpty(t *testing.T) { - fsCdrCfg, _ = config.NewDefaultCGRConfig() + fsCdrCfg = config.NewDefaultCGRConfig() reader := bytes.NewReader(body) fsCdr, err := NewFSCdr(reader, fsCdrCfg) if err != nil { @@ -560,10 +560,8 @@ func TestFsCdrFirstDefined(t *testing.T) { } func TestFscdrAsCDR(t *testing.T) { - cgrCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := config.NewDefaultCGRConfig() + cgrCfg.CdrsCfg().ExtraFields, err = config.NewRSRParsersFromSlice([]string{"~*req.PayPalAccount"}) if err != nil { t.Error(err) @@ -602,10 +600,8 @@ func TestFscdrAsCDR(t *testing.T) { } func TestFscdrAsCdrOrderId(t *testing.T) { - cgrCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := config.NewDefaultCGRConfig() + fsCdrByte := []byte(` { "variables": { "cgr_orderid": "123s" @@ -621,10 +617,8 @@ func TestFscdrAsCdrOrderId(t *testing.T) { } func TestFscdrAsCdrSetupTime(t *testing.T) { - cgrCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := config.NewDefaultCGRConfig() + fsCdrByte := []byte(` { "variables": { "start_epoch": "123ss" @@ -640,10 +634,8 @@ func TestFscdrAsCdrSetupTime(t *testing.T) { } func TestFscdrAsCdrAnswerTime(t *testing.T) { - cgrCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := config.NewDefaultCGRConfig() + fsCdrByte := []byte(` { "variables": { "answer_epoch": "123ss" @@ -659,10 +651,8 @@ func TestFscdrAsCdrAnswerTime(t *testing.T) { } func TestFscdrAsCdrUsage(t *testing.T) { - cgrCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := config.NewDefaultCGRConfig() + fsCdrByte := []byte(` { "variables": { "billsec": "1ss" @@ -678,10 +668,8 @@ func TestFscdrAsCdrUsage(t *testing.T) { } func TestFscdrAsCdrPartial(t *testing.T) { - cgrCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := config.NewDefaultCGRConfig() + fsCdrByte := []byte(` { "variables": { "cgr_partial": "InvalidBoolFormat" @@ -697,10 +685,8 @@ func TestFscdrAsCdrPartial(t *testing.T) { } func TestFscdrAsCdrPreRated(t *testing.T) { - cgrCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := config.NewDefaultCGRConfig() + fsCdrByte := []byte(` { "variables": { "cgr_prerated": "InvalidBoolFormat" @@ -716,10 +702,8 @@ func TestFscdrAsCdrPreRated(t *testing.T) { } func TestFscdrAsCdrFirstDefined(t *testing.T) { - cgrCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := config.NewDefaultCGRConfig() + fsCdrByte := []byte(` { "variables": { "cgr_account": "randomAccount" @@ -748,10 +732,8 @@ func TestFscdrAsCdrFirstDefined(t *testing.T) { } } func TestNewFSCdrDecodeError(t *testing.T) { - cgrCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := config.NewDefaultCGRConfig() + expectedErr := "EOF" newReader := bytes.NewReader(nil) if _, err := NewFSCdr(newReader, cgrCfg); err == nil || err.Error() != expectedErr { @@ -760,10 +742,8 @@ func TestNewFSCdrDecodeError(t *testing.T) { } func TestSearchExtraFieldDefaultType(t *testing.T) { - cgrCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := config.NewDefaultCGRConfig() + newMap := map[string]interface{}{ "variables": map[string]string{ "cgr_orderid": "123", @@ -777,10 +757,8 @@ func TestSearchExtraFieldDefaultType(t *testing.T) { } func TestSearchExtraFieldInterface(t *testing.T) { - cgrCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := config.NewDefaultCGRConfig() + newMap := map[string]interface{}{ //There is a slice with no maps "variables": []interface{}{ 2, @@ -796,10 +774,8 @@ func TestSearchExtraFieldInterface(t *testing.T) { } func TestGetExtraFields(t *testing.T) { - cgrCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + cgrCfg := config.NewDefaultCGRConfig() + cgrCfg.CdrsCfg().ExtraFields, err = config.NewRSRParsersFromSlice([]string{"PayPalAccount"}) if err != nil { t.Error(err) diff --git a/engine/mapevent_test.go b/engine/mapevent_test.go index 2c64a52b3..52a6de600 100644 --- a/engine/mapevent_test.go +++ b/engine/mapevent_test.go @@ -317,10 +317,8 @@ func TestMapEventAsCDR(t *testing.T) { } else if !reflect.DeepEqual(expected, rply) { t.Errorf("Expecting %+v, received: %+v", expected, rply) } - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Errorf("Error: %+v", err) - } + cfg := config.NewDefaultCGRConfig() + expected = &CDR{ CGRID: "da39a3ee5e6b4b0d3255bfef95601890afd80709", Cost: -1.0, diff --git a/engine/routes_test.go b/engine/routes_test.go index d6b6b5eda..63d6b9874 100644 --- a/engine/routes_test.go +++ b/engine/routes_test.go @@ -296,7 +296,7 @@ func TestRoutesSort(t *testing.T) { } func TestRoutesPopulateRouteService(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmSPP = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) defaultCfg.RouteSCfg().StringIndexedFields = nil diff --git a/engine/safevent_test.go b/engine/safevent_test.go index 41fbdbd77..92ec420fb 100644 --- a/engine/safevent_test.go +++ b/engine/safevent_test.go @@ -631,7 +631,7 @@ func TestSafEventAsCDR(t *testing.T) { } else if !reflect.DeepEqual(expected, rply) { t.Errorf("Expecting %+v, received: %+v", expected, rply) } - cfg, err := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() if err != nil { t.Errorf("Error: %+v", err) } diff --git a/engine/stats_test.go b/engine/stats_test.go index d571ef22d..2ad9d3c8a 100644 --- a/engine/stats_test.go +++ b/engine/stats_test.go @@ -148,7 +148,7 @@ var ( ) func TestStatQueuesPopulateService(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmSTS = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) diff --git a/engine/suretax_test.go b/engine/suretax_test.go index 963336844..44cdd5ba3 100644 --- a/engine/suretax_test.go +++ b/engine/suretax_test.go @@ -41,7 +41,7 @@ func TestNewSureTaxRequest(t *testing.T) { ExtraFields: map[string]string{"field_extr1": "val_extr1", "fieldextr2": "valextr2"}, Cost: 1.01, PreRated: true, } - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() stCfg := cfg.SureTaxCfg() stCfg.ClientNumber = "000000000" stCfg.ValidationKey = "19491161-F004-4F44-BDB3-E976D6739A64" diff --git a/engine/thresholds_test.go b/engine/thresholds_test.go index fbb9c4d6d..10bca7c90 100644 --- a/engine/thresholds_test.go +++ b/engine/thresholds_test.go @@ -148,7 +148,7 @@ func TestThresholdsSort(t *testing.T) { } func TestThresholdsPopulateThresholdService(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmTH = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) defaultCfg.ThresholdSCfg().StoreInterval = 0 diff --git a/engine/z_attributes_test.go b/engine/z_attributes_test.go index 53537ce1c..8e291e7b8 100644 --- a/engine/z_attributes_test.go +++ b/engine/z_attributes_test.go @@ -157,7 +157,7 @@ var ( ) func TestAttributePopulateAttrService(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 defaultCfg.AttributeSCfg().StringIndexedFields = nil defaultCfg.AttributeSCfg().PrefixIndexedFields = nil @@ -1818,7 +1818,7 @@ func TestAttributeProcessEventValueExponent(t *testing.T) { } func BenchmarkAttributeProcessEventConstant(b *testing.B) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -1881,7 +1881,7 @@ func BenchmarkAttributeProcessEventConstant(b *testing.B) { } func BenchmarkAttributeProcessEventVariable(b *testing.B) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -1974,7 +1974,7 @@ func TestGetAttributeProfileFromInline(t *testing.T) { } func TestProcessAttributeConstant(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2035,7 +2035,7 @@ func TestProcessAttributeConstant(t *testing.T) { } func TestProcessAttributeVariable(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2099,7 +2099,7 @@ func TestProcessAttributeVariable(t *testing.T) { } func TestProcessAttributeComposed(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2169,7 +2169,7 @@ func TestProcessAttributeComposed(t *testing.T) { } func TestProcessAttributeUsageDifference(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2234,7 +2234,7 @@ func TestProcessAttributeUsageDifference(t *testing.T) { } func TestProcessAttributeSum(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2299,7 +2299,7 @@ func TestProcessAttributeSum(t *testing.T) { } func TestProcessAttributeDiff(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2364,7 +2364,7 @@ func TestProcessAttributeDiff(t *testing.T) { } func TestProcessAttributeMultiply(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2429,7 +2429,7 @@ func TestProcessAttributeMultiply(t *testing.T) { } func TestProcessAttributeDivide(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2494,7 +2494,7 @@ func TestProcessAttributeDivide(t *testing.T) { } func TestProcessAttributeValueExponent(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2559,7 +2559,7 @@ func TestProcessAttributeValueExponent(t *testing.T) { } func TestProcessAttributeUnixTimeStamp(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2624,7 +2624,7 @@ func TestProcessAttributeUnixTimeStamp(t *testing.T) { } func TestProcessAttributePrefix(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2688,7 +2688,7 @@ func TestProcessAttributePrefix(t *testing.T) { } func TestProcessAttributeSuffix(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2753,7 +2753,7 @@ func TestProcessAttributeSuffix(t *testing.T) { func TestAttributeIndexSelectsFalse(t *testing.T) { // change the IndexedSelects to false - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 defaultCfg.AttributeSCfg().StringIndexedFields = nil defaultCfg.AttributeSCfg().PrefixIndexedFields = nil @@ -2817,7 +2817,7 @@ func TestAttributeIndexSelectsFalse(t *testing.T) { } func TestProcessAttributeWithSameWeight(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().ProcessRuns = 1 data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2895,7 +2895,7 @@ func TestProcessAttributeWithSameWeight(t *testing.T) { } func TestAttributeMultipleProcessWithFiltersExists(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().IndexedSelects = false data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) @@ -2993,7 +2993,7 @@ func TestAttributeMultipleProcessWithFiltersExists(t *testing.T) { } func TestAttributeMultipleProcessWithFiltersNotEmpty(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() defaultCfg.AttributeSCfg().IndexedSelects = false data := NewInternalDB(nil, nil, true) dmAtr = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) diff --git a/engine/z_datamanager_it_test.go b/engine/z_datamanager_it_test.go index 348e0ae20..4cfe6a9a8 100644 --- a/engine/z_datamanager_it_test.go +++ b/engine/z_datamanager_it_test.go @@ -42,7 +42,7 @@ var ( ) func TestDMitinitDB(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() var dataDB DataDB var err error diff --git a/engine/z_filterindexer_it_test.go b/engine/z_filterindexer_it_test.go index d382f29dc..becce4b19 100644 --- a/engine/z_filterindexer_it_test.go +++ b/engine/z_filterindexer_it_test.go @@ -76,7 +76,7 @@ func TestFilterIndexerIT(t *testing.T) { dataManager = NewDataManager(NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) case utils.MetaMySQL: - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() redisDB, err := NewRedisStorage( fmt.Sprintf("%s:%s", cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort), 4, cfg.DataDbCfg().DataDbUser, cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, diff --git a/engine/z_onstor_it_test.go b/engine/z_onstor_it_test.go index 27a4d0b9f..89dee8df3 100644 --- a/engine/z_onstor_it_test.go +++ b/engine/z_onstor_it_test.go @@ -90,7 +90,7 @@ func TestOnStorIT(t *testing.T) { onStor = NewDataManager(NewInternalDB(nil, nil, true), config.CgrConfig().CacheCfg(), nil) case utils.MetaMySQL: - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() rdsITdb, err = NewRedisStorage( fmt.Sprintf("%s:%s", cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort), 4, cfg.DataDbCfg().DataDbUser, cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, diff --git a/engine/z_poster_it_test.go b/engine/z_poster_it_test.go index c39717c6b..eda121ae7 100644 --- a/engine/z_poster_it_test.go +++ b/engine/z_poster_it_test.go @@ -131,10 +131,8 @@ func TestSQSPoster(t *testing.T) { if !*itTestSQS { return } - cfg1, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg1 := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg1.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) @@ -212,10 +210,8 @@ func TestS3Poster(t *testing.T) { if !*itTestS3 { return } - cfg1, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg1 := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg1.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) @@ -275,10 +271,8 @@ func TestAMQPv1Poster(t *testing.T) { if !*itTestAMQPv1 { return } - cfg1, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg1 := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg1.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) diff --git a/engine/z_resources_test.go b/engine/z_resources_test.go index 0b5c779d9..ae811306d 100644 --- a/engine/z_resources_test.go +++ b/engine/z_resources_test.go @@ -369,7 +369,7 @@ func TestRSCacheSetGet(t *testing.T) { } func TestResourcePopulateResourceService(t *testing.T) { - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmRES = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) defaultCfg.ResourceSCfg().StoreInterval = 1 @@ -727,7 +727,7 @@ func TestResourceCaching(t *testing.T) { //clear the cache Cache.Clear(nil) // start fresh with new dataManager - defaultCfg, _ := config.NewDefaultCGRConfig() + defaultCfg := config.NewDefaultCGRConfig() data := NewInternalDB(nil, nil, true) dmRES = NewDataManager(data, config.CgrConfig().CacheCfg(), nil) diff --git a/engine/z_stordb_it_test.go b/engine/z_stordb_it_test.go index 9198feb4b..51753428d 100644 --- a/engine/z_stordb_it_test.go +++ b/engine/z_stordb_it_test.go @@ -64,9 +64,7 @@ func TestStorDBit(t *testing.T) { //var stestName string switch *dbType { case utils.MetaInternal: - if cfg, err = config.NewDefaultCGRConfig(); err != nil { - t.Error(err) - } + cfg = config.NewDefaultCGRConfig() config.SetCgrConfig(cfg) storDB = NewInternalDB(nil, nil, false) case utils.MetaMySQL: diff --git a/ers/ers_test.go b/ers/ers_test.go index 454d9d84c..bfe2220a1 100644 --- a/ers/ers_test.go +++ b/ers/ers_test.go @@ -28,7 +28,7 @@ import ( ) func TestERsNewERService(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() fltrS := &engine.FilterS{} expected := &ERService{cfg: cfg, filterS: fltrS, @@ -48,7 +48,7 @@ func TestERsNewERService(t *testing.T) { } func TestERsAddReader(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() fltrS := &engine.FilterS{} erS := NewERService(cfg, fltrS, nil) reader := cfg.ERsCfg().Readers[0] diff --git a/ers/readers_test.go b/ers/readers_test.go index 47e1c046d..4c5043730 100644 --- a/ers/readers_test.go +++ b/ers/readers_test.go @@ -28,7 +28,7 @@ import ( ) func TestNewInvalidReader(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() reader := cfg.ERsCfg().Readers[0] reader.Type = "Invalid" reader.ID = "InvaidReader" @@ -42,7 +42,7 @@ func TestNewInvalidReader(t *testing.T) { } func TestNewCsvReader(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() fltr := &engine.FilterS{} reader := cfg.ERsCfg().Readers[0] reader.Type = utils.MetaFileCSV @@ -74,7 +74,7 @@ func TestNewCsvReader(t *testing.T) { } func TestNewKafkaReader(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() fltr := &engine.FilterS{} reader := cfg.ERsCfg().Readers[0] reader.Type = utils.MetaKafkajsonMap @@ -96,7 +96,7 @@ func TestNewKafkaReader(t *testing.T) { } func TestNewSQLReader(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() fltr := &engine.FilterS{} reader := cfg.ERsCfg().Readers[0].Clone() reader.Type = utils.MetaSQL diff --git a/general_tests/filters_test.go b/general_tests/filters_test.go index ea79af051..24beb29d2 100644 --- a/general_tests/filters_test.go +++ b/general_tests/filters_test.go @@ -84,7 +84,7 @@ func TestFilterPassDestinations(t *testing.T) { } func TestInlineFilterPassFiltersForEvent(t *testing.T) { - cfg, _ := config.NewDefaultCGRConfig() + cfg := config.NewDefaultCGRConfig() cfg.FilterSCfg().ApierSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaApier)} internalAPIerSv1Chan := make(chan rpcclient.ClientConnector, 1) connMgr := engine.NewConnManager(cfg, map[string]chan rpcclient.ClientConnector{ diff --git a/general_tests/smschrg1_test.go b/general_tests/smschrg1_test.go index af2bbe8c3..633bea53e 100644 --- a/general_tests/smschrg1_test.go +++ b/general_tests/smschrg1_test.go @@ -27,7 +27,7 @@ import ( ) func TestSMSSetStorageSmsChrg1(t *testing.T) { - dflt, _ := config.NewDefaultCGRConfig() + dflt := config.NewDefaultCGRConfig() config.SetCgrConfig(dflt) config.CgrConfig().CacheCfg().Partitions[utils.CacheRatingPlans].Precache = true // precache rating plan data := engine.NewInternalDB(nil, nil, true) diff --git a/rates/rates_test.go b/rates/rates_test.go index 042f9331e..d8ce0d32f 100644 --- a/rates/rates_test.go +++ b/rates/rates_test.go @@ -42,10 +42,8 @@ func TestListenAndServe(t *testing.T) { } func TestNewRateS(t *testing.T) { - config, err := config.NewDefaultCGRConfig() - if err != nil { - t.Error(err) - } + config := config.NewDefaultCGRConfig() + data := engine.NewInternalDB(nil, nil, true) dataManager := engine.NewDataManager(data, config.CacheCfg(), nil) filters := engine.NewFilterS(config, nil, dataManager) @@ -69,10 +67,8 @@ func TestCallRates(t *testing.T) { } func TestMatchingRateProfileEvent(t *testing.T) { - defaultCfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + defaultCfg := config.NewDefaultCGRConfig() + data := engine.NewInternalDB(nil, nil, true) dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil) filters := engine.NewFilterS(defaultCfg, nil, dm) @@ -91,7 +87,7 @@ func TestMatchingRateProfileEvent(t *testing.T) { ExpiryTime: t1, }, } - err = dm.SetRateProfile(rpp, true) + err := dm.SetRateProfile(rpp, true) if err != nil { t.Error(err) } diff --git a/services/apiers_it_test.go b/services/apiers_it_test.go index c0c60ea6f..4722be98f 100644 --- a/services/apiers_it_test.go +++ b/services/apiers_it_test.go @@ -34,10 +34,8 @@ import ( ) func TestApiersReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -66,7 +64,7 @@ func TestApiersReload(t *testing.T) { apiSv2 := NewAPIerSv2Service(apiSv1, cfg, server, make(chan rpcclient.ClientConnector, 1), anz) srvMngr.AddServices(apiSv1, apiSv2, schS, tS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db, stordb) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if apiSv1.IsRunning() { diff --git a/services/asteriskagent_it_test.go b/services/asteriskagent_it_test.go index dce4d213c..ef7854bb1 100644 --- a/services/asteriskagent_it_test.go +++ b/services/asteriskagent_it_test.go @@ -34,10 +34,8 @@ import ( ) func TestAsteriskAgentReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + cfg.SessionSCfg().Enabled = true utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) @@ -60,7 +58,7 @@ func TestAsteriskAgentReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(srv, sS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Fatal(err) } if srv.IsRunning() { diff --git a/services/attributes_it_test.go b/services/attributes_it_test.go index bb0ba2232..644854f1b 100644 --- a/services/attributes_it_test.go +++ b/services/attributes_it_test.go @@ -35,10 +35,8 @@ import ( ) func TestAttributeSReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) @@ -60,7 +58,7 @@ func TestAttributeSReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(attrS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if attrS.IsRunning() { diff --git a/services/cdrs_it_test.go b/services/cdrs_it_test.go index ceed4772d..57c5484e3 100644 --- a/services/cdrs_it_test.go +++ b/services/cdrs_it_test.go @@ -34,10 +34,8 @@ import ( ) func TestCdrsReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -79,7 +77,7 @@ func TestCdrsReload(t *testing.T) { srvMngr.AddServices(cdrS, ralS, schS, chrS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db, stordb) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if cdrS.IsRunning() { diff --git a/services/chargers_it_test.go b/services/chargers_it_test.go index ac1df7381..3ca1f3209 100644 --- a/services/chargers_it_test.go +++ b/services/chargers_it_test.go @@ -35,10 +35,8 @@ import ( ) func TestChargerSReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.AttributeSCfg().Enabled = true @@ -61,7 +59,7 @@ func TestChargerSReload(t *testing.T) { srvMngr.AddServices(attrS, chrS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if chrS.IsRunning() { @@ -71,7 +69,7 @@ func TestChargerSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err = cfg.V1ReloadConfig(&config.ReloadArgs{ + if err := cfg.V1ReloadConfig(&config.ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.ChargerSCfgJson, }, &reply); err != nil { diff --git a/services/datadb_it_test.go b/services/datadb_it_test.go index d0390073b..d391f0f12 100644 --- a/services/datadb_it_test.go +++ b/services/datadb_it_test.go @@ -36,10 +36,8 @@ import ( ) func TestDataDBReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) @@ -58,7 +56,7 @@ func TestDataDBReload(t *testing.T) { srvMngr.AddServices(NewAttributeService(cfg, db, chS, filterSChan, server, make(chan rpcclient.ClientConnector, 1), anz), NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if db.IsRunning() { diff --git a/services/diameteragent_it_test.go b/services/diameteragent_it_test.go index 306e87607..0989c75f2 100644 --- a/services/diameteragent_it_test.go +++ b/services/diameteragent_it_test.go @@ -34,10 +34,8 @@ import ( ) func TestDiameterAgentReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + cfg.SessionSCfg().Enabled = true utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) @@ -60,7 +58,7 @@ func TestDiameterAgentReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(srv, sS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Fatal(err) } if srv.IsRunning() { diff --git a/services/dispatchers_it_test.go b/services/dispatchers_it_test.go index b090e201d..066386d58 100644 --- a/services/dispatchers_it_test.go +++ b/services/dispatchers_it_test.go @@ -35,10 +35,8 @@ import ( ) func TestDispatcherSReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.AttributeSCfg().Enabled = true @@ -63,7 +61,7 @@ func TestDispatcherSReload(t *testing.T) { srvMngr.AddServices(attrS, srv, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if srv.IsRunning() { @@ -73,7 +71,7 @@ func TestDispatcherSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err = cfg.V1ReloadConfig(&config.ReloadArgs{ + if err := cfg.V1ReloadConfig(&config.ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "dispatchers", "dispatchers_mysql"), Section: config.DispatcherSJson, diff --git a/services/dnsagent_it_test.go b/services/dnsagent_it_test.go index 3e9f46dd8..b9edfbce3 100644 --- a/services/dnsagent_it_test.go +++ b/services/dnsagent_it_test.go @@ -34,10 +34,8 @@ import ( ) func TestDNSAgentReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + cfg.SessionSCfg().Enabled = true utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) @@ -60,7 +58,7 @@ func TestDNSAgentReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(srv, sS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Fatal(err) } if srv.IsRunning() { diff --git a/services/ees_it_test.go b/services/ees_it_test.go index 1771fe5b2..e2beca711 100644 --- a/services/ees_it_test.go +++ b/services/ees_it_test.go @@ -45,10 +45,8 @@ func TestEventExporterSReload(t *testing.T) { t.Fatal("Error creating folder: ", dir, err) } } - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.AttributeSCfg().Enabled = true @@ -69,7 +67,7 @@ func TestEventExporterSReload(t *testing.T) { ees := NewEventExporterService(cfg, filterSChan, engine.NewConnManager(cfg, nil), server, make(chan rpcclient.ClientConnector, 1), anz) srvMngr.AddServices(ees, attrS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if ees.IsRunning() { diff --git a/services/ers_it_test.go b/services/ers_it_test.go index d52579aa3..7182c1f5f 100644 --- a/services/ers_it_test.go +++ b/services/ers_it_test.go @@ -44,10 +44,8 @@ func TestEventReaderSReload(t *testing.T) { t.Fatal("Error creating folder: ", dir, err) } } - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.SessionSCfg().Enabled = true @@ -64,7 +62,7 @@ func TestEventReaderSReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(attrS, sS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if attrS.IsRunning() { diff --git a/services/freeswitchagent_it_test.go b/services/freeswitchagent_it_test.go index ae3c8b0d6..73944fcb2 100644 --- a/services/freeswitchagent_it_test.go +++ b/services/freeswitchagent_it_test.go @@ -35,10 +35,8 @@ import ( ) func TestFreeSwitchAgentReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + cfg.SessionSCfg().Enabled = true cfg.SessionSCfg().ListenBijson = "" utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) @@ -62,7 +60,7 @@ func TestFreeSwitchAgentReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(srv, sS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Fatal(err) } if srv.IsRunning() { diff --git a/services/globalvars_test.go b/services/globalvars_test.go index cb4ba287d..ece64226e 100644 --- a/services/globalvars_test.go +++ b/services/globalvars_test.go @@ -26,10 +26,8 @@ import ( ) func TestGlobalVarS(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + exp := &GlobalVarS{cfg: cfg} if gv := NewGlobalVarS(cfg); !reflect.DeepEqual(gv, exp) { t.Errorf("Expected %+v, received %+v", exp, gv) @@ -50,7 +48,7 @@ func TestGlobalVarS(t *testing.T) { if err := exp.Reload(); err == nil { t.Error("Expected reload to not be succesfully finished") } - if err = exp.Shutdown(); err != nil { + if err := exp.Shutdown(); err != nil { t.Fatal(err) } } diff --git a/services/kamailioagent_it_test.go b/services/kamailioagent_it_test.go index 92aafcd9c..ad4265035 100644 --- a/services/kamailioagent_it_test.go +++ b/services/kamailioagent_it_test.go @@ -35,10 +35,8 @@ import ( ) func TestKamailioAgentReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + cfg.SessionSCfg().Enabled = true cfg.SessionSCfg().ListenBijson = "" utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) @@ -62,7 +60,7 @@ func TestKamailioAgentReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(srv, sS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Fatal(err) } if srv.IsRunning() { diff --git a/services/radiusagent_it_test.go b/services/radiusagent_it_test.go index 0186e2d85..51e2747d8 100644 --- a/services/radiusagent_it_test.go +++ b/services/radiusagent_it_test.go @@ -34,10 +34,8 @@ import ( ) func TestRadiusAgentReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + cfg.SessionSCfg().Enabled = true utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) @@ -60,7 +58,7 @@ func TestRadiusAgentReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(srv, sS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Fatal(err) } if srv.IsRunning() { diff --git a/services/rals_it_test.go b/services/rals_it_test.go index 49ae0f613..54abe3f88 100644 --- a/services/rals_it_test.go +++ b/services/rals_it_test.go @@ -34,10 +34,8 @@ import ( ) func TestRalsReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -75,7 +73,7 @@ func TestRalsReload(t *testing.T) { shdChan, nil, anz) srvMngr.AddServices(ralS, schS, tS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db, stordb) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if ralS.IsRunning() { diff --git a/services/rates_it_test.go b/services/rates_it_test.go index bc665fc10..9c04cc30a 100644 --- a/services/rates_it_test.go +++ b/services/rates_it_test.go @@ -35,10 +35,8 @@ import ( ) func TestRateSReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -56,7 +54,7 @@ func TestRateSReload(t *testing.T) { rS := NewRateService(cfg, chS, filterSChan, db, server, make(chan rpcclient.ClientConnector, 1), anz) srvMngr.AddServices(rS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if rS.IsRunning() { diff --git a/services/resources_it_test.go b/services/resources_it_test.go index 11f7e31c5..c68f7a474 100644 --- a/services/resources_it_test.go +++ b/services/resources_it_test.go @@ -36,10 +36,8 @@ import ( func TestResourceSReload(t *testing.T) { // utils.Logger.SetLogLevel(7) - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.ThresholdSCfg().Enabled = true @@ -63,7 +61,7 @@ func TestResourceSReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(tS, reS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if reS.IsRunning() { @@ -73,7 +71,7 @@ func TestResourceSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err = cfg.V1ReloadConfig(&config.ReloadArgs{ + if err := cfg.V1ReloadConfig(&config.ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.RESOURCES_JSON, }, &reply); err != nil { diff --git a/services/routes_it_test.go b/services/routes_it_test.go index 0d1782a6d..0e51d4311 100644 --- a/services/routes_it_test.go +++ b/services/routes_it_test.go @@ -35,10 +35,8 @@ import ( ) func TestSupplierSReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.StatSCfg().Enabled = true @@ -61,7 +59,7 @@ func TestSupplierSReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(supS, sts, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if supS.IsRunning() { diff --git a/services/schedulers_it_test.go b/services/schedulers_it_test.go index 29160c3ad..d5f148624 100644 --- a/services/schedulers_it_test.go +++ b/services/schedulers_it_test.go @@ -34,10 +34,8 @@ import ( ) func TestSchedulerSReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) shdChan := utils.NewSyncedChan() @@ -54,7 +52,7 @@ func TestSchedulerSReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(schS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if schS.IsRunning() { diff --git a/services/sessions_it_test.go b/services/sessions_it_test.go index 23c742007..d856f8a1c 100644 --- a/services/sessions_it_test.go +++ b/services/sessions_it_test.go @@ -34,10 +34,8 @@ import ( ) func TestSessionSReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + cfg.ChargerSCfg().Enabled = true cfg.RalsCfg().Enabled = true cfg.CdrsCfg().Enabled = true @@ -86,7 +84,7 @@ func TestSessionSReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(srv, chrS, schS, ralS, cdrS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db, stordb) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if srv.IsRunning() { diff --git a/services/sipagent_it_test.go b/services/sipagent_it_test.go index 80d8f100c..b3f27ff77 100644 --- a/services/sipagent_it_test.go +++ b/services/sipagent_it_test.go @@ -34,10 +34,8 @@ import ( ) func TestSIPAgentReload(t *testing.T) { - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + cfg.SessionSCfg().Enabled = true utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) @@ -60,7 +58,7 @@ func TestSIPAgentReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(srv, sS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Fatal(err) } if srv.IsRunning() { diff --git a/services/stats_it_test.go b/services/stats_it_test.go index 998514de1..98c8d8e39 100644 --- a/services/stats_it_test.go +++ b/services/stats_it_test.go @@ -36,10 +36,8 @@ import ( func TestStatSReload(t *testing.T) { // utils.Logger.SetLogLevel(7) - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) cfg.ThresholdSCfg().Enabled = true @@ -63,7 +61,7 @@ func TestStatSReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(tS, sS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if sS.IsRunning() { @@ -73,7 +71,7 @@ func TestStatSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err = cfg.V1ReloadConfig(&config.ReloadArgs{ + if err := cfg.V1ReloadConfig(&config.ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.STATS_JSON, }, &reply); err != nil { diff --git a/services/thresholds_it_test.go b/services/thresholds_it_test.go index 144fa4c94..530a9983d 100644 --- a/services/thresholds_it_test.go +++ b/services/thresholds_it_test.go @@ -35,10 +35,8 @@ import ( func TestThresholdSReload(t *testing.T) { // utils.Logger.SetLogLevel(7) - cfg, err := config.NewDefaultCGRConfig() - if err != nil { - t.Fatal(err) - } + cfg := config.NewDefaultCGRConfig() + utils.Newlogger(utils.MetaSysLog, cfg.GeneralCfg().NodeID) utils.Logger.SetLogLevel(7) filterSChan := make(chan *engine.FilterS, 1) @@ -57,7 +55,7 @@ func TestThresholdSReload(t *testing.T) { engine.NewConnManager(cfg, nil) srvMngr.AddServices(tS, NewLoaderService(cfg, db, filterSChan, server, make(chan rpcclient.ClientConnector, 1), nil, anz), db) - if err = srvMngr.StartServices(); err != nil { + if err := srvMngr.StartServices(); err != nil { t.Error(err) } if tS.IsRunning() { @@ -67,7 +65,7 @@ func TestThresholdSReload(t *testing.T) { t.Errorf("Expected service to be down") } var reply string - if err = cfg.V1ReloadConfig(&config.ReloadArgs{ + if err := cfg.V1ReloadConfig(&config.ReloadArgs{ Path: path.Join("/usr", "share", "cgrates", "conf", "samples", "tutmongo"), Section: config.THRESHOLDS_JSON, }, &reply); err != nil { diff --git a/sessions/sessions_test.go b/sessions/sessions_test.go index 67b6c340b..584126193 100644 --- a/sessions/sessions_test.go +++ b/sessions/sessions_test.go @@ -88,7 +88,7 @@ func TestIsIndexed(t *testing.T) { } func TestSessionSIndexAndUnindexSessions(t *testing.T) { - sSCfg, _ := config.NewDefaultCGRConfig() + sSCfg := config.NewDefaultCGRConfig() sSCfg.SessionSCfg().SessionIndexes = utils.StringSet{ "Tenant": {}, "Account": {}, @@ -414,7 +414,7 @@ func TestSessionSIndexAndUnindexSessions(t *testing.T) { } func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { - sSCfg, _ := config.NewDefaultCGRConfig() + sSCfg := config.NewDefaultCGRConfig() sS := NewSessionS(sSCfg, nil, nil) sSEv := engine.NewMapEvent(map[string]interface{}{ utils.EVENT_NAME: "TEST_EVENT", @@ -632,7 +632,7 @@ func TestSessionSRegisterAndUnregisterASessions(t *testing.T) { } func TestSessionSRegisterAndUnregisterPSessions(t *testing.T) { - sSCfg, _ := config.NewDefaultCGRConfig() + sSCfg := config.NewDefaultCGRConfig() sS := NewSessionS(sSCfg, nil, nil) sSEv := engine.NewMapEvent(map[string]interface{}{ utils.EVENT_NAME: "TEST_EVENT", @@ -1416,7 +1416,7 @@ func TestV1ProcessEventReplyAsNavigableMap(t *testing.T) { } func TestSessionStransitSState(t *testing.T) { - sSCfg, _ := config.NewDefaultCGRConfig() + sSCfg := config.NewDefaultCGRConfig() sS := NewSessionS(sSCfg, nil, nil) sSEv := engine.NewMapEvent(map[string]interface{}{ utils.EVENT_NAME: "TEST_EVENT", @@ -1462,7 +1462,7 @@ func TestSessionStransitSState(t *testing.T) { } func TestSessionSrelocateSessionS(t *testing.T) { - sSCfg, _ := config.NewDefaultCGRConfig() + sSCfg := config.NewDefaultCGRConfig() sS := NewSessionS(sSCfg, nil, nil) sSEv := engine.NewMapEvent(map[string]interface{}{ utils.EVENT_NAME: "TEST_EVENT", @@ -1612,7 +1612,7 @@ func TestSessionSNewV1AuthorizeArgsWithOpts2(t *testing.T) { } func TestSessionSGetIndexedFilters(t *testing.T) { - sSCfg, _ := config.NewDefaultCGRConfig() + sSCfg := config.NewDefaultCGRConfig() mpStr := engine.NewInternalDB(nil, nil, true) sS := NewSessionS(sSCfg, engine.NewDataManager(mpStr, config.CgrConfig().CacheCfg(), nil), nil) expIndx := map[string][]string{} @@ -1665,7 +1665,7 @@ func TestSessionSGetIndexedFilters(t *testing.T) { } func TestSessionSgetSessionIDsMatchingIndexes(t *testing.T) { - sSCfg, _ := config.NewDefaultCGRConfig() + sSCfg := config.NewDefaultCGRConfig() sSCfg.SessionSCfg().SessionIndexes = utils.StringSet{ "ToR": {}, } @@ -1778,7 +1778,7 @@ type testRPCClientConnection struct{} func (*testRPCClientConnection) Call(string, interface{}, interface{}) error { return nil } func TestNewSessionS(t *testing.T) { - cgrCGF, _ := config.NewDefaultCGRConfig() + cgrCGF := config.NewDefaultCGRConfig() eOut := &SessionS{ cgrCfg: cgrCGF, @@ -1944,7 +1944,7 @@ func TestV1ProcessMessageArgsParseFlags(t *testing.T) { } func TestSessionSgetSession(t *testing.T) { - sSCfg, _ := config.NewDefaultCGRConfig() + sSCfg := config.NewDefaultCGRConfig() sS := NewSessionS(sSCfg, nil, nil) sSEv := engine.NewMapEvent(map[string]interface{}{ utils.EVENT_NAME: "TEST_EVENT", @@ -1988,7 +1988,7 @@ func TestSessionSgetSession(t *testing.T) { } func TestSessionSfilterSessions(t *testing.T) { - sSCfg, _ := config.NewDefaultCGRConfig() + sSCfg := config.NewDefaultCGRConfig() sSCfg.SessionSCfg().SessionIndexes = utils.StringSet{ "ToR": {}, } @@ -2164,7 +2164,7 @@ func TestSessionSfilterSessions(t *testing.T) { } func TestSessionSfilterSessionsCount(t *testing.T) { - sSCfg, _ := config.NewDefaultCGRConfig() + sSCfg := config.NewDefaultCGRConfig() sSCfg.SessionSCfg().SessionIndexes = utils.StringSet{ "ToR": {}, }