Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Macrostabiliteit binnenwaarts/Ondergrond traject 12_2.soil =================================================================== diff -u -refe4ae44cb9533476d8503d107bcc1d122be07cf -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Application/Ringtoets/src/Application.Ringtoets.Setup/Examples/Voorbeeld Traject 12-2 - Dijken en dammen - Piping/Ondergrond traject 12_2.soil =================================================================== diff -u -r8a4a7ff34fc3908f5fb572cb860502d5677042cc -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Demo/Ringtoets/src/Demo.Ringtoets/EmbeddedResources/DR6.soil =================================================================== diff -u -r97fd85a69fb9570efb56640cb3c301f4af9f3b62 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilDatabaseVersionReader.cs =================================================================== diff -u -r1fa1ff1080811742abffbd23346b23cf1a8aef3d -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilDatabaseVersionReader.cs (.../SoilDatabaseVersionReader.cs) (revision 1fa1ff1080811742abffbd23346b23cf1a8aef3d) +++ Ringtoets/Common/src/Ringtoets.Common.IO/SoilProfile/SoilDatabaseVersionReader.cs (.../SoilDatabaseVersionReader.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -34,7 +34,7 @@ /// public class SoilDatabaseVersionReader : SqLiteDatabaseReaderBase { - private const string databaseRequiredVersion = "15.0.6.0"; + private const string databaseRequiredVersion = "17.2.0.0"; /// /// Creates a new instance of , Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilDatabaseVersionReaderTest.cs =================================================================== diff -u -r1fa1ff1080811742abffbd23346b23cf1a8aef3d -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilDatabaseVersionReaderTest.cs (.../SoilDatabaseVersionReaderTest.cs) (revision 1fa1ff1080811742abffbd23346b23cf1a8aef3d) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/SoilDatabaseVersionReaderTest.cs (.../SoilDatabaseVersionReaderTest.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -115,7 +115,7 @@ TestDelegate test = () => versionReader.VerifyVersion(); // Assert - const string requiredVersion = "15.0.6.0"; + const string requiredVersion = "17.2.0.0"; string expectedVersionMessage = $"Fout bij het lezen van bestand '{filePath}': " + "de database heeft niet de vereiste versie informatie. " + $"Vereiste versie is '{requiredVersion}'."; Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs =================================================================== diff -u -r36e7a0a258891013379258ea856d49351594666e -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 36e7a0a258891013379258ea856d49351594666e) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -126,7 +126,7 @@ // Assert var exception = Assert.Throws(test); - const string version = "15.0.6.0"; + const string version = "17.2.0.0"; string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build( "De database heeft niet de vereiste versie informatie. " + $"Vereiste versie is '{version}'."); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SegmentPointReader/complete.soil =================================================================== diff -u -rbe3fdb23bcc3b82eb8766e2cc22221862634224e -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SegmentPointReader/emptySchema.soil =================================================================== diff -u -r1d91b8411e6db990c17fade0ad12aa8ac0e54865 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SegmentPointReader/invalidSegmentPoint.soil =================================================================== diff -u -r17a2476bd707ad3da72ba4d6382915b9cc3fed07 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilDatabaseConstraintsReader/emptySchema.soil =================================================================== diff -u -r866f2505f3d89a2a96a810d18419c840946d0d3b -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilDatabaseConstraintsReader/missingStochasticSoilModelTable.soil =================================================================== diff -u -rda8e78c538a77ceea5a0709122e9e28ef573507b -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilDatabaseConstraintsReader/missingStochasticSoilProfileProbability.soil =================================================================== diff -u -rda8e78c538a77ceea5a0709122e9e28ef573507b -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilDatabaseConstraintsReader/missingStochasticSoilProfileTable.soil =================================================================== diff -u -rda8e78c538a77ceea5a0709122e9e28ef573507b -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilDatabaseConstraintsReader/nonUniqueSoilModelNames.soil =================================================================== diff -u -rda8e78c538a77ceea5a0709122e9e28ef573507b -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilDatabaseVersionReader/correctVersion.soil =================================================================== diff -u -r1fa1ff1080811742abffbd23346b23cf1a8aef3d -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilDatabaseVersionReader/emptyschema.soil =================================================================== diff -u -r7516bd32d4eea4904a5ed0ba43a05ad8e5c868f3 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilDatabaseVersionReader/incorrectVersion.soil =================================================================== diff -u -r1fa1ff1080811742abffbd23346b23cf1a8aef3d -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilProfile1DReader/1dprofile.soil =================================================================== diff -u -r32535803492f107f7405399b93166d26446b77b7 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilProfile1DReader/1dprofileWithEmpty1d.soil =================================================================== diff -u -r72a2809486183c2a0ecfd8a529b4518f852d250d -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilProfile1DReader/emptyschema.soil =================================================================== diff -u -r72a2809486183c2a0ecfd8a529b4518f852d250d -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilProfile2DReader/1dprofile.soil =================================================================== diff -u -recd4d4b6e6b86aea559e4dee86f46850ee1477bf -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilProfile2DReader/2dprofile.soil =================================================================== diff -u -recd4d4b6e6b86aea559e4dee86f46850ee1477bf -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/SoilProfile2DReader/emptyschema.soil =================================================================== diff -u -recd4d4b6e6b86aea559e4dee86f46850ee1477bf -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilModelReader/complete.soil =================================================================== diff -u -r6379e5b1f8fd510f54137ceed602bd2900cdf235 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilModelReader/emptyschema.soil =================================================================== diff -u -r7516bd32d4eea4904a5ed0ba43a05ad8e5c868f3 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilModelReader/invalidSegmentPoint.soil =================================================================== diff -u -r83eac2f8b272c0306bec2f92a028c23737505624 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilModelReader/modelWithoutProfile.soil =================================================================== diff -u -r83eac2f8b272c0306bec2f92a028c23737505624 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilModelReader/otherFailureMechanism.soil =================================================================== diff -u -rbe4427a66ef77dfa213048b0a823824ea679bce3 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilProfileReader/complete.soil =================================================================== diff -u -r0ec64f4150d76a9530b3bed3f1af18334b5bf673 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilProfileReader/emptySchema.soil =================================================================== diff -u -r0ec64f4150d76a9530b3bed3f1af18334b5bf673 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilProfileReader/invalidStochasticSoilProfile1d.soil =================================================================== diff -u -r72a2809486183c2a0ecfd8a529b4518f852d250d -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/test-data/StochasticSoilProfileReader/invalidStochasticSoilProfile2d.soil =================================================================== diff -u -r72a2809486183c2a0ecfd8a529b4518f852d250d -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/EmbeddedResources/DR6.soil =================================================================== diff -u -r97fd85a69fb9570efb56640cb3c301f4af9f3b62 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Integration/test/Ringtoets.Integration.TestUtils/EmbeddedResources/DR6_updated.soil =================================================================== diff -u -r7172df944db7fd2d59d68a7a8def96110a44ed9b -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/SoilDatabaseVersionReader.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/SoilDatabaseVersionReader.cs (.../SoilDatabaseVersionReader.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.IO/SoilProfile/SoilDatabaseVersionReader.cs (.../SoilDatabaseVersionReader.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -35,7 +35,7 @@ /// public class SoilDatabaseVersionReader : SqLiteDatabaseReaderBase { - private const string databaseRequiredVersion = "15.0.6.0"; + private const string databaseRequiredVersion = "17.2.0.0"; /// /// Creates a new instance of , Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/MacroStabilityInwardsSoilProfileReaderTest.cs =================================================================== diff -u -rd47809e3a8fadff2be5b10056b79b16dc27eeca2 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/MacroStabilityInwardsSoilProfileReaderTest.cs (.../MacroStabilityInwardsSoilProfileReaderTest.cs) (revision d47809e3a8fadff2be5b10056b79b16dc27eeca2) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/MacroStabilityInwardsSoilProfileReaderTest.cs (.../MacroStabilityInwardsSoilProfileReaderTest.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -136,9 +136,7 @@ public void Constructor_IncorrectVersion_ThrowsCriticalFileReadException() { // Setup - const string version = "15.0.6.0"; - const string dbName = "incorrectversion.soil"; - string dbFile = Path.Combine(testDataPath, dbName); + string dbFile = Path.Combine(testDataPath, "incorrectversion.soil"); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -151,6 +149,8 @@ // Assert var exception = Assert.Throws(test); + + const string version = "17.2.0.0"; Assert.AreEqual($"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'.", exception.Message); Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/SoilDatabaseVersionReaderTest.cs =================================================================== diff -u -r616d3ed2e3262894d16948262fa1b223d2bc806e -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/SoilDatabaseVersionReaderTest.cs (.../SoilDatabaseVersionReaderTest.cs) (revision 616d3ed2e3262894d16948262fa1b223d2bc806e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/SoilDatabaseVersionReaderTest.cs (.../SoilDatabaseVersionReaderTest.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -74,10 +74,7 @@ public void Constructor_IncorrectVersion_ThrowsCriticalFileReadException() { // Setup - const string version = "15.0.6.0"; - string expectedVersionMessage = $"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'."; - const string dbName = "incorrectversion.soil"; - string dbFile = Path.Combine(testDataPath, dbName); + string dbFile = Path.Combine(testDataPath, "incorrectversion.soil"); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -89,6 +86,9 @@ // Assert var exception = Assert.Throws(test); + + const string version = "17.2.0.0"; + string expectedVersionMessage = $"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'."; Assert.AreEqual(expectedVersionMessage, exception.Message); } Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs =================================================================== diff -u -r3329f24f4e41a93f26e8b64a8454cbe851ee057f -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 3329f24f4e41a93f26e8b64a8454cbe851ee057f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -80,8 +80,7 @@ { // Setup string dbFile = Path.Combine(testDataPath, dbName); - string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). - Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -103,8 +102,7 @@ { // Setup string dbFile = Path.Combine(testDataPath, "withoutSoilModelTables.soil"); - string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). - Build("Kan geen ondergrondmodellen lezen. Mogelijk bestaat de 'StochasticSoilModel' tabel niet."); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kan geen ondergrondmodellen lezen. Mogelijk bestaat de 'StochasticSoilModel' tabel niet."); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -127,8 +125,7 @@ // Setup string path = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Ringtoets.MacroStabilityInwards.IO.Path, "SoilDatabaseConstraintsReader")); string dbFile = Path.Combine(path, "nonUniqueSoilModelNames.soil"); - string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). - Build("Namen van ondergrondmodellen zijn niet uniek."); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Namen van ondergrondmodellen zijn niet uniek."); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -166,10 +163,7 @@ public void Constructor_IncorrectVersion_ThrowsCriticalFileReadException() { // Setup - const string version = "15.0.6.0"; - string expectedVersionMessage = $"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'."; - const string dbName = "incorrectversion.soil"; - string dbFile = Path.Combine(testDataPath, dbName); + string dbFile = Path.Combine(testDataPath, "incorrectversion.soil"); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -182,6 +176,9 @@ // Assert var exception = Assert.Throws(test); + + const string version = "17.2.0.0"; + string expectedVersionMessage = $"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'."; Assert.AreEqual(expectedVersionMessage, exception.Message); Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs =================================================================== diff -u -r616d3ed2e3262894d16948262fa1b223d2bc806e -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs (.../StochasticSoilProfileReaderTest.cs) (revision 616d3ed2e3262894d16948262fa1b223d2bc806e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs (.../StochasticSoilProfileReaderTest.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -82,8 +82,7 @@ { // Setup string dbFile = Path.Combine(testDataPath, dbName); - string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). - Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -121,10 +120,7 @@ public void Constructor_IncorrectVersion_ThrowsCriticalFileReadException() { // Setup - const string version = "15.0.6.0"; - string expectedVersionMessage = $"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'."; - const string dbName = "incorrectversion.soil"; - string dbFile = Path.Combine(testDataPath, dbName); + string dbFile = Path.Combine(testDataPath, "incorrectversion.soil"); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -137,6 +133,9 @@ // Assert var exception = Assert.Throws(test); + + const string version = "17.2.0.0"; + string expectedVersionMessage = $"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'."; Assert.AreEqual(expectedVersionMessage, exception.Message); Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/1dProfileUsedInTwoSegments.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/1dprofile.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/1dprofileNoValues.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/1dprofileWithEmpty1d.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/2dProfileUsedInTwoSegments.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/2dprofile.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/EmptySoilModel.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/SingleSoilProfile2D_noLayerProperties.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/SingleSoilProfile2D_withLayerProperties.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/combined1d2d.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/complete.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/emptyschema.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/incorrectProbability.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/incorrectValue2dProperty.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/incorrectValue2dStochastProperty.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/incorrectversion.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/invalid2dGeometry.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/invalidAtX2dProperty.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/invalidBottom1dProfile.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/invalidStochasticSoilProfiles.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/invalidTop1dProfile.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/multipleStochasticSoilProfileForSameProfile.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/reusedSoilProfile1D.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/reusedSoilProfile2D.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/MacroStabilityInwardsSoilProfilesReader/vertical2dGeometry.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/SoilDatabaseConstraintsReader/missingStochasticSoilModelTable.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/SoilDatabaseConstraintsReader/missingStochasticSoilProfileProbability.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/SoilDatabaseConstraintsReader/missingStochasticSoilProfileTable.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/SoilDatabaseConstraintsReader/nonUniqueSoilModelNames.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/SoilDatabaseVersionReader/incorrectversion.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilModelDatabaseReader/complete.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilModelDatabaseReader/emptyschema.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilModelDatabaseReader/incorrectversion.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilModelDatabaseReader/invalidSegmentPoint.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilModelDatabaseReader/invalidStochasticSoilProfile.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilModelDatabaseReader/modelWithoutProfile.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilModelDatabaseReader/modelWithoutSegmentPoints.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilModelDatabaseReader/withoutSoilModelTables.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilProfileReader/complete.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilProfileReader/corruptStochasticSoilProfile.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilProfileReader/emptyschema.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilProfileReader/incorrectversion.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilProfileReader/invalidStochasticSoilProfile1d.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilProfileReader/invalidStochasticSoilProfile2d.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/test-data/StochasticSoilProfileReader/invalidStochasticSoilProfiles.soil =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseVersionReader.cs =================================================================== diff -u -r81fa8a9bf3bd503cbd280e88b8f6037a840cff12 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseVersionReader.cs (.../SoilDatabaseVersionReader.cs) (revision 81fa8a9bf3bd503cbd280e88b8f6037a840cff12) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseVersionReader.cs (.../SoilDatabaseVersionReader.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -35,7 +35,7 @@ /// public class SoilDatabaseVersionReader : SqLiteDatabaseReaderBase { - private const string databaseRequiredVersion = "15.0.6.0"; + private const string databaseRequiredVersion = "17.2.0.0"; /// /// Creates a new instance of , Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs =================================================================== diff -u -r616d3ed2e3262894d16948262fa1b223d2bc806e -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs (.../PipingSoilProfileReaderTest.cs) (revision 616d3ed2e3262894d16948262fa1b223d2bc806e) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs (.../PipingSoilProfileReaderTest.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -136,9 +136,7 @@ public void Constructor_IncorrectVersion_ThrowsCriticalFileReadException() { // Setup - const string version = "15.0.6.0"; - const string dbName = "incorrectversion.soil"; - string dbFile = Path.Combine(testDataPath, dbName); + string dbFile = Path.Combine(testDataPath, "incorrectversion.soil"); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -151,6 +149,8 @@ // Assert var exception = Assert.Throws(test); + + const string version = "17.2.0.0"; Assert.AreEqual($"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'.", exception.Message); Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilDatabaseVersionReaderTest.cs =================================================================== diff -u -r616d3ed2e3262894d16948262fa1b223d2bc806e -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilDatabaseVersionReaderTest.cs (.../SoilDatabaseVersionReaderTest.cs) (revision 616d3ed2e3262894d16948262fa1b223d2bc806e) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilDatabaseVersionReaderTest.cs (.../SoilDatabaseVersionReaderTest.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -74,10 +74,7 @@ public void Constructor_IncorrectVersion_ThrowsCriticalFileReadException() { // Setup - const string version = "15.0.6.0"; - string expectedVersionMessage = $"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'."; - const string dbName = "incorrectversion.soil"; - string dbFile = Path.Combine(testDataPath, dbName); + string dbFile = Path.Combine(testDataPath, "incorrectversion.soil"); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -89,6 +86,9 @@ // Assert var exception = Assert.Throws(test); + + const string version = "17.2.0.0"; + string expectedVersionMessage = $"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'."; Assert.AreEqual(expectedVersionMessage, exception.Message); } Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs =================================================================== diff -u -r3329f24f4e41a93f26e8b64a8454cbe851ee057f -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 3329f24f4e41a93f26e8b64a8454cbe851ee057f) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -80,8 +80,7 @@ { // Setup string dbFile = Path.Combine(testDataPath, dbName); - string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). - Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -103,8 +102,7 @@ { // Setup string dbFile = Path.Combine(testDataPath, "withoutSoilModelTables.soil"); - string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). - Build("Kan geen ondergrondmodellen lezen. Mogelijk bestaat de 'StochasticSoilModel' tabel niet."); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Kan geen ondergrondmodellen lezen. Mogelijk bestaat de 'StochasticSoilModel' tabel niet."); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -127,8 +125,7 @@ // Setup string path = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Piping.IO.Path, "SoilDatabaseConstraintsReader")); string dbFile = Path.Combine(path, "nonUniqueSoilModelNames.soil"); - string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). - Build("Namen van ondergrondmodellen zijn niet uniek."); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build("Namen van ondergrondmodellen zijn niet uniek."); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -166,10 +163,7 @@ public void Constructor_IncorrectVersion_ThrowsCriticalFileReadException() { // Setup - const string version = "15.0.6.0"; - string expectedVersionMessage = $"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'."; - const string dbName = "incorrectversion.soil"; - string dbFile = Path.Combine(testDataPath, dbName); + string dbFile = Path.Combine(testDataPath, "incorrectversion.soil"); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -182,6 +176,9 @@ // Assert var exception = Assert.Throws(test); + + const string version = "17.2.0.0"; + string expectedVersionMessage = $"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'."; Assert.AreEqual(expectedVersionMessage, exception.Message); Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs =================================================================== diff -u -r616d3ed2e3262894d16948262fa1b223d2bc806e -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs (.../StochasticSoilProfileReaderTest.cs) (revision 616d3ed2e3262894d16948262fa1b223d2bc806e) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs (.../StochasticSoilProfileReaderTest.cs) (revision b5404a5a71bbedaa91bbcc5aee55c690a063aa8d) @@ -121,10 +121,7 @@ public void Constructor_IncorrectVersion_ThrowsCriticalFileReadException() { // Setup - const string version = "15.0.6.0"; - string expectedVersionMessage = $"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'."; - const string dbName = "incorrectversion.soil"; - string dbFile = Path.Combine(testDataPath, dbName); + string dbFile = Path.Combine(testDataPath, "incorrectversion.soil"); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -137,6 +134,9 @@ // Assert var exception = Assert.Throws(test); + + const string version = "17.2.0.0"; + string expectedVersionMessage = $"De database heeft niet de vereiste versie informatie. Vereiste versie is '{version}'."; Assert.AreEqual(expectedVersionMessage, exception.Message); Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/1dProfileUsedInTwoSegments.soil =================================================================== diff -u -r61da7f609eef63a149d27eb1c52b2bd908af33b3 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/1dprofile.soil =================================================================== diff -u -rf817bfc2122cfa0a48bd19ad8518a948dfd7c95c -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/1dprofileNoValues.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/1dprofileWithEmpty1d.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/2dProfileUsedInTwoSegments.soil =================================================================== diff -u -r61da7f609eef63a149d27eb1c52b2bd908af33b3 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/2dprofile.soil =================================================================== diff -u -rf817bfc2122cfa0a48bd19ad8518a948dfd7c95c -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/EmptySoilModel.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/SingleSoilProfile2D_noLayerProperties.soil =================================================================== diff -u -rf4efcc2bb58d597f4a19884d98d0ab79bab04b1c -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/SingleSoilProfile2D_withLayerProperties.soil =================================================================== diff -u -rf4efcc2bb58d597f4a19884d98d0ab79bab04b1c -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/combined1d2d.soil =================================================================== diff -u -r796c405a61f5ef0fc93cba697ecbbb505ea5ec4f -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/complete.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/emptyschema.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/incorrect2dStochastDistributionProperty.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/incorrect2dStochastShiftProperty.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/incorrectProbability.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/incorrectValue2dProperty.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/incorrectValue2dStochastProperty.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/incorrectversion.soil =================================================================== diff -u -r15d2770669092ea9574682421c755fc9b6c2e16f -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/invalid2dGeometry.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/invalidAtX2dProperty.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/invalidBottom1dProfile.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/invalidStochasticSoilProfiles.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/invalidTop1dProfile.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/multipleStochasticSoilProfileForSameProfile.soil =================================================================== diff -u -r4e4ced94d27f939fc77f364201840814dc542af1 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/reusedSoilProfile1D.soil =================================================================== diff -u -rf4efcc2bb58d597f4a19884d98d0ab79bab04b1c -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/reusedSoilProfile2D.soil =================================================================== diff -u -rf4efcc2bb58d597f4a19884d98d0ab79bab04b1c -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/PipingSoilProfilesReader/vertical2dGeometry.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/SoilDatabaseConstraintsReader/missingStochasticSoilModelTable.soil =================================================================== diff -u -r0fbb881c5c82f540f01772234b3c1faadfab07f9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/SoilDatabaseConstraintsReader/missingStochasticSoilProfileProbability.soil =================================================================== diff -u -r0fbb881c5c82f540f01772234b3c1faadfab07f9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/SoilDatabaseConstraintsReader/missingStochasticSoilProfileTable.soil =================================================================== diff -u -r0fbb881c5c82f540f01772234b3c1faadfab07f9 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/SoilDatabaseConstraintsReader/nonUniqueSoilModelNames.soil =================================================================== diff -u -r9a9a99ad27ee6fdcd22f0df408b868816502647e -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/SoilDatabaseVersionReader/incorrectversion.soil =================================================================== diff -u -rdc338e85283e37af4984f737a9f7ae0d213596be -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilModelDatabaseReader/complete.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilModelDatabaseReader/emptyschema.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilModelDatabaseReader/incorrectversion.soil =================================================================== diff -u -r14db78eb3fc065c42f2d92c60d9d6b4b43dc9bd7 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilModelDatabaseReader/invalidSegmentPoint.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilModelDatabaseReader/invalidStochasticSoilProfile.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilModelDatabaseReader/modelWithoutProfile.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilModelDatabaseReader/modelWithoutSegmentPoints.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilModelDatabaseReader/withoutSoilModelTables.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilProfileReader/complete.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilProfileReader/corruptStochasticSoilProfile.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilProfileReader/emptyschema.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilProfileReader/incorrectversion.soil =================================================================== diff -u -rdc338e85283e37af4984f737a9f7ae0d213596be -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilProfileReader/invalidStochasticSoilProfile1d.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilProfileReader/invalidStochasticSoilProfile2d.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/test-data/StochasticSoilProfileReader/invalidStochasticSoilProfiles.soil =================================================================== diff -u -re7e22e69b16b23c89c063f18444c82aa818dc176 -rb5404a5a71bbedaa91bbcc5aee55c690a063aa8d Binary files differ