From 35e3893a8d8a86b5a5b09e6da29d35e587bbf0b3 Mon Sep 17 00:00:00 2001 From: adragusin Date: Thu, 18 Jun 2020 18:03:54 +0300 Subject: [PATCH] Updated tests in migrator --- migrator/rating_profile_it_test.go | 10 +++++++--- migrator/resource_it_test.go | 10 +++++++--- migrator/routes_it_test.go | 10 +++++++--- migrator/session_costs_it_test.go | 15 ++++++++++----- migrator/sharedgroup_it_test.go | 16 +++++++++++----- migrator/stats_it_test.go | 15 +++++++++++---- 6 files changed, 53 insertions(+), 23 deletions(-) diff --git a/migrator/rating_profile_it_test.go b/migrator/rating_profile_it_test.go index c15f24372..6038540c1 100644 --- a/migrator/rating_profile_it_test.go +++ b/migrator/rating_profile_it_test.go @@ -140,9 +140,13 @@ func testRtPrfITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - rtprflMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, - false, false, false, false) + if reflect.DeepEqual(rtprflPathIn, rtprflPathOut) { + rtprflMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + rtprflMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/resource_it_test.go b/migrator/resource_it_test.go index ecd2ae079..2904681d7 100644 --- a/migrator/resource_it_test.go +++ b/migrator/resource_it_test.go @@ -140,9 +140,13 @@ func testResITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - resMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, - false, false, false, false) + if reflect.DeepEqual(resPathIn, resPathOut) { + resMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + resMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/routes_it_test.go b/migrator/routes_it_test.go index 626f78c65..e0bfc955c 100644 --- a/migrator/routes_it_test.go +++ b/migrator/routes_it_test.go @@ -139,9 +139,13 @@ func testSupITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - supMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, - false, false, false, false) + if reflect.DeepEqual(supPathIn, supPathOut) { + supMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + supMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/session_costs_it_test.go b/migrator/session_costs_it_test.go index 39892ded8..27c25000f 100755 --- a/migrator/session_costs_it_test.go +++ b/migrator/session_costs_it_test.go @@ -49,11 +49,11 @@ var sTestssCostIT = []func(t *testing.T){ func TestSessionCostITMongo(t *testing.T) { var err error sCostPathIn = path.Join(*dataDir, "conf", "samples", "tutmongo") - sCostPathOut = path.Join(*dataDir, "conf", "samples", "tutmongojson") sCostCfgIn, err = config.NewCGRConfigFromPath(sCostPathIn) if err != nil { t.Error(err) } + sCostPathOut = path.Join(*dataDir, "conf", "samples", "tutmongojson") sCostCfgOut, err = config.NewCGRConfigFromPath(sCostPathOut) if err != nil { t.Error(err) @@ -71,7 +71,8 @@ func TestSessionCostITMySql(t *testing.T) { if err != nil { t.Error(err) } - sCostCfgOut, err = config.NewCGRConfigFromPath(sCostPathIn) + sCostPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql") + sCostCfgOut, err = config.NewCGRConfigFromPath(sCostPathOut) if err != nil { t.Error(err) } @@ -102,9 +103,13 @@ func testSessionCostITConnect(t *testing.T) { if err != nil { t.Error(err) } - sCostMigrator, err = NewMigrator(nil, nil, - storDBIn, storDBOut, - false, false, false, false) + if actTrgPathIn == actTrgPathOut { + sCostMigrator, err = NewMigrator(nil, nil, storDBIn, storDBOut, + false, false, true, false) + } else { + sCostMigrator, err = NewMigrator(nil, nil, storDBIn, storDBOut, + false, false, false, false) + } if err != nil { t.Error(err) } diff --git a/migrator/sharedgroup_it_test.go b/migrator/sharedgroup_it_test.go index cfe8a84c1..dc82a4779 100644 --- a/migrator/sharedgroup_it_test.go +++ b/migrator/sharedgroup_it_test.go @@ -53,7 +53,8 @@ func TestSharedGroupITRedis(t *testing.T) { if err != nil { t.Fatal(err) } - shrGrpCfgOut, err = config.NewCGRConfigFromPath(shrGrpPathIn) + shrGrpPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql") + shrGrpCfgOut, err = config.NewCGRConfigFromPath(shrGrpPathOut) if err != nil { t.Fatal(err) } @@ -71,7 +72,8 @@ func TestSharedGroupITMongo(t *testing.T) { if err != nil { t.Fatal(err) } - shrGrpCfgOut, err = config.NewCGRConfigFromPath(shrGrpPathIn) + shrGrpPathOut = path.Join(*dataDir, "conf", "samples", "tutmongo") + shrGrpCfgOut, err = config.NewCGRConfigFromPath(shrGrpPathOut) if err != nil { t.Fatal(err) } @@ -156,9 +158,13 @@ func testShrGrpITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - shrGrpMigrator, err = NewMigrator(dataDBIn, dataDBOut, - nil, nil, - false, false, false, false) + if reflect.DeepEqual(shrGrpPathIn, shrGrpPathOut) { + shrGrpMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + shrGrpMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) } diff --git a/migrator/stats_it_test.go b/migrator/stats_it_test.go index 1bb539b5d..e067a3e67 100755 --- a/migrator/stats_it_test.go +++ b/migrator/stats_it_test.go @@ -55,7 +55,8 @@ func TestStatsQueueITRedis(t *testing.T) { if err != nil { t.Fatal(err) } - stsCfgOut, err = config.NewCGRConfigFromPath(stsPathIn) + stsPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql") + stsCfgOut, err = config.NewCGRConfigFromPath(stsPathOut) if err != nil { t.Fatal(err) } @@ -73,7 +74,8 @@ func TestStatsQueueITMongo(t *testing.T) { if err != nil { t.Fatal(err) } - stsCfgOut, err = config.NewCGRConfigFromPath(stsPathIn) + stsPathOut = path.Join(*dataDir, "conf", "samples", "tutmongo") + stsCfgOut, err = config.NewCGRConfigFromPath(stsPathOut) if err != nil { t.Fatal(err) } @@ -120,8 +122,13 @@ func testStsITConnect(t *testing.T) { if err != nil { log.Fatal(err) } - stsMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, - false, false, false, false) + if stsPathIn == stsPathOut { + stsMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, true, false, false) + } else { + stsMigrator, err = NewMigrator(dataDBIn, dataDBOut, nil, nil, + false, false, false, false) + } if err != nil { log.Fatal(err) }