From c718f90b8938c35aa3831e04cf89713b21170bc3 Mon Sep 17 00:00:00 2001 From: Trial97 Date: Tue, 29 Oct 2019 11:02:39 +0200 Subject: [PATCH] Updated engine integration tests --- apier/v1/resourcesv1_it_test.go | 2 +- engine/actions2_it_test.go | 3 +-- engine/cdr_test.go | 2 +- engine/chargers_test.go | 2 +- engine/datamanager_it_test.go | 2 +- engine/filterhelpers_test.go | 2 +- engine/filterindexer_it_test.go | 2 +- engine/filters_test.go | 8 ++++---- engine/onstor_it_test.go | 4 ++-- engine/storage_internal_stordb.go | 2 +- 10 files changed, 14 insertions(+), 15 deletions(-) diff --git a/apier/v1/resourcesv1_it_test.go b/apier/v1/resourcesv1_it_test.go index 679baad38..bd028c6dc 100644 --- a/apier/v1/resourcesv1_it_test.go +++ b/apier/v1/resourcesv1_it_test.go @@ -521,7 +521,7 @@ func testV1RsReleaseResource(t *testing.T) { } func testV1RsDBStore(t *testing.T) { - if rlsV1ConfDIR == "tutinternal"{ + if rlsV1ConfDIR == "tutinternal" { t.SkipNow() } argsRU := utils.ArgRSv1ResourceUsage{ diff --git a/engine/actions2_it_test.go b/engine/actions2_it_test.go index a670ee691..a897d74d4 100644 --- a/engine/actions2_it_test.go +++ b/engine/actions2_it_test.go @@ -84,12 +84,11 @@ func testActionsInitCdrsStore(t *testing.T) { actsCfg.StorDbCfg().ConnMaxLifetime); err != nil { t.Fatal("Could not connect to mysql", err.Error()) } - } else if actsCfgDir == "cdrsv2mongo" { if actsCdrStore, err = NewMongoStorage(actsCfg.StorDbCfg().Host, actsCfg.StorDbCfg().Port, actsCfg.StorDbCfg().Name, actsCfg.StorDbCfg().User, actsCfg.StorDbCfg().Password, - utils.StorDB, nil, actsCfg.CacheCfg(), false); err != nil { + utils.StorDB, nil, false); err != nil { t.Fatal("Could not connect to mongo", err.Error()) } } diff --git a/engine/cdr_test.go b/engine/cdr_test.go index 9aa3b07bb..9c030b924 100644 --- a/engine/cdr_test.go +++ b/engine/cdr_test.go @@ -663,7 +663,7 @@ func TestCDRAsExportRecord(t *testing.T) { t.Errorf("Expecting:\n%s\nReceived:\n%s", "1", expRecord[0]) } data, _ := NewMapStorage() - dmForCDR := NewDataManager(data,config.CgrConfig().CacheCfg()) + dmForCDR := NewDataManager(data, config.CgrConfig().CacheCfg()) defaultCfg, err := config.NewDefaultCGRConfig() if err != nil { t.Errorf("Error: %+v", err) diff --git a/engine/chargers_test.go b/engine/chargers_test.go index 614fb55b3..306f5cc32 100755 --- a/engine/chargers_test.go +++ b/engine/chargers_test.go @@ -102,7 +102,7 @@ var ( func TestChargerPopulateChargerService(t *testing.T) { data := NewInternalDB(nil, nil) - dmCharger = NewDataManager(data,config.CgrConfig().CacheCfg()) + dmCharger = NewDataManager(data, config.CgrConfig().CacheCfg()) defaultCfg, err := config.NewDefaultCGRConfig() if err != nil { t.Errorf("Error: %+v", err) diff --git a/engine/datamanager_it_test.go b/engine/datamanager_it_test.go index 59bdd3726..bbb46f7ea 100644 --- a/engine/datamanager_it_test.go +++ b/engine/datamanager_it_test.go @@ -63,7 +63,7 @@ func TestDMitMongo(t *testing.T) { dataDB, err := NewMongoStorage(mgoITCfg.StorDbCfg().Host, mgoITCfg.StorDbCfg().Port, mgoITCfg.StorDbCfg().Name, mgoITCfg.StorDbCfg().User, mgoITCfg.StorDbCfg().Password, - utils.StorDB, nil, mgoITCfg.CacheCfg(), false) + utils.StorDB, nil, false) if err != nil { t.Fatal("Could not connect to Mongo", err.Error()) } diff --git a/engine/filterhelpers_test.go b/engine/filterhelpers_test.go index 35bcdc47f..40e8f48b8 100644 --- a/engine/filterhelpers_test.go +++ b/engine/filterhelpers_test.go @@ -37,7 +37,7 @@ func TestFilterMatchingItemIDsForEvent(t *testing.T) { stringFilterID := "stringFilterID" prefixFilterID := "prefixFilterID" data := NewInternalDB(nil, nil) - dmMatch = NewDataManager(data,config.CgrConfig().CacheCfg()) + dmMatch = NewDataManager(data, config.CgrConfig().CacheCfg()) context := utils.MetaRating x, err := NewFilterRule(utils.MetaString, "~Field", []string{"profile"}) if err != nil { diff --git a/engine/filterindexer_it_test.go b/engine/filterindexer_it_test.go index b3869df70..c87dcae1d 100644 --- a/engine/filterindexer_it_test.go +++ b/engine/filterindexer_it_test.go @@ -88,7 +88,7 @@ func TestFilterIndexerITMongo(t *testing.T) { mongoDB, err := NewMongoStorage(mgoITCfg.StorDbCfg().Host, mgoITCfg.StorDbCfg().Port, mgoITCfg.StorDbCfg().Name, mgoITCfg.StorDbCfg().User, mgoITCfg.StorDbCfg().Password, - utils.StorDB, nil, mgoITCfg.CacheCfg(), false) + utils.StorDB, nil, false) if err != nil { t.Fatal(err) } diff --git a/engine/filters_test.go b/engine/filters_test.go index a3a629bba..4522f5216 100644 --- a/engine/filters_test.go +++ b/engine/filters_test.go @@ -605,7 +605,7 @@ func TestFilterNewRequestFilter(t *testing.T) { func TestInlineFilterPassFiltersForEvent(t *testing.T) { data := NewInternalDB(nil, nil) - dmFilterPass := NewDataManager(data,config.CgrConfig().CacheCfg()) + dmFilterPass := NewDataManager(data, config.CgrConfig().CacheCfg()) cfg, _ := config.NewDefaultCGRConfig() filterS := FilterS{ cfg: cfg, @@ -793,7 +793,7 @@ func TestInlineFilterPassFiltersForEvent(t *testing.T) { func TestPassFiltersForEventWithEmptyFilter(t *testing.T) { data := NewInternalDB(nil, nil) - dmFilterPass := NewDataManager(data,config.CgrConfig().CacheCfg()) + dmFilterPass := NewDataManager(data, config.CgrConfig().CacheCfg()) cfg, _ := config.NewDefaultCGRConfig() filterS := FilterS{ cfg: cfg, @@ -883,7 +883,7 @@ func TestPassFiltersForEventWithEmptyFilter(t *testing.T) { func TestPassFilterMaxCost(t *testing.T) { data := NewInternalDB(nil, nil) - dmFilterPass := NewDataManager(data,config.CgrConfig().CacheCfg()) + dmFilterPass := NewDataManager(data, config.CgrConfig().CacheCfg()) cfg, _ := config.NewDefaultCGRConfig() filterS := FilterS{ cfg: cfg, @@ -929,7 +929,7 @@ func TestPassFilterMaxCost(t *testing.T) { func TestPassFilterMissingField(t *testing.T) { data := NewInternalDB(nil, nil) - dmFilterPass := NewDataManager(data,config.CgrConfig().CacheCfg()) + dmFilterPass := NewDataManager(data, config.CgrConfig().CacheCfg()) cfg, _ := config.NewDefaultCGRConfig() filterS := FilterS{ cfg: cfg, diff --git a/engine/onstor_it_test.go b/engine/onstor_it_test.go index b41feb6b6..125273128 100644 --- a/engine/onstor_it_test.go +++ b/engine/onstor_it_test.go @@ -87,7 +87,7 @@ func TestOnStorITRedis(t *testing.T) { rdsITdb, err = NewRedisStorage( fmt.Sprintf("%s:%s", cfg.DataDbCfg().DataDbHost, cfg.DataDbCfg().DataDbPort), 4, cfg.DataDbCfg().DataDbPass, cfg.GeneralCfg().DBDataEncoding, - utils.REDIS_MAX_CONNS, "") + utils.REDIS_MAX_CONNS, "") if err != nil { t.Fatal("Could not connect to Redis", err.Error()) } @@ -108,7 +108,7 @@ func TestOnStorITMongo(t *testing.T) { if mgoITdb, err = NewMongoStorage(mgoITCfg.StorDbCfg().Host, mgoITCfg.StorDbCfg().Port, mgoITCfg.StorDbCfg().Name, mgoITCfg.StorDbCfg().User, mgoITCfg.StorDbCfg().Password, - utils.StorDB, nil, mgoITCfg.CacheCfg(), false); err != nil { + utils.StorDB, nil, false); err != nil { t.Fatal(err) } onStorCfg = mgoITCfg.StorDbCfg().Name diff --git a/engine/storage_internal_stordb.go b/engine/storage_internal_stordb.go index f37d3d3f7..fda132403 100644 --- a/engine/storage_internal_stordb.go +++ b/engine/storage_internal_stordb.go @@ -968,7 +968,7 @@ func (iDB *InternalDB) RemoveSMCosts(qryFltr *utils.SMCostFilter) error { for key := range smMpIDs { iDB.db.Remove(utils.SessionCostsTBL, key, - cacheCommit(utils.NonTransactional), utils.NonTransactional) + cacheCommit(utils.NonTransactional), utils.NonTransactional) } return nil }