Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/PreconsolidationStressReaderTest.cs =================================================================== diff -u -r0fa0d88d03cc6adb9d820c65c4c7a43e853ef5a3 -reae3622163e0c8bdfc32f73eda6f5bd8d3b02484 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/PreconsolidationStressReaderTest.cs (.../PreconsolidationStressReaderTest.cs) (revision 0fa0d88d03cc6adb9d820c65c4c7a43e853ef5a3) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/SoilProfile/PreconsolidationStressReaderTest.cs (.../PreconsolidationStressReaderTest.cs) (revision eae3622163e0c8bdfc32f73eda6f5bd8d3b02484) @@ -62,10 +62,7 @@ public void Constructor_InvalidPath_ThrowsCriticalFileReadException(string fileName) { // Call - TestDelegate test = () => - { - using (new PreconsolidationStressReader(fileName)) {} - }; + TestDelegate test = () => new PreconsolidationStressReader(fileName); // Assert Assert.Throws(test); @@ -132,7 +129,7 @@ } [Test] - public void HasNext_DatabaseWithStochasticSoilModels_ReturnsTrue() + public void HasNext_DatabaseWithPreconsolidationStresses_ReturnsTrue() { // Setup string dbFile = Path.Combine(testDataPath, "2dprofileWithPreconsolidationStresses.soil"); @@ -152,7 +149,7 @@ } [Test] - public void ReadStochasticSoilModelId_EmptyDatabase_ThrowsInvalidOperationException() + public void ReadSoilProfileId_EmptyDatabase_ThrowsInvalidOperationException() { // Setup string dbFile = Path.Combine(testDataPath, "emptySchema.soil"); @@ -318,33 +315,33 @@ { 2, 3 - },readStresses.Select(stress => stress.XCoordinate)); + }, readStresses.Select(stress => stress.XCoordinate)); CollectionAssert.AreEqual(new[] { 2, 3 - },readStresses.Select(stress => stress.ZCoordinate)); + }, readStresses.Select(stress => stress.ZCoordinate)); CollectionAssert.AreEqual(new[] - { + { 3, 3 }, readStresses.Select(stress => stress.PreconsolidationStressDistributionType)); CollectionAssert.AreEqual(new[] { 2, 3 - },readStresses.Select(stress => stress.PreconsolidationStressMean)); + }, readStresses.Select(stress => stress.PreconsolidationStressMean)); CollectionAssert.AreEqual(new[] { 1, 1 - },readStresses.Select(stress => stress.PreconsolidationStressCoefficientOfVariation)); + }, readStresses.Select(stress => stress.PreconsolidationStressCoefficientOfVariation)); CollectionAssert.AreEqual(new[] { 0, 0 - },readStresses.Select(stress => stress.PreconsolidationStressShift)); + }, readStresses.Select(stress => stress.PreconsolidationStressShift)); Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); }