uppal/cgrates
1
0
Fork 1
mirror of https://github.com/cgrates/cgrates.git synced 2026-02-15 21:29:52 +05:00
Code Issues Packages Projects Releases Wiki Activity

Fix failing tests after refactoring

Browse Source
This commit is contained in:
ionutboangiu
2021-04-12 18:39:48 +03:00
committed by Dan Christian Bogos
parent 46ca196ab4
commit 5fd739f56c
3 changed files with 19 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
accounts/accounts_test.go
View File

@@ -446,12 +446,12 @@ func TestAccountsDebit(t *testing.T) {
accntsPrf[0].Balances["ConcreteBalance2"].Units = &utils.Decimal{decimal.New(213, 0)}
accnts.dm = nil
expected = "NO_DATA_BASE_CONNECTION"
expected = utils.ErrNoDatabaseConn.Error()
if _, err := accnts.accountsDebit(accntsPrf, cgrEvent, true, true); err == nil || err.Error() != expected {
t.Errorf("Expected %+v, received %+v", expected, err)
}
subString := "<AccountS> error <NO_DATA_BASE_CONNECTION> restoring account <cgrates.org:TestAccountsDebit>"
subString := "<AccountS> error <NO_DATABASE_CONNECTION> restoring account <cgrates.org:TestAccountsDebit>"
if rcv := buff.String(); !strings.Contains(rcv, subString) {
t.Errorf("Expected %+q, received %+q", subString, rcv)
}
@@ -1187,7 +1187,7 @@ func TestV1ActionRemoveBalance(t *testing.T) {
}
args.BalanceIDs = []string{"AbstractBalance1"}
expected = "NO_DATA_BASE_CONNECTION"
expected = utils.ErrNoDatabaseConn.Error()
accnts.dm = nil
if err := accnts.V1ActionRemoveBalance(args, &reply); err == nil || err.Error() != expected {
t.Errorf("Expected %+v, received %+v", expected, err)

2
accounts/actsetbalance_test.go
View File

@@ -43,7 +43,7 @@ func TestActSetAccountBalance(t *testing.T) {
},
}
expected := "NO_DATA_BASE_CONNECTION"
expected := utils.ErrNoDatabaseConn.Error()
if err := actSetAccount(nil, "cgrates.org", acntID, diktats, false); err == nil || err.Error() != expected {
t.Errorf("Expected %+v, received %+v", expected, err)
}

33
loaders/loader_test.go
View File

@@ -3799,8 +3799,8 @@ cgrates.org,NewRes1
"Resources.csv": &openedCSVFile{fileName: "Resources.csv",
rdr: rdr, csvRdr: rdrCsv}},
}
expected := "NO_DATA_BASE_CONNECTION"
if err := ldr.processContent(utils.MetaResources, utils.EmptyString); err == nil || err.Error() != expected {
expected := utils.ErrNoDatabaseConn
if err := ldr.processContent(utils.MetaResources, utils.EmptyString); err == nil || err != expected {
t.Errorf("Expected %+v, received %+v", expected, err)
}
}
@@ -3892,8 +3892,8 @@ cgrates.org,FILTERS_REM_1
},
},
}
expected := "NO_DATA_BASE_CONNECTION"
if err := ldr.processContent(utils.MetaFilters, utils.EmptyString); err == nil || err.Error() != expected {
expected := utils.ErrNoDatabaseConn
if err := ldr.processContent(utils.MetaFilters, utils.EmptyString); err == nil || err != expected {
t.Errorf("Expected %+v, received %+v", expected, err)
}
}
@@ -3985,8 +3985,8 @@ cgrates.org,REM_STATS_1
},
},
}
expected := "NO_DATA_BASE_CONNECTION"
if err := ldr.processContent(utils.MetaStats, utils.EmptyString); err == nil || err.Error() != expected {
expected := utils.ErrNoDatabaseConn
if err := ldr.processContent(utils.MetaStats, utils.EmptyString); err == nil || err != expected {
t.Errorf("Expected %+v, received %+v", expected, err)
}
}
@@ -4492,7 +4492,7 @@ func TestProcessContentEmptyDataBase(t *testing.T) {
},
}
expectedErr := utils.ErrNoDatabaseConn
if err := ldr.processContent(utils.MetaDispatcherHosts, utils.EmptyString); err == nil || err.Error() != expectedErr {
if err := ldr.processContent(utils.MetaDispatcherHosts, utils.EmptyString); err == nil || err != expectedErr {
t.Errorf("Expected %+v, received %+v", expectedErr, err)
}
}
@@ -4587,7 +4587,6 @@ cgrates.org,REM_RATEPROFILE_1
},
}
}
}
func TestRemoveActionProfileContent(t *testing.T) {
@@ -4629,8 +4628,8 @@ cgrates.org,REM_ACTPROFILE_1
},
},
}
expected := "NO_DATA_BASE_CONNECTION"
if err := ldr.processContent(utils.MetaActionProfiles, utils.EmptyString); err == nil || err.Error() != expected {
expected := utils.ErrNoDatabaseConn
if err := ldr.processContent(utils.MetaActionProfiles, utils.EmptyString); err == nil || err != expected {
t.Errorf("Expected %+v, received %+v", expected, err)
}
@@ -4708,8 +4707,8 @@ cgrates.org,REM_ACTPROFILE_1
},
},
}
expected := "NO_DATA_BASE_CONNECTION"
if err := ldr.processContent(utils.MetaAccounts, utils.EmptyString); err == nil || err.Error() != expected {
expected := utils.ErrNoDatabaseConn
if err := ldr.processContent(utils.MetaAccounts, utils.EmptyString); err == nil || err != expected {
t.Errorf("Expected %+v, received %+v", expected, err)
}
@@ -4925,8 +4924,8 @@ cgrates.org,REM_RATEPROFILE_1,RT_WEEKEND
}
ldr.flagsTpls[utils.MetaRateProfiles] = utils.FlagsWithParamsFromSlice([]string{utils.MetaPartial})
ldr.dm = nil
expected := "NO_DATA_BASE_CONNECTION"
if err := ldr.processContent(utils.MetaRateProfiles, utils.EmptyString); err == nil || err.Error() != expected {
expected := utils.ErrNoDatabaseConn
if err := ldr.processContent(utils.MetaRateProfiles, utils.EmptyString); err == nil || err != expected {
t.Errorf("Expected %+v, received %+v", utils.ToJSON(expected), utils.ToJSON(err))
}
@@ -4943,8 +4942,7 @@ cgrates.org,REM_RATEPROFILE_1,RT_WEEKEND
},
}
ldr.flagsTpls[utils.MetaRateProfiles] = utils.FlagsWithParamsFromSlice([]string{"INVALID_FLAGS"})
expected = "NO_DATA_BASE_CONNECTION"
if err := ldr.processContent(utils.MetaRateProfiles, utils.EmptyString); err == nil || err.Error() != expected {
if err := ldr.processContent(utils.MetaRateProfiles, utils.EmptyString); err == nil || err != expected {
t.Errorf("Expected %+v, received %+v", utils.ToJSON(expected), utils.ToJSON(err))
}
@@ -4955,8 +4953,7 @@ cgrates.org,REM_RATEPROFILE_1,RT_WEEKEND
ldr.dm = nil
ldr.flagsTpls[utils.MetaRateProfiles] = utils.FlagsWithParamsFromSlice([]string{utils.MetaPartial})
expected = "NO_DATA_BASE_CONNECTION"
if err := ldr.removeContent(utils.MetaRateProfiles, utils.EmptyString); err == nil || err.Error() != expected {
if err := ldr.removeContent(utils.MetaRateProfiles, utils.EmptyString); err == nil || err != expected {
t.Errorf("Expected %+v, received %+v", utils.ToJSON(expected), utils.ToJSON(err))
}
}