Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs =================================================================== diff -u -r5830 -r5996 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 5830) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/WaterBoardImporterTests.cs (.../WaterBoardImporterTests.cs) (revision 5996) @@ -73,17 +73,17 @@ // Check Segments Assert.That(waterBoard.Segments.Count, Is.EqualTo(24)); Segment segment = waterBoard.Segments.First(x => x.Name.Equals(segmentId)); - Assert.That(segment.SoilProfileProbabilities[0].SoilGeometryName, Is.EqualTo("10Y_024_STBI.sti")); + Assert.That(segment.SoilProfileProbabilities[0].SoilGeometryName, Is.EqualTo("10Y_024_STBI.stix")); Assert.That(segment.SoilProfileProbabilities[0].Probability, Is.EqualTo(100.0).Within(cTolerance)); Assert.That(segment.SoilProfileProbabilities[0].SegmentFailureMechanismType .Equals(FailureMechanismSystemType.StabilityInside), Is.True); // Check segment with stability and piping segment = waterBoard.Segments.FirstOrDefault(x => x.Name.Equals("segment_dijkring10_dwp02_4")); - Assert.That(segment.SoilProfileProbabilities[0].SoilGeometryName, Is.EqualTo("10Y_024_STBI.sti")); + Assert.That(segment.SoilProfileProbabilities[0].SoilGeometryName, Is.EqualTo("10Y_024_STBI.stix")); Assert.That(segment.SoilProfileProbabilities[0].Probability, Is.EqualTo(100.0).Within(cTolerance)); Assert.That(segment.SoilProfileProbabilities[0].SegmentFailureMechanismType .Equals(FailureMechanismSystemType.StabilityInside), Is.True); - Assert.That(segment.SoilProfileProbabilities[1].SoilGeometryName, Is.EqualTo("10Y_024_STBI.sti")); + Assert.That(segment.SoilProfileProbabilities[1].SoilGeometryName, Is.EqualTo("10Y_024_STBI.stix")); Assert.That(segment.SoilProfileProbabilities[1].Probability, Is.EqualTo(100.0).Within(cTolerance)); Assert.That(segment.SoilProfileProbabilities[1].SegmentFailureMechanismType .Equals(FailureMechanismSystemType.Piping), Is.True); Index: DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/segments.csv =================================================================== diff -u -r4507 -r5996 --- DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/segments.csv (.../segments.csv) (revision 4507) +++ DamClients/DamUI/trunk/src/Dam/Deltares.Dam.Tests/TestData/GrootSallandBinnenwaarts/segments.csv (.../segments.csv) (revision 5996) @@ -1,27 +1,27 @@ segment_id;soilgeometry2D_name;probability;calculation_type -segment_dijkring10_dwp00_5;10Y_005_STBI.sti;100;Stability -segment_dijkring10_dwp00_5;10Y_005_STBI.sti;100;Piping -segment_dijkring10_dwp02_4;10Y_024_STBI.sti;100;Stability -segment_dijkring10_dwp02_4;10Y_024_STBI.sti;100;Piping -segment_dijkring10_dwp04_1;10Y_041_STBI.sti;100;Stability -segment_dijkring10_dwp05_4;10Y_054_STBI.sti;100;Stability -segment_dijkring10_dwp06_6;10Y_066_STBI.sti;100;Stability -segment_dijkring10_dwp09_0;10Y_090_STBI.sti;100;Stability -segment_dijkring10_dwp10_2;10Y_102_STBI.sti;100;Stability -segment_dijkring10_dwp11_7;10Y_117_STBI.sti;100;Stability -segment_dijkring10_dwp13_0;10Y_130_STBI.sti;100;Stability -segment_dijkring10_dwp14_9;10Y_149_STBI.sti;100;Stability -segment_dijkring10_dwp15_7;10Z_157_STBI.sti;100;Stability -segment_dijkring10_dwp16_5;10Z_165_STBI.sti;100;Stability -segment_dijkring10_dwp18_6;10Z_186_STBI.sti;100;Stability -segment_dijkring10_dwp19_9;10Z_199_STBI.sti;100;Stability -segment_dijkring10_dwp25_8;10Z_258_STBI.sti;100;Stability -segment_dijkring10_dwp27_5;10Z_275_STBI.sti;100;Stability -segment_dijkring10_dwp28_2;10Z_282_STBI.sti;100;Stability -segment_dijkring10_dwp38_0;10Z_380_STBI.sti;100;Stability -segment_dijkring10_dwp39_0;10Z_390_STBI.sti;100;Stability -segment_dijkring10_dwp40_0;10Z_400_STBI.sti;100;Stability -segment_dijkring10_dwp42_1;10Z_421_STBI.sti;100;Stability -segment_dijkring10_dwp43_2;10Z_432_STBI.sti;100;Stability -segment_dijkring10_dwp46_0;10Z_460_STBI.sti;100;Stability -segment_dijkring10_dwp47_5;10Z_475_STBI.sti;100;Stability +segment_dijkring10_dwp00_5;10Y_005_STBI.stix;100;Stability +segment_dijkring10_dwp00_5;10Y_005_STBI.stix;100;Piping +segment_dijkring10_dwp02_4;10Y_024_STBI.stix;100;Stability +segment_dijkring10_dwp02_4;10Y_024_STBI.stix;100;Piping +segment_dijkring10_dwp04_1;10Y_041_STBI.stix;100;Stability +segment_dijkring10_dwp05_4;10Y_054_STBI.stix;100;Stability +segment_dijkring10_dwp06_6;10Y_066_STBI.stix;100;Stability +segment_dijkring10_dwp09_0;10Y_090_STBI.stix;100;Stability +segment_dijkring10_dwp10_2;10Y_102_STBI.stix;100;Stability +segment_dijkring10_dwp11_7;10Y_117_STBI.stix;100;Stability +segment_dijkring10_dwp13_0;10Y_130_STBI.stix;100;Stability +segment_dijkring10_dwp14_9;10Y_149_STBI.stix;100;Stability +segment_dijkring10_dwp15_7;10Z_157_STBI.stix;100;Stability +segment_dijkring10_dwp16_5;10Z_165_STBI.stix;100;Stability +segment_dijkring10_dwp18_6;10Z_186_STBI.stix;100;Stability +segment_dijkring10_dwp19_9;10Z_199_STBI.stix;100;Stability +segment_dijkring10_dwp25_8;10Z_258_STBI.stix;100;Stability +segment_dijkring10_dwp27_5;10Z_275_STBI.stix;100;Stability +segment_dijkring10_dwp28_2;10Z_282_STBI.stix;100;Stability +segment_dijkring10_dwp38_0;10Z_380_STBI.stix;100;Stability +segment_dijkring10_dwp39_0;10Z_390_STBI.stix;100;Stability +segment_dijkring10_dwp40_0;10Z_400_STBI.stix;100;Stability +segment_dijkring10_dwp42_1;10Z_421_STBI.stix;100;Stability +segment_dijkring10_dwp43_2;10Z_432_STBI.stix;100;Stability +segment_dijkring10_dwp46_0;10Z_460_STBI.stix;100;Stability +segment_dijkring10_dwp47_5;10Z_475_STBI.stix;100;Stability