Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/SoilLayerVisualizationHelper.cs
===================================================================
diff -u -rb78ce5f4404784962bcf619a79e0769f771679bf -rd7eb93d1ab39297383c7ac7389513ef8f27982b1
--- Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/SoilLayerVisualizationHelper.cs (.../SoilLayerVisualizationHelper.cs) (revision b78ce5f4404784962bcf619a79e0769f771679bf)
+++ Ringtoets/Common/src/Ringtoets.Common.Forms/Helpers/SoilLayerVisualizationHelper.cs (.../SoilLayerVisualizationHelper.cs) (revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
@@ -32,7 +32,7 @@
///
/// Gets the display name of the soil layer.
///
- /// The name to check whether it's a valid display name.
+ /// The name to turn into a valid display name.
/// when it's not ;
/// a default value otherwise.
public static string GetDisplayName(string name)
@@ -45,7 +45,7 @@
///
/// Gets the display color of the soil layer.
///
- /// The color to check whether it's a valid display color.
+ /// The color to turn into a valid display color.
/// when it's not ;
/// a default value otherwise.
public static Color GetDisplayColor(Color color)
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs
===================================================================
diff -u -r686c5eeaad900a6bb627733de8c21bd607f130aa -rd7eb93d1ab39297383c7ac7389513ef8f27982b1
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs (.../SoilProfileConverter.cs) (revision 686c5eeaad900a6bb627733de8c21bd607f130aa)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Converters/SoilProfileConverter.cs (.../SoilProfileConverter.cs) (revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
@@ -24,6 +24,7 @@
using System.ComponentModel;
using System.Linq;
using Core.Common.Base.Geometry;
+using Ringtoets.Common.Forms.Helpers;
using Ringtoets.MacroStabilityInwards.KernelWrapper.Calculators.Input;
using Ringtoets.MacroStabilityInwards.Primitives;
@@ -82,7 +83,7 @@
return new SoilLayer(RingToPoints(l.OuterRing),
new SoilLayer.ConstructionProperties
{
- MaterialName = data.MaterialName,
+ MaterialName = SoilLayerVisualizationHelper.GetDisplayName(data.MaterialName),
UsePop = data.UsePop,
IsAquifer = data.IsAquifer,
ShearStrengthModel = ConvertShearStrengthModel(data.ShearStrengthModel),
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Ringtoets.MacroStabilityInwards.CalculatedInput.csproj
===================================================================
diff -u -r68f204f50eaf5f1e881c18fb2d878a17c722f75a -rd7eb93d1ab39297383c7ac7389513ef8f27982b1
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Ringtoets.MacroStabilityInwards.CalculatedInput.csproj (.../Ringtoets.MacroStabilityInwards.CalculatedInput.csproj) (revision 68f204f50eaf5f1e881c18fb2d878a17c722f75a)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.CalculatedInput/Ringtoets.MacroStabilityInwards.CalculatedInput.csproj (.../Ringtoets.MacroStabilityInwards.CalculatedInput.csproj) (revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
@@ -62,6 +62,11 @@
Ringtoets.Common.Data
False
+
+ {4D840673-3812-4338-A352-84854E32B8A0}
+ Ringtoets.Common.Forms
+ False
+
{3C0D3B38-A9F7-4B22-9705-513DA26AE2CC}
Ringtoets.MacroStabilityInwards.KernelWrapper
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer1DProperties.cs
===================================================================
diff -u -r69d647795daacbf48e17d0cf3a02a21865ab4ae6 -rd7eb93d1ab39297383c7ac7389513ef8f27982b1
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer1DProperties.cs (.../MacroStabilityInwardsSoilLayer1DProperties.cs) (revision 69d647795daacbf48e17d0cf3a02a21865ab4ae6)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer1DProperties.cs (.../MacroStabilityInwardsSoilLayer1DProperties.cs) (revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
@@ -26,6 +26,7 @@
using Core.Common.Gui.Attributes;
using Core.Common.Gui.PropertyBag;
using Core.Common.Utils.Attributes;
+using Ringtoets.Common.Forms.Helpers;
using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -61,7 +62,7 @@
{
get
{
- return data.Data.MaterialName;
+ return SoilLayerVisualizationHelper.GetDisplayName(data.Data.MaterialName);
}
}
@@ -91,7 +92,7 @@
public override string ToString()
{
- return data.Data.MaterialName;
+ return Name;
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DBaseProperties.cs
===================================================================
diff -u -r03bb865f66b346c37c91f2cd8a442abbb2952cba -rd7eb93d1ab39297383c7ac7389513ef8f27982b1
--- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DBaseProperties.cs (.../MacroStabilityInwardsSoilLayer2DBaseProperties.cs) (revision 03bb865f66b346c37c91f2cd8a442abbb2952cba)
+++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PropertyClasses/MacroStabilityInwardsSoilLayer2DBaseProperties.cs (.../MacroStabilityInwardsSoilLayer2DBaseProperties.cs) (revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
@@ -27,6 +27,7 @@
using Core.Common.Gui.Converters;
using Core.Common.Gui.PropertyBag;
using Core.Common.Utils.Attributes;
+using Ringtoets.Common.Forms.Helpers;
using Ringtoets.MacroStabilityInwards.Forms.Properties;
using Ringtoets.MacroStabilityInwards.Primitives;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -63,7 +64,7 @@
{
get
{
- return data.Data.MaterialName;
+ return SoilLayerVisualizationHelper.GetDisplayName(data.Data.MaterialName);
}
}
@@ -82,7 +83,7 @@
public override string ToString()
{
- return data.Data.MaterialName;
+ return Name;
}
}
}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs
===================================================================
diff -u -reb6d3b69267f3ae2870b25679793bbc0099338cd -rd7eb93d1ab39297383c7ac7389513ef8f27982b1
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs (.../SoilProfileConverterTest.cs) (revision eb6d3b69267f3ae2870b25679793bbc0099338cd)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/Converters/SoilProfileConverterTest.cs (.../SoilProfileConverterTest.cs) (revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
@@ -97,6 +97,28 @@
}
[Test]
+ public void Convert_SoilProfileWithSoilLayerWithEmptyName_ReturnSoilProfile()
+ {
+ // Setup
+ MacroStabilityInwardsSoilLayer2D soilLayer1 = CreateRandomSoilLayer(22, Enumerable.Empty());
+ soilLayer1.Data.MaterialName = string.Empty;
+
+ var profile = new MacroStabilityInwardsSoilProfileUnderSurfaceLine(
+ new[]
+ {
+ soilLayer1
+ },
+ new IMacroStabilityInwardsPreconsolidationStress[0]);
+
+ // Call
+ SoilProfile soilProfile = SoilProfileConverter.Convert(profile);
+
+ // Assert
+ Assert.AreEqual(1, soilProfile.Layers.Count());
+ Assert.AreEqual("Onbekend", soilProfile.Layers.First().MaterialName);
+ }
+
+ [Test]
public void Convert_InvalidShearStrengthModel_ThrowInvalidEnumArgumentException()
{
// Setup
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs
===================================================================
diff -u -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 -rd7eb93d1ab39297383c7ac7389513ef8f27982b1
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsChartDataFactoryTest.cs (.../MacroStabilityInwardsChartDataFactoryTest.cs) (revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
@@ -222,11 +222,11 @@
const string name = "Soil layer test name";
Color fillColor = Color.Firebrick;
- // Call
MacroStabilityInwardsSoilLayer2D layer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D();
layer.Data.MaterialName = name;
layer.Data.Color = fillColor;
+ // Call
ChartMultipleAreaData data = MacroStabilityInwardsChartDataFactory.CreateSoilLayerChartData(layer);
// Assert
@@ -238,11 +238,12 @@
[Test]
public void CreateSoilLayerChartData_LayerWithEmptyNameAndColor_ReturnsEmptyChartDataCollectionWithExpectedStyling()
{
- // Call
+ // Setup
MacroStabilityInwardsSoilLayer2D layer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D();
layer.Data.MaterialName = string.Empty;
layer.Data.Color = Color.Empty;
+ // Call
ChartMultipleAreaData data = MacroStabilityInwardsChartDataFactory.CreateSoilLayerChartData(layer);
// Assert
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer1DPropertiesTest.cs
===================================================================
diff -u -rbeb20fbb814f4128b6d7dc7648af798fcccbe24c -rd7eb93d1ab39297383c7ac7389513ef8f27982b1
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer1DPropertiesTest.cs (.../MacroStabilityInwardsSoilLayer1DPropertiesTest.cs) (revision beb20fbb814f4128b6d7dc7648af798fcccbe24c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer1DPropertiesTest.cs (.../MacroStabilityInwardsSoilLayer1DPropertiesTest.cs) (revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
@@ -80,13 +80,32 @@
}
[Test]
- public void ToString_Always_ReturnsMaterialName()
+ public void GetProperties_WithDataEmptyName_ReturnExpectedValues()
{
// Setup
var layer = new MacroStabilityInwardsSoilLayer1D(-2.9)
{
Data =
{
+ MaterialName = string.Empty
+ }
+ };
+
+ // Call
+ var properties = new MacroStabilityInwardsSoilLayer1DProperties(layer);
+
+ // Assert
+ Assert.AreEqual("Onbekend", properties.Name);
+ }
+
+ [Test]
+ public void ToString_ValidName_ReturnsMaterialName()
+ {
+ // Setup
+ var layer = new MacroStabilityInwardsSoilLayer1D(-2.9)
+ {
+ Data =
+ {
MaterialName = "Layer A"
}
};
@@ -101,6 +120,27 @@
}
[Test]
+ public void ToString_EmptyName_ReturnsDefaultName()
+ {
+ // Setup
+ var layer = new MacroStabilityInwardsSoilLayer1D(-2.9)
+ {
+ Data =
+ {
+ MaterialName = string.Empty
+ }
+ };
+
+ var properties = new MacroStabilityInwardsSoilLayer1DProperties(layer);
+
+ // Call
+ string name = properties.ToString();
+
+ // Assert
+ Assert.AreEqual("Onbekend", name);
+ }
+
+ [Test]
public void Constructor_ValidData_PropertieshaveExpectedAttributeValues()
{
// Setup
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs
===================================================================
diff -u -reb6d3b69267f3ae2870b25679793bbc0099338cd -rd7eb93d1ab39297383c7ac7389513ef8f27982b1
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs (.../MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs) (revision eb6d3b69267f3ae2870b25679793bbc0099338cd)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs (.../MacroStabilityInwardsSoilLayer2DBasePropertiesTest.cs) (revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
@@ -96,10 +96,24 @@
}
[Test]
- public void ToString_Always_ReturnsMaterialName()
+ public void GetProperties_WithDataEmptyName_ReturnExpectedValues()
{
// Setup
MacroStabilityInwardsSoilLayer2D layer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D();
+ layer.Data.MaterialName = string.Empty;
+
+ // Call
+ var properties = new MacroStabilityInwardsSoilLayer2DBaseProperties(layer);
+
+ // Assert
+ Assert.AreEqual("Onbekend", properties.Name);
+ }
+
+ [Test]
+ public void ToString_ValidName_ReturnsMaterialName()
+ {
+ // Setup
+ MacroStabilityInwardsSoilLayer2D layer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D();
layer.Data.MaterialName = "Layer A 2D";
var properties = new MacroStabilityInwardsSoilLayer2DBaseProperties(layer);
@@ -112,6 +126,22 @@
}
[Test]
+ public void ToString_EmptyName_ReturnsDefaultName()
+ {
+ // Setup
+ MacroStabilityInwardsSoilLayer2D layer = MacroStabilityInwardsSoilLayer2DTestFactory.CreateMacroStabilityInwardsSoilLayer2D();
+ layer.Data.MaterialName = string.Empty;
+
+ var properties = new MacroStabilityInwardsSoilLayer2DBaseProperties(layer);
+
+ // Call
+ string name = properties.ToString();
+
+ // Assert
+ Assert.AreEqual("Onbekend", name);
+ }
+
+ [Test]
public void Constructor_ValidData_PropertieshaveExpectedAttributeValues()
{
// Setup
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingSoilLayerProperties.cs
===================================================================
diff -u -r8d95e188fa8b69e29e776e86411988f4d97ea172 -rd7eb93d1ab39297383c7ac7389513ef8f27982b1
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingSoilLayerProperties.cs (.../PipingSoilLayerProperties.cs) (revision 8d95e188fa8b69e29e776e86411988f4d97ea172)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingSoilLayerProperties.cs (.../PipingSoilLayerProperties.cs) (revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
@@ -26,6 +26,7 @@
using Core.Common.Gui.Attributes;
using Core.Common.Gui.PropertyBag;
using Core.Common.Utils.Attributes;
+using Ringtoets.Common.Forms.Helpers;
using Ringtoets.Piping.Primitives;
using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources;
@@ -61,7 +62,7 @@
{
get
{
- return data.MaterialName;
+ return SoilLayerVisualizationHelper.GetDisplayName(data.MaterialName);
}
}
@@ -91,7 +92,7 @@
public override string ToString()
{
- return data.MaterialName;
+ return Name;
}
}
}
\ No newline at end of file
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSoilLayerPropertiesTest.cs
===================================================================
diff -u -rc3590f48e7da0ab48b1ccd7f58a7e623565b566c -rd7eb93d1ab39297383c7ac7389513ef8f27982b1
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSoilLayerPropertiesTest.cs (.../PipingSoilLayerPropertiesTest.cs) (revision c3590f48e7da0ab48b1ccd7f58a7e623565b566c)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSoilLayerPropertiesTest.cs (.../PipingSoilLayerPropertiesTest.cs) (revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
@@ -78,9 +78,25 @@
}
[Test]
- public void ToString_Always_ReturnsMaterialName()
+ public void GetProperties_WithDataEmptyName_ReturnExpectedValues()
{
// Setup
+ var layer = new PipingSoilLayer(-2.91)
+ {
+ MaterialName = string.Empty
+ };
+
+ // Call
+ var properties = new PipingSoilLayerProperties(layer);
+
+ // Assert
+ Assert.AreEqual("Onbekend", properties.Name);
+ }
+
+ [Test]
+ public void ToString_ValidName_ReturnsMaterialName()
+ {
+ // Setup
var layer = new PipingSoilLayer(-2.9)
{
MaterialName = "Layer A"
@@ -96,6 +112,24 @@
}
[Test]
+ public void ToString_EmptyName_ReturnsDefaultName()
+ {
+ // Setup
+ var layer = new PipingSoilLayer(-2.9)
+ {
+ MaterialName = string.Empty
+ };
+
+ var properties = new PipingSoilLayerProperties(layer);
+
+ // Call
+ string name = properties.ToString();
+
+ // Assert
+ Assert.AreEqual("Onbekend", name);
+ }
+
+ [Test]
public void Constructor_ValidData_PropertieshaveExpectedAttributeValues()
{
// Setup
Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSoilLayerTableTest.cs
===================================================================
diff -u -rfe9be55b75061a8035a3388a2d1bb8f80d49f0f8 -rd7eb93d1ab39297383c7ac7389513ef8f27982b1
--- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSoilLayerTableTest.cs (.../PipingSoilLayerTableTest.cs) (revision fe9be55b75061a8035a3388a2d1bb8f80d49f0f8)
+++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSoilLayerTableTest.cs (.../PipingSoilLayerTableTest.cs) (revision d7eb93d1ab39297383c7ac7389513ef8f27982b1)
@@ -162,10 +162,6 @@
CreatePipingSoilLayer(),
CreatePipingSoilLayer()
};
- table.SetData(new[]
- {
- new PipingSoilLayer(1.0)
- });
// Call
table.SetData(layers);
@@ -205,10 +201,6 @@
{
soilLayer
};
- table.SetData(new[]
- {
- new PipingSoilLayer(1.0)
- });
// Call
table.SetData(layers);