Updated engine integration tests

This commit is contained in:
Trial97
2019-10-29 11:02:39 +02:00
committed by Dan Christian Bogos
parent 7f0f164a14
commit c718f90b89
10 changed files with 14 additions and 15 deletions

View File

@@ -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{

View File

@@ -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())
}
}

View File

@@ -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)

View File

@@ -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)

View File

@@ -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())
}

View File

@@ -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 {

View File

@@ -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)
}

View File

@@ -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,

View File

@@ -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

View File

@@ -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
}