Index: Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs =================================================================== diff -u -r68f02442e2e790aaa0bde531c328662819908f10 -r09a6345c35c5c851dfb153e73abd69aaf64c0ebd --- Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs (.../StorageMigrationIntegrationTest.cs) (revision 68f02442e2e790aaa0bde531c328662819908f10) +++ Application/Riskeer/test/Application.Riskeer.Integration.Test/StorageMigrationIntegrationTest.cs (.../StorageMigrationIntegrationTest.cs) (revision 09a6345c35c5c851dfb153e73abd69aaf64c0ebd) @@ -44,7 +44,7 @@ private DirectoryDisposeHelper directoryDisposeHelper; [Test] - [TestCaseSource(typeof(ProjectMigrationTestHelper), nameof(ProjectMigrationTestHelper.GetAllOutdatedSupportedProjectFileVersions))] + [TestCaseSource(typeof(ProjectMigrationTestHelper), nameof(ProjectMigrationTestHelper.GetAllOutdatedSupportedProjectFileNames))] [Apartment(ApartmentState.STA)] public void GivenRiskeerGuiWithStorageSql_WhenRunWithMigratedFile_MigratedProjectSet(string version) { @@ -78,7 +78,7 @@ } [Test] - [TestCaseSource(typeof(ProjectMigrationTestHelper), nameof(ProjectMigrationTestHelper.GetAllOutdatedSupportedProjectFileVersions))] + [TestCaseSource(typeof(ProjectMigrationTestHelper), nameof(ProjectMigrationTestHelper.GetAllOutdatedSupportedProjectFileNames))] [Apartment(ApartmentState.STA)] public void GivenRiskeerGui_WhenRunWithUnmigratedFileAndInquireContinuation_MigratedProjectSet(string version) { @@ -116,7 +116,7 @@ } [Test] - [TestCaseSource(typeof(ProjectMigrationTestHelper), nameof(ProjectMigrationTestHelper.GetAllOutdatedSupportedProjectFileVersions))] + [TestCaseSource(typeof(ProjectMigrationTestHelper), nameof(ProjectMigrationTestHelper.GetAllOutdatedSupportedProjectFileNames))] [Apartment(ApartmentState.STA)] public void GivenRiskeerGui_WhenRunWithUnmigratedFileAndNoInquireContinuation_MigratedProjectNotSet(string version) { @@ -169,9 +169,9 @@ migrator.Migrate(fromVersionedFile, newVersion, targetFilePath); } - private static string GetTestProjectFilePath(string versionNumber) + private static string GetTestProjectFilePath(string fileName) { - return TestHelper.GetTestDataPath(TestDataPath.Riskeer.Migration.Core, $"MigrationTestProject{versionNumber}.rtd"); + return TestHelper.GetTestDataPath(TestDataPath.Riskeer.Migration.Core, fileName); } } } \ No newline at end of file Index: Riskeer/Migration/test/Riskeer.Migration.Core.Test/test-data/MigrationTestProject191.risk =================================================================== diff -u -r22c4b419facdb472e33a52bd4e74bc39e8382ab8 -r09a6345c35c5c851dfb153e73abd69aaf64c0ebd Binary files differ Index: Riskeer/Migration/test/Riskeer.Migration.Core.Test/test-data/MigrationTestProject192.risk =================================================================== diff -u -r20b228bc1658eb5bc892c76dd4ec0d871c6499fb -r09a6345c35c5c851dfb153e73abd69aaf64c0ebd Binary files differ Index: Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil.Test/ProjectMigrationTestHelperTest.cs =================================================================== diff -u -re7e71c79d26107c1f810fc3768c2652d4fbba562 -r09a6345c35c5c851dfb153e73abd69aaf64c0ebd --- Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil.Test/ProjectMigrationTestHelperTest.cs (.../ProjectMigrationTestHelperTest.cs) (revision e7e71c79d26107c1f810fc3768c2652d4fbba562) +++ Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil.Test/ProjectMigrationTestHelperTest.cs (.../ProjectMigrationTestHelperTest.cs) (revision 09a6345c35c5c851dfb153e73abd69aaf64c0ebd) @@ -80,14 +80,14 @@ } [Test] - public void GetAllOutdatedSupportedProjectFileVersions_Always_ReturnsAllProjectFilePathsToSupportedProjectVersions() + public void GetAllOutdatedSupportedProjectFileNames_Always_ReturnsAllProjectFilePathsToSupportedProjectVersions() { // Setup - string[] versions = ProjectMigrationTestHelper.GetAllOutdatedSupportedProjectFileVersions().ToArray(); + string[] fileNames = ProjectMigrationTestHelper.GetAllOutdatedSupportedProjectFileNames().ToArray(); // Call - List returnedProjectVersions = versions.Select(v => new ProjectVersionedFile(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Migration.Core, - $"MigrationTestProject{v}.rtd")).GetVersion()).ToList(); + string[] returnedProjectVersions = fileNames.Select(fileName => new ProjectVersionedFile(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Migration.Core, + fileName)).GetVersion()).ToArray(); // Assert IEnumerable expectedProjectVersions = new[] @@ -96,7 +96,8 @@ "17.1", "17.2", "17.3", - "18.1" + "18.1", + "19.1" }; CollectionAssert.AreEqual(expectedProjectVersions, returnedProjectVersions); } Index: Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil/ProjectMigrationTestHelper.cs =================================================================== diff -u -rc5e921dfc712b32007ae63810899055b2f2696fa -r09a6345c35c5c851dfb153e73abd69aaf64c0ebd --- Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil/ProjectMigrationTestHelper.cs (.../ProjectMigrationTestHelper.cs) (revision c5e921dfc712b32007ae63810899055b2f2696fa) +++ Riskeer/Migration/test/Riskeer.Migration.Core.TestUtil/ProjectMigrationTestHelper.cs (.../ProjectMigrationTestHelper.cs) (revision 09a6345c35c5c851dfb153e73abd69aaf64c0ebd) @@ -60,18 +60,19 @@ } /// - /// Retrieves the version numbers of all projects with an older database version, + /// Retrieves the project file names with an older database version, /// which are supported for the migration. /// /// An of all the version numbers of supported /// outdated projects. - public static IEnumerable GetAllOutdatedSupportedProjectFileVersions() + public static IEnumerable GetAllOutdatedSupportedProjectFileNames() { - yield return "164"; - yield return "171"; - yield return "172"; - yield return "173"; - yield return "181"; + yield return "MigrationTestProject164.rtd"; + yield return "MigrationTestProject171.rtd"; + yield return "MigrationTestProject172.rtd"; + yield return "MigrationTestProject173.rtd"; + yield return "MigrationTestProject181.rtd"; + yield return "MigrationTestProject191.risk"; } ///