Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingSoilLayerTransformerTest.cs =================================================================== diff -u -r7b692ef44a3029ae881190f04c20cfd075927783 -rf7ba321e694e09374f2843d85e9b95c704f44e4f --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingSoilLayerTransformerTest.cs (.../PipingSoilLayerTransformerTest.cs) (revision 7b692ef44a3029ae881190f04c20cfd075927783) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfiles/PipingSoilLayerTransformerTest.cs (.../PipingSoilLayerTransformerTest.cs) (revision f7ba321e694e09374f2843d85e9b95c704f44e4f) @@ -38,6 +38,33 @@ [TestFixture] public class PipingSoilLayerTransformerTest { + private readonly string outerLoopSimple = string.Join(Environment.NewLine, + "6", + "..1..2..", + "........", + "........", + "........", + "........", + "..4..3.."); + + private readonly string outerLoopWide = string.Join(Environment.NewLine, + "6", + "..1..2..", + "........", + "........", + "........", + ".4....3.", + "........"); + + private readonly string innerLoopWide = string.Join(Environment.NewLine, + "6", + "...43...", + "........", + "...12...", + "........", + "........", + "........"); + [Test] public void SoilLayer1DTransform_SoilLayer1DNull_ThrowsArgumentNullException() { @@ -341,14 +368,7 @@ { // Setup List outerLoop = Segment2DLoopCollectionHelper.CreateFromString( - string.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - "........", - "..4..3..")); + outerLoopSimple); List innerLoop = Segment2DLoopCollectionHelper.CreateFromString( string.Join(Environment.NewLine, @@ -386,14 +406,7 @@ { // Setup List outerLoop = Segment2DLoopCollectionHelper.CreateFromString( - string.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - "........", - "..4..3..")); + outerLoopSimple); List innerLoop = Segment2DLoopCollectionHelper.CreateFromString( string.Join(Environment.NewLine, @@ -432,14 +445,7 @@ { // Setup List outerLoop = Segment2DLoopCollectionHelper.CreateFromString( - string.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - "........", - "..4..3..")); + outerLoopSimple); List innerLoop = Segment2DLoopCollectionHelper.CreateFromString( string.Join(Environment.NewLine, @@ -489,14 +495,7 @@ { // Setup List outerLoop = Segment2DLoopCollectionHelper.CreateFromString( - string.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - ".4....3.", - "........")); + outerLoopWide); List innerLoop = Segment2DLoopCollectionHelper.CreateFromString( string.Join(Environment.NewLine, @@ -529,18 +528,11 @@ } [Test] - public void SoilLayer2DTransform_Outer_LoopOverlappingInnerLoopsFirstInnerLoopNotOverBottom_ReturnsOneLayer() + public void SoilLayer2DTransform_OuterLoopOverlappingInnerLoopsFirstInnerLoopNotOverBottom_ReturnsOneLayer() { // Setup List outerLoop = Segment2DLoopCollectionHelper.CreateFromString( - string.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - ".4....3.", - "........")); + outerLoopWide); List innerLoop = Segment2DLoopCollectionHelper.CreateFromString( string.Join(Environment.NewLine, @@ -588,14 +580,7 @@ { // Setup List outerLoop = Segment2DLoopCollectionHelper.CreateFromString( - string.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - ".4....3.", - "........")); + outerLoopWide); List innerLoop = Segment2DLoopCollectionHelper.CreateFromString( string.Join(Environment.NewLine, @@ -632,26 +617,19 @@ public void SoilLayer2DTransform_OuterLoopInnerLoopOverlapTop_ReturnsOneLayer() { // Setup - List outerLoop = Segment2DLoopCollectionHelper.CreateFromString - (string.Join(Environment.NewLine, - "6", - "........", - "..1..2..", - "........", - "........", - ".4....3.", - "........")); - - List innerLoop = Segment2DLoopCollectionHelper.CreateFromString( + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString( string.Join(Environment.NewLine, "6", - "...43...", "........", - "...12...", + "..1..2..", "........", "........", + ".4....3.", "........")); + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString( + innerLoopWide); + SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2D(new[] { innerLoop @@ -677,24 +655,10 @@ { // Setup List outerLoop = Segment2DLoopCollectionHelper.CreateFromString( - string.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - ".4....3.", - "........")); + outerLoopWide); List innerLoop = Segment2DLoopCollectionHelper.CreateFromString( - string.Join(Environment.NewLine, - "6", - "...43...", - "........", - "...12...", - "........", - "........", - "........")); + innerLoopWide); SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2D(new[] { @@ -722,14 +686,7 @@ // Setup const double atX = 2.0; List outerLoop = Segment2DLoopCollectionHelper.CreateFromString( - string.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - "........", - "..4..3..")); + outerLoopSimple); SoilLayer2D layer = SoilLayer2DTestFactory.CreateSoilLayer2D( Enumerable.Empty(), outerLoop); @@ -750,14 +707,7 @@ // Setup const double atX = 3.0; List outerLoop = Segment2DLoopCollectionHelper.CreateFromString( - string.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - "........", - "..4..3..")); + outerLoopSimple); List innerLoop = Segment2DLoopCollectionHelper.CreateFromString( string.Join(Environment.NewLine,