Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfileHelperTests.cs =================================================================== diff -u -r5238 -r5247 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfileHelperTests.cs (.../SoilProfileHelperTests.cs) (revision 5238) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SoilProfileHelperTests.cs (.../SoilProfileHelperTests.cs) (revision 5247) @@ -42,9 +42,11 @@ Assert.Multiple(() => { Assert.That(soilProfile1D2.Layers[0].TopLevel, Is.EqualTo(0)); - Assert.That(soilProfile1D2.Layers[0].SoilName, Is.EqualTo("Layer 4")); + Assert.That(soilProfile1D2.Layers[0].SoilName, Is.EqualTo("Soil 4")); + Assert.That(soilProfile1D2.Layers[0].Name, Is.EqualTo("Layer 4")); Assert.That(soilProfile1D2.Layers[1].TopLevel, Is.EqualTo(-3)); - Assert.That(soilProfile1D2.Layers[1].SoilName, Is.EqualTo("Layer 5")); + Assert.That(soilProfile1D2.Layers[1].SoilName, Is.EqualTo("Soil 5")); + Assert.That(soilProfile1D2.Layers[1].Name, Is.EqualTo("Layer 5")); }); } @@ -57,13 +59,17 @@ Assert.Multiple(() => { Assert.That(soilProfile1D2.Layers[0].TopLevel, Is.EqualTo(5)); - Assert.That(soilProfile1D2.Layers[0].SoilName, Is.EqualTo("Layer 2")); + Assert.That(soilProfile1D2.Layers[0].SoilName, Is.EqualTo("Soil 2")); + Assert.That(soilProfile1D2.Layers[0].Name, Is.EqualTo("Layer 2")); Assert.That(soilProfile1D2.Layers[1].TopLevel, Is.EqualTo(4)); - Assert.That(soilProfile1D2.Layers[1].SoilName, Is.EqualTo("Layer 3")); + Assert.That(soilProfile1D2.Layers[1].SoilName, Is.EqualTo("Soil 3")); + Assert.That(soilProfile1D2.Layers[1].Name, Is.EqualTo("Layer 3")); Assert.That(soilProfile1D2.Layers[2].TopLevel, Is.EqualTo(2)); - Assert.That(soilProfile1D2.Layers[2].SoilName, Is.EqualTo("Layer 4")); + Assert.That(soilProfile1D2.Layers[2].SoilName, Is.EqualTo("Soil 4")); + Assert.That(soilProfile1D2.Layers[2].Name, Is.EqualTo("Layer 4")); Assert.That(soilProfile1D2.Layers[3].TopLevel, Is.EqualTo(-3)); - Assert.That(soilProfile1D2.Layers[3].SoilName, Is.EqualTo("Layer 5")); + Assert.That(soilProfile1D2.Layers[3].SoilName, Is.EqualTo("Soil 5")); + Assert.That(soilProfile1D2.Layers[3].Name, Is.EqualTo("Layer 5")); }); } } @@ -82,26 +88,32 @@ Assert.That(soilProfile1D2.Layers[0].TopLevel, Is.EqualTo(20)); Assert.That(soilProfile1D2.Layers[0].SoilName, Is.EqualTo("Embankment")); Assert.That(soilProfile1D2.Layers[1].TopLevel, Is.EqualTo(10)); - Assert.That(soilProfile1D2.Layers[1].SoilName, Is.EqualTo("Layer 1")); + Assert.That(soilProfile1D2.Layers[1].SoilName, Is.EqualTo("Soil 1")); Assert.That(soilProfile1D2.Layers[2].TopLevel, Is.EqualTo(6)); - Assert.That(soilProfile1D2.Layers[2].SoilName, Is.EqualTo("Layer 2")); + Assert.That(soilProfile1D2.Layers[2].SoilName, Is.EqualTo("Soil 2")); Assert.That(soilProfile1D2.Layers[3].TopLevel, Is.EqualTo(4)); - Assert.That(soilProfile1D2.Layers[3].SoilName, Is.EqualTo("Layer 3")); + Assert.That(soilProfile1D2.Layers[3].SoilName, Is.EqualTo("Soil 3")); Assert.That(soilProfile1D2.Layers[4].TopLevel, Is.EqualTo(2)); - Assert.That(soilProfile1D2.Layers[4].SoilName, Is.EqualTo("Layer 4")); + Assert.That(soilProfile1D2.Layers[4].SoilName, Is.EqualTo("Soil 4")); Assert.That(soilProfile1D2.Layers[5].TopLevel, Is.EqualTo(-3)); - Assert.That(soilProfile1D2.Layers[5].SoilName, Is.EqualTo("Layer 5")); + Assert.That(soilProfile1D2.Layers[5].SoilName, Is.EqualTo("Soil 5")); }); } private static SoilProfile1D CreateSoilProfile1D() { var soilProfile1D = new SoilProfile1D(); - soilProfile1D.Layers.Add(new SoilLayer1D(new Soil("Layer 1"), 10)); - soilProfile1D.Layers.Add(new SoilLayer1D(new Soil("Layer 2"), 6)); - soilProfile1D.Layers.Add(new SoilLayer1D(new Soil("Layer 3"), 4)); - soilProfile1D.Layers.Add(new SoilLayer1D(new Soil("Layer 4"), 2)); - soilProfile1D.Layers.Add(new SoilLayer1D(new Soil("Layer 5"), -3)); + soilProfile1D.Layers.Add(new SoilLayer1D(new Soil("Soil 1"), 10)); + soilProfile1D.Layers.Add(new SoilLayer1D(new Soil("Soil 2"), 6)); + soilProfile1D.Layers.Add(new SoilLayer1D(new Soil("Soil 3"), 4)); + soilProfile1D.Layers.Add(new SoilLayer1D(new Soil("Soil 4"), 2)); + soilProfile1D.Layers.Add(new SoilLayer1D(new Soil("Soil 5"), -3)); + + soilProfile1D.Layers[0].Name = "Layer 1"; + soilProfile1D.Layers[1].Name = "Layer 2"; + soilProfile1D.Layers[2].Name = "Layer 3"; + soilProfile1D.Layers[3].Name = "Layer 4"; + soilProfile1D.Layers[4].Name = "Layer 5"; return soilProfile1D; }