Adjust tests to InternalDB constructor

This commit is contained in:
arberkatellari
2025-04-07 17:15:24 +02:00
committed by Dan Christian Bogos
parent 0e5c5a9e60
commit 5463eb61c6
102 changed files with 3295 additions and 1154 deletions

View File

@@ -69,7 +69,10 @@ func TestAttrSProcessEvent(t *testing.T) {
}
cfg := config.NewDefaultCGRConfig()
cfg.EEsNoLksCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)}
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
clientConn := make(chan birpc.ClientConnector, 1)
@@ -101,7 +104,10 @@ func TestAttrSProcessEvent2(t *testing.T) {
}
cfg := config.NewDefaultCGRConfig()
cfg.EEsNoLksCfg().AttributeSConns = []string{utils.ConcatenatedKey(utils.MetaInternal, utils.MetaAttributes)}
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
clientConn := make(chan birpc.ClientConnector, 1)
@@ -130,7 +136,10 @@ func TestV1ProcessEvent(t *testing.T) {
cfg.EEsCfg().Exporters[0].Type = "*file_csv"
cfg.EEsCfg().Exporters[0].ID = "SQLExporterFull"
cfg.EEsCfg().Exporters[0].ExportPath = filePath
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
eeS, err := NewEventExporterS(cfg, filterS, nil)
@@ -183,7 +192,10 @@ func TestV1ProcessEvent2(t *testing.T) {
cfg.EEsCfg().Exporters[0].Type = "*file_csv"
cfg.EEsCfg().Exporters[0].ID = "SQLExporterFull"
cfg.EEsCfg().Exporters[0].Filters = []string{"*prefix:~*req.Subject:20"}
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
eeS, err := NewEventExporterS(cfg, filterS, nil)
@@ -226,7 +238,10 @@ func TestV1ProcessEvent3(t *testing.T) {
cfg.EEsCfg().Exporters[0].Flags = utils.FlagsWithParams{
utils.MetaAttributes: utils.FlagParams{},
}
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
eeS, err := NewEventExporterS(cfg, filterS, nil)
@@ -254,7 +269,10 @@ func TestV1ProcessEvent4(t *testing.T) {
cfg.EEsCfg().Exporters[0].Type = utils.MetaHTTPPost
cfg.EEsCfg().Exporters[0].ID = "SQLExporterFull"
cfg.EEsCfg().Exporters[0].Synchronous = true
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
eeS, err := NewEventExporterS(cfg, filterS, nil)
@@ -323,7 +341,10 @@ func TestV1ProcessEventMockMetrics(t *testing.T) {
cfg.EEsCfg().Exporters[0].Type = utils.MetaHTTPPost
cfg.EEsCfg().Exporters[0].ID = "SQLExporterFull"
cfg.EEsCfg().Exporters[0].Synchronous = true
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
eeS, err := NewEventExporterS(cfg, filterS, nil)
@@ -376,7 +397,10 @@ func TestV1ProcessEvent5(t *testing.T) {
},
},
}
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
eeS, err := NewEventExporterS(cfg, filterS, nil)
@@ -394,7 +418,10 @@ func TestV1ProcessEvent6(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
cfg.EEsCfg().Exporters[0].Type = utils.MetaHTTPPost
cfg.EEsCfg().Exporters[0].ID = "SQLExporterFull"
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
eeS, err := NewEventExporterS(cfg, filterS, nil)

View File

@@ -50,7 +50,10 @@ func (nopCloser) Close() error { return nil }
func TestFileCsvComposeHeader(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)
@@ -113,7 +116,10 @@ func TestFileCsvComposeHeader(t *testing.T) {
func TestFileCsvComposeTrailer(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)
@@ -176,7 +182,10 @@ func TestFileCsvComposeTrailer(t *testing.T) {
func TestFileCsvExportEvent(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)
@@ -206,7 +215,10 @@ func TestFileCsvExportEvent(t *testing.T) {
func TestFileCsvOnEvictedTrailer(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)
@@ -240,7 +252,10 @@ func TestFileCsvOnEvictedTrailer(t *testing.T) {
func TestFileCsvOnEvictedClose(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)

View File

@@ -44,7 +44,10 @@ func TestFileFwvGetMetrics(t *testing.T) {
func TestFileFwvComposeHeader(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)
@@ -106,7 +109,10 @@ func TestFileFwvComposeHeader(t *testing.T) {
func TestFileFwvComposeTrailer(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)
@@ -168,7 +174,10 @@ func TestFileFwvComposeTrailer(t *testing.T) {
func TestFileFwvExportEvent(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)
@@ -205,7 +214,10 @@ func (nopCloserWrite) Write(s []byte) (n int, err error) {
func TestFileFwvExportEventWriteError(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)
@@ -227,7 +239,10 @@ func TestFileFwvExportEventWriteError(t *testing.T) {
func TestFileFwvComposeHeaderWriteError(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)
@@ -259,7 +274,10 @@ func TestFileFwvComposeHeaderWriteError(t *testing.T) {
func TestFileFwvComposeTrailerWriteError(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)
@@ -290,7 +308,10 @@ func TestFileFwvComposeTrailerWriteError(t *testing.T) {
}
func TestFileFwvOnEvictedTrailer(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)
@@ -328,7 +349,10 @@ func (nopCloserError) Write(s []byte) (n int, err error) {
}
func TestFileFwvOnEvictedClose(t *testing.T) {
cfg := config.NewDefaultCGRConfig()
newIDb := engine.NewInternalDB(nil, nil, true, false, cfg.DataDbCfg().Items)
newIDb, err := engine.NewInternalDB(nil, nil, true, nil, cfg.DataDbCfg().Items)
if err != nil {
t.Error(err)
}
newDM := engine.NewDataManager(newIDb, cfg.CacheCfg(), nil)
filterS := engine.NewFilterS(cfg, nil, newDM)
byteBuff := new(bytes.Buffer)