Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Piping/PipingCalculation.cs =================================================================== diff -u -ra950714ad9510756331d862aa35695fa0b2ed03b -r5eb251659313f12d82ee14e5703572ae09455e07 --- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Piping/PipingCalculation.cs (.../PipingCalculation.cs) (revision a950714ad9510756331d862aa35695fa0b2ed03b) +++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Piping/PipingCalculation.cs (.../PipingCalculation.cs) (revision 5eb251659313f12d82ee14e5703572ae09455e07) @@ -89,7 +89,7 @@ var validationResults = new List(); if (input.SoilProfile == null) { - validationResults.Add(Resources.PipingCalculation_Validate_Lacks_SoilProfile_Uplift); + validationResults.Add(Resources.PipingCalculation_Validate_Lacks_SoilProfile_uplift); } return validationResults; Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Piping/PipingProfileCreator.cs =================================================================== diff -u -r33d4f4e7e5404dcc6470dd3d34168b30410109eb -r5eb251659313f12d82ee14e5703572ae09455e07 --- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Piping/PipingProfileCreator.cs (.../PipingProfileCreator.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) +++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Piping/PipingProfileCreator.cs (.../PipingProfileCreator.cs) (revision 5eb251659313f12d82ee14e5703572ae09455e07) @@ -48,7 +48,7 @@ { if (dSoilModelDatabaseContainsAquiferOnLayerLevel) { - var message = String.Format(Resources.PipingProfileCreator_No_Aquifer_Layer, soilProfile.Name); + var message = String.Format(Resources.PipingProfileCreator_No_aquifer_layer, soilProfile.Name); throw new PipingProfileCreatorException(message); } soilProfile.Layers.First().IsAquifer = true; Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Properties/Resources.Designer.cs =================================================================== diff -u -r33d4f4e7e5404dcc6470dd3d34168b30410109eb -r5eb251659313f12d82ee14e5703572ae09455e07 --- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) +++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5eb251659313f12d82ee14e5703572ae09455e07) @@ -63,9 +63,9 @@ /// /// Looks up a localized string similar to Een ondergrondprofiel moet geselecteerd zijn om een Uplift berekening uit te kunnen voeren.. /// - internal static string PipingCalculation_Validate_Lacks_SoilProfile_Uplift { + internal static string PipingCalculation_Validate_Lacks_SoilProfile_uplift { get { - return ResourceManager.GetString("PipingCalculation_Validate_Lacks_SoilProfile_Uplift", resourceCulture); + return ResourceManager.GetString("PipingCalculation_Validate_Lacks_SoilProfile_uplift", resourceCulture); } } @@ -81,9 +81,9 @@ /// /// Looks up a localized string similar to Het profiel '{0}' bevat geen waterdoorlatende laag.. /// - internal static string PipingProfileCreator_No_Aquifer_Layer { + internal static string PipingProfileCreator_No_aquifer_layer { get { - return ResourceManager.GetString("PipingProfileCreator_No_Aquifer_Layer", resourceCulture); + return ResourceManager.GetString("PipingProfileCreator_No_aquifer_layer", resourceCulture); } } } Index: Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Properties/Resources.resx =================================================================== diff -u -r33d4f4e7e5404dcc6470dd3d34168b30410109eb -r5eb251659313f12d82ee14e5703572ae09455e07 --- Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Properties/Resources.resx (.../Resources.resx) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) +++ Ringtoets/Piping/src/Ringtoets.Piping.Calculation/Properties/Resources.resx (.../Resources.resx) (revision 5eb251659313f12d82ee14e5703572ae09455e07) @@ -117,13 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + Een ondergrondprofiel moet geselecteerd zijn om een Uplift berekening uit te kunnen voeren. Een dwarsdoorsnede moet geselecteerd zijn om een Uplift berekening uit te kunnen voeren. - + Het profiel '{0}' bevat geen waterdoorlatende laag. \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSurfaceLinesCsvReaderTest.cs =================================================================== diff -u -r33d4f4e7e5404dcc6470dd3d34168b30410109eb -r5eb251659313f12d82ee14e5703572ae09455e07 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSurfaceLinesCsvReaderTest.cs (.../PipingSurfaceLinesCsvReaderTest.cs) (revision 33d4f4e7e5404dcc6470dd3d34168b30410109eb) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/PipingSurfaceLinesCsvReaderTest.cs (.../PipingSurfaceLinesCsvReaderTest.cs) (revision 5eb251659313f12d82ee14e5703572ae09455e07) @@ -236,7 +236,7 @@ [Test] [SetCulture("en-US")] - public void ReadLine_OpenedValidFileWithHeaderAndSurfaceLinesWithDuplicatePointsWithCultureEN_ReturnCreatedSurfaceLineWithoutDuplicatePoints() + public void ReadLine_OpenedValidFileWithHeaderAndSurfaceLinesWithDuplicatePointsWithCultureEN_ReturnCreatedSurfaceLineWithDuplicatePoints() { // Setup // File: First 3 points are identical @@ -253,8 +253,10 @@ // Assert Assert.AreEqual("Rotterdam1", surfaceLine1.Name); var geometryPoints = surfaceLine1.Points.ToArray(); - Assert.AreEqual(geometryPoints.Length, geometryPoints.Distinct().Count()); - Assert.AreNotEqual(geometryPoints[0].X, geometryPoints[1].X); + Assert.AreNotEqual(geometryPoints.Length, geometryPoints.Distinct().Count(), + "Duplicate points should be parsed."); + Assert.AreEqual(geometryPoints[0].X, geometryPoints[1].X, + "Consecutive duplicate points are still parsed."); Assert.AreEqual(surfaceLine1.StartingWorldPoint, geometryPoints.First()); Assert.AreEqual(surfaceLine1.EndingWorldPoint, geometryPoints.Last()); }