Fixed some migrator integration tests

This commit is contained in:
Trial97
2019-01-15 14:19:54 +02:00
committed by Dan Christian Bogos
parent a017d790d5
commit b243aaf3d0
9 changed files with 111 additions and 29 deletions

View File

@@ -216,13 +216,14 @@ func testAcc2ITMigrate(t *testing.T) {
utils.Actions: 2,
utils.ActionTriggers: 2,
utils.ActionPlans: 2,
utils.SharedGroups: 2}
err = acc2Migrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false)
utils.SharedGroups: 2,
}
err = acc2Migrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false)
if err != nil {
t.Error("Error when setting version for Accounts ", err.Error())
}
//check if version was set correctly
if vrs, err := acc2Migrator.dmOut.DataManager().DataDB().GetVersions(""); err != nil {
if vrs, err := acc2Migrator.dmIN.DataManager().DataDB().GetVersions(""); err != nil {
t.Error(err)
} else if vrs[utils.Accounts] != 1 {
t.Errorf("Unexpected version returned: %d", vrs[utils.Accounts])

View File

@@ -101,6 +101,24 @@ func TestAccountITMove(t *testing.T) {
}
}
func TestAccountITMigrateMongo2Redis(t *testing.T) {
var err error
accPathIn = path.Join(*dataDir, "conf", "samples", "tutmongo")
accCfgIn, err = config.NewCGRConfigFromFolder(accPathIn)
if err != nil {
t.Fatal(err)
}
accPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql")
accCfgOut, err = config.NewCGRConfigFromFolder(accPathOut)
if err != nil {
t.Fatal(err)
}
accAction = utils.Migrate
for _, stest := range sTestsAccIT {
t.Run("TestAccountITMigrateMongo2Redis", stest)
}
}
func TestAccountITMoveEncoding(t *testing.T) {
var err error
accPathIn = path.Join(*dataDir, "conf", "samples", "tutmongo")
@@ -262,13 +280,14 @@ func testAccITMigrateAndMove(t *testing.T) {
utils.Actions: 2,
utils.ActionTriggers: 2,
utils.ActionPlans: 2,
utils.SharedGroups: 2}
err = accMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false)
utils.SharedGroups: 2,
}
err = accMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false)
if err != nil {
t.Error("Error when setting version for Accounts ", err.Error())
}
//check if version was set correctly
if vrs, err := accMigrator.dmOut.DataManager().DataDB().GetVersions(""); err != nil {
if vrs, err := accMigrator.dmIN.DataManager().DataDB().GetVersions(""); err != nil {
t.Error(err)
} else if vrs[utils.Accounts] != 1 {
t.Errorf("Unexpected version returned: %d", vrs[utils.Accounts])

View File

@@ -117,6 +117,25 @@ func TestActionITMoveEncoding(t *testing.T) {
}
/*
func TestActionITMigrateMongo2Redis(t *testing.T) {
var err error
actPathIn = path.Join(*dataDir, "conf", "samples", "tutmongo")
actCfgIn, err = config.NewCGRConfigFromFolder(actPathIn)
if err != nil {
t.Fatal(err)
}
actPathOut = path.Join(*dataDir, "conf", "samples", "tutmysql")
actCfgOut, err = config.NewCGRConfigFromFolder(actPathOut)
if err != nil {
t.Fatal(err)
}
actAction = utils.Migrate
for _, stest := range sTestsActIT {
t.Run("TestActionITMigrateMongo2Redis", stest)
}
}
*/
func TestActionITMoveEncoding2(t *testing.T) {
var err error
actPathIn = path.Join(*dataDir, "conf", "samples", "tutmysql")
@@ -133,7 +152,7 @@ func TestActionITMoveEncoding2(t *testing.T) {
for _, stest := range sTestsActIT {
t.Run("TestActionITMoveEncoding2", stest)
}
}*/
}
func testActITConnect(t *testing.T) {
dataDBIn, err := NewMigratorDataDB(actCfgIn.DataDbCfg().DataDbType,
@@ -166,6 +185,9 @@ func testActITFlush(t *testing.T) {
if err := engine.SetDBVersions(actMigrator.dmIN.DataManager().DataDB()); err != nil {
t.Error("Error ", err.Error())
}
if err := engine.SetDBVersions(actMigrator.dmOut.DataManager().DataDB()); err != nil {
t.Error("Error ", err.Error())
}
}
func testActITMigrateAndMove(t *testing.T) {
@@ -212,8 +234,16 @@ func testActITMigrateAndMove(t *testing.T) {
if err != nil {
t.Error("Error when setting v1 Actions ", err.Error())
}
currentVersion := engine.Versions{utils.StatS: 2, utils.Thresholds: 2, utils.Accounts: 2, utils.Actions: 1, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2}
err = actMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false)
currentVersion := engine.Versions{
utils.StatS: 2,
utils.Thresholds: 2,
utils.Accounts: 2,
utils.Actions: 1,
utils.ActionTriggers: 2,
utils.ActionPlans: 2,
utils.SharedGroups: 2,
}
err = actMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false)
if err != nil {
t.Error("Error when setting version for Actions ", err.Error())
}

View File

@@ -202,8 +202,14 @@ func testActPlnITMigrateAndMove(t *testing.T) {
if err != nil {
t.Error("Error when setting v1 ActionPlan ", err.Error())
}
currentVersion := engine.Versions{utils.StatS: 2, utils.Thresholds: 2, utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 1, utils.SharedGroups: 2}
err = actPlnMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false)
currentVersion := engine.Versions{
utils.StatS: 2, utils.Thresholds: 2,
utils.Accounts: 2, utils.Actions: 2,
utils.ActionTriggers: 2,
utils.ActionPlans: 1,
utils.SharedGroups: 2,
}
err = actPlnMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false)
if err != nil {
t.Error("Error when setting version for ActionPlan ", err.Error())
}

View File

@@ -243,14 +243,13 @@ func testAttrITMigrateAndMove(t *testing.T) {
if err != nil {
t.Error("Error when setting v1 AttributeProfile ", err.Error())
}
currentVersion := engine.Versions{
utils.Attributes: 1}
err = attrMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false)
currentVersion := engine.Versions{utils.Attributes: 1}
err = attrMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false)
if err != nil {
t.Error("Error when setting version for Attributes ", err.Error())
}
if vrs, err := attrMigrator.dmOut.DataManager().DataDB().GetVersions(""); err != nil {
if vrs, err := attrMigrator.dmIN.DataManager().DataDB().GetVersions(""); err != nil {
t.Error(err)
} else if vrs[utils.Attributes] != 1 {
t.Errorf("Unexpected version returned: %d", vrs[utils.Attributes])

View File

@@ -36,12 +36,14 @@ func NewMigrator(
sameStorDB bool) (m *Migrator, err error) {
stats := make(map[string]int)
m = &Migrator{
dmOut: dmOut,
dmIN: dmIN,
storDBIn: storDBIn,
storDBOut: storDBOut,
dryRun: dryRun, sameDataDB: sameDataDB, sameStorDB: sameStorDB,
stats: stats,
dmOut: dmOut,
dmIN: dmIN,
storDBIn: storDBIn,
storDBOut: storDBOut,
dryRun: dryRun,
sameDataDB: sameDataDB,
sameStorDB: sameStorDB,
stats: stats,
}
return m, err
}

View File

@@ -188,8 +188,16 @@ func testShrGrpITMigrateAndMove(t *testing.T) {
if err != nil {
t.Error("Error when setting v1 SharedGroup ", err.Error())
}
currentVersion := engine.Versions{utils.StatS: 2, utils.Thresholds: 2, utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 1}
err = shrGrpMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false)
currentVersion := engine.Versions{
utils.StatS: 2,
utils.Thresholds: 2,
utils.Accounts: 2,
utils.Actions: 2,
utils.ActionTriggers: 2,
utils.ActionPlans: 2,
utils.SharedGroups: 1,
}
err = shrGrpMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false)
if err != nil {
t.Error("Error when setting version for SharedGroup ", err.Error())
}

View File

@@ -245,8 +245,9 @@ func testStsITMigrateAndMove(t *testing.T) {
utils.Actions: 2,
utils.ActionTriggers: 2,
utils.ActionPlans: 2,
utils.SharedGroups: 2}
err = stsMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false)
utils.SharedGroups: 2,
}
err = stsMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false)
if err != nil {
t.Error("Error when setting version for stats ", err.Error())
}

