Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/GenericSoilLayerParametersTest.cs =================================================================== diff -u -rc28cee59f7b527892aa7e5d8acb92fc9732196e9 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/GenericSoilLayerParametersTest.cs (.../GenericSoilLayerParametersTest.cs) (revision c28cee59f7b527892aa7e5d8acb92fc9732196e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/GenericSoilLayerParametersTest.cs (.../GenericSoilLayerParametersTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -63,7 +63,7 @@ TestDelegate test = () => parameters.CallSetOptionalStochasticParameters(null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("pipingSoilLayer", paramName); } @@ -136,8 +136,8 @@ Assert.AreEqual(permeabilityDeviation, soilLayer.PermeabilityDeviation); } - private class TestGenericSoilLayerParameters : GenericSoilLayerParameters { - + private class TestGenericSoilLayerParameters : GenericSoilLayerParameters + { /// /// Simply calls the implementation of the protected /// . Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs =================================================================== diff -u -r7fae71414e3c8eb1a72de4c173850498104205bd -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs (.../SoilDatabaseQueryBuilderTest.cs) (revision 7fae71414e3c8eb1a72de4c173850498104205bd) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilDatabaseQueryBuilderTest.cs (.../SoilDatabaseQueryBuilderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -67,7 +67,7 @@ const string expectedQuery = "SELECT (" + "SELECT COUNT(DISTINCT sl1D.SP1D_ID) " + "FROM Mechanism AS m " + - "JOIN Segment AS segment USING(ME_ID) "+ + "JOIN Segment AS segment USING(ME_ID) " + "JOIN StochasticSoilProfile ssp USING(SSM_ID) " + "JOIN SoilLayer1D sl1D USING(SP1D_ID) " + "WHERE m.ME_Name = @ME_Name" + Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer1DTest.cs =================================================================== diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer1DTest.cs (.../SoilLayer1DTest.cs) (revision 7f759fbabca9c41e75d229269f1b21581b373b5f) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer1DTest.cs (.../SoilLayer1DTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -23,6 +23,7 @@ using System.Drawing; using NUnit.Framework; using Ringtoets.Piping.IO.Builders; +using Ringtoets.Piping.Primitives; namespace Ringtoets.Piping.IO.Test.Builders { @@ -63,7 +64,7 @@ [Test] [TestCase(1.0)] - [TestCase(1.0+1e-12)] + [TestCase(1.0 + 1e-12)] [TestCase(2.0)] public void AsPipingSoilLayer_PropertiesSetWithCorrectDistributionsAndDifferentLayerParameters_PropertiesAreSetInPipingSoilLayer(double isAquifer) { @@ -93,17 +94,14 @@ MaterialName = materialName, IsAquifer = isAquifer, Color = color.ToArgb(), - BelowPhreaticLevelDistribution = belowPhreaticLevelDistribution, BelowPhreaticLevelShift = belowPhreaticLevelShift, BelowPhreaticLevelMean = belowPhreaticLevelMean, BelowPhreaticLevelDeviation = belowPhreaticLevelDeviation, - DiameterD70Distribution = diameterD70Distribution, DiameterD70Shift = diameterD70Shift, DiameterD70Mean = diameterD70Mean, DiameterD70Deviation = diameterD70Deviation, - PermeabilityDistribution = permeabilityDistribution, PermeabilityShift = permeabilityShift, PermeabilityMean = permeabilityMean, @@ -140,7 +138,7 @@ TestDelegate test = () => layer.AsPipingSoilLayer(); // Assert - var message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; Assert.AreEqual(string.Format("Parameter '{0}' is niet verschoven lognormaal verdeeld.", "Verzadigd gewicht"), message); } @@ -167,20 +165,20 @@ TestDelegate test = () => layer.AsPipingSoilLayer(); // Assert - var message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; Assert.AreEqual(string.Format("Parameter '{0}' is niet lognormaal verdeeld.", expectedParameter), message); } [Test] - [TestCase(-1e-6,0.0,"Korrelgrootte")] - [TestCase(0.0,9,"Doorlatendheid")] + [TestCase(-1e-6, 0.0, "Korrelgrootte")] + [TestCase(0.0, 9, "Doorlatendheid")] public void AsPipingSoilLayer_ShiftNotZero_ThrowsSoilLayerConversionException( double diameterD70Shift, double permeabilityShift, string expectedParameter) { // Setup - var validDistribution = SoilLayerConstants.LogNormalDistributionValue; + long validDistribution = SoilLayerConstants.LogNormalDistributionValue; var layer = new SoilLayer1D(1.0) { DiameterD70Distribution = validDistribution, @@ -193,7 +191,7 @@ TestDelegate test = () => layer.AsPipingSoilLayer(); // Assert - var message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; Assert.AreEqual(string.Format("Parameter '{0}' is niet lognormaal verdeeld.", expectedParameter), message); } @@ -206,7 +204,7 @@ var layer = new SoilLayer1D(top); // Call - var result = layer.AsPipingSoilLayer(); + PipingSoilLayer result = layer.AsPipingSoilLayer(); // Assert Assert.IsEmpty(result.MaterialName); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer2DTest.cs =================================================================== diff -u -rc28cee59f7b527892aa7e5d8acb92fc9732196e9 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer2DTest.cs (.../SoilLayer2DTest.cs) (revision c28cee59f7b527892aa7e5d8acb92fc9732196e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayer2DTest.cs (.../SoilLayer2DTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -23,14 +23,12 @@ using System.Collections.Generic; using System.Drawing; using System.Linq; - using Core.Common.Base.Geometry; - using NUnit.Framework; - using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.IO.Builders; using Ringtoets.Piping.IO.Properties; +using Ringtoets.Piping.Primitives; namespace Ringtoets.Piping.IO.Test.Builders { @@ -85,7 +83,7 @@ }; // Assert - var exception = Assert.Throws(test); + ArgumentException exception = Assert.Throws(test); Assert.AreEqual("De segmenten van de geometrie van de laag vormen geen lus.", exception.Message); } @@ -96,21 +94,21 @@ { // Setup var layer = new SoilLayer2D(); - var pointA = new Point2D(0.0,0.0); - var pointB = new Point2D(1.0,0.0); - var pointC = new Point2D(1.0,1.0); - var pointD = new Point2D(0.0,diff); + var pointA = new Point2D(0.0, 0.0); + var pointB = new Point2D(1.0, 0.0); + var pointC = new Point2D(1.0, 1.0); + var pointD = new Point2D(0.0, diff); // Call TestDelegate test = () => layer.OuterLoop = new List { - new Segment2D(pointA,pointB), - new Segment2D(pointB,pointC), - new Segment2D(pointC,pointD), + new Segment2D(pointA, pointB), + new Segment2D(pointB, pointC), + new Segment2D(pointC, pointD), }; // Assert - var exception = Assert.Throws(test); + ArgumentException exception = Assert.Throws(test); Assert.AreEqual("De segmenten van de geometrie van de laag vormen geen lus.", exception.Message); } @@ -125,14 +123,14 @@ // Call layer.OuterLoop = new List { - new Segment2D(pointA,pointB), - new Segment2D(pointB,pointA) + new Segment2D(pointA, pointB), + new Segment2D(pointB, pointA) }; // Assert Assert.NotNull(layer.OuterLoop); - Assert.AreEqual(new Segment2D(pointA,pointB), layer.OuterLoop.ElementAt(0)); - Assert.AreEqual(new Segment2D(pointB,pointA), layer.OuterLoop.ElementAt(1)); + Assert.AreEqual(new Segment2D(pointA, pointB), layer.OuterLoop.ElementAt(0)); + Assert.AreEqual(new Segment2D(pointB, pointA), layer.OuterLoop.ElementAt(1)); } [Test] @@ -147,9 +145,9 @@ // Call layer.OuterLoop = new List { - new Segment2D(pointA,pointB), - new Segment2D(pointB,pointC), - new Segment2D(pointC,pointA) + new Segment2D(pointA, pointB), + new Segment2D(pointB, pointC), + new Segment2D(pointC, pointA) }; // Assert @@ -178,7 +176,7 @@ }); // Assert - var exception = Assert.Throws(test); + ArgumentException exception = Assert.Throws(test); Assert.AreEqual("De segmenten van de geometrie van de laag vormen geen lus.", exception.Message); } @@ -189,21 +187,21 @@ { // Setup var layer = new SoilLayer2D(); - var pointA = new Point2D(0.0,0.0); - var pointB = new Point2D(1.0,0.0); - var pointC = new Point2D(1.0,1.0); - var pointD = new Point2D(0.0,diff); + var pointA = new Point2D(0.0, 0.0); + var pointB = new Point2D(1.0, 0.0); + var pointC = new Point2D(1.0, 1.0); + var pointD = new Point2D(0.0, diff); // Call TestDelegate test = () => layer.AddInnerLoop(new List { - new Segment2D(pointA,pointB), - new Segment2D(pointB,pointC), - new Segment2D(pointC,pointD), + new Segment2D(pointA, pointB), + new Segment2D(pointB, pointC), + new Segment2D(pointC, pointD), }); // Assert - var exception = Assert.Throws(test); + ArgumentException exception = Assert.Throws(test); Assert.AreEqual("De segmenten van de geometrie van de laag vormen geen lus.", exception.Message); } @@ -218,8 +216,8 @@ // Call layer.AddInnerLoop(new List { - new Segment2D(pointA,pointB), - new Segment2D(pointB,pointA) + new Segment2D(pointA, pointB), + new Segment2D(pointB, pointA) }); // Assert @@ -240,14 +238,14 @@ // Call layer.AddInnerLoop(new List { - new Segment2D(pointA,pointB), - new Segment2D(pointB,pointC), - new Segment2D(pointC,pointA) + new Segment2D(pointA, pointB), + new Segment2D(pointB, pointC), + new Segment2D(pointC, pointA) }); // Assert Assert.AreEqual(1, layer.InnerLoops.Count()); - Assert.AreEqual(new Segment2D(pointA,pointB), layer.InnerLoops.ElementAt(0)[0]); + Assert.AreEqual(new Segment2D(pointA, pointB), layer.InnerLoops.ElementAt(0)[0]); Assert.AreEqual(new Segment2D(pointB, pointC), layer.InnerLoops.ElementAt(0)[1]); Assert.AreEqual(new Segment2D(pointC, pointA), layer.InnerLoops.ElementAt(0)[2]); } @@ -260,7 +258,7 @@ double bottom; // Call - var result = layer.AsPipingSoilLayers(0.0, out bottom); + IEnumerable result = layer.AsPipingSoilLayers(0.0, out bottom); // Assert CollectionAssert.IsEmpty(result); @@ -298,50 +296,38 @@ MaterialName = materialName, IsAquifer = 1.0, Color = color.ToArgb(), - BelowPhreaticLevelDistribution = logNormalDistribution, BelowPhreaticLevelShift = logNormalShift, BelowPhreaticLevelMean = belowPhreaticLevelMean, BelowPhreaticLevelDeviation = belowPhreaticLevelDeviation, - DiameterD70Distribution = logNormalDistribution, DiameterD70Shift = logNormalShift, DiameterD70Mean = diameterD70Mean, DiameterD70Deviation = diameterD70Deviation, - PermeabilityDistribution = logNormalDistribution, PermeabilityShift = logNormalShift, PermeabilityMean = permeabilityMean, PermeabilityDeviation = permeabilityDeviation, - OuterLoop = new List { - new Segment2D( - new Point2D(x1, y1), - new Point2D(x3, y1) - ), - new Segment2D( - new Point2D(x3, y1), - new Point2D(x3, y2) - ), - new Segment2D( - new Point2D(x3, y2), - new Point2D(x1, y2) - ), - new Segment2D( - new Point2D(x1, y1), - new Point2D(x1, y2) - ) + new Segment2D(new Point2D(x1, y1), + new Point2D(x3, y1)), + new Segment2D(new Point2D(x3, y1), + new Point2D(x3, y2)), + new Segment2D(new Point2D(x3, y2), + new Point2D(x1, y2)), + new Segment2D(new Point2D(x1, y1), + new Point2D(x1, y2)) } }; // Call - var result = layer.AsPipingSoilLayers(x2, out bottom).ToArray(); + PipingSoilLayer[] result = layer.AsPipingSoilLayers(x2, out bottom).ToArray(); // Assert Assert.AreEqual(1, result.Length); Assert.AreEqual(y1, bottom, 1e-6); - var resultLayer = result.First(); + PipingSoilLayer resultLayer = result.First(); Assert.AreEqual(y2, resultLayer.Top, 1e-6); Assert.IsTrue(resultLayer.IsAquifer); Assert.AreEqual(materialName, resultLayer.MaterialName); @@ -363,20 +349,16 @@ { OuterLoop = new List { - new Segment2D( - new Point2D(0, 1), - new Point2D(1, 1) - ), - new Segment2D( - new Point2D(1, 1), - new Point2D(0, 1) - ) + new Segment2D(new Point2D(0, 1), + new Point2D(1, 1)), + new Segment2D(new Point2D(1, 1), + new Point2D(0, 1)) } }; double bottom; // Call - var result = layer.AsPipingSoilLayers(0, out bottom).ToArray(); + PipingSoilLayer[] result = layer.AsPipingSoilLayers(0, out bottom).ToArray(); // Assert Assert.AreEqual(1, result.Length); @@ -395,20 +377,16 @@ { OuterLoop = new List { - new Segment2D( - new Point2D(1.0, y1), - new Point2D(1.2, y2) - ), - new Segment2D( - new Point2D(1.2, y2), - new Point2D(1.0, y1) - ) + new Segment2D(new Point2D(1.0, y1), + new Point2D(1.2, y2)), + new Segment2D(new Point2D(1.2, y2), + new Point2D(1.0, y1)) } }; double bottom; // Call - var result = layer.AsPipingSoilLayers(0.0, out bottom); + IEnumerable result = layer.AsPipingSoilLayers(0.0, out bottom); // Assert CollectionAssert.IsEmpty(result); @@ -424,20 +402,16 @@ { OuterLoop = new List { - new Segment2D( - new Point2D(-0.1, expectedZ), - new Point2D(0.1, expectedZ) - ), - new Segment2D( - new Point2D(-0.1, expectedZ), - new Point2D(0.1, expectedZ) - ) + new Segment2D(new Point2D(-0.1, expectedZ), + new Point2D(0.1, expectedZ)), + new Segment2D(new Point2D(-0.1, expectedZ), + new Point2D(0.1, expectedZ)) } }; double bottom; // Call - var result = layer.AsPipingSoilLayers(0.0, out bottom).ToArray(); + PipingSoilLayer[] result = layer.AsPipingSoilLayers(0.0, out bottom).ToArray(); // Assert Assert.AreEqual(1, result.Length); @@ -449,14 +423,14 @@ public void AsPipingSoilLayers_OuterLoopComplex_ReturnsTwoLayers() { // Setup - var outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "..8.7...", - "..5.6...", - "..4..3..", - "........")); + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "..1..2..", + "........", + "..8.7...", + "..5.6...", + "..4..3..", + "........")); var layer = new SoilLayer2D { @@ -465,35 +439,39 @@ // Call double bottom; - var result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); + PipingSoilLayer[] result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); // Assert Assert.AreEqual(2, result.Length); Assert.AreEqual(1.0, bottom); - CollectionAssert.AreEquivalent(new[] { 5.0, 2.0 }, result.Select(rl => rl.Top)); + CollectionAssert.AreEquivalent(new[] + { + 5.0, + 2.0 + }, result.Select(rl => rl.Top)); } [Test] public void AsPipingSoilLayers_OuterLoopInnerLoopSimple_ReturnsTwoLayers() { // Setup - var outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - "........", - "..4..3..")); + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "..1..2..", + "........", + "........", + "........", + "........", + "..4..3..")); - var innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "........", - "...12...", - "........", - "........", - "...43...", - "........")); + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "........", + "...12...", + "........", + "........", + "...43...", + "........")); var layer = new SoilLayer2D { @@ -503,35 +481,39 @@ // Call double bottom; - var result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); + PipingSoilLayer[] result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); // Assert Assert.AreEqual(2, result.Length); Assert.AreEqual(0, bottom); - CollectionAssert.AreEquivalent(new [] {5.0, 1.0}, result.Select(rl => rl.Top)); + CollectionAssert.AreEquivalent(new[] + { + 5.0, + 1.0 + }, result.Select(rl => rl.Top)); } [Test] public void AsPipingSoilLayers_OuterLoopInnerLoopComplex_ReturnsThreeLayers() { // Setup - var outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - "........", - "..4..3..")); + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "..1..2..", + "........", + "........", + "........", + "........", + "..4..3..")); - var innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "........", - "...1.2..", - "...87...", - "...56...", - "...4.3..", - "........")); + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "........", + "...1.2..", + "...87...", + "...56...", + "...4.3..", + "........")); var layer = new SoilLayer2D { @@ -541,44 +523,49 @@ // Call double bottom; - var result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); + PipingSoilLayer[] result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); // Assert Assert.AreEqual(3, result.Length); Assert.AreEqual(0, bottom); - CollectionAssert.AreEquivalent(new[] { 5.0, 3.0, 1.0 }, result.Select(rl => rl.Top)); + CollectionAssert.AreEquivalent(new[] + { + 5.0, + 3.0, + 1.0 + }, result.Select(rl => rl.Top)); } [Test] public void AsPipingSoilLayers_OuterLoopMultipleInnerLoops_ReturnsThreeLayers() { // Setup - var outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - "........", - "..4..3..")); + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "..1..2..", + "........", + "........", + "........", + "........", + "..4..3..")); - var innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "........", - "...12...", - "...43...", - "........", - "........", - "........")); + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "........", + "...12...", + "...43...", + "........", + "........", + "........")); - var innerLoop2 = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "........", - "........", - "........", - "........", - "...12...", - "........")); + List innerLoop2 = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "........", + "........", + "........", + "........", + "...12...", + "........")); var layer = new SoilLayer2D { @@ -589,35 +576,40 @@ // Call double bottom; - var result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); + PipingSoilLayer[] result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); // Assert Assert.AreEqual(3, result.Length); Assert.AreEqual(0, bottom); - CollectionAssert.AreEquivalent(new[] { 5.0, 3.0, 1.0 }, result.Select(rl => rl.Top)); + CollectionAssert.AreEquivalent(new[] + { + 5.0, + 3.0, + 1.0 + }, result.Select(rl => rl.Top)); } [Test] public void AsPipingSoilLayers_OuterLoopOverlappingInnerLoop_ReturnsOneLayer() { // Setup - var outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - ".4....3.", - "........")); + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "..1..2..", + "........", + "........", + "........", + ".4....3.", + "........")); - var innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "........", - "........", - "........", - "...12...", - "........", - "...43...")); + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "........", + "........", + "........", + "...12...", + "........", + "...43...")); var layer = new SoilLayer2D { @@ -627,44 +619,47 @@ // Call double bottom; - var result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); + PipingSoilLayer[] result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); // Assert Assert.AreEqual(1, result.Length); Assert.AreEqual(2.0, bottom); - CollectionAssert.AreEquivalent(new[] { 5.0 }, result.Select(rl => rl.Top)); + CollectionAssert.AreEquivalent(new[] + { + 5.0 + }, result.Select(rl => rl.Top)); } [Test] public void AsPipingSoilLayers_OuterLoopOverlappingInnerLoopsFirstInnerLoopNotOverBottom_ReturnsOneLayer() { // Setup - var outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - ".4....3.", - "........")); + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "..1..2..", + "........", + "........", + "........", + ".4....3.", + "........")); - var innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "........", - "...12...", - "........", - "...43...", - "........", - "........")); + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "........", + "...12...", + "........", + "...43...", + "........", + "........")); - var innerLoop2 = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "........", - "........", - "...12...", - "........", - "........", - "...43...")); + List innerLoop2 = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "........", + "........", + "...12...", + "........", + "........", + "...43...")); var layer = new SoilLayer2D { @@ -675,35 +670,38 @@ // Call double bottom; - var result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); + PipingSoilLayer[] result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); // Assert Assert.AreEqual(1, result.Length); Assert.AreEqual(4.0, bottom); - CollectionAssert.AreEquivalent(new[] { 5.0 }, result.Select(rl => rl.Top)); + CollectionAssert.AreEquivalent(new[] + { + 5.0 + }, result.Select(rl => rl.Top)); } [Test] public void AsPipingSoilLayers_OuterLoopInnerLoopOnBorderBottom_ReturnsTwoLayers() { // Setup - var outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - ".4....3.", - "........")); + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "..1..2..", + "........", + "........", + "........", + ".4....3.", + "........")); - var innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "........", - "........", - "...12...", - "........", - "...43...", - "........")); + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "........", + "........", + "...12...", + "........", + "...43...", + "........")); var layer = new SoilLayer2D { @@ -713,35 +711,39 @@ // Call double bottom; - var result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); + PipingSoilLayer[] result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); // Assert Assert.AreEqual(2, result.Length); Assert.AreEqual(3.0, bottom); - CollectionAssert.AreEquivalent(new[] { 5.0, 1.0 }, result.Select(rl => rl.Top)); + CollectionAssert.AreEquivalent(new[] + { + 5.0, + 1.0 + }, result.Select(rl => rl.Top)); } [Test] public void AsPipingSoilLayers_OuterLoopInnerLoopOverlapTop_ReturnsOneLayer() { // Setup - var outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "........", - "..1..2..", - "........", - "........", - ".4....3.", - "........")); + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "........", + "..1..2..", + "........", + "........", + ".4....3.", + "........")); - var innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "...43...", - "........", - "...12...", - "........", - "........", - "........")); + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "...43...", + "........", + "...12...", + "........", + "........", + "........")); var layer = new SoilLayer2D { @@ -751,35 +753,38 @@ // Call double bottom; - var result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); + PipingSoilLayer[] result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); // Assert Assert.AreEqual(1, result.Length); Assert.AreEqual(1.0, bottom); - CollectionAssert.AreEquivalent(new[] { 3.0 }, result.Select(rl => rl.Top)); + CollectionAssert.AreEquivalent(new[] + { + 3.0 + }, result.Select(rl => rl.Top)); } [Test] public void AsPipingSoilLayers_OuterLoopInnerLoopOnBorderTop_ReturnsOneLayer() { // Setup - var outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - ".4....3.", - "........")); + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "..1..2..", + "........", + "........", + "........", + ".4....3.", + "........")); - var innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "...43...", - "........", - "...12...", - "........", - "........", - "........")); + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "...43...", + "........", + "...12...", + "........", + "........", + "........")); var layer = new SoilLayer2D { @@ -789,27 +794,30 @@ // Call double bottom; - var result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); + PipingSoilLayer[] result = layer.AsPipingSoilLayers(3.5, out bottom).ToArray(); // Assert Assert.AreEqual(1, result.Length); Assert.AreEqual(1.0, bottom); - CollectionAssert.AreEquivalent(new[] { 3.0 }, result.Select(rl => rl.Top)); + CollectionAssert.AreEquivalent(new[] + { + 3.0 + }, result.Select(rl => rl.Top)); } [Test] public void AsPipingSoilLayers_OuterLoopVerticalAtX_ThrowsException() { // Setup var atX = 2.0; - var outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - "........", - "..4..3..")); + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "..1..2..", + "........", + "........", + "........", + "........", + "..4..3..")) var layer = new SoilLayer2D { @@ -821,7 +829,7 @@ TestDelegate test = () => layer.AsPipingSoilLayers(atX, out bottom); // Assert - var exception = Assert.Throws(test); + SoilLayerConversionException exception = Assert.Throws(test); Assert.AreEqual(String.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_X_0_, atX), exception.Message); } @@ -830,23 +838,23 @@ { // Setup var atX = 3.0; - var outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "..1..2..", - "........", - "........", - "........", - "........", - "..4..3..")); + List outerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "..1..2..", + "........", + "........", + "........", + "........", + "..4..3..")); - var innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "6", - "........", - "...1.2..", - "........", - "........", - "...4.3..", - "........")); + List innerLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "6", + "........", + "...1.2..", + "........", + "........", + "...4.3..", + "........")); var layer = new SoilLayer2D { @@ -859,7 +867,7 @@ TestDelegate test = () => layer.AsPipingSoilLayers(atX, out bottom); // Assert - var exception = Assert.Throws(test); + SoilLayerConversionException exception = Assert.Throws(test); Assert.AreEqual(String.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_X_0_, atX), exception.Message); } @@ -878,7 +886,7 @@ TestDelegate test = () => layer.AsPipingSoilLayers(0, out bottom); // Assert - var message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; Assert.AreEqual(string.Format("Parameter '{0}' is niet verschoven lognormaal verdeeld.", "Verzadigd gewicht"), message); } @@ -907,7 +915,7 @@ TestDelegate test = () => layer.AsPipingSoilLayers(0, out bottom); // Assert - var message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; Assert.AreEqual(string.Format("Parameter '{0}' is niet lognormaal verdeeld.", expectedParameter), message); } @@ -920,7 +928,7 @@ string expectedParameter) { // Setup - var validDistribution = SoilLayerConstants.LogNormalDistributionValue; + long validDistribution = SoilLayerConstants.LogNormalDistributionValue; var layer = new SoilLayer2D { DiameterD70Distribution = validDistribution, @@ -935,7 +943,7 @@ TestDelegate test = () => layer.AsPipingSoilLayers(0, out bottom); // Assert - var message = Assert.Throws(test).Message; + string message = Assert.Throws(test).Message; Assert.AreEqual(string.Format("Parameter '{0}' is niet lognormaal verdeeld.", expectedParameter), message); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayerConversionExceptionTest.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayerConversionExceptionTest.cs (.../SoilLayerConversionExceptionTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilLayerConversionExceptionTest.cs (.../SoilLayerConversionExceptionTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -32,7 +32,8 @@ public void DefaultConstructor_InnerExceptionNullAndMessageDefault() { // Setup - var expectedMessage = string.Format("Exception of type '{0}' was thrown.", typeof(SoilLayerConversionException).FullName); + var expectedMessage = string.Format("Exception of type '{0}' was thrown.", + typeof(SoilLayerConversionException).FullName); // Call var exception = new SoilLayerConversionException(); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs =================================================================== diff -u -rcb6877f670bacc7a6a896ab132d592eeef1107b5 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs (.../SoilProfileBuilder2DTest.cs) (revision cb6877f670bacc7a6a896ab132d592eeef1107b5) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilder2DTest.cs (.../SoilProfileBuilder2DTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -43,8 +43,8 @@ TestDelegate test = () => new SoilProfileBuilder2D(name, double.NaN, 0); // Assert - var exception = Assert.Throws(test); - var message = string.Format(Resources.Error_SoilProfileBuilder_cant_determine_intersect_SoilProfileName_0_at_double_NaN, name); + ArgumentException exception = Assert.Throws(test); + string message = string.Format(Resources.Error_SoilProfileBuilder_cant_determine_intersect_SoilProfileName_0_at_double_NaN, name); Assert.AreEqual(message, exception.Message); } @@ -68,31 +68,24 @@ var atX = 0.0; var builder = new SoilProfileBuilder2D(profileName, atX, 0); - SoilLayer2D soilLayer = new SoilLayer2D + var soilLayer = new SoilLayer2D { OuterLoop = new List { - new Segment2D - ( - new Point2D(atX, 0.0), - new Point2D(atX, 1.0) - ), - new Segment2D( - new Point2D(atX, 1.0), - new Point2D(0.5, 0.5) - ), - new Segment2D( - new Point2D(0.5, 0.5), - new Point2D(atX, 0.0) - ) + new Segment2D(new Point2D(atX, 0.0), + new Point2D(atX, 1.0)), + new Segment2D(new Point2D(atX, 1.0), + new Point2D(0.5, 0.5)), + new Segment2D(new Point2D(0.5, 0.5), + new Point2D(atX, 0.0)) } }; // Call TestDelegate test = () => builder.Add(soilLayer); // Assert - var exception = Assert.Throws(test); + SoilProfileBuilderException exception = Assert.Throws(test); Assert.IsInstanceOf(exception.InnerException); var message = string.Format("Er kan geen 1D-profiel bepaald worden wanneer segmenten in een 2D laag verticaal lopen op de gekozen positie: x = {0}.", atX); Assert.AreEqual(message, exception.Message); @@ -167,8 +160,7 @@ "...", "1.2", "4.3", - "..." - )) + "...")) }).Add(new SoilLayer2D { OuterLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, @@ -182,8 +174,7 @@ "...", "1.2", "...", - "..." - )) + "...")) }).Add(new SoilLayer2D { OuterLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, @@ -197,8 +188,7 @@ "...", "...", "...", - "..." - )), + "...")), IsAquifer = 1.0 }); @@ -225,14 +215,13 @@ var profileName = "SomeProfile"; const long pipingSoilProfileId = 1234L; var builder = new SoilProfileBuilder2D(profileName, 2.0, pipingSoilProfileId); - var loopHole = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, - "5", - ".....", - ".4.1.", - ".3.2.", - ".....", - "....." - )); + List loopHole = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, + "5", + ".....", + ".4.1.", + ".3.2.", + ".....", + ".....")); var soilLayer2D = new SoilLayer2D { OuterLoop = Segment2DLoopCollectionHelper.CreateFromString(String.Join(Environment.NewLine, @@ -241,8 +230,7 @@ ".....", ".....", ".....", - "1...4" - )), + "1...4")), IsAquifer = 1.0 }; soilLayer2D.AddInnerLoop(loopHole); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilderExceptionTest.cs =================================================================== diff -u -r751aaf9b7623bac357cbacf4e6ddae87b2b69f1f -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilderExceptionTest.cs (.../SoilProfileBuilderExceptionTest.cs) (revision 751aaf9b7623bac357cbacf4e6ddae87b2b69f1f) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Builders/SoilProfileBuilderExceptionTest.cs (.../SoilProfileBuilderExceptionTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -32,7 +32,8 @@ public void DefaultConstructor_InnerExceptionNullAndMessageDefault() { // Setup - var expectedMessage = string.Format("Exception of type '{0}' was thrown.", typeof(SoilProfileBuilderException).FullName); + var expectedMessage = string.Format("Exception of type '{0}' was thrown.", + typeof(SoilProfileBuilderException).FullName); // Call var exception = new SoilProfileBuilderException(); @@ -69,6 +70,6 @@ // Assert Assert.AreSame(expectedInnerException, exception.InnerException); Assert.AreEqual(expectedMessage, exception.Message); -} + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Exceptions/PipingSoilProfileReadExceptionTest.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Exceptions/PipingSoilProfileReadExceptionTest.cs (.../PipingSoilProfileReadExceptionTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Exceptions/PipingSoilProfileReadExceptionTest.cs (.../PipingSoilProfileReadExceptionTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -33,7 +33,8 @@ { // Setup var profileName = "name"; - var expectedMessage = string.Format("Exception of type '{0}' was thrown.", typeof(PipingSoilProfileReadException).FullName); + var expectedMessage = string.Format("Exception of type '{0}' was thrown.", + typeof(PipingSoilProfileReadException).FullName); // Call var exception = new PipingSoilProfileReadException(profileName); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/CriticalProfilePropertiesTest.cs =================================================================== diff -u -r751aaf9b7623bac357cbacf4e6ddae87b2b69f1f -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/CriticalProfilePropertiesTest.cs (.../CriticalProfilePropertiesTest.cs) (revision 751aaf9b7623bac357cbacf4e6ddae87b2b69f1f) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/CriticalProfilePropertiesTest.cs (.../CriticalProfilePropertiesTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -86,9 +86,9 @@ TestDelegate test = () => new CriticalProfileProperties(reader); // Assert - var exception = Assert.Throws(test); + CriticalFileReadException exception = Assert.Throws(test); Assert.AreSame(invalidCastException, exception.InnerException); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + string expectedMessage = new FileReaderErrorMessageBuilder(path) .Build(Resources.PipingSoilProfileReader_Critical_Unexpected_value_on_column); Assert.AreEqual(expectedMessage, exception.Message); @@ -114,9 +114,9 @@ TestDelegate test = () => new CriticalProfileProperties(reader); // Assert - var exception = Assert.Throws(test); + CriticalFileReadException exception = Assert.Throws(test); Assert.AreSame(invalidCastException, exception.InnerException); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithSubject(string.Format("ondergrondschematisatie '{0}'", profileName)) .Build(Resources.PipingSoilProfileReader_Critical_Unexpected_value_on_column); Assert.AreEqual(expectedMessage, exception.Message); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/LayerPropertiesTest.cs =================================================================== diff -u -rc28cee59f7b527892aa7e5d8acb92fc9732196e9 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/LayerPropertiesTest.cs (.../LayerPropertiesTest.cs) (revision c28cee59f7b527892aa7e5d8acb92fc9732196e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/LayerPropertiesTest.cs (.../LayerPropertiesTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -38,7 +38,7 @@ TestDelegate test = () => new LayerProperties(null, ""); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("reader", paramName); } @@ -54,7 +54,7 @@ TestDelegate test = () => new LayerProperties(reader, null); // Assert - var paramName = Assert.Throws(test).ParamName; + string paramName = Assert.Throws(test).ParamName; Assert.AreEqual("profileName", paramName); mocks.VerifyAll(); } @@ -98,7 +98,6 @@ reader.Expect(r => r.ReadOrDefault(SoilProfileDatabaseColumns.PermeabilityDeviation)).Return(permeabilityDeviation); mocks.ReplayAll(); - // Call var properties = new LayerProperties(reader, ""); @@ -118,6 +117,7 @@ Assert.AreEqual(permeabilityDeviation, properties.PermeabilityDeviation); mocks.VerifyAll(); } + [Test] public void LayerProperties_ReaderThrowsInvalidCastException_ThrowsPipingSoilProfileReadException() { @@ -141,7 +141,7 @@ path, profileName); - var exception = Assert.Throws(test); + PipingSoilProfileReadException exception = Assert.Throws(test); Assert.AreEqual(expectedMessage, exception.Message); Assert.AreEqual(profileName, exception.ProfileName); mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs (.../PipingSoilProfileReaderTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs (.../PipingSoilProfileReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -47,7 +47,7 @@ public void Constructor_NonExistingPath_ThrowsCriticalFileReadException() { // Setup - var testFile = Path.Combine(testDataPath, "none.soil"); + string testFile = Path.Combine(testDataPath, "none.soil"); // Call TestDelegate test = () => { using (new PipingSoilProfileReader(testFile)) {} }; @@ -67,9 +67,9 @@ TestDelegate test = () => { using (new PipingSoilProfileReader(fileName)) {} }; // Assert - var exception = Assert.Throws(test); - var expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': {1}", - fileName, UtilsResources.Error_Path_must_be_specified); + CriticalFileReadException exception = Assert.Throws(test); + string expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': {1}", + fileName, UtilsResources.Error_Path_must_be_specified); Assert.AreEqual(expectedMessage, exception.Message); } @@ -79,8 +79,9 @@ public void Constructor_IncorrectFormatFileOrInvalidSchema_ThrowsPipingCriticalFileReadException(string dbName) { // Setup - var dbFile = Path.Combine(testDataPath, dbName); - var expectedMessage = new FileReaderErrorMessageBuilder(dbFile).Build(String.Format(Resources.PipingSoilProfileReader_Critical_Unexpected_value_on_column, dbName)); + string dbFile = Path.Combine(testDataPath, dbName); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile) + .Build(String.Format(Resources.PipingSoilProfileReader_Critical_Unexpected_value_on_column, dbName)); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -98,7 +99,7 @@ public void ParameteredConstructor_PathToExistingFile_ExpectedValues() { // Setup - var dbName = "emptyschema.soil"; + string dbName = "emptyschema.soil"; string dbFile = Path.Combine(testDataPath, dbName); // Call @@ -114,8 +115,8 @@ public void Constructor_EmptyDatabase_HasNextFalse() { // Setup - var dbName = "emptyschema.soil"; - var dbFile = Path.Combine(testDataPath, dbName); + string dbName = "emptyschema.soil"; + string dbFile = Path.Combine(testDataPath, dbName); // Call using (var pipingSoilProfileReader = new PipingSoilProfileReader(dbFile)) @@ -132,7 +133,7 @@ // Setup var version = "15.0.5.0"; var dbName = "incorrectversion.soil"; - var dbFile = Path.Combine(testDataPath, dbName); + string dbFile = Path.Combine(testDataPath, dbName); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -141,7 +142,7 @@ TestDelegate test = () => { using (new PipingSoilProfileReader(dbFile)) {} }; // Assert - var exception = Assert.Throws(test); + CriticalFileReadException exception = Assert.Throws(test); Assert.AreEqual(String.Format(Resources.PipingSoilProfileReader_Database_incorrect_version_requires_Version_0_, version), exception.Message); Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } @@ -151,7 +152,7 @@ { // Setup var testFile = "1dprofile.soil"; - var dbFile = Path.Combine(testDataPath, testFile); + string dbFile = Path.Combine(testDataPath, testFile); using (var pipingSoilProfileReader = new PipingSoilProfileReader(dbFile)) { @@ -170,7 +171,7 @@ { // Setup var testFile = "combined1d2d.soil"; - var dbFile = Path.Combine(testDataPath, testFile); + string dbFile = Path.Combine(testDataPath, testFile); using (var pipingSoilProfilesReader = new PipingSoilProfileReader(dbFile)) { @@ -197,7 +198,7 @@ { // Setup var testFile = "1dprofileWithEmpty1d.soil"; - var dbFile = Path.Combine(testDataPath, testFile); + string dbFile = Path.Combine(testDataPath, testFile); var expextedProfileName = "Profile"; using (var pipingSoilProfilesReader = new PipingSoilProfileReader(dbFile)) @@ -229,14 +230,14 @@ TestDelegate profile = () => pipingSoilProfilesReader.ReadProfile(); // Assert - var exception = Assert.Throws(profile); - var expectedMessage = new FileReaderErrorMessageBuilder(databaseFilePath) + PipingSoilProfileReadException exception = Assert.Throws(profile); + string expectedMessage = new FileReaderErrorMessageBuilder(databaseFilePath) .WithSubject("ondergrondschematisatie 'Profile'") .Build(Resources.SoilLayer2DReader_Geometry_contains_no_valid_xml); Assert.AreEqual(expectedMessage, exception.Message); // Call - var pipingSoilProfile = pipingSoilProfilesReader.ReadProfile(); + PipingSoilProfile pipingSoilProfile = pipingSoilProfilesReader.ReadProfile(); // Assert Assert.AreEqual("Profile2", pipingSoilProfile.Name); @@ -258,14 +259,14 @@ TestDelegate profile = () => pipingSoilProfilesReader.ReadProfile(); // Assert - var exception = Assert.Throws(profile); - var message = new FileReaderErrorMessageBuilder(databaseFilePath) + PipingSoilProfileReadException exception = Assert.Throws(profile); + string message = new FileReaderErrorMessageBuilder(databaseFilePath) .WithSubject("ondergrondschematisatie 'Profile'") .Build(String.Format(Resources.Error_Can_not_determine_1D_profile_with_vertical_segments_at_X_0_, 85.2)); Assert.AreEqual(message, exception.Message); // Call - var pipingSoilProfile = pipingSoilProfilesReader.ReadProfile(); + PipingSoilProfile pipingSoilProfile = pipingSoilProfilesReader.ReadProfile(); // Assert Assert.AreEqual("Profile2", pipingSoilProfile.Name); @@ -283,7 +284,7 @@ using (var pipingSoilProfilesReader = new PipingSoilProfileReader(Path.Combine(testDataPath, testFile))) { // Call - var profile = pipingSoilProfilesReader.ReadProfile(); + PipingSoilProfile profile = pipingSoilProfilesReader.ReadProfile(); // Assert Assert.AreEqual("Profile", profile.Name); @@ -314,8 +315,8 @@ TestDelegate profile = () => pipingSoilProfilesReader.ReadProfile(); // Assert - var exceptionMessage = Assert.Throws(profile).Message; - var message = new FileReaderErrorMessageBuilder(databaseFilePath) + string exceptionMessage = Assert.Throws(profile).Message; + string message = new FileReaderErrorMessageBuilder(databaseFilePath) .WithSubject("ondergrondschematisatie 'Profile'") .Build(expectedMessage); Assert.AreEqual(message, exceptionMessage); @@ -327,11 +328,11 @@ { // Setup var testFile = "1dprofile.soil"; - var dbFile = Path.Combine(testDataPath, testFile); + string dbFile = Path.Combine(testDataPath, testFile); using (var reader = new PipingSoilProfileReader(dbFile)) { // Call - var profile = reader.ReadProfile(); + PipingSoilProfile profile = reader.ReadProfile(); // Assert CollectionAssert.AreEqual(new[] @@ -342,9 +343,9 @@ }, profile.Layers.Select(l => l.IsAquifer)); CollectionAssert.AreEqual(new[] { - Color.FromArgb(128,255,128), - Color.FromArgb(255,0,0), - Color.FromArgb(70,130,180) + Color.FromArgb(128, 255, 128), + Color.FromArgb(255, 0, 0), + Color.FromArgb(70, 130, 180) }, profile.Layers.Select(l => l.Color)); CollectionAssert.AreEqual(new[] { @@ -396,11 +397,11 @@ { // Setup var testFile = "2dprofile.soil"; - var dbFile = Path.Combine(testDataPath, testFile); + string dbFile = Path.Combine(testDataPath, testFile); using (var reader = new PipingSoilProfileReader(dbFile)) { // Call - var profile = reader.ReadProfile(); + PipingSoilProfile profile = reader.ReadProfile(); // Assert CollectionAssert.AreEqual(new[] @@ -409,11 +410,11 @@ false, false }, profile.Layers.Select(l => l.IsAquifer)); - CollectionAssert.AreEqual(new [] + CollectionAssert.AreEqual(new[] { - Color.FromArgb(70,130,180), - Color.FromArgb(255,0,0), - Color.FromArgb(128,255,128) + Color.FromArgb(70, 130, 180), + Color.FromArgb(255, 0, 0), + Color.FromArgb(128, 255, 128) }, profile.Layers.Select(l => l.Color)); CollectionAssert.AreEqual(new[] { @@ -465,7 +466,7 @@ { // Setup var testFile = "1dprofile.soil"; - var dbFile = Path.Combine(testDataPath, testFile); + string dbFile = Path.Combine(testDataPath, testFile); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition failed: The file should be writable to begin with."); @@ -482,7 +483,7 @@ { // Setup var testFile = "1dprofile.soil"; - var dbFile = Path.Combine(testDataPath, testFile); + string dbFile = Path.Combine(testDataPath, testFile); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition failed: The file should be writable to begin with."); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilDatabaseVersionReaderTest.cs =================================================================== diff -u -r7f759fbabca9c41e75d229269f1b21581b373b5f -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilDatabaseVersionReaderTest.cs (.../SoilDatabaseVersionReaderTest.cs) (revision 7f759fbabca9c41e75d229269f1b21581b373b5f) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilDatabaseVersionReaderTest.cs (.../SoilDatabaseVersionReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -45,8 +45,8 @@ TestDelegate test = () => { using (new SoilDatabaseVersionReader(testFile)) {} }; // Assert - var exception = Assert.Throws(test); - var expectedMessage = new FileReaderErrorMessageBuilder(testFile).Build(UtilsResources.Error_File_does_not_exist); + CriticalFileReadException exception = Assert.Throws(test); + string expectedMessage = new FileReaderErrorMessageBuilder(testFile).Build(UtilsResources.Error_File_does_not_exist); Assert.AreEqual(expectedMessage, exception.Message); } @@ -62,7 +62,7 @@ TestDelegate test = () => { using (new SoilDatabaseVersionReader(fileName)) {} }; // Assert - var exception = Assert.Throws(test); + CriticalFileReadException exception = Assert.Throws(test); Assert.AreEqual(expectedMessage, exception.Message); } @@ -73,7 +73,7 @@ const string version = "15.0.5.0"; string expectedVersionMessage = string.Format(Resources.PipingSoilProfileReader_Database_incorrect_version_requires_Version_0_, version); const string dbName = "incorrectversion.soil"; - var dbFile = Path.Combine(testDataPath, dbName); + string dbFile = Path.Combine(testDataPath, dbName); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilLayer2DReaderTest.cs =================================================================== diff -u -rcb6877f670bacc7a6a896ab132d592eeef1107b5 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilLayer2DReaderTest.cs (.../SoilLayer2DReaderTest.cs) (revision cb6877f670bacc7a6a896ab132d592eeef1107b5) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilLayer2DReaderTest.cs (.../SoilLayer2DReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -24,9 +24,8 @@ using System.Collections.ObjectModel; using System.Globalization; using System.Linq; - +using System.Xml.Linq; using Core.Common.Base.Geometry; - using NUnit.Framework; using Ringtoets.Piping.IO.Builders; using Ringtoets.Piping.IO.Properties; @@ -52,71 +51,71 @@ public void Read_MalformedXmlDocument_ThrowsSoilLayer2DConversionException() { // Setup - var xmlDoc = StringGeometryHelper.GetByteArray("test"); + byte[] xmlDoc = StringGeometryHelper.GetByteArray("test"); var reader = new SoilLayer2DReader(); // Call TestDelegate test = () => reader.Read(xmlDoc); // Assert - var exception = Assert.Throws(test); + SoilLayerConversionException exception = Assert.Throws(test); Assert.AreEqual(Resources.SoilLayer2DReader_Geometry_contains_no_valid_xml, exception.Message); } [Test] public void Read_XmlDocumentWithoutSaneContent_ThrowsSoilLayer2DConversionException() { // Setup - var xmlDoc = StringGeometryHelper.GetXmlDocument(""); + XDocument xmlDoc = StringGeometryHelper.GetXmlDocument(""); var reader = new SoilLayer2DReader(); // Call TestDelegate test = () => reader.Read(xmlDoc); // Assert - var exception = Assert.Throws(test); + SoilLayerConversionException exception = Assert.Throws(test); Assert.AreEqual(Resources.SoilLayer2DReader_Geometry_contains_no_valid_xml, exception.Message); } [Test] public void Read_XmlDocumentWithNoInnerLoops_ThrowsSoilLayer2DConversionException() { // Setup - var xmlDoc = StringGeometryHelper.GetXmlDocument(""); + XDocument xmlDoc = StringGeometryHelper.GetXmlDocument(""); var reader = new SoilLayer2DReader(); // Call TestDelegate test = () => reader.Read(xmlDoc); // Assert - var exception = Assert.Throws(test); + SoilLayerConversionException exception = Assert.Throws(test); Assert.AreEqual(Resources.SoilLayer2DReader_Geometry_contains_no_valid_xml, exception.Message); } [Test] public void Read_XmlDocumentWithNoOuterLoop_ThrowsSoilLayer2DConversionException() { // Setup - var xmlDoc = StringGeometryHelper.GetXmlDocument(""); + XDocument xmlDoc = StringGeometryHelper.GetXmlDocument(""); var reader = new SoilLayer2DReader(); // Call TestDelegate test = () => reader.Read(xmlDoc); // Assert - var exception = Assert.Throws(test); + SoilLayerConversionException exception = Assert.Throws(test); Assert.AreEqual(Resources.SoilLayer2DReader_Geometry_contains_no_valid_xml, exception.Message); } [Test] public void Read_XmlDocumentWithEmptyInnerLoopAndOuterLoop_ReturnsLayerWithEmptyInnerLoopAndEmptyOuterLoop() { // Setup - var xmlDoc = StringGeometryHelper.GetXmlDocument(""); + XDocument xmlDoc = StringGeometryHelper.GetXmlDocument(""); var reader = new SoilLayer2DReader(); // Call - var result = reader.Read(xmlDoc); + SoilLayer2D result = reader.Read(xmlDoc); // Assert Assert.NotNull(result); @@ -131,37 +130,37 @@ public void Read_XmlDocumentWithInvalidPointCoordinate_ThrowsSoilLayer2DConversionException(string incorrectNumber) { // Setup - var xmlDoc = StringGeometryHelper.GetXmlDocument(string.Format( + XDocument xmlDoc = StringGeometryHelper.GetXmlDocument(string.Format( "" + "{0}1.2" + "1.21.2" + - "",incorrectNumber)); + "", incorrectNumber)); var reader = new SoilLayer2DReader(); // Call TestDelegate test = () => reader.Read(xmlDoc); // Assert - var exception = Assert.Throws(test); + SoilLayerConversionException exception = Assert.Throws(test); Assert.AreEqual(Resources.SoilLayer2DReader_Could_not_parse_point_location, exception.Message); } [Test] public void Read_XmlDocumentWitOverflowingPointCoordinate_ThrowsSoilLayer2DConversionException() { // Setup - var xmlDoc = StringGeometryHelper.GetXmlDocument(string.Format( + XDocument xmlDoc = StringGeometryHelper.GetXmlDocument(string.Format( "" + "{0}1.2" + "1.21.2" + - "",double.MaxValue)); + "", double.MaxValue)); var reader = new SoilLayer2DReader(); // Call TestDelegate test = () => reader.Read(xmlDoc); // Assert - var exception = Assert.Throws(test); + SoilLayerConversionException exception = Assert.Throws(test); Assert.AreEqual(Resources.SoilLayer2DReader_Could_not_parse_point_location, exception.Message); } @@ -179,45 +178,6 @@ Read_XmlDocumentPointInOuterLoop_ReturnsLayerWithOuterLoopWithPoint(); } - private void Read_XmlDocumentPointInOuterLoop_ReturnsLayerWithOuterLoopWithPoint() - { - // Setup - var random = new Random(22); - var invariantCulture = CultureInfo.InvariantCulture; - - var x1 = random.NextDouble(); - var x2 = random.NextDouble(); - var y1 = random.NextDouble(); - var y2 = random.NextDouble(); - - var x1String = x1.ToString(invariantCulture); - var x2String = x2.ToString(invariantCulture); - var y1String = y1.ToString(invariantCulture); - var y2String = y2.ToString(invariantCulture); - var parsedX1 = double.Parse(x1String, invariantCulture); - var parsedX2 = double.Parse(x2String, invariantCulture); - var parsedY1 = double.Parse(y1String, invariantCulture); - var parsedY2 = double.Parse(y2String, invariantCulture); - var bytes = StringGeometryHelper.GetXmlDocument(string.Format(invariantCulture, "" + - "{0}0.1{1}" + - "{2}0.1{3}" + - "" + - "{0}0.1{1}" + - "{2}0.1{3}" + - "", - x1String, y1String, x2String, y2String)); - var xmlDoc = bytes; - var reader = new SoilLayer2DReader(); - - // Call - var result = reader.Read(xmlDoc); - - // Assert - Assert.NotNull(result); - Segment2D expectedSegment = new Segment2D(new Point2D(parsedX1, parsedY1), new Point2D(parsedX2, parsedY2)); - CollectionAssert.AreEqual(new List {expectedSegment, expectedSegment}, result.OuterLoop); - } - [Test] public void Read_XmlDocumentPointsInInnerLoop_ReturnsLayerWithInnerLoopWithSegment() { @@ -248,20 +208,26 @@ var reader = new SoilLayer2DReader(); // Call - var result = reader.Read(xmlDoc); + SoilLayer2D result = reader.Read(xmlDoc); // Assert Assert.NotNull(result); Segment2D expectedSegment = new Segment2D(new Point2D(parsedX1, parsedY1), new Point2D(parsedX2, parsedY2)); - var expectedCollection = new Collection> { new List { expectedSegment, expectedSegment } }; + var expectedCollection = new [] + { + new List + { + expectedSegment, expectedSegment + } + }; CollectionAssert.AreEqual(expectedCollection, result.InnerLoops); } [Test] public void Read_XmlDocumentSinglePointOuterLoopGeometryCurve_ThrowsSoilLayer2DConversionException() { // Setup - var xmlDoc = StringGeometryHelper.GetXmlDocument("10.11.1"); + XDocument xmlDoc = StringGeometryHelper.GetXmlDocument("10.11.1"); var reader = new SoilLayer2DReader(); // Call @@ -275,7 +241,7 @@ public void Read_XmlDocumentSinglePointInnerLoopGeometryCurve_ThrowsSoilLayer2DConversionException() { // Setup - var xmlDoc = StringGeometryHelper.GetXmlDocument("00.11.1"); + XDocument xmlDoc = StringGeometryHelper.GetXmlDocument("00.11.1"); var reader = new SoilLayer2DReader(); // Call @@ -289,23 +255,64 @@ public void Read_XmlDocumentEqualSegments_ReturnsTwoEqualSegments() { // Setup - var xmlDoc = StringGeometryHelper.GetXmlDocument("" + - "" + - "001.1101.1" + - "" + - "" + - "001.1101.1" + - "" + - ""); + XDocument xmlDoc = StringGeometryHelper.GetXmlDocument("" + + "" + + "001.1101.1" + + "" + + "" + + "001.1101.1" + + "" + + ""); var reader = new SoilLayer2DReader(); // Call - var result = reader.Read(xmlDoc); + SoilLayer2D result = reader.Read(xmlDoc); // Assert Assert.AreEqual(2, result.OuterLoop.Count()); Assert.AreEqual(result.OuterLoop.ElementAt(0), result.OuterLoop.ElementAt(1)); } + + private void Read_XmlDocumentPointInOuterLoop_ReturnsLayerWithOuterLoopWithPoint() + { + // Setup + var random = new Random(22); + var invariantCulture = CultureInfo.InvariantCulture; + + var x1 = random.NextDouble(); + var x2 = random.NextDouble(); + var y1 = random.NextDouble(); + var y2 = random.NextDouble(); + + var x1String = x1.ToString(invariantCulture); + var x2String = x2.ToString(invariantCulture); + var y1String = y1.ToString(invariantCulture); + var y2String = y2.ToString(invariantCulture); + var parsedX1 = double.Parse(x1String, invariantCulture); + var parsedX2 = double.Parse(x2String, invariantCulture); + var parsedY1 = double.Parse(y1String, invariantCulture); + var parsedY2 = double.Parse(y2String, invariantCulture); + XDocument bytes = StringGeometryHelper.GetXmlDocument(string.Format(invariantCulture, "" + + "{0}0.1{1}" + + "{2}0.1{3}" + + "" + + "{0}0.1{1}" + + "{2}0.1{3}" + + "", + x1String, y1String, x2String, y2String)); + var reader = new SoilLayer2DReader(); + + // Call + SoilLayer2D result = reader.Read(bytes); + + // Assert + Assert.NotNull(result); + Segment2D expectedSegment = new Segment2D(new Point2D(parsedX1, parsedY1), new Point2D(parsedX2, parsedY2)); + CollectionAssert.AreEqual(new List + { + expectedSegment, expectedSegment + }, result.OuterLoop); + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilLayerColorConversionHelperTest.cs =================================================================== diff -u -r8129f84fe18c49d8e7cbafcb16e8acf5dd08130b -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilLayerColorConversionHelperTest.cs (.../SoilLayerColorConversionHelperTest.cs) (revision 8129f84fe18c49d8e7cbafcb16e8acf5dd08130b) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilLayerColorConversionHelperTest.cs (.../SoilLayerColorConversionHelperTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -32,7 +32,7 @@ public void FromNullableDouble_Null_ReturnsEmptyColor() { // Call - var color = SoilLayerColorConversionHelper.ColorFromNullableDouble(null); + Color color = SoilLayerColorConversionHelper.ColorFromNullableDouble(null); // Assert Assert.AreEqual(Color.Empty, color); @@ -52,7 +52,7 @@ public void FromNullableDouble_DifferentDoubleValues_ReturnsExpectedColor(double colorValue, int r, int g, int b) { // Call - var color = SoilLayerColorConversionHelper.ColorFromNullableDouble(colorValue); + Color color = SoilLayerColorConversionHelper.ColorFromNullableDouble(colorValue); // Assert Assert.AreEqual(Color.FromArgb(r, g, b), color); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs =================================================================== diff -u -rc28cee59f7b527892aa7e5d8acb92fc9732196e9 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs (.../SoilProfile1DReaderTest.cs) (revision c28cee59f7b527892aa7e5d8acb92fc9732196e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile1DReaderTest.cs (.../SoilProfile1DReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -30,6 +30,7 @@ using Ringtoets.Piping.IO.Builders; using Ringtoets.Piping.IO.Exceptions; using Ringtoets.Piping.IO.SoilProfile; +using Ringtoets.Piping.Primitives; namespace Ringtoets.Piping.IO.Test.SoilProfile { @@ -63,8 +64,8 @@ TestDelegate test = () => SoilProfile1DReader.ReadFrom(reader); // Assert - var exception = Assert.Throws(test); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + CriticalFileReadException exception = Assert.Throws(test); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithSubject(string.Format("ondergrondschematisatie '{0}'", profileName)) .Build("Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."); Assert.AreEqual(expectedMessage, exception.Message); @@ -90,8 +91,8 @@ TestDelegate test = () => SoilProfile1DReader.ReadFrom(reader); // Assert - var exception = Assert.Throws(test); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + PipingSoilProfileReadException exception = Assert.Throws(test); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithSubject(string.Format("ondergrondschematisatie '{0}'", profileName)) .Build("Ondergrondschematisatie bevat geen geldige waarde in kolom 'Bottom'."); Assert.AreEqual(expectedMessage, exception.Message); @@ -115,8 +116,8 @@ TestDelegate test = () => SoilProfile1DReader.ReadFrom(reader); // Assert - var exception = Assert.Throws(test); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + PipingSoilProfileReadException exception = Assert.Throws(test); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithSubject(string.Format("ondergrondschematisatie '{0}'", profileName)) .Build("Geen lagen gevonden voor de ondergrondschematisatie."); Assert.AreEqual(expectedMessage, exception.Message); @@ -141,8 +142,8 @@ TestDelegate test = () => SoilProfile1DReader.ReadFrom(reader); // Assert - var exception = Assert.Throws(test); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + PipingSoilProfileReadException exception = Assert.Throws(test); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithSubject(string.Format("ondergrondschematisatie '{0}'", profileName)) .Build("Ondergrondschematisatie bevat geen geldige waarde in kolom 'IsAquifer'."); Assert.AreEqual(expectedMessage, exception.Message); @@ -161,13 +162,13 @@ mocks.ReplayAll(); // Call - var profile = SoilProfile1DReader.ReadFrom(reader); + PipingSoilProfile profile = SoilProfile1DReader.ReadFrom(reader); // Assert Assert.AreEqual(1, profile.Layers.Count()); Assert.AreEqual(bottom, profile.Bottom); - var pipingSoilLayer = profile.Layers.First(); + PipingSoilLayer pipingSoilLayer = profile.Layers.First(); Assert.AreEqual(top, pipingSoilLayer.Top); Assert.IsEmpty(pipingSoilLayer.MaterialName); @@ -197,8 +198,8 @@ TestDelegate test = () => SoilProfile1DReader.ReadFrom(reader); // Assert - var message = Assert.Throws(test).Message; - var expected = string.Format( + string message = Assert.Throws(test).Message; + string expected = string.Format( "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet verschoven lognormaal verdeeld.", "Verzadigd gewicht"); Assert.AreEqual(expected, message); @@ -218,8 +219,8 @@ TestDelegate test = () => SoilProfile1DReader.ReadFrom(reader); // Assert - var message = Assert.Throws(test).Message; - var expected = string.Format( + string message = Assert.Throws(test).Message; + string expected = string.Format( "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet lognormaal verdeeld.", "Korrelgrootte"); Assert.AreEqual(expected, message); @@ -240,8 +241,8 @@ TestDelegate test = () => SoilProfile1DReader.ReadFrom(reader); // Assert - var message = Assert.Throws(test).Message; - var expected = string.Format( + string message = Assert.Throws(test).Message; + string expected = string.Format( "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet lognormaal verdeeld.", "Korrelgrootte"); Assert.AreEqual(expected, message); @@ -261,8 +262,8 @@ TestDelegate test = () => SoilProfile1DReader.ReadFrom(reader); // Assert - var message = Assert.Throws(test).Message; - var expected = string.Format( + string message = Assert.Throws(test).Message; + string expected = string.Format( "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet lognormaal verdeeld.", "Doorlatendheid"); Assert.AreEqual(expected, message); @@ -283,8 +284,8 @@ TestDelegate test = () => SoilProfile1DReader.ReadFrom(reader); // Assert - var message = Assert.Throws(test).Message; - var expected = string.Format( + string message = Assert.Throws(test).Message; + string expected = string.Format( "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet lognormaal verdeeld.", "Doorlatendheid"); Assert.AreEqual(expected, message); @@ -302,7 +303,7 @@ var bottom = random.NextDouble(); var top = bottom + random.NextDouble(); string materialName = "material"; - var color = Color.FromArgb(Color.DarkKhaki.ToArgb()); + Color color = Color.FromArgb(Color.DarkKhaki.ToArgb()); var belowPhreaticLevelMean = random.NextDouble(); var belowPhreaticLevelDeviation = random.NextDouble(); @@ -312,31 +313,31 @@ var permeabilityDeviation = random.NextDouble(); SetExpectations( - layerCount, - "", - bottom, - top, - 1.0, - materialName, - color.ToArgb(), - belowPhreaticLevelMean, + layerCount, + "", + bottom, + top, + 1.0, + materialName, + color.ToArgb(), + belowPhreaticLevelMean, belowPhreaticLevelDeviation, diameterD70Mean, diameterD70Deviation, - permeabilityMean, + permeabilityMean, permeabilityDeviation); mocks.ReplayAll(); // Call - var profile = SoilProfile1DReader.ReadFrom(reader); + PipingSoilProfile profile = SoilProfile1DReader.ReadFrom(reader); Assert.AreEqual(bottom, profile.Bottom); // Assert Assert.AreEqual(layerCount, profile.Layers.Count()); - var pipingSoilLayer = profile.Layers.First(); + PipingSoilLayer pipingSoilLayer = profile.Layers.First(); Assert.AreEqual(top, pipingSoilLayer.Top); Assert.IsTrue(pipingSoilLayer.IsAquifer); Assert.AreEqual(materialName, pipingSoilLayer.MaterialName); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs =================================================================== diff -u -rc28cee59f7b527892aa7e5d8acb92fc9732196e9 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs (.../SoilProfile2DReaderTest.cs) (revision c28cee59f7b527892aa7e5d8acb92fc9732196e9) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilProfile2DReaderTest.cs (.../SoilProfile2DReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -31,6 +31,7 @@ using Ringtoets.Piping.IO.Exceptions; using Ringtoets.Piping.IO.SoilProfile; using Ringtoets.Piping.IO.Test.TestHelpers; +using Ringtoets.Piping.Primitives; namespace Ringtoets.Piping.IO.Test.SoilProfile { @@ -74,8 +75,8 @@ TestDelegate test = () => SoilProfile2DReader.ReadFrom(reader); // Assert - var exception = Assert.Throws(test); - var expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, "Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."); + CriticalFileReadException exception = Assert.Throws(test); + string expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, "Kritieke fout opgetreden bij het uitlezen van waardes uit kolommen in de database."); Assert.AreEqual(expectedMessage, exception.Message); mocks.VerifyAll(); @@ -99,8 +100,8 @@ TestDelegate test = () => SoilProfile2DReader.ReadFrom(reader); // Assert - var exception = Assert.Throws(test); - var expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, "Ondergrondschematisatie bevat geen geldige waarde in kolom 'IntersectionX'."); + PipingSoilProfileReadException exception = Assert.Throws(test); + string expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, "Ondergrondschematisatie bevat geen geldige waarde in kolom 'IntersectionX'."); Assert.AreEqual(expectedMessage, exception.Message); mocks.VerifyAll(); @@ -124,8 +125,8 @@ TestDelegate test = () => SoilProfile2DReader.ReadFrom(reader); // Assert - var exception = Assert.Throws(test); - var expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, string.Format("Geen geldige X waarde gevonden om intersectie te maken uit 2D profiel '{0}'.", name)); + PipingSoilProfileReadException exception = Assert.Throws(test); + string expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, string.Format("Geen geldige X waarde gevonden om intersectie te maken uit 2D profiel '{0}'.", name)); Assert.AreEqual(expectedMessage, exception.Message); mocks.VerifyAll(); @@ -147,8 +148,8 @@ TestDelegate test = () => SoilProfile2DReader.ReadFrom(reader); // Assert - var exception = Assert.Throws(test); - var expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, "Geen lagen gevonden voor de ondergrondschematisatie."); + PipingSoilProfileReadException exception = Assert.Throws(test); + string expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, "Geen lagen gevonden voor de ondergrondschematisatie."); Assert.AreEqual(expectedMessage, exception.Message); mocks.VerifyAll(); @@ -170,8 +171,8 @@ TestDelegate test = () => SoilProfile2DReader.ReadFrom(reader); // Assert - var exception = Assert.Throws(test); - var expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, "De geometrie is leeg."); + PipingSoilProfileReadException exception = Assert.Throws(test); + string expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, "De geometrie is leeg."); StringAssert.StartsWith(expectedMessage, exception.Message); mocks.VerifyAll(); @@ -193,8 +194,8 @@ TestDelegate test = () => SoilProfile2DReader.ReadFrom(reader); // Assert - var exception = Assert.Throws(test); - var expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, "Het XML-document dat de geometrie beschrijft voor de laag is niet geldig."); + PipingSoilProfileReadException exception = Assert.Throws(test); + string expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, "Het XML-document dat de geometrie beschrijft voor de laag is niet geldig."); Assert.AreEqual(expectedMessage, exception.Message); mocks.VerifyAll(); @@ -217,8 +218,8 @@ TestDelegate test = () => SoilProfile2DReader.ReadFrom(reader); // Assert - var exception = Assert.Throws(test); - var expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, "Ondergrondschematisatie bevat geen geldige waarde in kolom 'IsAquifer'."); + PipingSoilProfileReadException exception = Assert.Throws(test); + string expectedMessage = GetExpectedSoilProfileReaderErrorMessage(path, name, "Ondergrondschematisatie bevat geen geldige waarde in kolom 'IsAquifer'."); Assert.AreEqual(expectedMessage, exception.Message); mocks.VerifyAll(); @@ -233,13 +234,13 @@ mocks.ReplayAll(); // Call - var profile = SoilProfile2DReader.ReadFrom(reader); + PipingSoilProfile profile = SoilProfile2DReader.ReadFrom(reader); // Assert Assert.AreEqual(1, profile.Layers.Count()); Assert.AreEqual(1.1, profile.Bottom); - var pipingSoilLayer = profile.Layers.First(); + PipingSoilLayer pipingSoilLayer = profile.Layers.First(); Assert.AreEqual(1.1, pipingSoilLayer.Top); Assert.IsFalse(pipingSoilLayer.IsAquifer); @@ -266,7 +267,7 @@ var random = new Random(22); var intersectionX = 0.5; var materialName = "material"; - var color = Color.FromArgb(Color.AliceBlue.ToArgb()); + Color color = Color.FromArgb(Color.AliceBlue.ToArgb()); var belowPhreaticLevelMean = random.NextDouble(); var belowPhreaticLevelDeviation = random.NextDouble(); @@ -293,14 +294,14 @@ mocks.ReplayAll(); // Call - var profile = SoilProfile2DReader.ReadFrom(reader); + PipingSoilProfile profile = SoilProfile2DReader.ReadFrom(reader); // Assert Assert.AreEqual(layerCount, profile.Layers.Count()); Assert.AreEqual(1.1, profile.Bottom); - var pipingSoilLayer = profile.Layers.First(); + PipingSoilLayer pipingSoilLayer = profile.Layers.First(); Assert.AreEqual(1.1, pipingSoilLayer.Top); Assert.IsTrue(pipingSoilLayer.IsAquifer); Assert.AreEqual(materialName, pipingSoilLayer.MaterialName); @@ -315,6 +316,7 @@ mocks.VerifyAll(); } + [Test] public void ReadFrom_InvalidBelowPhreaticLevelDistributionValue_ThrowsPipingSoilProfileReadException() { @@ -330,9 +332,9 @@ TestDelegate test = () => SoilProfile2DReader.ReadFrom(reader); // Assert - var message = Assert.Throws(test).Message; - var expected = string.Format( - "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet verschoven lognormaal verdeeld.", + string message = Assert.Throws(test).Message; + string expected = string.Format( + "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet verschoven lognormaal verdeeld.", "Verzadigd gewicht"); Assert.AreEqual(expected, message); mocks.VerifyAll(); @@ -353,9 +355,9 @@ TestDelegate test = () => SoilProfile2DReader.ReadFrom(reader); // Assert - var message = Assert.Throws(test).Message; - var expected = string.Format( - "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet lognormaal verdeeld.", + string message = Assert.Throws(test).Message; + string expected = string.Format( + "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet lognormaal verdeeld.", "Korrelgrootte"); Assert.AreEqual(expected, message); mocks.VerifyAll(); @@ -377,9 +379,9 @@ TestDelegate test = () => SoilProfile2DReader.ReadFrom(reader); // Assert - var message = Assert.Throws(test).Message; - var expected = string.Format( - "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet lognormaal verdeeld.", + string message = Assert.Throws(test).Message; + string expected = string.Format( + "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet lognormaal verdeeld.", "Korrelgrootte"); Assert.AreEqual(expected, message); mocks.VerifyAll(); @@ -400,9 +402,9 @@ TestDelegate test = () => SoilProfile2DReader.ReadFrom(reader); // Assert - var message = Assert.Throws(test).Message; - var expected = string.Format( - "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet lognormaal verdeeld.", + string message = Assert.Throws(test).Message; + string expected = string.Format( + "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet lognormaal verdeeld.", "Doorlatendheid"); Assert.AreEqual(expected, message); mocks.VerifyAll(); @@ -424,9 +426,9 @@ TestDelegate test = () => SoilProfile2DReader.ReadFrom(reader); // Assert - var message = Assert.Throws(test).Message; - var expected = string.Format( - "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet lognormaal verdeeld.", + string message = Assert.Throws(test).Message; + string expected = string.Format( + "Fout bij het lezen van bestand '' (ondergrondschematisatie ''): Parameter '{0}' is niet lognormaal verdeeld.", "Doorlatendheid"); Assert.AreEqual(expected, message); mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs =================================================================== diff -u -rbe66e1bec38a780abb27fedea8632acf4d24a173 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision be66e1bec38a780abb27fedea8632acf4d24a173) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -44,14 +44,14 @@ public void Constructor_NonExistingPath_ThrowsCriticalFileReadException() { // Setup - var testFile = Path.Combine(testDataPath, "none.soil"); + string testFile = Path.Combine(testDataPath, "none.soil"); // Call TestDelegate test = () => { using (new StochasticSoilModelReader(testFile)) {} }; // Assert - var exception = Assert.Throws(test); - var expectedMessage = new FileReaderErrorMessageBuilder(testFile).Build(UtilsResources.Error_File_does_not_exist); + CriticalFileReadException exception = Assert.Throws(test); + string expectedMessage = new FileReaderErrorMessageBuilder(testFile).Build(UtilsResources.Error_File_does_not_exist); Assert.AreEqual(expectedMessage, exception.Message); } @@ -67,7 +67,7 @@ TestDelegate test = () => { using (new StochasticSoilModelReader(fileName)) {} }; // Assert - var exception = Assert.Throws(test); + CriticalFileReadException exception = Assert.Throws(test); Assert.AreEqual(expectedMessage, exception.Message); } @@ -77,8 +77,8 @@ public void Constructor_IncorrectFormatFileOrInvalidSchema_ThrowsPipingCriticalFileReadException(string dbName) { // Setup - var dbFile = Path.Combine(testDataPath, dbName); - var expectedMessage = new FileReaderErrorMessageBuilder(dbFile). + string dbFile = Path.Combine(testDataPath, dbName); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). Build(String.Format(Resources.PipingSoilProfileReader_Critical_Unexpected_value_on_column, dbName)); // Precondition @@ -98,8 +98,8 @@ public void Constructor_InvalidSchemaThatPassesValidation_ThrowsPipingCriticalFileReadException(string dbName) { // Setup - var dbFile = Path.Combine(testDataPath, dbName); - var expectedMessage = new FileReaderErrorMessageBuilder(dbFile). + string dbFile = Path.Combine(testDataPath, dbName); + string expectedMessage = new FileReaderErrorMessageBuilder(dbFile). Build(String.Format(Resources.StochasticSoilModelDatabaseReader_Failed_to_read_database, dbName)); // Precondition @@ -118,7 +118,7 @@ public void ParameteredConstructor_PathToExistingFile_ExpectedValues() { // Setup - var dbName = "emptyschema.soil"; + string dbName = "emptyschema.soil"; string dbFile = Path.Combine(testDataPath, dbName); // Call @@ -138,7 +138,7 @@ const string version = "15.0.5.0"; string expectedVersionMessage = string.Format(Resources.PipingSoilProfileReader_Database_incorrect_version_requires_Version_0_, version); const string dbName = "incorrectversion.soil"; - var dbFile = Path.Combine(testDataPath, dbName); + string dbFile = Path.Combine(testDataPath, dbName); // Precondition Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile), "Precondition: file can be opened for edits."); @@ -147,7 +147,7 @@ TestDelegate test = () => { using (new StochasticSoilModelReader(dbFile)) {} }; // Assert - var exception = Assert.Throws(test); + CriticalFileReadException exception = Assert.Throws(test); Assert.AreEqual(expectedVersionMessage, exception.Message); Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } @@ -156,7 +156,7 @@ public void HasNext_EmptyDatabase_ReturnsFalse() { // Setup - var dbName = "emptyschema.soil"; + string dbName = "emptyschema.soil"; string dbFile = Path.Combine(testDataPath, dbName); using (var stochasticSoilModelDatabaseReader = new StochasticSoilModelReader(dbFile)) @@ -175,7 +175,7 @@ public void HasNext_CompleteDatabase_ReturnsTrue() { // Setup - var dbName = "complete.soil"; + string dbName = "complete.soil"; string dbFile = Path.Combine(testDataPath, dbName); using (var stochasticSoilModelDatabaseReader = new StochasticSoilModelReader(dbFile)) @@ -216,7 +216,7 @@ public void ReadStochasticSoilModel_EmptyDatabase_ReturnsNull() { // Setup - var dbName = "emptyschema.soil"; + string dbName = "emptyschema.soil"; string dbFile = Path.Combine(testDataPath, dbName); const int expectedNrOfModels = 0; @@ -239,7 +239,7 @@ public void ReadStochasticSoilModel_ModelWithoutProfile_ThreeModelsWithSecondWithoutProfiles() { // Setup - var dbName = "modelWithoutProfile.soil"; + string dbName = "modelWithoutProfile.soil"; string dbFile = Path.Combine(testDataPath, dbName); const int expectedNrOfModels = 3; Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs =================================================================== diff -u -rbe66e1bec38a780abb27fedea8632acf4d24a173 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs (.../StochasticSoilProfileReaderTest.cs) (revision be66e1bec38a780abb27fedea8632acf4d24a173) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilProfileReaderTest.cs (.../StochasticSoilProfileReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -31,7 +31,6 @@ using Ringtoets.Piping.IO.Properties; using Ringtoets.Piping.IO.SoilProfile; using Ringtoets.Piping.Primitives; - using UtilsResources = Core.Common.Utils.Properties.Resources; namespace Ringtoets.Piping.IO.Test.SoilProfile @@ -51,8 +50,8 @@ TestDelegate test = () => { using (new StochasticSoilProfileReader(testFile)) {} }; // Assert - var exception = Assert.Throws(test); - var expectedMessage = new FileReaderErrorMessageBuilder(testFile).Build(UtilsResources.Error_File_does_not_exist); + CriticalFileReadException exception = Assert.Throws(test); + string expectedMessage = new FileReaderErrorMessageBuilder(testFile).Build(UtilsResources.Error_File_does_not_exist); Assert.AreEqual(expectedMessage, exception.Message); } @@ -68,7 +67,7 @@ TestDelegate test = () => { using (new StochasticSoilProfileReader(fileName)) {} }; // Assert - var exception = Assert.Throws(test); + CriticalFileReadException exception = Assert.Throws(test); Assert.AreEqual(expectedMessage, exception.Message); } @@ -127,7 +126,7 @@ TestDelegate test = () => { using (new StochasticSoilProfileReader(dbFile)) {} }; // Assert - var exception = Assert.Throws(test); + CriticalFileReadException exception = Assert.Throws(test); Assert.AreEqual(expectedVersionMessage, exception.Message); Assert.IsTrue(TestHelper.CanOpenFileForWrite(dbFile)); } Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SurfaceLines/CharacteristicPointsCsvReaderTest.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SurfaceLines/CharacteristicPointsCsvReaderTest.cs (.../CharacteristicPointsCsvReaderTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SurfaceLines/CharacteristicPointsCsvReaderTest.cs (.../CharacteristicPointsCsvReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -57,16 +57,17 @@ // Setup string path = Path.Combine(testDataPath, "TwoValidLocations.csv"); - var invalidCharacters = Path.GetInvalidPathChars(); + char[] invalidCharacters = Path.GetInvalidPathChars(); - var corruptPath = path.Replace('V', invalidCharacters[0]); + string corruptPath = path.Replace('V', invalidCharacters[0]); // Call TestDelegate call = () => new CharacteristicPointsCsvReader(corruptPath); // Assert - var expectedMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(string.Format(UtilsResources.Error_Path_cannot_contain_Characters_0_, - string.Join(", ", Path.GetInvalidFileNameChars()))); + string innerErrorMessage = string.Format(UtilsResources.Error_Path_cannot_contain_Characters_0_, + string.Join(", ", Path.GetInvalidFileNameChars())); + string expectedMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(innerErrorMessage); TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); } @@ -77,8 +78,8 @@ TestDelegate call = () => new CharacteristicPointsCsvReader(testDataPath); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(testDataPath).Build(UtilsResources.Error_Path_must_not_point_to_empty_file_name); + ArgumentException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(testDataPath).Build(UtilsResources.Error_Path_must_not_point_to_empty_file_name); Assert.AreEqual(expectedMessage, exception.Message); } @@ -108,7 +109,7 @@ using (var reader = new CharacteristicPointsCsvReader(path)) { // Call - var result = reader.GetLocationsCount(); + int result = reader.GetLocationsCount(); // Assert Assert.AreEqual(expectedCount, result); @@ -130,8 +131,8 @@ TestDelegate call = () => reader.GetLocationsCount(); // Assert - var exception = Assert.Throws(call); - var expectedError = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_File_does_not_exist); + CriticalFileReadException exception = Assert.Throws(call); + string expectedError = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_File_does_not_exist); Assert.AreEqual(expectedError, exception.Message); Assert.IsInstanceOf(exception.InnerException); } @@ -152,8 +153,8 @@ TestDelegate call = () => reader.GetLocationsCount(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Directory_missing); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Directory_missing); Assert.AreEqual(expectedMessage, exception.Message); Assert.IsInstanceOf(exception.InnerException); } @@ -174,8 +175,10 @@ TestDelegate call = () => reader.GetLocationsCount(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(UtilsResources.Error_File_empty); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 1") + .Build(UtilsResources.Error_File_empty); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -201,8 +204,10 @@ TestDelegate call = () => reader.ReadCharacteristicPointsLocation(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(Resources.CharacteristicPointsCsvReader_File_invalid_header); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 1") + .Build(Resources.CharacteristicPointsCsvReader_File_invalid_header); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -222,8 +227,10 @@ TestDelegate call = () => reader.GetLocationsCount(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(Resources.CharacteristicPointsCsvReader_File_invalid_header); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 1") + .Build(Resources.CharacteristicPointsCsvReader_File_invalid_header); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -243,8 +250,10 @@ TestDelegate call = () => reader.GetLocationsCount(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(Resources.CharacteristicPointsCsvReader_File_invalid_header); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 1") + .Build(Resources.CharacteristicPointsCsvReader_File_invalid_header); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -287,7 +296,7 @@ } // Call - var result = reader.ReadCharacteristicPointsLocation(); + CharacteristicPoints result = reader.ReadCharacteristicPointsLocation(); // Assert Assert.IsNull(result); @@ -309,8 +318,8 @@ TestDelegate call = () => reader.ReadCharacteristicPointsLocation(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_File_does_not_exist); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_File_does_not_exist); Assert.AreEqual(expectedMessage, exception.Message); Assert.IsInstanceOf(exception.InnerException); } @@ -331,8 +340,8 @@ TestDelegate call = () => reader.ReadCharacteristicPointsLocation(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Directory_missing); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Directory_missing); Assert.AreEqual(expectedMessage, exception.Message); Assert.IsInstanceOf(exception.InnerException); } @@ -353,8 +362,10 @@ TestDelegate call = () => reader.ReadCharacteristicPointsLocation(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(UtilsResources.Error_File_empty); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 1") + .Build(UtilsResources.Error_File_empty); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -374,8 +385,10 @@ TestDelegate call = () => reader.ReadCharacteristicPointsLocation(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(Resources.CharacteristicPointsCsvReader_File_invalid_header); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 1") + .Build(Resources.CharacteristicPointsCsvReader_File_invalid_header); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -395,8 +408,10 @@ TestDelegate call = () => reader.ReadCharacteristicPointsLocation(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(Resources.CharacteristicPointsCsvReader_File_invalid_header); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 1") + .Build(Resources.CharacteristicPointsCsvReader_File_invalid_header); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -416,8 +431,8 @@ TestDelegate call = () => reader.ReadCharacteristicPointsLocation(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 2") .WithSubject("locatie 'Invalid'") .Build(Resources.Error_CharacteristicPoint_has_not_double); @@ -447,8 +462,8 @@ TestDelegate call = () => reader.ReadCharacteristicPointsLocation(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 2") .WithSubject("locatie 'InvalidNumber'") .Build(Resources.Error_CharacteristicPoint_parsing_causes_overflow); @@ -473,12 +488,16 @@ // Assert // 1st line has no text at all: - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 2").Build(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Line_lacks_ID); + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 2") + .Build(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Line_lacks_ID); Assert.AreEqual(expectedMessage, exception.Message); // 2nd line has only whitespace text: - expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 3").Build(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Line_lacks_ID); + expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 3") + .Build(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Line_lacks_ID); exception = Assert.Throws(call); Assert.AreEqual(expectedMessage, exception.Message); } @@ -500,12 +519,16 @@ // Assert // 1st line has no text at all: - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 2").Build(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Line_lacks_ID); + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 2") + .Build(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Line_lacks_ID); Assert.AreEqual(expectedMessage, exception.Message); // 2nd line has only whitespace text: - expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 4").Build(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Line_lacks_ID); + expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 4") + .Build(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Line_lacks_ID); exception = Assert.Throws(call); Assert.AreEqual(expectedMessage, exception.Message); } @@ -526,8 +549,10 @@ TestDelegate call = () => reader.ReadCharacteristicPointsLocation(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(string.Format(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Line_lacks_separator_0_, ';')); + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 1") + .Build(string.Format(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Line_lacks_separator_0_, ';')); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -548,8 +573,8 @@ // Assert // 1st row lacks 1 coordinate value: - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 2") .WithSubject("locatie 'LacksOneCoordinate'") .Build(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Location_lacks_values_for_characteristic_points); @@ -581,8 +606,8 @@ // Assert // 1st row lacks 1 coordinate value: - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 2") .WithSubject("locatie 'OneValueTooMuch'") .Build(Resources.CharacteristicPointsCsvReader_ReadCharacteristicPointsLocation_Location_lacks_values_for_characteristic_points); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SurfaceLines/PipingSurfaceLinesCsvReaderTest.cs =================================================================== diff -u -rce31448a066c084f755439f3e7d453bfb042b291 -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SurfaceLines/PipingSurfaceLinesCsvReaderTest.cs (.../PipingSurfaceLinesCsvReaderTest.cs) (revision ce31448a066c084f755439f3e7d453bfb042b291) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SurfaceLines/PipingSurfaceLinesCsvReaderTest.cs (.../PipingSurfaceLinesCsvReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -22,11 +22,13 @@ using System; using System.IO; using System.Linq; +using Core.Common.Base.Geometry; using Core.Common.IO.Exceptions; using Core.Common.TestUtil; using Core.Common.Utils.Builders; using NUnit.Framework; using Ringtoets.Piping.IO.SurfaceLines; +using Ringtoets.Piping.Primitives; using IOResources = Ringtoets.Piping.IO.Properties.Resources; using UtilsResources = Core.Common.Utils.Properties.Resources; @@ -47,7 +49,7 @@ TestDelegate call = () => new PipingSurfaceLinesCsvReader(path); // Assert - var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Path_must_be_specified); + string expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Path_must_be_specified); TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); } @@ -57,16 +59,17 @@ // Setup string path = Path.Combine(testDataPath, "TwoValidSurfaceLines.csv"); - var invalidCharacters = Path.GetInvalidPathChars(); + char[] invalidCharacters = Path.GetInvalidPathChars(); - var corruptPath = path.Replace('V', invalidCharacters[0]); + string corruptPath = path.Replace('V', invalidCharacters[0]); // Call TestDelegate call = () => new PipingSurfaceLinesCsvReader(corruptPath); // Assert - var expectedMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(string.Format(UtilsResources.Error_Path_cannot_contain_Characters_0_, - string.Join(", ", Path.GetInvalidFileNameChars()))); + string innerExpectedMessage = string.Format(UtilsResources.Error_Path_cannot_contain_Characters_0_, + string.Join(", ", Path.GetInvalidFileNameChars())); + string expectedMessage = new FileReaderErrorMessageBuilder(corruptPath).Build(innerExpectedMessage); TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, expectedMessage); } @@ -77,8 +80,8 @@ TestDelegate call = () => new PipingSurfaceLinesCsvReader(testDataPath); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(testDataPath).Build(UtilsResources.Error_Path_must_not_point_to_empty_file_name); + ArgumentException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(testDataPath).Build(UtilsResources.Error_Path_must_not_point_to_empty_file_name); Assert.AreEqual(expectedMessage, exception.Message); } @@ -134,7 +137,7 @@ // Setup string path = Path.Combine(testDataPath, "ValidFileWithoutSurfaceLines.csv"); - using (var reader = new PipingSurfaceLinesCsvReader(path)) + using (var reader = new PipingSurfaceLinesCsvReader(path)) { // Call int linesCount = reader.GetSurfaceLinesCount(); @@ -159,8 +162,8 @@ TestDelegate call = () => reader.GetSurfaceLinesCount(); // Assert - var exception = Assert.Throws(call); - var expectedError = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_File_does_not_exist); + CriticalFileReadException exception = Assert.Throws(call); + string expectedError = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_File_does_not_exist); Assert.AreEqual(expectedError, exception.Message); Assert.IsInstanceOf(exception.InnerException); } @@ -181,8 +184,8 @@ TestDelegate call = () => reader.GetSurfaceLinesCount(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Directory_missing); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Directory_missing); Assert.AreEqual(expectedMessage, exception.Message); Assert.IsInstanceOf(exception.InnerException); } @@ -203,8 +206,8 @@ TestDelegate call = () => reader.GetSurfaceLinesCount(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(UtilsResources.Error_File_empty); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(UtilsResources.Error_File_empty); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -224,8 +227,10 @@ TestDelegate call = () => reader.GetSurfaceLinesCount(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(IOResources.PipingSurfaceLinesCsvReader_File_invalid_header); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 1") + .Build(IOResources.PipingSurfaceLinesCsvReader_File_invalid_header); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -237,7 +242,7 @@ public void GetSurfaceLinesCount_InvalidHeader2_ThrowCriticalFileReadException(string missingVariableName) { // Setup - var filename = string.Format("InvalidHeader_Lacks{0}1.csv", missingVariableName); + string filename = string.Format("InvalidHeader_Lacks{0}1.csv", missingVariableName); string path = Path.Combine(testDataPath, filename); // Precondition @@ -249,8 +254,8 @@ TestDelegate call = () => reader.GetSurfaceLinesCount(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 1") .Build("Het bestand is niet geschikt om profielschematisaties uit te lezen (Verwachte koptekst: locationid;X1;Y1;Z1)."); Assert.AreEqual(expectedMessage, exception.Message); @@ -283,15 +288,15 @@ using (var reader = new PipingSurfaceLinesCsvReader(path)) { // Call - var surfaceLine1 = reader.ReadSurfaceLine(); - var surfaceLine2 = reader.ReadSurfaceLine(); + RingtoetsPipingSurfaceLine surfaceLine1 = reader.ReadSurfaceLine(); + RingtoetsPipingSurfaceLine surfaceLine2 = reader.ReadSurfaceLine(); // Assert #region 1st surfaceline Assert.AreEqual("Rotterdam1", surfaceLine1.Name); - Assert.AreEqual(8, surfaceLine1.Points.Count()); + Assert.AreEqual(8, surfaceLine1.Points.Length); Assert.AreEqual(94263.0026213, surfaceLine1.StartingWorldPoint.X); Assert.AreEqual(427776.654093, surfaceLine1.StartingWorldPoint.Y); Assert.AreEqual(-1.02, surfaceLine1.StartingWorldPoint.Z); @@ -306,7 +311,7 @@ #region 2nd surfaceline Assert.AreEqual("ArtifcialLocal", surfaceLine2.Name); - Assert.AreEqual(3, surfaceLine2.Points.Count()); + Assert.AreEqual(3, surfaceLine2.Points.Length); Assert.AreEqual(2.3, surfaceLine2.StartingWorldPoint.X); Assert.AreEqual(0, surfaceLine2.StartingWorldPoint.Y); Assert.AreEqual(1, surfaceLine2.StartingWorldPoint.Z); @@ -332,15 +337,15 @@ using (var reader = new PipingSurfaceLinesCsvReader(path)) { // Call - var surfaceLine1 = reader.ReadSurfaceLine(); - var surfaceLine2 = reader.ReadSurfaceLine(); + RingtoetsPipingSurfaceLine surfaceLine1 = reader.ReadSurfaceLine(); + RingtoetsPipingSurfaceLine surfaceLine2 = reader.ReadSurfaceLine(); // Assert #region 1st surfaceline Assert.AreEqual("Rotterdam1", surfaceLine1.Name); - Assert.AreEqual(8, surfaceLine1.Points.Count()); + Assert.AreEqual(8, surfaceLine1.Points.Length); Assert.AreEqual(94263.0026213, surfaceLine1.StartingWorldPoint.X); Assert.AreEqual(427776.654093, surfaceLine1.StartingWorldPoint.Y); Assert.AreEqual(-1.02, surfaceLine1.StartingWorldPoint.Z); @@ -355,7 +360,7 @@ #region 2nd surfaceline Assert.AreEqual("ArtifcialLocal", surfaceLine2.Name); - Assert.AreEqual(3, surfaceLine2.Points.Count()); + Assert.AreEqual(3, surfaceLine2.Points.Length); Assert.AreEqual(2.3, surfaceLine2.StartingWorldPoint.X); Assert.AreEqual(0, surfaceLine2.StartingWorldPoint.Y); Assert.AreEqual(1, surfaceLine2.StartingWorldPoint.Z); @@ -387,11 +392,11 @@ // Assert Assert.AreEqual("Rotterdam1", surfaceLine1.Name); - var geometryPoints = surfaceLine1.Points.ToArray(); + Point3D[] geometryPoints = surfaceLine1.Points.ToArray(); Assert.AreNotEqual(geometryPoints.Length, geometryPoints.Distinct().Count(), - "Duplicate points should be parsed."); + "Duplicate points should be parsed."); Assert.AreEqual(geometryPoints[0].X, geometryPoints[1].X, - "Consecutive duplicate points are still parsed."); + "Consecutive duplicate points are still parsed."); Assert.AreEqual(surfaceLine1.StartingWorldPoint, geometryPoints.First()); Assert.AreEqual(surfaceLine1.EndingWorldPoint, geometryPoints.Last()); } @@ -408,14 +413,14 @@ int surfaceLinesCount = reader.GetSurfaceLinesCount(); for (int i = 0; i < surfaceLinesCount; i++) { - var pipingSurfaceLine = reader.ReadSurfaceLine(); + RingtoetsPipingSurfaceLine pipingSurfaceLine = reader.ReadSurfaceLine(); Assert.IsNotInstanceOf(pipingSurfaceLine, "Fail Fast: Disposal logic required to be implemented in test."); Assert.IsNotNull(pipingSurfaceLine); } // Call - var result = reader.ReadSurfaceLine(); + RingtoetsPipingSurfaceLine result = reader.ReadSurfaceLine(); // Assert Assert.IsNull(result); @@ -437,8 +442,8 @@ TestDelegate call = () => reader.ReadSurfaceLine(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_File_does_not_exist); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_File_does_not_exist); Assert.AreEqual(expectedMessage, exception.Message); Assert.IsInstanceOf(exception.InnerException); } @@ -459,8 +464,8 @@ TestDelegate call = () => reader.ReadSurfaceLine(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Directory_missing); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path).Build(UtilsResources.Error_Directory_missing); Assert.AreEqual(expectedMessage, exception.Message); Assert.IsInstanceOf(exception.InnerException); } @@ -481,8 +486,10 @@ TestDelegate call = () => reader.ReadSurfaceLine(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(UtilsResources.Error_File_empty); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 1") + .Build(UtilsResources.Error_File_empty); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -502,8 +509,10 @@ TestDelegate call = () => reader.ReadSurfaceLine(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 1").Build(IOResources.PipingSurfaceLinesCsvReader_File_invalid_header); + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 1") + .Build(IOResources.PipingSurfaceLinesCsvReader_File_invalid_header); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -527,8 +536,8 @@ TestDelegate call = () => reader.ReadSurfaceLine(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + CriticalFileReadException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 1") .Build("Het bestand is niet geschikt om profielschematisaties uit te lezen (Verwachte koptekst: locationid;X1;Y1;Z1)."); Assert.AreEqual(expectedMessage, exception.Message); @@ -553,8 +562,8 @@ TestDelegate call = () => reader.ReadSurfaceLine(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 2") .WithSubject("profielschematisatie 'InvalidSurfaceLine'") .Build(IOResources.Error_SurfaceLine_has_not_double); @@ -584,8 +593,8 @@ TestDelegate call = () => reader.ReadSurfaceLine(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 2") .WithSubject("profielschematisatie 'InvalidSurfaceLine'") .Build(IOResources.Error_SurfaceLine_parsing_causes_overflow); @@ -610,12 +619,16 @@ // Assert // 1st line has no text at all: - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 2").Build(IOResources.PipingSurfaceLinesCsvReader_ReadLine_Line_lacks_ID); + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 2") + .Build(IOResources.PipingSurfaceLinesCsvReader_ReadLine_Line_lacks_ID); Assert.AreEqual(expectedMessage, exception.Message); // 2nd line has only whitespace text: - expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 3").Build(IOResources.PipingSurfaceLinesCsvReader_ReadLine_Line_lacks_ID); + expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 3") + .Build(IOResources.PipingSurfaceLinesCsvReader_ReadLine_Line_lacks_ID); exception = Assert.Throws(call); Assert.AreEqual(expectedMessage, exception.Message); } @@ -637,12 +650,16 @@ // Assert // 1st line has no text at all: - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 2").Build(IOResources.PipingSurfaceLinesCsvReader_ReadLine_Line_lacks_ID); + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 2") + .Build(IOResources.PipingSurfaceLinesCsvReader_ReadLine_Line_lacks_ID); Assert.AreEqual(expectedMessage, exception.Message); // 2nd line has only whitespace text: - expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 4").Build(IOResources.PipingSurfaceLinesCsvReader_ReadLine_Line_lacks_ID); + expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 4") + .Build(IOResources.PipingSurfaceLinesCsvReader_ReadLine_Line_lacks_ID); exception = Assert.Throws(call); Assert.AreEqual(expectedMessage, exception.Message); } @@ -663,8 +680,10 @@ TestDelegate call = () => reader.ReadSurfaceLine(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path).WithLocation("op regel 2").Build(string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_Line_lacks_separator_0_, ';')); + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) + .WithLocation("op regel 2") + .Build(string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_Line_lacks_separator_0_, ';')); Assert.AreEqual(expectedMessage, exception.Message); } } @@ -684,8 +703,8 @@ TestDelegate call = () => reader.ReadSurfaceLine(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 2") .Build(string.Format(IOResources.PipingSurfaceLinesCsvReader_ReadLine_Line_lacks_separator_0_, ';')); Assert.AreEqual(expectedMessage, exception.Message); @@ -708,8 +727,8 @@ // Assert // 1st row lacks 1 coordinate value: - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 2") .WithSubject("profielschematisatie 'LacksOneCoordinate'") .Build(IOResources.PipingSurfaceLinesCsvReader_ReadLine_SurfaceLine_lacks_values_for_coordinate_triplet); @@ -740,8 +759,8 @@ TestDelegate call = () => reader.ReadSurfaceLine(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 2") .WithSubject("profielschematisatie 'ArtificialLocal'") .Build(IOResources.PipingSurfaceLinesCsvReader_ReadLine_SurfaceLine_has_reclining_geometry); @@ -766,8 +785,8 @@ TestDelegate call = () => reader.ReadSurfaceLine(); // Assert - var exception = Assert.Throws(call); - var expectedMessage = new FileReaderErrorMessageBuilder(path) + LineParseException exception = Assert.Throws(call); + string expectedMessage = new FileReaderErrorMessageBuilder(path) .WithLocation("op regel 2") .WithSubject("profielschematisatie 'Rotterdam1'") .Build(IOResources.PipingSurfaceLinesCsvReader_ReadLine_SurfaceLine_has_zero_length); @@ -806,15 +825,15 @@ using (var reader = new PipingSurfaceLinesCsvReader(path)) { // Call - var surfaceLine1 = reader.ReadSurfaceLine(); - var surfaceLine2 = reader.ReadSurfaceLine(); + RingtoetsPipingSurfaceLine surfaceLine1 = reader.ReadSurfaceLine(); + RingtoetsPipingSurfaceLine surfaceLine2 = reader.ReadSurfaceLine(); // Assert #region 1st surfaceline Assert.AreEqual("Rotterdam1", surfaceLine1.Name); - Assert.AreEqual(8, surfaceLine1.Points.Count()); + Assert.AreEqual(8, surfaceLine1.Points.Length); Assert.AreEqual(94263.0026213, surfaceLine1.StartingWorldPoint.X); Assert.AreEqual(427776.654093, surfaceLine1.StartingWorldPoint.Y); Assert.AreEqual(-1.02, surfaceLine1.StartingWorldPoint.Z); @@ -829,7 +848,7 @@ #region 2nd surfaceline Assert.AreEqual("ArtifcialLocal", surfaceLine2.Name); - Assert.AreEqual(3, surfaceLine2.Points.Count()); + Assert.AreEqual(3, surfaceLine2.Points.Length); Assert.AreEqual(2.3, surfaceLine2.StartingWorldPoint.X); Assert.AreEqual(0, surfaceLine2.StartingWorldPoint.Y); Assert.AreEqual(1, surfaceLine2.StartingWorldPoint.Z); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/TestHelpers/StringGeometryHelper.cs =================================================================== diff -u -r751aaf9b7623bac357cbacf4e6ddae87b2b69f1f -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/TestHelpers/StringGeometryHelper.cs (.../StringGeometryHelper.cs) (revision 751aaf9b7623bac357cbacf4e6ddae87b2b69f1f) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/TestHelpers/StringGeometryHelper.cs (.../StringGeometryHelper.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) @@ -56,9 +56,9 @@ /// . public static byte[] GetByteArray(string str) { - byte[] bytes = new byte[str.Length * sizeof(char)]; + byte[] bytes = new byte[str.Length*sizeof(char)]; Buffer.BlockCopy(str.ToCharArray(), 0, bytes, 0, bytes.Length); return bytes; - } + } } } \ No newline at end of file