Index: Core/Common/src/Core.Common.Base/Storage/MigrationRequired.cs
===================================================================
diff -u -r98cf6c4d8b075673ed441617ae8179914e3eab67 -r6ff58c7b2c3319780f85b62d2baa289682397675
--- Core/Common/src/Core.Common.Base/Storage/MigrationRequired.cs (.../MigrationRequired.cs) (revision 98cf6c4d8b075673ed441617ae8179914e3eab67)
+++ Core/Common/src/Core.Common.Base/Storage/MigrationRequired.cs (.../MigrationRequired.cs) (revision 6ff58c7b2c3319780f85b62d2baa289682397675)
@@ -42,8 +42,8 @@
Aborted,
///
- /// Migration workflow failed.
+ /// Migration workflow not supported.
///
- Failed
+ NotSupported
}
}
\ No newline at end of file
Index: Core/Gui/src/Core.Gui/Commands/StorageCommandHandler.cs
===================================================================
diff -u -r98cf6c4d8b075673ed441617ae8179914e3eab67 -r6ff58c7b2c3319780f85b62d2baa289682397675
--- Core/Gui/src/Core.Gui/Commands/StorageCommandHandler.cs (.../StorageCommandHandler.cs) (revision 98cf6c4d8b075673ed441617ae8179914e3eab67)
+++ Core/Gui/src/Core.Gui/Commands/StorageCommandHandler.cs (.../StorageCommandHandler.cs) (revision 6ff58c7b2c3319780f85b62d2baa289682397675)
@@ -215,7 +215,7 @@
MigrationRequired migrationRequired = PrepareProjectMigration(
filePath, out OpenProjectActivity.ProjectMigrationConstructionProperties migrationProperties);
- if (migrationRequired == MigrationRequired.Failed)
+ if (migrationRequired == MigrationRequired.NotSupported)
{
projectOwner.SetProject(null, null);
return false;
Index: Core/Gui/test/Core.Gui.Test/Commands/StorageCommandHandlerTest.cs
===================================================================
diff -u -r98cf6c4d8b075673ed441617ae8179914e3eab67 -r6ff58c7b2c3319780f85b62d2baa289682397675
--- Core/Gui/test/Core.Gui.Test/Commands/StorageCommandHandlerTest.cs (.../StorageCommandHandlerTest.cs) (revision 98cf6c4d8b075673ed441617ae8179914e3eab67)
+++ Core/Gui/test/Core.Gui.Test/Commands/StorageCommandHandlerTest.cs (.../StorageCommandHandlerTest.cs) (revision 6ff58c7b2c3319780f85b62d2baa289682397675)
@@ -401,7 +401,7 @@
}
[Test]
- public void OpenExistingProject_ShouldMigrateFailed_SetProjectNullAndReturnsFalse()
+ public void OpenExistingProject_MigrationNotSupported_SetProjectNullAndReturnsFalse()
{
// Setup
const string fileName = "newProject";
@@ -410,7 +410,7 @@
var projectStorage = mocks.StrictMock();
var projectMigrator = mocks.StrictMock();
- projectMigrator.Expect(pm => pm.ShouldMigrate(pathToSomeValidFile)).Return(MigrationRequired.Failed);
+ projectMigrator.Expect(pm => pm.ShouldMigrate(pathToSomeValidFile)).Return(MigrationRequired.NotSupported);
var project = mocks.Stub();
var projectFactory = mocks.StrictMock();
Index: Riskeer/Migration/src/Riskeer.Migration/ProjectMigrator.cs
===================================================================
diff -u -r98cf6c4d8b075673ed441617ae8179914e3eab67 -r6ff58c7b2c3319780f85b62d2baa289682397675
--- Riskeer/Migration/src/Riskeer.Migration/ProjectMigrator.cs (.../ProjectMigrator.cs) (revision 98cf6c4d8b075673ed441617ae8179914e3eab67)
+++ Riskeer/Migration/src/Riskeer.Migration/ProjectMigrator.cs (.../ProjectMigrator.cs) (revision 6ff58c7b2c3319780f85b62d2baa289682397675)
@@ -96,7 +96,7 @@
string errorMessage = string.Format(MigrationCoreStorageResources.Migrate_From_Version_0_To_Version_1_Not_Supported,
version, currentDatabaseVersion);
log.Error(errorMessage);
- return MigrationRequired.Failed;
+ return MigrationRequired.NotSupported;
}
string query = string.Format(Resources.ProjectMigrator_Migrate_Outdated_project_file_update_to_current_version_0_inquire,
Index: Riskeer/Migration/test/Riskeer.Migration.Test/ProjectMigratorTest.cs
===================================================================
diff -u -r98cf6c4d8b075673ed441617ae8179914e3eab67 -r6ff58c7b2c3319780f85b62d2baa289682397675
--- Riskeer/Migration/test/Riskeer.Migration.Test/ProjectMigratorTest.cs (.../ProjectMigratorTest.cs) (revision 98cf6c4d8b075673ed441617ae8179914e3eab67)
+++ Riskeer/Migration/test/Riskeer.Migration.Test/ProjectMigratorTest.cs (.../ProjectMigratorTest.cs) (revision 6ff58c7b2c3319780f85b62d2baa289682397675)
@@ -147,7 +147,7 @@
// Assert
var expectedMessage = $"Het migreren van een projectbestand met versie '{fileVersion}' naar versie '{currentDatabaseVersion}' is niet ondersteund.";
TestHelper.AssertLogMessageIsGenerated(Call, expectedMessage);
- Assert.AreEqual(MigrationRequired.Failed, shouldMigrate);
+ Assert.AreEqual(MigrationRequired.NotSupported, shouldMigrate);
mocks.VerifyAll();
}