View File

@@ -276,8 +276,16 @@ func testTrsITMigrateAndMove(t *testing.T) {
if err != nil {
t.Error("Error when setting v1 Thresholds ", err.Error())
}
currentVersion := engine.Versions{utils.StatS: 2, utils.Thresholds: 1, utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2}
err = trsMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false)
currentVersion := engine.Versions{
utils.StatS: 2,
utils.Thresholds: 1,
utils.Accounts: 2,
utils.Actions: 2,
utils.ActionTriggers: 2,
utils.ActionPlans: 2,
utils.SharedGroups: 2,
}
err = trsMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false)
if err != nil {
t.Error("Error when setting version for Thresholds ", err.Error())
}
@@ -310,8 +318,16 @@ func testTrsITMigrateAndMove(t *testing.T) {
t.Error("Error when setting v1 Thresholds ", err.Error())
}
currentVersion = engine.Versions{utils.StatS: 2, utils.Thresholds: 2, utils.Accounts: 2, utils.Actions: 2, utils.ActionTriggers: 2, utils.ActionPlans: 2, utils.SharedGroups: 2}
err = trsMigrator.dmOut.DataManager().DataDB().SetVersions(currentVersion, false)
currentVersion = engine.Versions{
utils.StatS: 2,
utils.Thresholds: 2,
utils.Accounts: 2,
utils.Actions: 2,
utils.ActionTriggers: 2,
utils.ActionPlans: 2,
utils.SharedGroups: 2,
}
err = trsMigrator.dmIN.DataManager().DataDB().SetVersions(currentVersion, false)
if err != nil {
t.Error("Error when setting version for Thresholds ", err.Error())
}