From 5fd739f56ce84a32eb13f2bbab265839cb221c69 Mon Sep 17 00:00:00 2001 From: ionutboangiu Date: Mon, 12 Apr 2021 18:39:48 +0300 Subject: [PATCH] Fix failing tests after refactoring --- accounts/accounts_test.go | 6 +++--- accounts/actsetbalance_test.go | 2 +- loaders/loader_test.go | 33 +++++++++++++++------------------ 3 files changed, 19 insertions(+), 22 deletions(-) diff --git a/accounts/accounts_test.go b/accounts/accounts_test.go index 8c7508cbd..509c98516 100644 --- a/accounts/accounts_test.go +++ b/accounts/accounts_test.go @@ -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 := " error restoring account " + subString := " error restoring account " 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) diff --git a/accounts/actsetbalance_test.go b/accounts/actsetbalance_test.go index 3b3843007..115df3e5c 100644 --- a/accounts/actsetbalance_test.go +++ b/accounts/actsetbalance_test.go @@ -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) } diff --git a/loaders/loader_test.go b/loaders/loader_test.go index 205563651..a8b777af6 100644 --- a/loaders/loader_test.go +++ b/loaders/loader_test.go @@ -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)) } }