From 0b75816fb65e3faeb9dbc58bfaf26470da2859ec Mon Sep 17 00:00:00 2001 From: adragusin Date: Wed, 17 Jun 2020 18:01:02 +0300 Subject: [PATCH] Updated tests in migrator --- migrator/accounts2_it_test.go | 15 +++++++--- migrator/accounts_it_test.go | 41 +++++++++++++++---------- migrator/action_it_test.go | 16 ++++++---- migrator/action_plan_it_test.go | 16 ++++++---- migrator/action_trigger_it_test.go | 17 +++++++---- migrator/alias_it_test.go | 29 +++++++++++------- migrator/attributes_it_test.go | 17 +++++++---- migrator/cdrs_it_test.go | 2 +- migrator/chargers_it_test.go | 10 +++++-- migrator/derived_chargers_it_test.go | 27 ++++++++++------- migrator/dispatchers_it_test.go | 10 +++++-- migrator/filters_it_test.go | 45 ++++++++++++++++------------ migrator/load_ids_it_test.go | 25 +++++++++------- migrator/rating_plan_it_test.go | 10 +++++-- migrator/thresholds_it_test.go | 13 ++++---- 15 files changed, 188 insertions(+), 105 deletions(-) diff --git a/migrator/accounts2_it_test.go b/migrator/accounts2_it_test.go index 24d6c7cb2..032173be2 100755 --- a/migrator/accounts2_it_test.go +++ b/migrator/accounts2_it_test.go @@ -53,7 +53,8 @@ func TestAccMigrateWithInternal(t *testing.T) { if err != nil { t.Fatal(err) } - acc2CfgOut, err = config.NewCGRConfigFromPath(acc2PathIn) + acc2PathOut = path.Join(*dataDir, "conf", "samples", "migwithinternal") + acc2CfgOut, err = config.NewCGRConfigFromPath(acc2PathOut) if err != nil { t.Fatal(err) } @@ -101,9 +102,15 @@ func testAcc2ITConnect(t *testing.T) { if err != nil { t.Error(err) } - acc2Migrator, err = NewMigrator(dataDBIn, dataDBOut, - storDBIn, storDBOut, - false, false, false, false) + if reflect.DeepEqual(acc2PathIn, acc2PathOut) { + acc2Migrator, err = NewMigrator(dataDBIn, dataDBOut, + storDBIn, storDBOut, + false, true, false, false) + } else { + acc2Migrator, err = NewMigrator(dataDBIn, dataDBOut, + storDBIn, storDBOut, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/accounts_it_test.go b/migrator/accounts_it_test.go index 53de6fc30..83ad94905 100755 --- a/migrator/accounts_it_test.go +++ b/migrator/accounts_it_test.go @@ -55,7 +55,8 @@ func TestAccountMigrateITRedis(t *testing.T) { if err != nil { t.Fatal(err) } - accCfgOut, err = config.NewCGRConfigFromPath(accPathIn) + accPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql") + accCfgOut, err = config.NewCGRConfigFromPath(accPathOut) if err != nil { t.Fatal(err) } @@ -73,7 +74,8 @@ func TestAccountMigrateITMongo(t *testing.T) { if err != nil { t.Fatal(err) } - accCfgOut, err = config.NewCGRConfigFromPath(accPathIn) + accPathOut = path.Join(*dataDir, "conf", "samples", "tutmongo") + accCfgOut, err = config.NewCGRConfigFromPath(accPathOut) if err != nil { t.Fatal(err) } @@ -177,20 +179,24 @@ func testAccITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - accMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, - false, false, false, false) + if reflect.DeepEqual(accPathIn, accPathOut) { + accMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + accMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } } func testAccITFlush(t *testing.T) { - accMigrator.dmOut.DataManager().DataDB().Flush("") + accMigrator.dmOut.DataManager().DataDB().Flush(utils.EmptyString) if err := engine.SetDBVersions(accMigrator.dmOut.DataManager().DataDB()); err != nil { t.Error("Error ", err.Error()) } - accMigrator.dmIN.DataManager().DataDB().Flush("") + accMigrator.dmIN.DataManager().DataDB().Flush(utils.EmptyString) if err := engine.SetDBVersions(accMigrator.dmIN.DataManager().DataDB()); err != nil { t.Error("Error ", err.Error()) } @@ -344,19 +350,24 @@ func testAccITMigrateAndMove(t *testing.T) { if err != nil { t.Error(err) } - if !reflect.DeepEqual(testAccount.ID, result.ID) { - t.Errorf("Expecting: %+v, received: %+v", testAccount.ID, result.ID) - } else if !reflect.DeepEqual(testAccount.ActionTriggers, result.ActionTriggers) { - t.Errorf("Expecting: %+v, received: %+v", testAccount.ActionTriggers, result.ActionTriggers) - } else if !reflect.DeepEqual(testAccount.BalanceMap, result.BalanceMap) { - t.Errorf("Expecting: %+v, received: %+v", testAccount.BalanceMap, result.BalanceMap) - } else if !reflect.DeepEqual(testAccount.UnitCounters, result.UnitCounters) { - t.Errorf("Expecting: %+v, received: %+v", testAccount.UnitCounters, result.UnitCounters) + if result != nil { + if !reflect.DeepEqual(testAccount.ID, result.ID) { + t.Errorf("Expecting: %+v, received: %+v", testAccount.ID, result.ID) + } else if !reflect.DeepEqual(testAccount.ActionTriggers, result.ActionTriggers) { + t.Errorf("Expecting: %+v, received: %+v", testAccount.ActionTriggers, result.ActionTriggers) + } else if !reflect.DeepEqual(testAccount.BalanceMap, result.BalanceMap) { + t.Errorf("Expecting: %+v, received: %+v", testAccount.BalanceMap, result.BalanceMap) + } else if !reflect.DeepEqual(testAccount.UnitCounters, result.UnitCounters) { + t.Errorf("Expecting: %+v, received: %+v", testAccount.UnitCounters, result.UnitCounters) + } + } else { + t.Errorf("Expecting to be not nil") } //check if old account was deleted result, err = accMigrator.dmIN.DataManager().GetAccount(testAccount.ID) if err != utils.ErrNotFound { t.Error(err) } + } } diff --git a/migrator/action_it_test.go b/migrator/action_it_test.go index 6cefdc3e0..074f4e6da 100644 --- a/migrator/action_it_test.go +++ b/migrator/action_it_test.go @@ -53,7 +53,8 @@ func TestActionITRedis(t *testing.T) { if err != nil { t.Fatal(err) } - actCfgOut, err = config.NewCGRConfigFromPath(actPathIn) + actPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql") + actCfgOut, err = config.NewCGRConfigFromPath(actPathOut) if err != nil { t.Fatal(err) } @@ -71,7 +72,8 @@ func TestActionITMongo(t *testing.T) { if err != nil { t.Fatal(err) } - actCfgOut, err = config.NewCGRConfigFromPath(actPathIn) + actPathOut = path.Join(*dataDir, "conf", "samples", "tutmongo") + actCfgOut, err = config.NewCGRConfigFromPath(actPathOut) if err != nil { t.Fatal(err) } @@ -175,9 +177,13 @@ func testActITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - actMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, - false, false, false, false) + if reflect.DeepEqual(actPathIn, actPathOut) { + actMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + actMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/action_plan_it_test.go b/migrator/action_plan_it_test.go index 8453b6592..434d8e856 100644 --- a/migrator/action_plan_it_test.go +++ b/migrator/action_plan_it_test.go @@ -53,7 +53,8 @@ func TestActionPlanITRedis(t *testing.T) { if err != nil { t.Fatal(err) } - actPlnCfgOut, err = config.NewCGRConfigFromPath(actPlnPathIn) + actPlnPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql") + actPlnCfgOut, err = config.NewCGRConfigFromPath(actPlnPathOut) if err != nil { t.Fatal(err) } @@ -71,7 +72,8 @@ func TestActionPlanITMongo(t *testing.T) { if err != nil { t.Fatal(err) } - actPlnCfgOut, err = config.NewCGRConfigFromPath(actPlnPathIn) + actPlnPathOut = path.Join(*dataDir, "conf", "samples", "tutmongo") + actPlnCfgOut, err = config.NewCGRConfigFromPath(actPlnPathOut) if err != nil { t.Fatal(err) } @@ -175,9 +177,13 @@ func testActPlnITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - actPlnMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, - false, false, false, false) + if reflect.DeepEqual(actPlnPathIn, actPlnPathOut) { + actPlnMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + actPlnMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/action_trigger_it_test.go b/migrator/action_trigger_it_test.go index b69a2f30f..175094582 100644 --- a/migrator/action_trigger_it_test.go +++ b/migrator/action_trigger_it_test.go @@ -21,7 +21,6 @@ along with this program. If not, see package migrator import ( - //"flag" "log" "path" "reflect" @@ -55,7 +54,8 @@ func TestActionTriggerITRedis(t *testing.T) { if err != nil { t.Fatal(err) } - actTrgCfgOut, err = config.NewCGRConfigFromPath(actTrgPathIn) + actTrgPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql") + actTrgCfgOut, err = config.NewCGRConfigFromPath(actTrgPathOut) if err != nil { t.Fatal(err) } @@ -73,7 +73,8 @@ func TestActionTriggerITMongo(t *testing.T) { if err != nil { t.Fatal(err) } - actTrgCfgOut, err = config.NewCGRConfigFromPath(actTrgPathIn) + actTrgPathOut = path.Join(*dataDir, "conf", "samples", "tutmongo") + actTrgCfgOut, err = config.NewCGRConfigFromPath(actTrgPathOut) if err != nil { t.Fatal(err) } @@ -158,9 +159,13 @@ func testActTrgITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - actTrgMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, - false, false, false, false) + if reflect.DeepEqual(actTrgPathIn, actTrgPathOut) { + actTrgMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + actTrgMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/alias_it_test.go b/migrator/alias_it_test.go index a533c7c63..12fb13424 100644 --- a/migrator/alias_it_test.go +++ b/migrator/alias_it_test.go @@ -33,6 +33,8 @@ import ( ) var ( + inPath string + outPath string alsCfgIn *config.CGRConfig alsCfgOut *config.CGRConfig alsMigrator *Migrator @@ -45,22 +47,24 @@ var sTestsAlsIT = []func(t *testing.T){ } func TestAliasMigrateITRedis(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmysql") - testStart("TestAliasMigrateITRedis", inPath, inPath, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + outPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + testStart("TestAliasMigrateITRedis", t) } func TestAliasMigrateITMongo(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmongo") - testStart("TestAliasMigrateITMongo", inPath, inPath, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + outPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + testStart("TestAliasMigrateITMongo", t) } func TestAliasITMigrateMongo2Redis(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmongo") - outPath := path.Join(*dataDir, "conf", "samples", "tutmysql") - testStart("TestAliasITMigrateMongo2Redis", inPath, outPath, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + outPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + testStart("TestAliasITMigrateMongo2Redis", t) } -func testStart(testName, inPath, outPath string, t *testing.T) { +func testStart(testName string, t *testing.T) { var err error if alsCfgIn, err = config.NewCGRConfigFromPath(inPath); err != nil { t.Fatal(err) @@ -91,8 +95,13 @@ func testAlsITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - alsMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, false, false, false, false) + if reflect.DeepEqual(inPath, outPath) { + alsMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + alsMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/attributes_it_test.go b/migrator/attributes_it_test.go index bd71937fe..3378e4a24 100755 --- a/migrator/attributes_it_test.go +++ b/migrator/attributes_it_test.go @@ -72,7 +72,8 @@ func TestAttributeITRedis(t *testing.T) { if err != nil { t.Fatal(err) } - attrCfgOut, err = config.NewCGRConfigFromPath(attrPathIn) + attrPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql") + attrCfgOut, err = config.NewCGRConfigFromPath(attrPathOut) if err != nil { t.Fatal(err) } @@ -90,7 +91,8 @@ func TestAttributeITMongo(t *testing.T) { if err != nil { t.Fatal(err) } - attrCfgOut, err = config.NewCGRConfigFromPath(attrPathIn) + attrPathOut = path.Join(*dataDir, "conf", "samples", "tutmongo") + attrCfgOut, err = config.NewCGRConfigFromPath(attrPathOut) if err != nil { t.Fatal(err) } @@ -213,9 +215,14 @@ func testAttrITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - attrMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, - false, false, false, false) + + if reflect.DeepEqual(attrPathIn, attrPathOut) { + attrMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + attrMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/cdrs_it_test.go b/migrator/cdrs_it_test.go index 2beb9d8f6..5160b0388 100755 --- a/migrator/cdrs_it_test.go +++ b/migrator/cdrs_it_test.go @@ -95,7 +95,7 @@ func testCdrITConnect(t *testing.T) { cdrMigrator, err = NewMigrator(nil, nil, storDBIn, storDBOut, - false, false, false, false) + false, true, false, false) if err != nil { t.Error(err) } diff --git a/migrator/chargers_it_test.go b/migrator/chargers_it_test.go index c34622f00..aa189d4ad 100755 --- a/migrator/chargers_it_test.go +++ b/migrator/chargers_it_test.go @@ -140,9 +140,13 @@ func testChrgITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - chrgMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, - false, false, false, false) + if reflect.DeepEqual(chrgPathIn, chrgPathOut) { + chrgMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + chrgMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/derived_chargers_it_test.go b/migrator/derived_chargers_it_test.go index 1eff17ae8..234aac5cb 100644 --- a/migrator/derived_chargers_it_test.go +++ b/migrator/derived_chargers_it_test.go @@ -46,22 +46,24 @@ var sTestsDCIT = []func(t *testing.T){ } func TestDerivedChargersVMigrateITRedis(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmysql") - testStartDC("TestDerivedChargersVMigrateITRedis", inPath, inPath, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + outPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + testStartDC("TestDerivedChargersVMigrateITRedis", t) } func TestDerivedChargersVMigrateITMongo(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmongo") - testStartDC("TestDerivedChargersVMigrateITMongo", inPath, inPath, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + outPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + testStartDC("TestDerivedChargersVMigrateITMongo", t) } func TestDerivedChargersVITMigrateMongo2Redis(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmongo") - outPath := path.Join(*dataDir, "conf", "samples", "tutmysql") - testStartDC("TestDerivedChargersVITMigrateMongo2Redis", inPath, outPath, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + outPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + testStartDC("TestDerivedChargersVITMigrateMongo2Redis", t) } -func testStartDC(testName, inPath, outPath string, t *testing.T) { +func testStartDC(testName string, t *testing.T) { var err error if dcCfgIn, err = config.NewCGRConfigFromPath(inPath); err != nil { t.Fatal(err) @@ -92,8 +94,13 @@ func testDCITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - dcMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, false, false, false, false) + if reflect.DeepEqual(inPath, outPath) { + dcMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + dcMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/dispatchers_it_test.go b/migrator/dispatchers_it_test.go index 6fa7b21da..53b6fb69d 100644 --- a/migrator/dispatchers_it_test.go +++ b/migrator/dispatchers_it_test.go @@ -140,9 +140,13 @@ func testDspITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - dspMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, - false, false, false, false) + if reflect.DeepEqual(dspPathIn, dspPathOut) { + dspMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + dspMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/filters_it_test.go b/migrator/filters_it_test.go index d6d76d5c1..48eeb3ef0 100644 --- a/migrator/filters_it_test.go +++ b/migrator/filters_it_test.go @@ -49,40 +49,42 @@ var sTestsFltrIT = []func(t *testing.T){ } func TestFiltersMigrateITRedis(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmysql") - testFltrStart("TestFiltersMigrateITRedis", inPath, inPath, utils.Migrate, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + outPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + testFltrStart("TestFiltersMigrateITRedis", utils.Migrate, t) } func TestFiltersMigrateITMongo(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmongo") - testFltrStart("TestFiltersMigrateITMongo", inPath, inPath, utils.Migrate, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + outPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + testFltrStart("TestFiltersMigrateITMongo", utils.Migrate, t) } func TestFiltersITMove(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmongo") - outPath := path.Join(*dataDir, "conf", "samples", "tutmysql") - testFltrStart("TestFiltersITMove", inPath, outPath, utils.Move, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + outPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + testFltrStart("TestFiltersITMove", utils.Move, t) } func TestFiltersITMigrateMongo2Redis(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmongo") - outPath := path.Join(*dataDir, "conf", "samples", "tutmysql") - testFltrStart("TestFiltersITMigrateMongo2Redis", inPath, outPath, utils.Migrate, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + outPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + testFltrStart("TestFiltersITMigrateMongo2Redis", utils.Migrate, t) } func TestFiltersITMoveEncoding(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmongo") - outPath := path.Join(*dataDir, "conf", "samples", "tutmongojson") - testFltrStart("TestFiltersITMoveEncoding", inPath, outPath, utils.Move, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + outPath = path.Join(*dataDir, "conf", "samples", "tutmongojson") + testFltrStart("TestFiltersITMoveEncoding", utils.Move, t) } func TestFiltersITMoveEncoding2(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmysql") - outPath := path.Join(*dataDir, "conf", "samples", "tutmysqljson") - testFltrStart("TestFiltersITMoveEncoding2", inPath, outPath, utils.Move, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + outPath = path.Join(*dataDir, "conf", "samples", "tutmysqljson") + testFltrStart("TestFiltersITMoveEncoding2", utils.Move, t) } -func testFltrStart(testName, inPath, outPath, action string, t *testing.T) { +func testFltrStart(testName, action string, t *testing.T) { var err error fltrAction = action if fltrCfgIn, err = config.NewCGRConfigFromPath(inPath); err != nil { @@ -114,8 +116,13 @@ func testFltrITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - fltrMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, false, false, false, false) + if reflect.DeepEqual(inPath, outPath) { + fltrMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + fltrMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/load_ids_it_test.go b/migrator/load_ids_it_test.go index 4ef9cba36..2938477fa 100644 --- a/migrator/load_ids_it_test.go +++ b/migrator/load_ids_it_test.go @@ -43,22 +43,22 @@ var sTestsLoadIdsIT = []func(t *testing.T){ } func TestLoadIDsMigrateITRedis(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmysql") - testLoadIdsStart("TestLoadIDsMigrateITRedis", inPath, inPath, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + testLoadIdsStart("TestLoadIDsMigrateITRedis", t) } func TestLoadIDsMigrateITMongo(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmongo") - testLoadIdsStart("TestLoadIDsMigrateITMongo", inPath, inPath, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + testLoadIdsStart("TestLoadIDsMigrateITMongo", t) } func TestLoadIDsITMigrateMongo2Redis(t *testing.T) { - inPath := path.Join(*dataDir, "conf", "samples", "tutmongo") - outPath := path.Join(*dataDir, "conf", "samples", "tutmysql") - testLoadIdsStart("TestLoadIDsITMigrateMongo2Redis", inPath, outPath, t) + inPath = path.Join(*dataDir, "conf", "samples", "tutmongo") + outPath = path.Join(*dataDir, "conf", "samples", "tutmysql") + testLoadIdsStart("TestLoadIDsITMigrateMongo2Redis", t) } -func testLoadIdsStart(testName, inPath, outPath string, t *testing.T) { +func testLoadIdsStart(testName string, t *testing.T) { var err error if loadCfgIn, err = config.NewCGRConfigFromPath(inPath); err != nil { t.Fatal(err) @@ -90,8 +90,13 @@ func testLoadIdsITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - loadMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, false, false, false, false) + if inPath == outPath { + loadMigrator, err = NewMigrator(dataDBIn, dataDBOut, + nil, nil, false, true, false, false) + } else { + loadMigrator, err = NewMigrator(dataDBIn, dataDBOut, + nil, nil, false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/rating_plan_it_test.go b/migrator/rating_plan_it_test.go index 23001fb33..9d267948c 100644 --- a/migrator/rating_plan_it_test.go +++ b/migrator/rating_plan_it_test.go @@ -139,9 +139,13 @@ func testRtPlITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - rtplMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, - false, false, false, false) + if rtplPathIn == rtplPathOut { + rtplMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + rtplMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/thresholds_it_test.go b/migrator/thresholds_it_test.go index 6a0202252..8b09c552a 100644 --- a/migrator/thresholds_it_test.go +++ b/migrator/thresholds_it_test.go @@ -54,7 +54,8 @@ func TestThresholdsITRedis(t *testing.T) { if err != nil { t.Fatal(err) } - trsCfgOut, err = config.NewCGRConfigFromPath(trsPathIn) + trsPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql") + trsCfgOut, err = config.NewCGRConfigFromPath(trsPathOut) if err != nil { t.Fatal(err) } @@ -72,7 +73,8 @@ func TestThresholdsITMongo(t *testing.T) { if err != nil { t.Fatal(err) } - trsCfgOut, err = config.NewCGRConfigFromPath(trsPathIn) + trsPathOut = path.Join(*dataDir, "conf", "samples", "tutmongo") + trsCfgOut, err = config.NewCGRConfigFromPath(trsPathOut) if err != nil { t.Fatal(err) } @@ -157,7 +159,7 @@ func testTrsITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - if !reflect.DeepEqual(trsCfgIn, trsCfgOut) { + if reflect.DeepEqual(trsPathIn, trsPathOut) { trsMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, false, true, false, false) } else { @@ -338,13 +340,12 @@ func testTrsITMigrateAndMove(t *testing.T) { if err != nil { t.Error("Error when migrating Thresholds ", err.Error()) } - result, err = trsMigrator.dmOut.DataManager().GetThresholdProfile(tresProf2.Tenant, tresProf2.ID, false, false, utils.NonTransactional) if err != nil { t.Error("Error when getting Thresholds ", err.Error()) } if !reflect.DeepEqual(tresProf2, result) { - t.Errorf("Expectong: %+v, received: %+v", utils.ToJSON(tresProf2), utils.ToJSON(result)) + t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(tresProf2), utils.ToJSON(result)) } result, err = trsMigrator.dmOut.DataManager().GetThresholdProfile(tresProf3.Tenant, tresProf3.ID, false, false, utils.NonTransactional) @@ -352,7 +353,7 @@ func testTrsITMigrateAndMove(t *testing.T) { t.Error("Error when getting Thresholds ", err.Error()) } if !reflect.DeepEqual(tresProf3, result) { - t.Errorf("Expectong: %+v, received: %+v", utils.ToJSON(tresProf3), utils.ToJSON(result)) + t.Errorf("Expecting: %+v, received: %+v", utils.ToJSON(tresProf3), utils.ToJSON(result)) } case utils.Move: