Updated unit tests

Author: Trial97

agents/agentreq_test.go

@@ -57,7 +57,7 @@ func (s *testMockSessionConn) Handlers() (b map[string]interface{}) {
 }
 
 func TestProcessRequest(t *testing.T) {
-	data := engine.NewInternalDB(nil, nil, true)
+	data := engine.NewInternalDB(nil, nil, true, config.CgrConfig().DataDbCfg().Items)
 	dm := engine.NewDataManager(data, config.CgrConfig().CacheCfg(), nil)
 	filters := engine.NewFilterS(config.CgrConfig(), nil, dm) // no need for filterS but still try to configure the dm :D
 

agents/diamagent_test.go

@@ -1146,7 +1146,7 @@ func TestFilterWithDiameterDP(t *testing.T) {
 		}})
 	dP := newDADataProvider(nil, avps)
 	cfg := config.NewDefaultCGRConfig()
-	dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true),
+	dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items),
 		config.CgrConfig().CacheCfg(), nil)
 	filterS := engine.NewFilterS(cfg, nil, dm)
 	agReq := NewAgentRequest(dP, nil, nil, nil, nil, nil, "cgrates.org", "", filterS, nil)

agents/libdiam_test.go

@@ -189,7 +189,7 @@ func TestAnalyzersV1Search(t *testing.T) {
 	if err := os.MkdirAll(cfg.AnalyzerSCfg().DBPath, 0700); err != nil {
 		t.Fatal(err)
 	}
-	dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), cfg.CacheCfg(), nil)
+	dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items), cfg.CacheCfg(), nil)
 	anz, err := NewAnalyzerService(cfg)
 
 	if err != nil {

analyzers/analyzers_test.go

@@ -33,7 +33,7 @@ var (
 
 func init() {
 	cfg := config.NewDefaultCGRConfig()
-	apierAcntsAcntStorage = engine.NewInternalDB(nil, nil, true)
+	apierAcntsAcntStorage = engine.NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
 	apierAcnts = &APIerSv1{
 		DataManager: engine.NewDataManager(apierAcntsAcntStorage, config.CgrConfig().CacheCfg(), nil),
 		Config:      cfg,

apier/v1/accounts_test.go

@@ -37,7 +37,7 @@ var (
 func init() {
 	cfg := config.NewDefaultCGRConfig()
 	config.SetCgrConfig(cfg)
-	apierDebitStorage = engine.NewInternalDB(nil, nil, true)
+	apierDebitStorage = engine.NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
 
 	responder := &engine.Responder{MaxComputedUsage: cfg.RalsCfg().MaxComputedUsage}
 	dm = engine.NewDataManager(apierDebitStorage, config.CgrConfig().CacheCfg(), nil)
@@ -52,7 +52,7 @@ func init() {
 func TestDebitUsageWithOptionsSetConfig(t *testing.T) {
 	cfg := config.NewDefaultCGRConfig()
 	config.SetCgrConfig(cfg)
-	apierDebitStorage = engine.NewInternalDB(nil, nil, true)
+	apierDebitStorage = engine.NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
 	responder := &engine.Responder{MaxComputedUsage: cfg.RalsCfg().MaxComputedUsage}
 	dm = engine.NewDataManager(apierDebitStorage, cfg.CacheCfg(), nil)
 	engine.SetDataStorage(dm)

apier/v1/debit_test.go

@@ -46,7 +46,7 @@ func TestFiltersSetFilterReloadCache(t *testing.T) {
 	cfg := config.NewDefaultCGRConfig()
 	cfg.GeneralCfg().DefaultCaching = utils.MetaNone
 	cfg.ApierCfg().CachesConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}
-	dataDB := engine.NewInternalDB(nil, nil, true)
+	dataDB := engine.NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
 	dm := engine.NewDataManager(dataDB, cfg.CacheCfg(), nil)
 	expArgs := &utils.AttrReloadCacheWithAPIOpts{
 		APIOpts: map[string]interface{}{
@@ -229,13 +229,14 @@ func TestFiltersSetFilterReloadCache(t *testing.T) {
 	}
 
 	dm.DataDB().Flush(utils.EmptyString)
+	engine.Cache.Clear(nil)
 }
 
 func TestFiltersSetFilterClearCache(t *testing.T) {
 	cfg := config.NewDefaultCGRConfig()
 	cfg.GeneralCfg().DefaultCaching = utils.MetaNone
 	cfg.ApierCfg().CachesConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaCaches)}
-	dataDB := engine.NewInternalDB(nil, nil, true)
+	dataDB := engine.NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items)
 	dm := engine.NewDataManager(dataDB, cfg.CacheCfg(), nil)
 	expArgs := &utils.AttrCacheIDsWithAPIOpts{
 		APIOpts: map[string]interface{}{
@@ -416,4 +417,5 @@ func TestFiltersSetFilterClearCache(t *testing.T) {
 	}
 
 	dm.DataDB().Flush(utils.EmptyString)
+	engine.Cache.Clear(nil)
 }

apier/v1/filters_test.go

@@ -207,7 +207,7 @@ func TestCallCache(t *testing.T) {
 
 func TestCallCacheForFilter(t *testing.T) {
 	cfg := config.NewDefaultCGRConfig()
-	dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true), cfg.CacheCfg(), nil)
+	dm := engine.NewDataManager(engine.NewInternalDB(nil, nil, true, cfg.DataDbCfg().Items), cfg.CacheCfg(), nil)
 	tnt := "cgrates.org"
 	flt := &engine.Filter{
 		Tenant: tnt,

apier/v1/libapier_test.go

@@ -108,7 +108,7 @@ func testAPIerSv2itConnectDataDB(t *testing.T) {
 		apierCfg.DataDbCfg().Host, apierCfg.DataDbCfg().Port,
 		apierCfg.DataDbCfg().Name, apierCfg.DataDbCfg().User,
 		apierCfg.DataDbCfg().Password, apierCfg.GeneralCfg().DBDataEncoding,
-		apierCfg.DataDbCfg().Opts)
+		apierCfg.DataDbCfg().Opts, apierCfg.DataDbCfg().Items)
 	if err != nil {
 		t.Fatal("Could not connect to Redis", err.Error())
 	}

apier/v2/apierv2_it_test.go

@@ -295,7 +295,7 @@ func testLoadItConnectToDB(t *testing.T) {
 		ldrItCfg.DataDbCfg().Host, ldrItCfg.DataDbCfg().Port,
 		ldrItCfg.DataDbCfg().Name, ldrItCfg.DataDbCfg().User,
 		ldrItCfg.DataDbCfg().Password, ldrItCfg.GeneralCfg().DBDataEncoding,
-		ldrItCfg.DataDbCfg().Opts); err != nil {
+		ldrItCfg.DataDbCfg().Opts, ldrItCfg.DataDbCfg().Items); err != nil {
 		t.Fatal(err)
 	}
 }