Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/Migration_5_17.1.sql =================================================================== diff -u -r56ac4eb28f5fcc5b20117474e9e4030399d6806a -rbbde2697fb2a586dea09927dd4d73927eeb721dd --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/Migration_5_17.1.sql (.../Migration_5_17.1.sql) (revision 56ac4eb28f5fcc5b20117474e9e4030399d6806a) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/Resources/Migration_5_17.1.sql (.../Migration_5_17.1.sql) (revision bbde2697fb2a586dea09927dd4d73927eeb721dd) @@ -171,7 +171,23 @@ INSERT INTO PipingSemiProbabilisticOutputEntity SELECT * FROM [SOURCEPROJECT].PipingSemiProbabilisticOutputEntity; INSERT INTO PipingStructureSectionResultEntity SELECT * FROM [SOURCEPROJECT].PipingStructureSectionResultEntity; INSERT INTO ProjectEntity SELECT * FROM [SOURCEPROJECT].ProjectEntity; -INSERT INTO SoilLayerEntity SELECT * FROM [SOURCEPROJECT].SoilLayerEntity; +INSERT INTO SoilLayerEntity +SELECT + [SoilLayerEntityId], + [SoilProfileEntityId], + [Top], + [IsAquifer], + [Color], + [MaterialName], + [BelowPhreaticLevelMean], + [BelowPhreaticLevelDeviation], + [DiameterD70Mean], + ROUND([DiameterD70Deviation] / [DiameterD70Mean], 6), + [BelowPhreaticLevelShift], + [PermeabilityMean], + ROUND([PermeabilityDeviation] / [PermeabilityMean], 6), + [Order] + FROM [SOURCEPROJECT].SoilLayerEntity; INSERT INTO SoilProfileEntity SELECT * FROM [SOURCEPROJECT].SoilProfileEntity; INSERT INTO StabilityPointStructureEntity SELECT * FROM [SOURCEPROJECT].StabilityPointStructureEntity; INSERT INTO StabilityPointStructuresCalculationEntity SELECT * FROM [SOURCEPROJECT].StabilityPointStructuresCalculationEntity; Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Console.Test/RingtoetsMigrationConsoleTest.cs =================================================================== diff -u -r0ec3500b27a04d8b0d942662301e03d10c277a02 -rbbde2697fb2a586dea09927dd4d73927eeb721dd --- Application/Ringtoets/test/Application.Ringtoets.Migration.Console.Test/RingtoetsMigrationConsoleTest.cs (.../RingtoetsMigrationConsoleTest.cs) (revision 0ec3500b27a04d8b0d942662301e03d10c277a02) +++ Application/Ringtoets/test/Application.Ringtoets.Migration.Console.Test/RingtoetsMigrationConsoleTest.cs (.../RingtoetsMigrationConsoleTest.cs) (revision bbde2697fb2a586dea09927dd4d73927eeb721dd) @@ -133,7 +133,7 @@ public void GivenConsole_WhenVersionSupportedCall_ThenReturnedIfSupported(string file, string fileVersion, bool isSupported) { // Given - string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, file); + string sourceFilePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core, file); var console = new RingtoetsMigrationConsole(); string expectedVersion = RingtoetsVersionHelper.GetCurrentDatabaseVersion(); Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Console.Test/RingtoetsMigrationToolTest.cs =================================================================== diff -u -r0ec3500b27a04d8b0d942662301e03d10c277a02 -rbbde2697fb2a586dea09927dd4d73927eeb721dd --- Application/Ringtoets/test/Application.Ringtoets.Migration.Console.Test/RingtoetsMigrationToolTest.cs (.../RingtoetsMigrationToolTest.cs) (revision 0ec3500b27a04d8b0d942662301e03d10c277a02) +++ Application/Ringtoets/test/Application.Ringtoets.Migration.Console.Test/RingtoetsMigrationToolTest.cs (.../RingtoetsMigrationToolTest.cs) (revision bbde2697fb2a586dea09927dd4d73927eeb721dd) @@ -35,7 +35,7 @@ public class RingtoetsMigrationToolTest { private TestEnvironmentControl environmentControl; - private readonly TestDataPath testPath = TestDataPath.Application.Ringtoets.Migration; + private readonly TestDataPath testPath = TestDataPath.Application.Ringtoets.Migration.Core; [SetUp] public void SetUp() Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/RingtoetsDatabaseSourceFileTest.cs =================================================================== diff -u -r1b9445050ddc7786014349d7014c7c4d85242a5d -rbbde2697fb2a586dea09927dd4d73927eeb721dd --- Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/RingtoetsDatabaseSourceFileTest.cs (.../RingtoetsDatabaseSourceFileTest.cs) (revision 1b9445050ddc7786014349d7014c7c4d85242a5d) +++ Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/RingtoetsDatabaseSourceFileTest.cs (.../RingtoetsDatabaseSourceFileTest.cs) (revision bbde2697fb2a586dea09927dd4d73927eeb721dd) @@ -32,7 +32,7 @@ [TestFixture] public class RingtoetsDatabaseSourceFileTest { - private static readonly TestDataPath testPath = TestDataPath.Application.Ringtoets.Migration; + private static readonly TestDataPath testPath = TestDataPath.Application.Ringtoets.Migration.Core; [Test] public void Constructor_NonExistingPath_ThrowsCriticalFileReadException() Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/RingtoetsVersionedFileTest.cs =================================================================== diff -u -r1b9445050ddc7786014349d7014c7c4d85242a5d -rbbde2697fb2a586dea09927dd4d73927eeb721dd --- Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/RingtoetsVersionedFileTest.cs (.../RingtoetsVersionedFileTest.cs) (revision 1b9445050ddc7786014349d7014c7c4d85242a5d) +++ Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/RingtoetsVersionedFileTest.cs (.../RingtoetsVersionedFileTest.cs) (revision bbde2697fb2a586dea09927dd4d73927eeb721dd) @@ -22,7 +22,6 @@ using System; using System.IO; using Core.Common.Base.IO; -using Core.Common.IO.Exceptions; using Core.Common.TestUtil; using NUnit.Framework; @@ -99,10 +98,10 @@ [TestCase("FullTestProject164.rtd", "5")] [TestCase("FullTestProject171.rtd", "17.1")] - public void GetVersion_ParameteredConstructor_ExptectedProperties(string file, string expectedVersion) + public void GetVersion_ParameteredConstructor_ExpectedProperties(string file, string expectedVersion) { // Setup - string filePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration, file); + string filePath = TestHelper.GetTestDataPath(TestDataPath.Application.Ringtoets.Migration.Core, file); var sourceFile = new RingtoetsVersionedFile(filePath); // Call Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageMigrationIntegrationTest.cs =================================================================== diff -u -r736e0e16a55a0bd731f6847f85a148aa9f9f299a -rbbde2697fb2a586dea09927dd4d73927eeb721dd --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageMigrationIntegrationTest.cs (.../StorageMigrationIntegrationTest.cs) (revision 736e0e16a55a0bd731f6847f85a148aa9f9f299a) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageMigrationIntegrationTest.cs (.../StorageMigrationIntegrationTest.cs) (revision bbde2697fb2a586dea09927dd4d73927eeb721dd) @@ -115,7 +115,7 @@ [Test] [TestCaseSource(typeof(RingtoetsProjectMigrationTestHelper), nameof(RingtoetsProjectMigrationTestHelper.GetAllOutdatedSupportedProjectFilePaths))] [Apartment(ApartmentState.STA)] - public void GivenRingtoetsGui_WhenRunWithUnmigratedFileAndNoInquireContinuation_MigratedProjectSet(string sourceFilePath) + public void GivenRingtoetsGui_WhenRunWithUnmigratedFileAndNoInquireContinuation_MigratedProjectNotSet(string sourceFilePath) { // Given var projectStore = new StorageSqLite(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectMigrationTestHelper.cs =================================================================== diff -u -r1a6dbc57bbe2b86d790ed9495ba20e8120aabfaa -rbbde2697fb2a586dea09927dd4d73927eeb721dd --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectMigrationTestHelper.cs (.../RingtoetsProjectMigrationTestHelper.cs) (revision 1a6dbc57bbe2b86d790ed9495ba20e8120aabfaa) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectMigrationTestHelper.cs (.../RingtoetsProjectMigrationTestHelper.cs) (revision bbde2697fb2a586dea09927dd4d73927eeb721dd) @@ -31,7 +31,7 @@ /// public static class RingtoetsProjectMigrationTestHelper { - private static readonly TestDataPath testDataPath = TestDataPath.Application.Ringtoets.Migration; + private static readonly TestDataPath testDataPath = TestDataPath.Application.Ringtoets.Migration.Core; /// /// Retrieves the file path of a Ringtoets project with the latest database version Index: Core/Common/test/Core.Common.TestUtil/TestDataPath.cs =================================================================== diff -u -r2923096aeb41e1fb5d4ba0ad43ccb9f95ca7407a -rbbde2697fb2a586dea09927dd4d73927eeb721dd --- Core/Common/test/Core.Common.TestUtil/TestDataPath.cs (.../TestDataPath.cs) (revision 2923096aeb41e1fb5d4ba0ad43ccb9f95ca7407a) +++ Core/Common/test/Core.Common.TestUtil/TestDataPath.cs (.../TestDataPath.cs) (revision bbde2697fb2a586dea09927dd4d73927eeb721dd) @@ -40,7 +40,10 @@ { public static class Ringtoets { - public static readonly TestDataPath Migration = System.IO.Path.Combine("Application", "Ringtoets", "test", "Application.Ringtoets.Migration.Core.Test"); + public static class Migration + { + public static readonly TestDataPath Core = System.IO.Path.Combine("Application", "Ringtoets", "test", "Application.Ringtoets.Migration.Core.Test"); + } public static readonly TestDataPath Storage = System.IO.Path.Combine("Application", "Ringtoets", "test", "Application.Ringtoets.Storage.Test"); } }