Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs =================================================================== diff -u -r4a27dfb1033419dd325dee88fd4abe3cb56e452d -rbc3f3fa34e839d801599d4e0cef89734aa8e0475 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs (.../PipingSoilProfileReaderTest.cs) (revision 4a27dfb1033419dd325dee88fd4abe3cb56e452d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs (.../PipingSoilProfileReaderTest.cs) (revision bc3f3fa34e839d801599d4e0cef89734aa8e0475) @@ -185,7 +185,7 @@ using (var pipingSoilProfilesReader = new PipingSoilProfileReader(dbFile)) { - var result = new Collection(); + var result = new Collection(); // Call while (pipingSoilProfilesReader.HasNext) @@ -212,7 +212,7 @@ using (var pipingSoilProfilesReader = new PipingSoilProfileReader(dbFile)) { - var result = new Collection(); + var result = new Collection(); // Call while (pipingSoilProfilesReader.HasNext) @@ -247,11 +247,11 @@ Assert.AreEqual(expectedMessage, exception.Message); // Call - PipingSoilProfile pipingSoilProfile = pipingSoilProfilesReader.ReadProfile(); + MacroStabilityInwardsSoilProfile macroStabilityInwardsSoilProfile = pipingSoilProfilesReader.ReadProfile(); // Assert - Assert.AreEqual("Profile2", pipingSoilProfile.Name); - Assert.AreEqual(3, pipingSoilProfile.Layers.Count()); + Assert.AreEqual("Profile2", macroStabilityInwardsSoilProfile.Name); + Assert.AreEqual(3, macroStabilityInwardsSoilProfile.Layers.Count()); Assert.IsTrue(TestHelper.CanOpenFileForWrite(testFile)); } @@ -276,11 +276,11 @@ Assert.AreEqual(message, exception.Message); // Call - PipingSoilProfile pipingSoilProfile = pipingSoilProfilesReader.ReadProfile(); + MacroStabilityInwardsSoilProfile macroStabilityInwardsSoilProfile = pipingSoilProfilesReader.ReadProfile(); // Assert - Assert.AreEqual("Profile2", pipingSoilProfile.Name); - Assert.AreEqual(3, pipingSoilProfile.Layers.Count()); + Assert.AreEqual("Profile2", macroStabilityInwardsSoilProfile.Name); + Assert.AreEqual(3, macroStabilityInwardsSoilProfile.Layers.Count()); Assert.IsTrue(TestHelper.CanOpenFileForWrite(testFile)); } @@ -294,7 +294,7 @@ using (var pipingSoilProfilesReader = new PipingSoilProfileReader(Path.Combine(testDataPath, testFile))) { // Call - PipingSoilProfile profile = pipingSoilProfilesReader.ReadProfile(); + MacroStabilityInwardsSoilProfile profile = pipingSoilProfilesReader.ReadProfile(); // Assert Assert.AreEqual("Profile", profile.Name); @@ -342,7 +342,7 @@ using (var reader = new PipingSoilProfileReader(dbFile)) { // Call - PipingSoilProfile profile = reader.ReadProfile(); + MacroStabilityInwardsSoilProfile profile = reader.ReadProfile(); // Assert CollectionAssert.AreEqual(new[] @@ -411,7 +411,7 @@ using (var reader = new PipingSoilProfileReader(dbFile)) { // Call - PipingSoilProfile profile = reader.ReadProfile(); + MacroStabilityInwardsSoilProfile profile = reader.ReadProfile(); // Assert CollectionAssert.AreEqual(new[] @@ -480,7 +480,7 @@ using (var pipingSoilProfilesReader = new PipingSoilProfileReader(dbFile)) { - var result = new Collection(); + var result = new Collection(); // Call while (pipingSoilProfilesReader.HasNext) @@ -491,9 +491,9 @@ // Assert Assert.AreEqual(1, pipingSoilProfilesReader.Count); Assert.AreEqual(1, result.Count); - PipingSoilProfile pipingSoilProfile = result[0]; - Assert.AreEqual("SoilProfile1D", pipingSoilProfile.Name); - Assert.AreEqual(SoilProfileType.SoilProfile1D, pipingSoilProfile.SoilProfileType); + MacroStabilityInwardsSoilProfile macroStabilityInwardsSoilProfile = result[0]; + Assert.AreEqual("SoilProfile1D", macroStabilityInwardsSoilProfile.Name); + Assert.AreEqual(SoilProfileType.SoilProfile1D, macroStabilityInwardsSoilProfile.SoilProfileType); } } @@ -506,7 +506,7 @@ using (var pipingSoilProfilesReader = new PipingSoilProfileReader(dbFile)) { - var result = new Collection(); + var result = new Collection(); // Call while (pipingSoilProfilesReader.HasNext) @@ -517,9 +517,9 @@ // Assert Assert.AreEqual(1, pipingSoilProfilesReader.Count); Assert.AreEqual(1, result.Count); - PipingSoilProfile pipingSoilProfile = result[0]; - Assert.AreEqual("SoilProfile2D", pipingSoilProfile.Name); - Assert.AreEqual(SoilProfileType.SoilProfile2D, pipingSoilProfile.SoilProfileType); + MacroStabilityInwardsSoilProfile macroStabilityInwardsSoilProfile = result[0]; + Assert.AreEqual("SoilProfile2D", macroStabilityInwardsSoilProfile.Name); + Assert.AreEqual(SoilProfileType.SoilProfile2D, macroStabilityInwardsSoilProfile.SoilProfileType); } } @@ -570,7 +570,7 @@ Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition failed: The file should be writable to begin with."); PipingSoilProfileReader pipingSoilProfilesReader = null; - PipingSoilProfile profile; + MacroStabilityInwardsSoilProfile profile; try { pipingSoilProfilesReader = new PipingSoilProfileReader(dbFile); @@ -622,7 +622,7 @@ using (var pipingSoilProfilesReader = new PipingSoilProfileReader(Path.Combine(testDataPath, testFile))) { // When - var result = new Collection(); + var result = new Collection(); var skipped = 0; while (pipingSoilProfilesReader.HasNext) @@ -658,7 +658,7 @@ using (var pipingSoilProfilesReader = new PipingSoilProfileReader(Path.Combine(testDataPath, testFile))) { // When - ICollection result = new List(); + ICollection result = new List(); var skipped = 0; while (pipingSoilProfilesReader.HasNext) @@ -767,7 +767,7 @@ 3 }, result.Select(p => p.Layers.Count()).ToArray()); - PipingSoilProfile firstProfile = result.FirstOrDefault(l => l.Name == "Segment_36005_1D1"); + MacroStabilityInwardsSoilProfile firstProfile = result.FirstOrDefault(l => l.Name == "Segment_36005_1D1"); Assert.NotNull(firstProfile); var expectedFirstProfileLayersTops = new[] { @@ -784,7 +784,7 @@ CollectionAssert.AllItemsAreUnique(layerTops); CollectionAssert.AreEqual(expectedFirstProfileLayersTops, layerTops, new DoubleWithToleranceComparer(1e-6)); - PipingSoilProfile secondProfile = result.FirstOrDefault(l => l.Name == "AD640M00_Segment_36005_1D1"); + MacroStabilityInwardsSoilProfile secondProfile = result.FirstOrDefault(l => l.Name == "AD640M00_Segment_36005_1D1"); Assert.NotNull(secondProfile); var expectedSecondProfileLayersTops = new[] {