Index: DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs =================================================================== diff -u -r4595 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs (.../GeneralHelper.cs) (revision 4595) +++ DamEngine/trunk/src/Deltares.DamEngine.TestHelpers/GeneralHelper.cs (.../GeneralHelper.cs) (revision 4627) @@ -60,19 +60,19 @@ public static Output RunAfterInputValidation(EngineInterface engineInterface, bool areResultsExpected = true, string outputXml = "") { // Validate input - Assert.IsNotNull(engineInterface.DamProjectData); + Assert.That(engineInterface.DamProjectData, Is.Not.Null); string validationMessages = engineInterface.Validate(); var extraValidationMessage = ""; if (outputXml != "") { extraValidationMessage = ", see output xml in debugger"; } - Assert.IsNull(validationMessages, "Validation should succeed but does not" + extraValidationMessage); + Assert.That(validationMessages, Is.Null, "Validation should succeed but does not" + extraValidationMessage); // Run calculation string outputString = engineInterface.Run(); - Assert.IsNotNull(outputString); + Assert.That(outputString, Is.Not.Null); Output output = DamXmlSerialization.LoadOutputFromXmlString(outputString); if (outputXml != "") { @@ -84,7 +84,7 @@ // Evaluate results if (!areResultsExpected) { - Assert.IsNull(output.Results.CalculationResults, "No results are expected"); + Assert.That(output.Results.CalculationResults, Is.Null, "No results are expected"); return output; } @@ -111,7 +111,7 @@ assertMessage = assertMessage + Environment.NewLine + calcMessage.Message1; } - Assert.IsNotNull(output.Results.CalculationResults, assertMessage); + Assert.That(output.Results.CalculationResults, Is.Not.Null, assertMessage); return output; } @@ -124,7 +124,7 @@ { string assertMessage = "No results available due to dependency on 2D geometries (sti files) and the old " + "MacroStability kernel wrapper implementation"; - Assert.IsNotNull(output.Results.CalculationResults, assertMessage); + Assert.That(output.Results.CalculationResults, Is.Not.Null, assertMessage); } } } @@ -144,13 +144,13 @@ { const string message = "After adapting the geometry, the calculated safety factor is less than the" + " required safety factor; this is unexpected."; - Assert.IsTrue(fosCalculated >= fosRequired, message); + Assert.That(fosCalculated, Is.GreaterThanOrEqualTo(fosRequired), message); } else { const string message = "As the design was not successful and had to stop, the calculated safety " + "factor should be less than the required safety factor but this is not the case."; - Assert.IsTrue(fosRequired >= fosCalculated, message); + Assert.That(fosRequired, Is.GreaterThanOrEqualTo(fosCalculated), message); } string fileName = calculationResult.BaseFileName; @@ -161,9 +161,9 @@ // The iterated file is created only for the stability mechanism (not for piping) to be opened in D-Stability if (engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType != FailureMechanismSystemType.Piping) { - Assert.IsTrue(isIteratedFilePresent, "The AnalyseType is set to AdaptGeometry in the input, however the geometry was " + - "not adapted in any location. Either set the AnalysisType to NoAdaptation or " + - "increase the required safety factor."); + Assert.That(isIteratedFilePresent, Is.True, "The AnalyseType is set to AdaptGeometry in the input, however the geometry was " + + "not adapted in any location. Either set the AnalysisType to NoAdaptation or " + + "increase the required safety factor."); } } } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineSlopeAdapterTest.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineSlopeAdapterTest.cs (.../SurfaceLineSlopeAdapterTest.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineSlopeAdapterTest.cs (.../SurfaceLineSlopeAdapterTest.cs) (revision 4627) @@ -67,7 +67,7 @@ SurfaceLine2 surfaceLine = CreateSimpleDike(); var surfaceLineAdapter = new SurfaceLineSlopeAdapter(surfaceLine, location, 0); SurfaceLine2 constructNewSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(1); - Assert.IsNotNull(constructNewSurfaceLine); + Assert.That(constructNewSurfaceLine, Is.Not.Null); } [Test] @@ -87,7 +87,7 @@ X = 4, Z = 0 }; - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); } [Test] @@ -151,10 +151,10 @@ X = pointSurfaceLevelInside.X, Z = pointSurfaceLevelInside.Z }; - Assert.IsTrue(expectedPointShoulderBaseInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside))); - Assert.IsTrue(expectedPointShoulderTopInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside))); - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); - Assert.IsTrue(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside))); + Assert.That(expectedPointShoulderBaseInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside)), Is.True); + Assert.That(expectedPointShoulderTopInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside)), Is.True); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); + Assert.That(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside)), Is.True); } [Test] @@ -241,12 +241,12 @@ X = pointSurfaceLevelInside.X, Z = pointSurfaceLevelInside.Z }; - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); - Assert.IsTrue(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide))); - Assert.IsTrue(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide))); - Assert.IsTrue(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside))); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); + Assert.That(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide)), Is.True); + Assert.That(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide)), Is.True); + Assert.That(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside)), Is.True); } [Test] @@ -354,14 +354,14 @@ X = pointSurfaceLevelInside.X, Z = pointSurfaceLevelInside.Z }; - Assert.IsTrue(expectedPointShoulderBaseInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside))); - Assert.IsTrue(expectedPointShoulderTopInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside))); - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); - Assert.IsTrue(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide))); - Assert.IsTrue(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide))); - Assert.IsTrue(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside))); + Assert.That(expectedPointShoulderBaseInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside)), Is.True); + Assert.That(expectedPointShoulderTopInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside)), Is.True); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); + Assert.That(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide)), Is.True); + Assert.That(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide)), Is.True); + Assert.That(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside)), Is.True); } [Test] @@ -379,15 +379,15 @@ }; Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(6)); Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(5)); // in between point should be thrown away - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); } [Test] public void AdaptedSurfaceLineWithTrafficLoadPointsHasAdjustedPoints() { const double cTolerance = 0.0000001; - // Create the base surfaceline (dike with shoulder and ditch) + // Create the base surface line (dike with shoulder and ditch) var surfaceLine = new SurfaceLine2 { CharacteristicPoints = @@ -525,15 +525,15 @@ { SurfaceLine2 surfaceLine = CreateSimpleDike(); var surfaceLineAdapter = new SurfaceLineSlopeAdapter(surfaceLine, location, 0); - Assert.IsNotNull(surfaceLineAdapter.ConstructNewSurfaceLineBySlope(1.0)); + Assert.That(surfaceLineAdapter.ConstructNewSurfaceLineBySlope(1.0), Is.Not.Null); } [Test] public void ConstructNewSurfaceLineBySlopeReturnsANewSurfaceLine() { SurfaceLine2 surfaceLine = CreateSimpleDike(); var surfaceLineAdapter = new SurfaceLineSlopeAdapter(surfaceLine, location, 0); - Assert.IsNotNull(surfaceLineAdapter.ConstructNewSurfaceLineBySlope(0.9)); + Assert.That(surfaceLineAdapter.ConstructNewSurfaceLineBySlope(0.9), Is.Not.Null); } [Test] @@ -548,7 +548,7 @@ X = 5, Z = 0 }; - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); } [Test] @@ -603,10 +603,10 @@ X = pointSurfaceLevelInside.X, Z = pointSurfaceLevelInside.Z }; - Assert.IsFalse(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderBaseInside)); - Assert.IsFalse(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderTopInside)); - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); - Assert.IsTrue(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside))); + Assert.That(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderBaseInside), Is.False); + Assert.That(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderTopInside), Is.False); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); + Assert.That(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside)), Is.True); } [Test] @@ -694,12 +694,12 @@ X = pointSurfaceLevelInside.X, Z = pointSurfaceLevelInside.Z }; - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); - Assert.IsTrue(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide))); - Assert.IsTrue(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide))); - Assert.IsTrue(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside))); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); + Assert.That(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide)), Is.True); + Assert.That(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide)), Is.True); + Assert.That(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside)), Is.True); } [Test] @@ -854,14 +854,14 @@ X = pointSurfaceLevelInside.X, Z = pointSurfaceLevelInside.Z }; - Assert.IsFalse(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderBaseInside)); - Assert.IsFalse(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderTopInside)); - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); - Assert.IsTrue(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide))); - Assert.IsTrue(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide))); - Assert.IsTrue(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside))); + Assert.That(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderBaseInside), Is.False); + Assert.That(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderTopInside), Is.False); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); + Assert.That(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide)), Is.True); + Assert.That(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide)), Is.True); + Assert.That(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside)), Is.True); } [Test] @@ -970,14 +970,14 @@ X = pointSurfaceLevelInside.X, Z = pointSurfaceLevelInside.Z }; - Assert.IsTrue(expectedShoulderBaseInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside))); - Assert.IsTrue(expectedShoulderTopInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside))); - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); - Assert.IsTrue(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide))); - Assert.IsTrue(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide))); - Assert.IsTrue(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside))); + Assert.That(expectedShoulderBaseInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside)), Is.True); + Assert.That(expectedShoulderTopInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside)), Is.True); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); + Assert.That(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide)), Is.True); + Assert.That(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide)), Is.True); + Assert.That(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside)), Is.True); } [Test] @@ -1080,15 +1080,15 @@ X = pointSurfaceLevelInside.X, Z = pointSurfaceLevelInside.Z }; - Assert.IsFalse(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderBaseInside)); - Assert.IsFalse(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderTopInside)); - Assert.IsTrue(adaptedSurfaceLine.Geometry.GetPointAt(expectedNewPoint.X, expectedNewPoint.Z) != null); - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); - Assert.IsTrue(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide))); - Assert.IsTrue(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide))); - Assert.IsTrue(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside))); + Assert.That(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderBaseInside), Is.False); + Assert.That(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderTopInside), Is.False); + Assert.That(adaptedSurfaceLine.Geometry.GetPointAt(expectedNewPoint.X, expectedNewPoint.Z), Is.Not.Null); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); + Assert.That(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide)), Is.True); + Assert.That(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide)), Is.True); + Assert.That(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside)), Is.True); } [Test] @@ -1192,15 +1192,15 @@ X = pointSurfaceLevelInside.X, Z = pointSurfaceLevelInside.Z }; - Assert.IsFalse(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderBaseInside)); - Assert.IsFalse(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderTopInside)); - Assert.IsTrue(adaptedSurfaceLine.Geometry.GetPointAt(expectedNewPoint.X, expectedNewPoint.Z) != null); - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); - Assert.IsTrue(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide))); - Assert.IsTrue(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide))); - Assert.IsTrue(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide))); - Assert.IsTrue(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside))); + Assert.That(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderBaseInside), Is.False); + Assert.That(adaptedSurfaceLine.HasAnnotation(CharacteristicPointType.ShoulderTopInside), Is.False); + Assert.That(adaptedSurfaceLine.Geometry.GetPointAt(expectedNewPoint.X, expectedNewPoint.Z), Is.Not.Null); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); + Assert.That(expectedPointDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchDikeSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide)), Is.True); + Assert.That(expectedPointBottomDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide)), Is.True); + Assert.That(expectedPointDitchPolderSide.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide)), Is.True); + Assert.That(expectedPointSurfaceLevelInside.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside)), Is.True); } [Test] @@ -1221,15 +1221,15 @@ }; Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(6)); Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(5)); // in between point should be thrown away - Assert.IsTrue(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); + Assert.That(expectedPointDikeToeAtPolder.LocationEquals(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); } [Test] public void AdaptedSurfaceLineWithTrafficLoadPointsBySlopeHasAdjustedPoints() { const double cTolerance = 0.0000001; - // Create the base surfaceline (dike with shoulder and ditch) + // Create the base surface line (dike with shoulder and ditch) var surfaceLine = new SurfaceLine2 { CharacteristicPoints = Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs (.../SurfaceLineHeightAdapterTest.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineHeightAdapterTest.cs (.../SurfaceLineHeightAdapterTest.cs) (revision 4627) @@ -52,7 +52,7 @@ surfaceLine.EnsurePointOfType(100, 0, CharacteristicPointType.SurfaceLevelInside); var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0); SurfaceLine2 constructNewSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(1); - Assert.IsNotNull(constructNewSurfaceLine); + Assert.That(constructNewSurfaceLine, Is.Not.Null); } [Test] @@ -99,8 +99,8 @@ SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight); { GeometryPoint newPointAtToeRiver = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver); - Assert.IsTrue(newPointAtToeRiver.LocationEquals(pointAtToeRiver)); - Assert.IsTrue(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtToeRiver))); + Assert.That(newPointAtToeRiver.LocationEquals(pointAtToeRiver), Is.True); + Assert.That(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtToeRiver)), Is.True); } } @@ -197,7 +197,7 @@ X = 2, Z = 2 }; - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); } [Test] @@ -240,7 +240,7 @@ surfaceLine.EnsurePointOfType(100, 0, CharacteristicPointType.SurfaceLevelInside); var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0); SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight); - Assert.IsFalse(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtTopRiver))); + Assert.That(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtTopRiver)), Is.False); } [Test] @@ -290,7 +290,7 @@ X = 3, Z = 2 }; - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); } [Test] @@ -333,7 +333,7 @@ surfaceLine.EnsurePointOfType(100, 0, CharacteristicPointType.SurfaceLevelInside); var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0); SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight); - Assert.IsFalse(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtTopPolder))); + Assert.That(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtTopPolder)), Is.False); } [Test] @@ -381,7 +381,7 @@ { X = 13 }; - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); double oldSlope = TanSlopeInside(surfaceLine); double newSlope = TanSlopeInside(newSurfaceLine); Assert.That(newSlope, Is.EqualTo(oldSlope).Within(0.001)); @@ -415,7 +415,7 @@ Z = 0 }; // GeometryPoint actualPoint = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); } [Test] @@ -475,10 +475,10 @@ surfaceLine.EnsurePointOfType(pointAtSurfaceLevelInside.X, pointAtSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside); var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0); SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight); - Assert.IsNull(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside)); - Assert.IsNull(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside)); - Assert.IsFalse(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtShoulderInsteek))); - Assert.IsFalse(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtShoulderTop))); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside), Is.Null); + Assert.That(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside), Is.Null); + Assert.That(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtShoulderInsteek)), Is.False); + Assert.That(newSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(pointAtShoulderTop)), Is.False); GeometryPoint newPointAtToePolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); Assert.That(newSurfaceLine.GetPointSegmentIncluding(pointAtTopRiver.X, newPointAtToePolder.X).Count(), Is.EqualTo(3)); Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(5)); @@ -541,7 +541,7 @@ surfaceLine.EnsurePointOfType(pointAtSurfaceLevelInside.X, pointAtSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside); var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0); SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight); - Assert.IsTrue(pointAtToePolder.LocationEquals(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); + Assert.That(pointAtToePolder.LocationEquals(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); } [Test] @@ -601,7 +601,7 @@ surfaceLine.EnsurePointOfType(pointAtSurfaceLevelInside.X, pointAtSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside); var surfaceLineAdapter = new SurfaceLineHeightAdapter(surfaceLine, location, 0); SurfaceLine2 newSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(newDikeHeight); - Assert.IsTrue(pointAtShoulderTop.LocationEquals(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside))); + Assert.That(pointAtShoulderTop.LocationEquals(newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside)), Is.True); } [Test] @@ -667,7 +667,7 @@ Z = 1 }; GeometryPoint actualPoint = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); } [Test] @@ -820,21 +820,21 @@ Z = 2 }; GeometryPoint actualNewTopRiver = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); - Assert.IsTrue(expectedNewTopRiver.LocationEquals(actualNewTopRiver)); + Assert.That(expectedNewTopRiver.LocationEquals(actualNewTopRiver), Is.True); var expectedNewTopPolder = new GeometryPoint { X = 3, Z = 2 }; GeometryPoint actualNewTopPolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); - Assert.IsTrue(expectedNewTopPolder.LocationEquals(actualNewTopPolder)); + Assert.That(expectedNewTopPolder.LocationEquals(actualNewTopPolder), Is.True); var expectedShoulderBaseInside = new GeometryPoint { X = 5, Z = 0 }; GeometryPoint actualShoulderBaseInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedShoulderBaseInside.LocationEquals(actualShoulderBaseInside)); + Assert.That(expectedShoulderBaseInside.LocationEquals(actualShoulderBaseInside), Is.True); Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(9)); } @@ -868,28 +868,28 @@ Z = 2 }; GeometryPoint actualNewTopRiver = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); - Assert.IsTrue(expectedNewTopRiver.LocationEquals(actualNewTopRiver)); + Assert.That(expectedNewTopRiver.LocationEquals(actualNewTopRiver), Is.True); var expectedNewTopPolder = new GeometryPoint { X = 2.8, Z = 2 }; GeometryPoint actualNewTopPolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); - Assert.IsTrue(expectedNewTopPolder.LocationEquals(actualNewTopPolder)); + Assert.That(expectedNewTopPolder.LocationEquals(actualNewTopPolder), Is.True); var expectedNewPoint = new GeometryPoint { X = 3.8, Z = 1 }; GeometryPoint actualNewPoint = newSurfaceLine.Geometry.Points[4]; - Assert.IsTrue(expectedNewPoint.LocationEquals(actualNewPoint)); + Assert.That(expectedNewPoint.LocationEquals(actualNewPoint), Is.True); var expectedShoulderBaseInside = new GeometryPoint { X = 5, Z = 0 }; GeometryPoint actualShoulderBaseInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedShoulderBaseInside.LocationEquals(actualShoulderBaseInside)); + Assert.That(expectedShoulderBaseInside.LocationEquals(actualShoulderBaseInside), Is.True); Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(10)); } @@ -923,21 +923,21 @@ Z = 2 }; GeometryPoint actualNewTopRiver = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); - Assert.IsTrue(expectedNewTopRiver.LocationEquals(actualNewTopRiver)); + Assert.That(expectedNewTopRiver.LocationEquals(actualNewTopRiver), Is.True); var expectedNewTopPolder = new GeometryPoint { X = 5, Z = 2 }; GeometryPoint actualNewTopPolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); - Assert.IsTrue(expectedNewTopPolder.LocationEquals(actualNewTopPolder)); + Assert.That(expectedNewTopPolder.LocationEquals(actualNewTopPolder), Is.True); var expectedToeInside = new GeometryPoint { X = 8, Z = -1 }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); + Assert.That(expectedToeInside.LocationEquals(actualToeInside), Is.True); Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(5)); } @@ -971,21 +971,21 @@ Z = 2 }; GeometryPoint actualNewTopRiver = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); - Assert.IsTrue(expectedNewTopRiver.LocationEquals(actualNewTopRiver)); + Assert.That(expectedNewTopRiver.LocationEquals(actualNewTopRiver), Is.True); var expectedNewTopPolder = new GeometryPoint { X = 4, Z = 2 }; GeometryPoint actualNewTopPolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); - Assert.IsTrue(expectedNewTopPolder.LocationEquals(actualNewTopPolder)); + Assert.That(expectedNewTopPolder.LocationEquals(actualNewTopPolder), Is.True); var expectedToeInside = new GeometryPoint { X = 7, Z = -1 }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); + Assert.That(expectedToeInside.LocationEquals(actualToeInside), Is.True); Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6)); } @@ -1019,35 +1019,35 @@ Z = 2 }; GeometryPoint actualNewTopRiver = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); - Assert.IsTrue(expectedNewTopRiver.LocationEquals(actualNewTopRiver)); + Assert.That(expectedNewTopRiver.LocationEquals(actualNewTopRiver), Is.True); var expectedNewTopPolder = new GeometryPoint { X = 3.5, Z = 2 }; GeometryPoint actualNewTopPolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); - Assert.IsTrue(expectedNewTopPolder.LocationEquals(actualNewTopPolder)); + Assert.That(expectedNewTopPolder.LocationEquals(actualNewTopPolder), Is.True); var expectedShoulderBaseInside = new GeometryPoint { X = 5.5, Z = 0 }; GeometryPoint actualShoulderBaseInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedShoulderBaseInside.LocationEquals(actualShoulderBaseInside)); + Assert.That(expectedShoulderBaseInside.LocationEquals(actualShoulderBaseInside), Is.True); var expectedShoulderTopInside = new GeometryPoint { X = 6, Z = 0 }; GeometryPoint actualShoulderTopInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedShoulderTopInside.LocationEquals(actualShoulderTopInside)); + Assert.That(expectedShoulderTopInside.LocationEquals(actualShoulderTopInside), Is.True); var expectedToeInside = new GeometryPoint { X = 7, Z = -1 }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); + Assert.That(expectedToeInside.LocationEquals(actualToeInside), Is.True); Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(7)); } @@ -1081,21 +1081,21 @@ Z = 2 }; GeometryPoint actualNewTopRiver = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); - Assert.IsTrue(expectedNewTopRiver.LocationEquals(actualNewTopRiver)); + Assert.That(expectedNewTopRiver.LocationEquals(actualNewTopRiver), Is.True); var expectedNewTopPolder = new GeometryPoint { X = 5, Z = 2 }; GeometryPoint actualNewTopPolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); - Assert.IsTrue(expectedNewTopPolder.LocationEquals(actualNewTopPolder)); + Assert.That(expectedNewTopPolder.LocationEquals(actualNewTopPolder), Is.True); var expectedToeInside = new GeometryPoint { X = 11, Z = -1 }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); + Assert.That(expectedToeInside.LocationEquals(actualToeInside), Is.True); Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(5)); } @@ -1129,28 +1129,28 @@ Z = 2 }; GeometryPoint actualNewTopRiver = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); - Assert.IsTrue(expectedNewTopRiver.LocationEquals(actualNewTopRiver)); + Assert.That(expectedNewTopRiver.LocationEquals(actualNewTopRiver), Is.True); var expectedNewTopPolder = new GeometryPoint { X = 5, Z = 2 }; GeometryPoint actualNewTopPolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); - Assert.IsTrue(expectedNewTopPolder.LocationEquals(actualNewTopPolder)); + Assert.That(expectedNewTopPolder.LocationEquals(actualNewTopPolder), Is.True); var expectedPoint = new GeometryPoint { X = 6, Z = 0 }; GeometryPoint actualPoint = newSurfaceLine.Geometry.Points[3]; - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); var expectedToeInside = new GeometryPoint { X = 7, Z = -1 }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); + Assert.That(expectedToeInside.LocationEquals(actualToeInside), Is.True); Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6)); } @@ -1184,21 +1184,21 @@ Z = 2 }; GeometryPoint actualNewTopRiver = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); - Assert.IsTrue(expectedNewTopRiver.LocationEquals(actualNewTopRiver)); + Assert.That(expectedNewTopRiver.LocationEquals(actualNewTopRiver), Is.True); var expectedNewTopPolder = new GeometryPoint { X = 4.5, Z = 2 }; GeometryPoint actualNewTopPolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); - Assert.IsTrue(expectedNewTopPolder.LocationEquals(actualNewTopPolder)); + Assert.That(expectedNewTopPolder.LocationEquals(actualNewTopPolder), Is.True); var expectedToeInside = new GeometryPoint { X = 7.5, Z = -1 }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); + Assert.That(expectedToeInside.LocationEquals(actualToeInside), Is.True); Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6)); } @@ -1232,21 +1232,21 @@ Z = 2 }; GeometryPoint actualNewTopRiver = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); - Assert.IsTrue(expectedNewTopRiver.LocationEquals(actualNewTopRiver)); + Assert.That(expectedNewTopRiver.LocationEquals(actualNewTopRiver), Is.True); var expectedNewTopPolder = new GeometryPoint { X = 6, Z = 2 }; GeometryPoint actualNewTopPolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); - Assert.IsTrue(expectedNewTopPolder.LocationEquals(actualNewTopPolder)); + Assert.That(expectedNewTopPolder.LocationEquals(actualNewTopPolder), Is.True); var expectedToeInside = new GeometryPoint { X = 9, Z = -1 }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); + Assert.That(expectedToeInside.LocationEquals(actualToeInside), Is.True); Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6)); } @@ -1284,42 +1284,42 @@ Z = 2 }; GeometryPoint actualNewTopRiver = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); - Assert.IsTrue(expectedNewTopRiver.LocationEquals(actualNewTopRiver)); + Assert.That(expectedNewTopRiver.LocationEquals(actualNewTopRiver), Is.True); var expectedNewTopPolder = new GeometryPoint { X = 3, Z = 2 }; GeometryPoint actualNewTopPolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); - Assert.IsTrue(expectedNewTopPolder.LocationEquals(actualNewTopPolder)); + Assert.That(expectedNewTopPolder.LocationEquals(actualNewTopPolder), Is.True); var expectedPoint = new GeometryPoint { X = 3.5, Z = 1 }; GeometryPoint actualPoint = newSurfaceLine.Geometry.Points[4]; - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); var expectedPoint2 = new GeometryPoint { X = 4, Z = 1 }; GeometryPoint actualPoint2 = newSurfaceLine.Geometry.Points[5]; - Assert.IsTrue(expectedPoint2.LocationEquals(actualPoint2)); + Assert.That(expectedPoint2.LocationEquals(actualPoint2), Is.True); var expectedShoulderBaseInside = new GeometryPoint { X = 5, Z = 0 }; GeometryPoint actualShoulderBaseInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedShoulderBaseInside.LocationEquals(actualShoulderBaseInside)); + Assert.That(expectedShoulderBaseInside.LocationEquals(actualShoulderBaseInside), Is.True); var expectedToeInside = new GeometryPoint { X = 7, Z = -1 }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); + Assert.That(expectedToeInside.LocationEquals(actualToeInside), Is.True); Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(10)); } @@ -1357,21 +1357,21 @@ Z = 2 }; GeometryPoint actualNewTopRiver = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver); - Assert.IsTrue(expectedNewTopRiver.LocationEquals(actualNewTopRiver)); + Assert.That(expectedNewTopRiver.LocationEquals(actualNewTopRiver), Is.True); var expectedNewTopPolder = new GeometryPoint { X = 3, Z = 2 }; GeometryPoint actualNewTopPolder = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder); - Assert.IsTrue(expectedNewTopPolder.LocationEquals(actualNewTopPolder)); + Assert.That(expectedNewTopPolder.LocationEquals(actualNewTopPolder), Is.True); var expectedToeInside = new GeometryPoint { X = 9, Z = -1 }; GeometryPoint actualToeInside = newSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedToeInside.LocationEquals(actualToeInside)); + Assert.That(expectedToeInside.LocationEquals(actualToeInside), Is.True); Assert.That(newSurfaceLine.Geometry.Points.Count, Is.EqualTo(6)); } Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/TypeExtensionsTests.cs =================================================================== diff -u -r4540 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/TypeExtensionsTests.cs (.../TypeExtensionsTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/TypeExtensionsTests.cs (.../TypeExtensionsTests.cs) (revision 4627) @@ -34,14 +34,14 @@ [TestCase(SegmentFailureMechanismType.Stability, SegmentFailureMechanismType.Stability, SegmentFailureMechanismType.All)] public void GivenValueAndSetWhenCheckingIfValueIsInSetThenReturnsTrue(SegmentFailureMechanismType val, params SegmentFailureMechanismType[] values) { - Assert.IsTrue(val.In(values)); + Assert.That(val.In(values), Is.True); } [Test] [TestCase(SegmentFailureMechanismType.Stability, SegmentFailureMechanismType.Piping)] [TestCase(SegmentFailureMechanismType.Stability, SegmentFailureMechanismType.Piping, SegmentFailureMechanismType.All)] public void GivenValueAndSetWhenCheckingIfValueIsNotInSetThenReturnsFalse(SegmentFailureMechanismType val, params SegmentFailureMechanismType[] values) { - Assert.IsFalse(val.In(values)); + Assert.That(val.In(values), Is.False); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/DamPipingBligh/DamPipingBlighKernelWrapperTests.cs (.../DamPipingBlighKernelWrapperTests.cs) (revision 4627) @@ -167,7 +167,7 @@ var damPipingOutput = new DamPipingBlighOutput(); List messages; kernelWrapper.Validate(damPipingInput, damPipingOutput, out messages); - Assert.IsTrue(messages.Count > 0); + Assert.That(messages.Count, Is.GreaterThan(0)); // Validate the input when valid input is provided. Expected no messages. damPipingInput = new DamPipingBlighInput Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs (.../CheckLargeResultsSets.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/CheckLargeResultsSets.cs (.../CheckLargeResultsSets.cs) (revision 4627) @@ -41,7 +41,7 @@ private const double tol2Digits = 0.005; private const double tolerance = 0.0005; - private static readonly List ResultsParametersToIgnore = new List + private static readonly List resultsParametersToIgnore = new List { "CalculationSubDir" }; @@ -144,7 +144,7 @@ seriesCount++; } - Assert.IsTrue(seriesCount > 0, "No output time series"); + Assert.That(seriesCount, Is.GreaterThan(0), "No output time series"); Assert.That(resultsCount, Is.EqualTo(16), "Incorrect number of results"); } @@ -464,13 +464,13 @@ break; } - Assert.IsNotNull(actualDesignResult, $"Design result {expectedDesignResult.BaseFileName} not found"); + Assert.That(actualDesignResult, Is.Not.Null, $"Design result {expectedDesignResult.BaseFileName} not found"); var compare = new CompareLogic { Config = { MaxDifferences = 100, - MembersToIgnore = ResultsParametersToIgnore, + MembersToIgnore = resultsParametersToIgnore, DoublePrecision = 1e-6 } }; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorTest.cs =================================================================== diff -u -r4540 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorTest.cs (.../SensorTest.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorTest.cs (.../SensorTest.cs) (revision 4627) @@ -37,7 +37,7 @@ bool actual = sensor.IsTransient(); // assert - Assert.IsTrue(actual); + Assert.That(actual, Is.True); } [Test] @@ -53,7 +53,7 @@ bool actual = sensor.IsTransient(); // assert - Assert.IsFalse(actual); + Assert.That(actual, Is.False); } #region Setup Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/MacroStabilityIoTests.cs (.../MacroStabilityIoTests.cs) (revision 4627) @@ -311,7 +311,7 @@ Point2D expectedCoordinate = expectedCalcPoints[i]; Point2D actualCoordinate = actualCalcPoints[i]; - Assert.True(expectedCoordinate.LocationEquals(actualCoordinate)); + Assert.That(expectedCoordinate.LocationEquals(actualCoordinate), Is.True); } } @@ -355,7 +355,7 @@ foreach (Soil expectedSoil in expectedSoils.Soils) { Soil actualSoil = actualSoils.Soils.SingleOrDefault(soil => soil.Name.Equals(expectedSoil.Name)); - Assert.IsNotNull(actualSoil, $"Soil {expectedSoil.Name} not found"); + Assert.That(actualSoil, Is.Not.Null, $"Soil {expectedSoil.Name} not found"); var compare = new CompareLogic { Config = Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs (.../SensorPLLineCreatorTest.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorPLLineCreatorTest.cs (.../SensorPLLineCreatorTest.cs) (revision 4627) @@ -251,27 +251,27 @@ // P1 PlLinePoint p1 = actual.Points.First(); - Assert.IsNotNull(p1); + Assert.That(p1, Is.Not.Null); double expectedZValueP1 = sensorValues[sensor1]; Assert.That(p1.Z, Is.EqualTo(expectedZValueP1)); // P2 PlLinePoint p2 = actual.Points.FirstOrDefault(p => p.Name == sensor2.Name); - Assert.IsNotNull(p2); + Assert.That(p2, Is.Not.Null); Assert.That(p2.X, Is.EqualTo(sensor2.RelativeLocation)); double expectedZValueP2 = sensorValues[sensor2]; Assert.That(p2.Z, Is.EqualTo(expectedZValueP2)); // P3 PlLinePoint p3 = actual.Points.FirstOrDefault(p => p.Name == sensor3.Name); - Assert.IsNotNull(p3); + Assert.That(p3, Is.Not.Null); Assert.That(p3.X, Is.EqualTo(sensor3.RelativeLocation)); double expectedZValueP3 = sensorValues[sensor3]; Assert.That(p3.Z, Is.EqualTo(expectedZValueP3)); // P4 PlLinePoint p4 = actual.Points.FirstOrDefault(p => p.Name == sensor4.Name); - Assert.IsNotNull(p4); + Assert.That(p4, Is.Not.Null); Assert.That(p4.X, Is.EqualTo(sensor4.RelativeLocation)); double expectedZValueP4 = sensorValues[sensor4]; Assert.That(p4.Z, Is.EqualTo(expectedZValueP4)); @@ -699,21 +699,21 @@ // P2 PlLinePoint p2 = actual.Points.FirstOrDefault(p => p.Name == sensor2.Name); - Assert.IsNotNull(p2); + Assert.That(p2, Is.Not.Null); Assert.That(p2.X, Is.EqualTo(sensor2.RelativeLocation)); double expectedZValueP2 = sensorValues[sensor2]; Assert.That(p2.Z, Is.EqualTo(expectedZValueP2)); // P3 PlLinePoint p3 = actual.Points.FirstOrDefault(p => p.Name == sensor3.Name); - Assert.IsNotNull(p3); + Assert.That(p3, Is.Not.Null); Assert.That(p3.X, Is.EqualTo(sensor3.RelativeLocation)); double expectedZValueP3 = sensorValues[sensor3]; Assert.That(p3.Z, Is.EqualTo(expectedZValueP3)); // P4 PlLinePoint p4 = actual.Points.FirstOrDefault(p => p.Name == sensor4.Name); - Assert.IsNotNull(p4); + Assert.That(p4, Is.Not.Null); Assert.That(p4.X, Is.EqualTo(sensor4.RelativeLocation)); double expectedZValueP4 = sensorValues[sensor4]; Assert.That(p4.Z, Is.EqualTo(expectedZValueP4)); @@ -842,21 +842,21 @@ // P2 PlLinePoint p2 = actual.Points.FirstOrDefault(p => p.Name == sensor2.Name); - Assert.IsNotNull(p2); + Assert.That(p2, Is.Not.Null); Assert.That(p2.X, Is.EqualTo(sensor2.RelativeLocation)); double expectedZValueP2 = sensorValues[sensor2]; Assert.That(p2.Z, Is.EqualTo(expectedZValueP2)); // P3 PlLinePoint p3 = actual.Points.FirstOrDefault(p => p.Name == sensor3.Name); - Assert.IsNotNull(p3); + Assert.That(p3, Is.Not.Null); Assert.That(p3.X, Is.EqualTo(sensor3.RelativeLocation)); double expectedZValueP3 = sensorValues[sensor3]; Assert.That(p3.Z, Is.EqualTo(expectedZValueP3)); // P4 PlLinePoint p4 = actual.Points.FirstOrDefault(p => p.Name == sensor4.Name); - Assert.IsNotNull(p4); + Assert.That(p4, Is.Not.Null); Assert.That(p4.X, Is.EqualTo(sensor4.RelativeLocation)); double expectedZValueP4 = sensorValues[sensor4]; Assert.That(p4.Z, Is.EqualTo(expectedZValueP4)); @@ -999,12 +999,12 @@ // checks double? xDitchDikeSide = creator.GetDitchWaterLevelIntersectionAtXDikeSide(sensorValues[sensor5]); double? xDitchPolderSide = creator.GetDitchWaterLevelIntersectionAtXPolderSide(sensorValues[sensor5]); - Assert.IsTrue(actual.Points.Any(p => p.X == xDitchDikeSide)); + Assert.That(actual.Points.Any(p => p.X == xDitchDikeSide), Is.True); double zDitchDikeSide = actual.Points.Single(p => p.X == xDitchDikeSide).Z; double zDitchPolderSide = actual.Points.Single(p => p.X == xDitchPolderSide).Z; - Assert.IsTrue(actual.Points.Any(p => p.X == xDitchPolderSide)); + Assert.That(actual.Points.Any(p => p.X == xDitchPolderSide), Is.True); Assert.That(zDitchPolderSide, Is.EqualTo(zDitchDikeSide)); PlLinePoint endPoint = actual.Points.Last(); Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs =================================================================== diff -u -r4540 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/UpliftHelperTests.cs (.../UpliftHelperTests.cs) (revision 4627) @@ -46,11 +46,11 @@ damKernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2; var upliftHelper = new UpliftHelper(); UpliftSituation upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); - Assert.IsTrue(upliftSituation.IsUplift); + Assert.That(upliftSituation.IsUplift, Is.True); damKernelInput.Location.ModelFactors.UpliftCriterionStability = 0.8; upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); - Assert.IsFalse(upliftSituation.IsUplift); + Assert.That(upliftSituation.IsUplift, Is.False); } [Test] @@ -67,11 +67,11 @@ damKernelInput.Location.ModelFactors.UpliftCriterionStability = 1.2; var upliftHelper = new UpliftHelper(); UpliftSituation upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); - Assert.IsTrue(upliftSituation.IsUplift); + Assert.That(upliftSituation.IsUplift, Is.True); damKernelInput.Location.ModelFactors.UpliftCriterionStability = 0.8; upliftSituation = upliftHelper.DetermineStabilityUplift(damKernelInput, false); - Assert.IsFalse(upliftSituation.IsUplift); + Assert.That(upliftSituation.IsUplift, Is.False); } private static DamKernelInput CreateDamKernelInput() Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/PlLinesCreator/PlLinesCreatorTest.cs (.../PlLinesCreatorTest.cs) (revision 4627) @@ -52,7 +52,7 @@ SurfaceLine2 surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; @@ -102,7 +102,7 @@ SurfaceLine2 surfacelineDikeWithSlopingShoulder = FactoryForSurfaceLines.CreateSurfacelineDikeWithSlopingShoulder(); { var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; @@ -142,7 +142,7 @@ SurfaceLine2 surfacelineDikeWithSlopingShoulder = FactoryForSurfaceLines.CreateSurfacelineDikeWithSlopingShoulder(); { var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.5; plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; @@ -212,7 +212,7 @@ SurfaceLine2 surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; @@ -235,7 +235,7 @@ SurfaceLine2 surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; @@ -267,7 +267,7 @@ SurfaceLine2 surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; @@ -304,7 +304,7 @@ SurfaceLine2 surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelRiverLow = 3.0; // <===================== low waterlevel crossing dike @@ -339,7 +339,7 @@ SurfaceLine2 surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelRiverLow = 1.0; // <===================== low waterlevel below surfacelevel @@ -374,7 +374,7 @@ { SurfaceLine = surfaceLine }; - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelRiverLow = 3.0; // <===================== low waterlevel crossing dike @@ -430,7 +430,7 @@ { SurfaceLine = surfaceLine }; - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelRiverLow = 1.0; // <===================== low waterlevel below surfacelevel @@ -464,7 +464,7 @@ SurfaceLine2 surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; @@ -501,7 +501,7 @@ SurfaceLine2 surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.ModelParametersForPlLines.DampingFactorPl3 = 0.3; plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = 0.4; @@ -816,7 +816,7 @@ SurfaceLine2 surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelRiverLow = 3.0; @@ -853,7 +853,7 @@ SurfaceLine2 surfacelineSimpleDike = FactoryForSurfaceLines.CreateSurfacelineSimpleDike(); { var plLineCreator = new Calculators.PlLinesCreator.PlLinesCreator(); - Assert.IsNotNull(plLineCreator); + Assert.That(plLineCreator, Is.Not.Null); plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateComplexProfile(); plLineCreator.WaterLevelRiverHigh = 4.0; plLineCreator.WaterLevelRiverLow = 2.1; @@ -976,7 +976,7 @@ plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; plLineCreator.HeadInPlLine2 = cHeadPL2; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02); - Assert.IsTrue(plLine.Exists()); + Assert.That(plLine.Exists(), Is.True); } } @@ -1024,7 +1024,7 @@ // No extra layer should have been added to profile Assert.That(plLineCreator.SoilProfile.Layers.Count, Is.EqualTo(4)); - Assert.IsFalse(plLine.Exists()); + Assert.That(plLine.Exists(), Is.False); } } @@ -1057,7 +1057,7 @@ plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; plLineCreator.HeadInPlLine2 = cHeadPL2; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02); - Assert.IsFalse(plLine.Exists()); + Assert.That(plLine.Exists(), Is.False); } } @@ -1081,7 +1081,7 @@ plLineCreator.SoilProfile = FactoryForSoilProfiles.CreateClaySandClaySandProfile(); plLineCreator.SurfaceLine = surfaceLineTutorial1; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02); - Assert.IsFalse(plLine.Exists()); + Assert.That(plLine.Exists(), Is.False); } } @@ -1109,13 +1109,13 @@ PlLines plLines = plLineCreator.CreateAllPlLines(location); PlLine plLine2 = plLines.Lines[PlLineType.Pl2]; PlLine plLine4 = plLines.Lines[PlLineType.Pl4]; - Assert.IsTrue(plLine2.Exists()); - Assert.IsTrue(plLine4.Exists()); + Assert.That(plLine2.Exists(), Is.True); + Assert.That(plLine4.Exists(), Is.True); Assert.That(plLine2.Points.Count, Is.EqualTo(plLine4.Points.Count)); Assert.That(plLine4.Points[0].Z, Is.EqualTo(4.0)); for (var pointIndex = 0; pointIndex < plLine4.Points.Count; pointIndex++) { - Assert.IsTrue(plLine2.Points[pointIndex].LocationEquals(plLine4.Points[pointIndex])); + Assert.That(plLine2.Points[pointIndex].LocationEquals(plLine4.Points[pointIndex]), Is.True); } } } @@ -1147,9 +1147,9 @@ plLineCreator.ModelParametersForPlLines.PenetrationLength = cPenetrationLength; plLineCreator.HeadInPlLine2 = cHeadPL2; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl2, 0.02); - Assert.IsTrue(plLine.Exists()); - Assert.IsTrue(plLine.Points[0].LocationEquals(new PlLinePoint(1.0, cHeadPL2))); - Assert.IsTrue(plLine.Points[1].LocationEquals(new PlLinePoint(21.0, cHeadPL2))); + Assert.That(plLine.Exists(), Is.True); + Assert.That(plLine.Points[0].LocationEquals(new PlLinePoint(1.0, cHeadPL2)), Is.True); + Assert.That(plLine.Points[1].LocationEquals(new PlLinePoint(21.0, cHeadPL2)), Is.True); // Check if extra layer is added to soilprofile Assert.That(plLineCreator.SoilProfile.Layers.Count, Is.EqualTo(orgLayerCount + 1)); Assert.That(plLineCreator.SoilProfile.Layers[orgLayerCount - 1].TopLevel, Is.EqualTo(-2.0).Within(0.01)); @@ -1307,7 +1307,7 @@ plLineCreator.ModelParametersForPlLines.DampingFactorPl4 = cDampingFactor; PlLine plLine = plLineCreator.CreatePlLineByExpertKnowledge(PlLineType.Pl4, 0.02); - Assert.IsFalse(plLine.Exists()); + Assert.That(plLine.Exists(), Is.False); } } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCorePipingCalculationTests.cs =================================================================== diff -u -r4540 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCorePipingCalculationTests.cs (.../MultiCorePipingCalculationTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCorePipingCalculationTests.cs (.../MultiCorePipingCalculationTests.cs) (revision 4627) @@ -100,7 +100,7 @@ } } - Assert.IsTrue(differences.Count == 0, "Differences found" + Environment.NewLine + differencesStringBuilder); + Assert.That(differences, Is.Empty, "Differences found" + Environment.NewLine + differencesStringBuilder); } private string DetermineOutputFilename(string prefix, string modelType, int coreCount, string extension = ".xml") Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/ReferenceEqualityComparerTest.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/ReferenceEqualityComparerTest.cs (.../ReferenceEqualityComparerTest.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Standard/ReferenceEqualityComparerTest.cs (.../ReferenceEqualityComparerTest.cs) (revision 4627) @@ -44,21 +44,21 @@ bool result = referenceComparer.Equals(doubleValue1.GetType(), doubleValue2.GetType()); - Assert.IsTrue(result); + Assert.That(result, Is.True); result = referenceComparer.Equals(doubleValue2.GetType(), intValue1.GetType()); - Assert.IsFalse(result); + Assert.That(result, Is.False); var testPoint1 = new ObjectCopierTest.TestPoint(); var testPoint2 = new ObjectCopierTest.TestPoint(); const double testDouble = new double(); result = referenceComparer.Equals(testPoint1.GetType(), testPoint2.GetType()); - Assert.IsTrue(result); + Assert.That(result, Is.True); result = referenceComparer.Equals(testDouble.GetType(), testPoint1.GetType()); - Assert.IsFalse(result); + Assert.That(result, Is.False); } /// Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Common/PlLinesHelperTests.cs (.../PlLinesHelperTests.cs) (revision 4627) @@ -47,18 +47,18 @@ PlLines plLines = PlLinesHelper.CreatePlLinesForPiping(timeStepDateTime, location, soilProfile1D, riverLevel); Assert.That(plLines.PlLineCount, Is.EqualTo(4)); Assert.That(plLines.Lines[PlLineType.Pl1].Points.Count, Is.EqualTo(8)); - Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[0])); - Assert.IsTrue(new PlLinePoint(14.900, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[1])); - Assert.IsTrue(new PlLinePoint(34.500, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[2])); - Assert.IsTrue(new PlLinePoint(40.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[3])); - Assert.IsTrue(new PlLinePoint(50.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[4])); - Assert.IsTrue(new PlLinePoint(58.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[5])); - Assert.IsTrue(new PlLinePoint(61.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[6])); - Assert.IsTrue(new PlLinePoint(75.000, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[7])); + Assert.That(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[0]), Is.True); + Assert.That(new PlLinePoint(14.900, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[1]), Is.True); + Assert.That(new PlLinePoint(34.500, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[2]), Is.True); + Assert.That(new PlLinePoint(40.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[3]), Is.True); + Assert.That(new PlLinePoint(50.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[4]), Is.True); + Assert.That(new PlLinePoint(58.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[5]), Is.True); + Assert.That(new PlLinePoint(61.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[6]), Is.True); + Assert.That(new PlLinePoint(75.000, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[7]), Is.True); Assert.That(plLines.Lines[PlLineType.Pl2].Points.Count, Is.EqualTo(0)); Assert.That(plLines.Lines[PlLineType.Pl3].Points.Count, Is.EqualTo(2)); - Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[0])); - Assert.IsTrue(new PlLinePoint(75.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[1])); + Assert.That(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[0]), Is.True); + Assert.That(new PlLinePoint(75.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[1]), Is.True); Assert.That(plLines.Lines[PlLineType.Pl4].Points.Count, Is.EqualTo(0)); } @@ -78,18 +78,18 @@ PlLines plLines = PlLinesHelper.CreatePlLinesForPiping(timeStepDateTime, location, soilProfile1D, riverLevel); Assert.That(plLines.PlLineCount, Is.EqualTo(4)); Assert.That(plLines.Lines[PlLineType.Pl1].Points.Count, Is.EqualTo(8)); - Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[0])); - Assert.IsTrue(new PlLinePoint(14.900, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[1])); - Assert.IsTrue(new PlLinePoint(34.500, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[2])); - Assert.IsTrue(new PlLinePoint(40.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[3])); - Assert.IsTrue(new PlLinePoint(50.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[4])); - Assert.IsTrue(new PlLinePoint(58.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[5])); - Assert.IsTrue(new PlLinePoint(61.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[6])); - Assert.IsTrue(new PlLinePoint(75.000, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[7])); + Assert.That(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[0]), Is.True); + Assert.That(new PlLinePoint(14.900, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[1]), Is.True); + Assert.That(new PlLinePoint(34.500, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[2]), Is.True); + Assert.That(new PlLinePoint(40.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[3]), Is.True); + Assert.That(new PlLinePoint(50.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[4]), Is.True); + Assert.That(new PlLinePoint(58.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[5]), Is.True); + Assert.That(new PlLinePoint(61.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[6]), Is.True); + Assert.That(new PlLinePoint(75.000, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[7]), Is.True); Assert.That(plLines.Lines[PlLineType.Pl2].Points.Count, Is.EqualTo(0)); Assert.That(plLines.Lines[PlLineType.Pl3].Points.Count, Is.EqualTo(2)); - Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[0])); - Assert.IsTrue(new PlLinePoint(75.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[1])); + Assert.That(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[0]), Is.True); + Assert.That(new PlLinePoint(75.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[1]), Is.True); Assert.That(plLines.Lines[PlLineType.Pl4].Points.Count, Is.EqualTo(0)); } @@ -119,23 +119,23 @@ PlLines plLines = PlLinesHelper.CreatePlLinesForPiping(timeStepDateTime, location, soilProfile1D, riverLevel); Assert.That(plLines.PlLineCount, Is.EqualTo(4)); Assert.That(plLines.Lines[PlLineType.Pl1].Points.Count, Is.EqualTo(8)); - Assert.IsTrue(new PlLinePoint(0.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[0])); - Assert.IsTrue(new PlLinePoint(12.450, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[1])); - Assert.IsTrue(new PlLinePoint(34.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[2])); - Assert.IsTrue(new PlLinePoint(40.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[3])); - Assert.IsTrue(new PlLinePoint(50.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[4])); - Assert.IsTrue(new PlLinePoint(58.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[5])); - Assert.IsTrue(new PlLinePoint(61.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[6])); - Assert.IsTrue(new PlLinePoint(75.000, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[7])); + Assert.That(new PlLinePoint(0.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[0]), Is.True); + Assert.That(new PlLinePoint(12.450, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[1]), Is.True); + Assert.That(new PlLinePoint(34.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[2]), Is.True); + Assert.That(new PlLinePoint(40.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[3]), Is.True); + Assert.That(new PlLinePoint(50.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[4]), Is.True); + Assert.That(new PlLinePoint(58.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[5]), Is.True); + Assert.That(new PlLinePoint(61.500, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[6]), Is.True); + Assert.That(new PlLinePoint(75.000, 0.000).LocationEquals(plLines.Lines[PlLineType.Pl1].Points[7]), Is.True); Assert.That(plLines.Lines[PlLineType.Pl2].Points.Count, Is.EqualTo(2)); - Assert.IsTrue(new PlLinePoint(0.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl2].Points[0])); - Assert.IsTrue(new PlLinePoint(75.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl2].Points[1])); + Assert.That(new PlLinePoint(0.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl2].Points[0]), Is.True); + Assert.That(new PlLinePoint(75.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl2].Points[1]), Is.True); Assert.That(plLines.Lines[PlLineType.Pl3].Points.Count, Is.EqualTo(2)); - Assert.IsTrue(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[0])); - Assert.IsTrue(new PlLinePoint(75.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[1])); + Assert.That(new PlLinePoint(0.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[0]), Is.True); + Assert.That(new PlLinePoint(75.000, 1.000).LocationEquals(plLines.Lines[PlLineType.Pl3].Points[1]), Is.True); Assert.That(plLines.Lines[PlLineType.Pl4].Points.Count, Is.EqualTo(2)); - Assert.IsTrue(new PlLinePoint(0.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl4].Points[0])); - Assert.IsTrue(new PlLinePoint(75.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl4].Points[1])); + Assert.That(new PlLinePoint(0.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl4].Points[0]), Is.True); + Assert.That(new PlLinePoint(75.000, 0.500).LocationEquals(plLines.Lines[PlLineType.Pl4].Points[1]), Is.True); } private void AddLayerToSoilProfile(SoilProfile1D soilProfile, double topLevel, bool isAquifer) Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityCommon/PlLinesToWaternetConverterTests.cs (.../PlLinesToWaternetConverterTests.cs) (revision 4627) @@ -71,7 +71,7 @@ Waternet waternet = PlLinesToWaternetConverter.ConvertPlLineToWaternet(plLines, soilProfile, penetrationLength, leftCoordinate, rightCoordinate); // Assert - Assert.IsNull(waternet.PhreaticLine); + Assert.That(waternet.PhreaticLine, Is.Null); Assert.That(waternet.HeadLineList, Is.Empty); Assert.That(waternet.WaternetLineList, Is.Empty); } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 4627) @@ -111,17 +111,17 @@ CalculationResult = CalculationResult.NoRun }; int errorCount = kernelWrapper.Validate(macroStabilityInput, macroStabilityOutput, out List messages); - Assert.IsTrue(errorCount > 0); + Assert.That(errorCount, Is.GreaterThan(0)); Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.InvalidInputData)); // Validate the input when valid input is provided. Expected no messages. DamKernelInput kernelInput = CreateDamKernelInputForTest(); kernelInput.Location.ModelFactors.UpliftCriterionStability = 1.4; PrepareResult prepareResult = kernelWrapper.Prepare(kernelInput, 0, out IKernelDataInput kernelDataInput, out IKernelDataOutput kernelDataOutput); - Assert.IsTrue(prepareResult == PrepareResult.Successful); + Assert.That(prepareResult, Is.EqualTo(PrepareResult.Successful)); messages.Clear(); errorCount = kernelWrapper.Validate(kernelDataInput, kernelDataOutput, out messages); - Assert.IsTrue(errorCount == 0); + Assert.That(errorCount, Is.EqualTo(0)); Assert.That(((MacroStabilityOutput)kernelDataOutput).CalculationResult, Is.EqualTo(CalculationResult.NoRun)); } @@ -431,7 +431,7 @@ // Run the dll kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out List messages); var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput; - Assert.IsTrue(messages.Count > 0); + Assert.That(messages.Count, Is.GreaterThan(0)); // as there is no data at all, expect unexpected error Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.UnexpectedError)); } @@ -462,15 +462,15 @@ // Validate the input int errorCount = kernelWrapper.Validate(kernelDataInput, kernelDataOutput, out List messages); - Assert.IsTrue(errorCount == 0); + Assert.That(errorCount, Is.EqualTo(0)); // Run the dl; the tangent line position is defined in such a way that this calculation will result in // several failed attempted slip planes so there should be warnings. kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out messages); var macroStabilityOutput = (MacroStabilityOutput) kernelDataOutput; Assert.That(messages.Count, Is.EqualTo(11)); Assert.That(macroStabilityOutput.CalculationResult, Is.EqualTo(CalculationResult.Succeeded)); - Assert.IsTrue(messages[0].Message.Contains("A slice is beyond the geometry at x")); + Assert.That(messages[0].Message, Does.Contain("A slice is beyond the geometry at x")); } [Test] @@ -498,7 +498,7 @@ // Validate the input int errorCount = kernelWrapper.Validate(kernelDataInput, kernelDataOutput, out List messages); - Assert.IsTrue(errorCount == 0); + Assert.That(errorCount, Is.EqualTo(0)); // Run the dll kernelWrapper.Execute(kernelDataInput, kernelDataOutput, out messages); @@ -514,7 +514,7 @@ LocationName = kernelInput.Location.Name }; kernelWrapper.PostProcess(kernelInput, macroStabilityOutput, designScenario, "", out List results); - Assert.IsTrue(results.Count > 0); + Assert.That(results.Count, Is.GreaterThan(0)); foreach (DesignResult result in results) { Assert.That(result.BaseFileName, Is.EqualTo("Loc(TestLocation)_Sce(1)_Pro(DefaultNameSoilProfile1D)")); @@ -607,7 +607,7 @@ LocationName = kernelInput.Location.Name }; kernelWrapper.PostProcess(kernelInput, macroStabilityOutput, designScenario, "", out List results); - Assert.IsTrue(results.Count > 0); + Assert.That(results.Count, Is.GreaterThan(0)); } [Test] @@ -624,7 +624,7 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used var engineInterface = new EngineInterface(inputString); - Assert.IsNotNull(engineInterface.DamProjectData); + Assert.That(engineInterface.DamProjectData, Is.Not.Null); engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.StabilityModelType = MStabModelType.UpliftVan; Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 4627) @@ -85,7 +85,7 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used var engineInterface = new EngineInterface(inputString); - Assert.IsNotNull(engineInterface.DamProjectData); + Assert.That(engineInterface.DamProjectData, Is.Not.Null); Output output = GeneralHelper.RunAfterInputValidation(inputString); @@ -133,14 +133,14 @@ Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage, Is.EqualTo("")); // Check that a line is specified - Assert.IsNotNull(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine, Is.Not.Null); // Profile name = DWP_1.sti Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("DWP_1.sti")); // Uplift UpliftSituation upliftSituation = output.Results.CalculationResults[0].StabilityDesignResults.UpliftSituation; - Assert.IsNotNull(upliftSituation); + Assert.That(upliftSituation, Is.Not.Null); Assert.That(upliftSituation.IsUplift, Is.EqualTo(true)); Assert.That(upliftSituation.Pl3MinUplift, Is.EqualTo(1.141).Within(tolerance)); Assert.That(upliftSituation.Pl3HeadAdjusted, Is.EqualTo(4.4).Within(tolerance)); @@ -185,14 +185,14 @@ Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.ResultMessage, Is.EqualTo("")); // Check that a line is specified - Assert.IsNotNull(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine); + Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.RedesignedSurfaceLine, Is.Not.Null); // Profile name = DWP_1.sti Assert.That(output.Results.CalculationResults[0].ProfileName, Is.EqualTo("DWP_1.sti")); // Uplift UpliftSituation upliftSituation = output.Results.CalculationResults[0].StabilityDesignResults.UpliftSituation; - Assert.IsNotNull(upliftSituation); + Assert.That(upliftSituation, Is.Not.Null); Assert.That(upliftSituation.IsUplift, Is.EqualTo(true)); Assert.That(upliftSituation.Pl3MinUplift, Is.EqualTo(1.141).Within(tolerance)); Assert.That(upliftSituation.Pl3HeadAdjusted, Is.EqualTo(4.4).Within(tolerance)); @@ -232,20 +232,20 @@ // Bishop DesignResult result = output.Results.CalculationResults[0]; Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.282).Within(tolerance)); - Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation); - Assert.IsTrue(result.StabilityDesignResults.UpliftSituation.IsUplift); + Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null); + Assert.That(result.StabilityDesignResults.UpliftSituation.IsUplift, Is.True); Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop)); Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1)")); // Uplift Van result = output.Results.CalculationResults[1]; Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.115).Within(tolerance)); - Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation); + Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null); Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)); Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1)")); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults[2]; Assert.That(result.StabilityDesignResults.SafetyFactor, Is.EqualTo(1.115).Within(tolerance)); - Assert.IsNotNull(result.StabilityDesignResults.UpliftSituation); + Assert.That(result.StabilityDesignResults.UpliftSituation, Is.Not.Null); Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)); Assert.That(result.BaseFileName, Is.EqualTo("Loc(DWP_1)_Sce(1)_Pro(DWP_1)")); @@ -282,18 +282,18 @@ // Bishop DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults; Assert.That(result.SafetyFactor, Is.EqualTo(0.452).Within(tolerance)); - Assert.IsNotNull(result.UpliftSituation); - Assert.IsTrue(result.UpliftSituation.IsUplift); + Assert.That(result.UpliftSituation, Is.Not.Null); + Assert.That(result.UpliftSituation.IsUplift, Is.True); Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop)); // Uplift Van result = output.Results.CalculationResults[1].StabilityDesignResults; Assert.That(result.SafetyFactor, Is.EqualTo(0.574).Within(tolerance)); - Assert.IsNotNull(result.UpliftSituation); + Assert.That(result.UpliftSituation, Is.Not.Null); Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults[2].StabilityDesignResults; Assert.That(result.SafetyFactor, Is.EqualTo(0.452).Within(tolerance)); - Assert.IsNotNull(result.UpliftSituation); + Assert.That(result.UpliftSituation, Is.Not.Null); Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)); // Calculation Result @@ -328,21 +328,21 @@ // Bishop DesignResultStabilityDesignResults result = output.Results.CalculationResults[0].StabilityDesignResults; - Assert.IsTrue(result.SafetyFactorSpecified); + Assert.That(result.SafetyFactorSpecified, Is.True); Assert.That(result.SafetyFactor, Is.EqualTo(1.458).Within(tolerance)); - Assert.IsNotNull(result.UpliftSituation); - Assert.IsFalse(result.UpliftSituation.IsUplift); + Assert.That(result.UpliftSituation, Is.Not.Null); + Assert.That(result.UpliftSituation.IsUplift, Is.False); Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.Bishop)); // Uplift Van result = output.Results.CalculationResults[1].StabilityDesignResults; - Assert.IsFalse(result.SafetyFactorSpecified); - Assert.IsNotNull(result.UpliftSituation); + Assert.That(result.SafetyFactorSpecified, Is.False); + Assert.That(result.UpliftSituation, Is.Not.Null); Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)); // Worst of Bishop and Uplift Van result = output.Results.CalculationResults[2].StabilityDesignResults; - Assert.IsTrue(result.SafetyFactorSpecified); + Assert.That(result.SafetyFactorSpecified, Is.True); Assert.That(result.SafetyFactor, Is.EqualTo(1.458).Within(tolerance)); - Assert.IsNotNull(result.UpliftSituation); + Assert.That(result.UpliftSituation, Is.Not.Null); Assert.That(result.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)); // Calculation Result @@ -439,7 +439,7 @@ // Calculation Result Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.RunFailed)); // SafetyFactor not specified - Assert.IsFalse(result.StabilityDesignResults.SafetyFactorSpecified); + Assert.That(result.StabilityDesignResults.SafetyFactorSpecified, Is.False); result = output.Results.CalculationResults[2]; Assert.That(result.LocationName, Is.EqualTo("6-4-3-B-1-D")); @@ -502,7 +502,7 @@ // Uplift Van Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.UnexpectedError)); // SafetyFactor not specified - Assert.IsFalse(result.StabilityDesignResults.SafetyFactorSpecified); + Assert.That(result.StabilityDesignResults.SafetyFactorSpecified, Is.False); Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.UpliftVan)); result = output.Results.CalculationResults[5]; @@ -511,7 +511,7 @@ // Bishop/Uplift Van Assert.That(ConversionHelper.ConvertToCalculationResult(result.CalculationResult), Is.EqualTo(CalculationResult.UnexpectedError)); // SafetyFactor not specified - Assert.IsFalse(result.StabilityDesignResults.SafetyFactorSpecified); + Assert.That(result.StabilityDesignResults.SafetyFactorSpecified, Is.False); Assert.That(result.StabilityDesignResults.StabilityModelType, Is.EqualTo(DesignResultStabilityDesignResultsStabilityModelType.BishopUpliftVan)); } @@ -558,7 +558,7 @@ string calcDir = engineInterface.DamProjectData.CalculationMap + "_SingleCore"; engineInterface.DamProjectData.CalculationMap = calcDir; - Assert.IsNotNull(engineInterface.DamProjectData); + Assert.That(engineInterface.DamProjectData, Is.Not.Null); calcDir = Directory.GetCurrentDirectory() + "\\" + calcDir; if (Directory.Exists(calcDir)) { @@ -690,10 +690,10 @@ // Note Bka: it already failed, with message "The preparation for this calculation failed". // Now for a different reason. Probably because DTH is not yet taken into account with testing/adjusting the data. const string message = "The error calculation message is not has expected."; - Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains("Location 'DWP_1', subsoil scenario 'DWP_1.sti', design scenario '1': " + - "The calculation failed with error message 'Value cannot be null."), message); - Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains("Location 'DWP_1', subsoil scenario 'DWP_1.sti', design scenario '1': " + - "The preparation for this calculation failed."), message); + Assert.That(output.Results.CalculationMessages[0].Message1.Contains("Location 'DWP_1', subsoil scenario 'DWP_1.sti', design scenario '1': " + + "The calculation failed with error message 'Value cannot be null."), Is.True, message); + Assert.That(output.Results.CalculationMessages[0].Message1.Contains("Location 'DWP_1', subsoil scenario 'DWP_1.sti', design scenario '1': " + + "The preparation for this calculation failed."), Is.True, message); } [Test, Ignore("This test is not yet implemented, waits on stix implementation.")] @@ -773,7 +773,7 @@ }; foreach (string file in fileList.Select(file => Path.Combine(Path.GetFullPath(calcDir), file))) { - Assert.IsTrue(File.Exists(file), file + " does not exist"); + Assert.That(File.Exists(file), Is.True, file + " does not exist"); } } @@ -838,7 +838,7 @@ }; foreach (string file in fileList.Select(file => Path.Combine(Path.GetFullPath(calcDir), file))) { - Assert.IsTrue(File.Exists(file), file + " does not exist"); + Assert.That(File.Exists(file), Is.True, file + " does not exist"); } } @@ -907,7 +907,7 @@ }; foreach (string file in fileList.Select(file => Path.Combine(Path.GetFullPath(calcDir), file))) { - Assert.IsTrue(File.Exists(file), file + " does not exist"); + Assert.That(File.Exists(file), Is.True, file + " does not exist"); } } @@ -973,7 +973,7 @@ }; foreach (string file in existingFilesList.Select(file => Path.Combine(Path.GetFullPath(calcDir), file))) { - Assert.IsTrue(File.Exists(file), file + " does not exist"); + Assert.That(File.Exists(file), Is.True, file + " does not exist"); } var noneExistingFilesList = new List @@ -987,7 +987,7 @@ }; foreach (string file in noneExistingFilesList.Select(file => Path.Combine(Path.GetFullPath(calcDir), file))) { - Assert.IsFalse(File.Exists(file), file + " does exist"); + Assert.That(File.Exists(file), Is.False, file + " does exist"); } } Index: DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun.Tests/EnvironmentTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun.Tests/EnvironmentTests.cs (.../EnvironmentTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.ConsoleRun.Tests/EnvironmentTests.cs (.../EnvironmentTests.cs) (revision 4627) @@ -31,6 +31,6 @@ public void TestIf64Bits() { Assert.That(IntPtr.Size, Is.EqualTo(8)); - Assert.IsTrue(Environment.Is64BitProcess); + Assert.That(Environment.Is64BitProcess, Is.True); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MultiCoreMacroStabilityTests.cs (.../MultiCoreMacroStabilityTests.cs) (revision 4627) @@ -58,7 +58,7 @@ int errorCount = GeneralHelper.DetermineNumberOfCalculationErrors(engineInterface.DamProjectData.CalculationMessages); Assert.That(errorCount, Is.EqualTo(0), "There should be no errors during the calculation."); Assert.That(engineInterface.DamProjectData.CalculationMessages.Count, Is.EqualTo(output.Results.CalculationMessages.Length)); - Assert.IsTrue(engineInterface.DamProjectData.DamProjectType == DamProjectType.Operational); + Assert.That(engineInterface.DamProjectData.DamProjectType, Is.EqualTo(DamProjectType.Operational)); Assert.That(output.Results.OperationalOutputTimeSeries.Length, Is.EqualTo(8)); var numberOfResults = 0; var numberOfRealResults = 0; @@ -92,7 +92,7 @@ string inputString = File.ReadAllText(fullInputFilename); var engineInterface = new EngineInterface(inputString); engineInterface.DamProjectData.ProjectPath = @"MultiCore\"; - Assert.IsTrue(engineInterface.DamProjectData.DamProjectType == DamProjectType.Design); + Assert.That(engineInterface.DamProjectData.DamProjectType, Is.EqualTo(DamProjectType.Design)); Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, "Output.xml"); @@ -121,9 +121,9 @@ Thread.CurrentThread.CurrentCulture = CultureInfo.InvariantCulture; string inputString = File.ReadAllText(fullInputFilename); var engineInterface = new EngineInterface(inputString); - Assert.IsNotNull(engineInterface.DamProjectData); + Assert.That(engineInterface.DamProjectData, Is.Not.Null); engineInterface.DamProjectData.MaxCalculationCores = maxCores; - Assert.IsTrue(engineInterface.DamProjectData.DamProjectType == DamProjectType.Operational); + Assert.That(engineInterface.DamProjectData.DamProjectType, Is.EqualTo(DamProjectType.Operational)); Output output = GeneralHelper.RunAfterInputValidation(engineInterface, true, "Output" + maxCores + ".xml"); @@ -157,7 +157,7 @@ }; string calcDir = engineInterface.DamProjectData.CalculationMap + "_Cores_" + maxCores; engineInterface.DamProjectData.CalculationMap = calcDir; - Assert.IsNotNull(engineInterface.DamProjectData); + Assert.That(engineInterface.DamProjectData, Is.Not.Null); calcDir = Directory.GetCurrentDirectory() + "\\" + calcDir; if (Directory.Exists(calcDir)) { @@ -202,7 +202,7 @@ } engineInterface.DamProjectData.CalculationMap = calcDir; - Assert.IsNotNull(engineInterface.DamProjectData); + Assert.That(engineInterface.DamProjectData, Is.Not.Null); calcDir = Directory.GetCurrentDirectory() + "\\" + calcDir; if (Directory.Exists(calcDir)) { @@ -269,7 +269,7 @@ string calcDir = engineInterface.DamProjectData.CalculationMap + "_Cores_" + maxCores; engineInterface.DamProjectData.CalculationMap = calcDir; - Assert.IsNotNull(engineInterface.DamProjectData); + Assert.That(engineInterface.DamProjectData, Is.Not.Null); calcDir = Directory.GetCurrentDirectory() + "\\" + calcDir; if (Directory.Exists(calcDir)) { Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/PipingBlighTests.cs (.../PipingBlighTests.cs) (revision 4627) @@ -262,10 +262,10 @@ Assert.That(output.Results.CalculationResults[4].PipingDesignResults.BlighFactor, Is.EqualTo(7.041).Within(tolerance)); Assert.That(output.Results.CalculationResults[5].PipingDesignResults.BlighFactor, Is.EqualTo(90.000).Within(tolerance)); Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(5)); - Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains("no uplift")); - Assert.IsTrue(output.Results.CalculationMessages[1].Message1.Contains("no uplift")); - Assert.IsTrue(output.Results.CalculationMessages[2].Message1.Contains("no uplift")); - Assert.IsTrue(output.Results.CalculationMessages[3].Message1.Contains("no uplift")); - Assert.IsTrue(output.Results.CalculationMessages[4].Message1.Contains("no uplift")); + Assert.That(output.Results.CalculationMessages[0].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[1].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[2].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[3].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[4].Message1, Does.Contain("no uplift")); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/FillXmlOutputFromDamTests.cs (.../FillXmlOutputFromDamTests.cs) (revision 4627) @@ -478,7 +478,7 @@ { if (!expected.HasValue) { - Assert.IsNull(actual); + Assert.That(actual, Is.Null); return; } @@ -495,7 +495,7 @@ { if (expected == null) { - Assert.IsNull(actual); + Assert.That(actual, Is.Null); return; } Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SigmaTauCurveTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SigmaTauCurveTests.cs (.../SigmaTauCurveTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/Geotechnics/SigmaTauCurveTests.cs (.../SigmaTauCurveTests.cs) (revision 4627) @@ -38,8 +38,8 @@ List points = curve.Points; // Then - Assert.IsNotNull(points); - Assert.IsInstanceOf>(points); + Assert.That(points, Is.Not.Null); + Assert.That(points, Is.InstanceOf>()); Assert.That(points.Count, Is.EqualTo(0)); } Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Uplift/UpliftLocationDeterminatorTest.cs (.../UpliftLocationDeterminatorTest.cs) (revision 4627) @@ -75,7 +75,7 @@ upliftLocationDeterminator.PlLines = FactoryForPlLines.CreatePlLinesForUpliftLocationDeterminatorTests(); upliftLocationDeterminator.SurfaceLine = surfaceLineForPipingBligh; UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationAndResult(1.0); - Assert.IsTrue(upliftLocationAndResult.LocationEquals(upliftLocationDeterminator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); + Assert.That(upliftLocationAndResult.LocationEquals(upliftLocationDeterminator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); } [Test] @@ -124,7 +124,7 @@ }; UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationInPolderNearestDikeWithUpliftFactorLowerThanRequired(1.0); - Assert.IsTrue(upliftLocationAndResult.LocationEquals(upliftLocationDeterminator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); + Assert.That(upliftLocationAndResult.LocationEquals(upliftLocationDeterminator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); Assert.That(upliftLocationAndResult.UpliftFactor.Value, Is.EqualTo(cExpectedUpliftFactor).Within(cTolerance)); } @@ -157,7 +157,7 @@ }; UpliftLocationAndResult upliftLocationAndResult = upliftLocationDeterminator.GetLocationInPolderNearestDikeWithUpliftFactorLowerThanRequired(1.0); - Assert.IsTrue(upliftLocationAndResult.LocationEquals(upliftLocationDeterminator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder))); + Assert.That(upliftLocationAndResult.LocationEquals(upliftLocationDeterminator.SurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)), Is.True); Assert.That(upliftLocationAndResult.UpliftFactor.Value, Is.EqualTo(cExpectedUpliftFactor).Within(cTolerance)); } Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/WtiPipingSellmeijerRevisedTests.cs (.../WtiPipingSellmeijerRevisedTests.cs) (revision 4627) @@ -272,11 +272,11 @@ Assert.That(output.Results.CalculationResults[4].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(9.316).Within(tolerance)); Assert.That(output.Results.CalculationResults[5].PipingDesignResults.Wti2017FactorOverall, Is.EqualTo(90.000).Within(tolerance)); Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(5)); - Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains("no uplift")); - Assert.IsTrue(output.Results.CalculationMessages[1].Message1.Contains("no uplift")); - Assert.IsTrue(output.Results.CalculationMessages[2].Message1.Contains("no uplift")); - Assert.IsTrue(output.Results.CalculationMessages[3].Message1.Contains("no uplift")); - Assert.IsTrue(output.Results.CalculationMessages[4].Message1.Contains("no uplift")); + Assert.That(output.Results.CalculationMessages[0].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[1].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[2].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[3].Message1, Does.Contain("no uplift")); + Assert.That(output.Results.CalculationMessages[4].Message1, Does.Contain("no uplift")); } private Output RunTestProjectCores(string calcDir, string outputFileName, int coreCount) Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs (.../GeometryDataTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryDataTests.cs (.../GeometryDataTests.cs) (revision 4627) @@ -126,10 +126,10 @@ Assert.That(geom.Surfaces[0].OuterLoop.Count, Is.EqualTo(4)); Assert.That(geom.Surfaces[0].OuterLoop.CurveList.Count, Is.EqualTo(4)); Assert.That(geom.Surfaces[0].OuterLoop.Points.Count, Is.EqualTo(4)); - Assert.IsTrue(geom.Surfaces[0].OuterLoop.HasArea()); - Assert.IsTrue(geom.Surfaces[0].OuterLoop.IsLoop()); - Assert.IsTrue(geom.Surfaces[0].OuterLoop.IsPointInLoopArea(new Point2D(25, 3))); - Assert.IsFalse(geom.Surfaces[0].OuterLoop.IsPointInLoopArea(new Point2D(25, 5.1))); + Assert.That(geom.Surfaces[0].OuterLoop.HasArea(), Is.True); + Assert.That(geom.Surfaces[0].OuterLoop.IsLoop(), Is.True); + Assert.That(geom.Surfaces[0].OuterLoop.IsPointInLoopArea(new Point2D(25, 3)), Is.True); + Assert.That(geom.Surfaces[0].OuterLoop.IsPointInLoopArea(new Point2D(25, 5.1)), Is.False); } private GeometryData CreateGeometrySurface() Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/WtiPipingSellmeijerRevised/WtiPipingSellmeijerRevisedKernelWrapperTests.cs (.../WtiPipingSellmeijerRevisedKernelWrapperTests.cs) (revision 4627) @@ -49,7 +49,7 @@ var damPipingOutput = new WtiPipingSellmeijerRevisedOutput(); List messages; kernelWrapper.Validate(damPipingInput, damPipingOutput, out messages); - Assert.IsTrue(messages.Count > 0); + Assert.That(messages.Count, Is.GreaterThan(0)); // Validate the input when valid input is provided. Expected no messages. damPipingInput = new WtiPipingSellmeijerRevisedInput Index: DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/IdValidatorTests.cs =================================================================== diff -u -r4540 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/IdValidatorTests.cs (.../IdValidatorTests.cs) (revision 4540) +++ DamEngine/trunk/src/Deltares.DamEngine.Io.Tests/IdValidatorTests.cs (.../IdValidatorTests.cs) (revision 4627) @@ -52,7 +52,7 @@ bool isOk = IdValidator.IsCorrectName(id); // Then Succeeds - Assert.IsTrue(isOk); + Assert.That(isOk, Is.True); } [TestCase("location_12_2_1D1")] // Between "location_12" and "_2_1D1" there are 2 illegal characters (1F hex) @@ -65,6 +65,6 @@ bool isOk = IdValidator.IsCorrectName(id); // Then Fails - Assert.IsFalse(isOk); + Assert.That(isOk, Is.False); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/EngineInterfaceTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/EngineInterfaceTests.cs (.../EngineInterfaceTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Interface.Tests/EngineInterfaceTests.cs (.../EngineInterfaceTests.cs) (revision 4627) @@ -70,6 +70,6 @@ const string fileName = @"TestFiles\InputFile.xml"; // This file is created by test CanWriteAndReadDamProjectDataToXml() string xmlString = File.ReadAllText(fileName); var engineInterface = new EngineInterface(xmlString); - Assert.IsNotNull(engineInterface.DamProjectData); + Assert.That(engineInterface.DamProjectData, Is.Not.Null); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/Sensors/SensorLocationTests.cs (.../SensorLocationTests.cs) (revision 4627) @@ -91,7 +91,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder, sensorValues, sensor); // assert - Assert.IsNull(actualValue); + Assert.That(actualValue, Is.Null); } [Test] @@ -138,7 +138,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeToeAtPolder, sensorValues, sensor); // assert - Assert.IsNull(actualValue); + Assert.That(actualValue, Is.Null); } [Test] @@ -161,7 +161,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder, sensorValues, sensor); // assert - Assert.IsNull(actualValue); + Assert.That(actualValue, Is.Null); } [Test] @@ -208,7 +208,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtPolder, sensorValues, sensor); // assert - Assert.IsNull(actualValue); + Assert.That(actualValue, Is.Null); } [Test] @@ -231,7 +231,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver, sensorValues, sensor); // assert - Assert.IsNull(actualValue); + Assert.That(actualValue, Is.Null); } [Test] @@ -278,7 +278,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowDikeTopAtRiver, sensorValues, sensor); // assert - Assert.IsNull(actualValue); + Assert.That(actualValue, Is.Null); } [Test] @@ -301,7 +301,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowShoulderBaseInside, sensorValues, sensor); // assert - Assert.IsNull(actualValue); + Assert.That(actualValue, Is.Null); } [Test] @@ -348,7 +348,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1PlLineOffsetBelowShoulderBaseInside, sensorValues, sensor); // assert - Assert.IsNull(actualValue); + Assert.That(actualValue, Is.Null); } [Test] @@ -371,7 +371,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtPolder, sensorValues, sensor); // assert - Assert.IsNull(actualValue); + Assert.That(actualValue, Is.Null); } [Test] @@ -441,7 +441,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl1WaterLevelAtRiver, sensorValues, sensor); // assert - Assert.IsNull(actualValue); + Assert.That(actualValue, Is.Null); } [Test] @@ -513,7 +513,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl3, sensorValues, sensor); // assert - Assert.IsNull(actualValue); + Assert.That(actualValue, Is.Null); } [Test] @@ -583,7 +583,7 @@ double? actualValue = sensorLocation.GetValue(x => x.SourceTypePl4, sensorValues, sensor); // assert - Assert.IsNull(actualValue); + Assert.That(actualValue, Is.Null); } [Test] Index: DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryLoopTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryLoopTests.cs (.../GeometryLoopTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Data.Tests/General/GeometryLoopTests.cs (.../GeometryLoopTests.cs) (revision 4627) @@ -43,7 +43,7 @@ Assert.That(loop.Points, Is.Empty); //Assert.AreEqual(String.Empty, loop.PointsDescription); - Assert.IsEmpty(loop.CurveList); + Assert.That(loop.CurveList, Is.Empty); } [Test] @@ -59,7 +59,7 @@ bool hasArea = loop.HasArea(); // assert - Assert.IsFalse(hasArea); + Assert.That(hasArea, Is.False); } [Test] @@ -76,7 +76,7 @@ bool hasArea = loop.HasArea(); // assert - Assert.IsFalse(hasArea); + Assert.That(hasArea, Is.False); } [Test] @@ -92,7 +92,7 @@ bool hasArea = loop.HasArea(); // assert - Assert.IsTrue(hasArea); + Assert.That(hasArea, Is.True); } [Test] @@ -107,7 +107,7 @@ var c3 = new GeometryCurve(loop.CurveList[1].EndPoint, loop.CurveList[0].HeadPoint); loop.CurveList.Add(c3); // assert - Assert.IsTrue(loop.HasArea()); + Assert.That(loop.HasArea(), Is.True); // reverse curve 1: E-H H-E H-E c1.Reverse(); @@ -116,7 +116,7 @@ loop1.CurveList.Add(c2); loop1.CurveList.Add(c3); // assert - Assert.IsTrue(loop1.HasArea()); + Assert.That(loop1.HasArea(), Is.True); // rereverse c1, reverse c2: H-E E-H H-E c1.Reverse(); @@ -126,7 +126,7 @@ loop2.CurveList.Add(c2); loop2.CurveList.Add(c3); // assert - Assert.IsTrue(loop2.HasArea()); + Assert.That(loop2.HasArea(), Is.True); // rereverse c2, reverse c3: H-E H-E E-H c2.Reverse(); @@ -136,7 +136,7 @@ loop3.CurveList.Add(c2); loop3.CurveList.Add(c3); // assert - Assert.IsTrue(loop3.HasArea()); + Assert.That(loop3.HasArea(), Is.True); // rereverse c3, reverse c1 and c2 : E-H E-H H-E c3.Reverse(); @@ -147,7 +147,7 @@ loop4.CurveList.Add(c2); loop4.CurveList.Add(c3); // assert - Assert.IsTrue(loop4.HasArea()); + Assert.That(loop4.HasArea(), Is.True); // reverse c3 : E-H E-H E-H c3.Reverse(); @@ -156,7 +156,7 @@ loop5.CurveList.Add(c2); loop5.CurveList.Add(c3); // assert - Assert.IsTrue(loop5.HasArea()); + Assert.That(loop5.HasArea(), Is.True); // reverse c2 : E-H H-E E-H c2.Reverse(); @@ -165,7 +165,7 @@ loop6.CurveList.Add(c2); loop6.CurveList.Add(c3); // assert - Assert.IsTrue(loop6.HasArea()); + Assert.That(loop6.HasArea(), Is.True); // reverse 1, rereverse c2 : H-E E-H E-H c1.Reverse(); @@ -175,7 +175,7 @@ loop7.CurveList.Add(c2); loop7.CurveList.Add(c3); // assert - Assert.IsTrue(loop7.HasArea()); + Assert.That(loop7.HasArea(), Is.True); } [Test] @@ -194,7 +194,7 @@ bool hasArea = loop.HasArea(); // assert - Assert.IsFalse(hasArea); + Assert.That(hasArea, Is.False); } [Test] @@ -211,7 +211,7 @@ bool isClockWise = loop.IsClockWise(); // assert - Assert.IsTrue(isClockWise); + Assert.That(isClockWise, Is.True); } [Test] @@ -250,7 +250,7 @@ bool isClockWise = loop.IsClockWise(); // assert - Assert.IsTrue(isClockWise); + Assert.That(isClockWise, Is.True); } [Test] @@ -267,7 +267,7 @@ bool isClockWise = loop.IsClockWise(); // assert - Assert.IsFalse(isClockWise); + Assert.That(isClockWise, Is.False); } [Test] @@ -305,7 +305,7 @@ bool isClockWise = loop.IsClockWise(); // assert - Assert.IsFalse(isClockWise); + Assert.That(isClockWise, Is.False); } [Test] @@ -374,7 +374,7 @@ bool isContained = loop.IsPointInLoopArea(point); // assert - Assert.IsTrue(isContained); + Assert.That(isContained, Is.True); } [Test] @@ -397,7 +397,7 @@ bool isContained = loop.IsPointInLoopArea(point); // assert - Assert.IsTrue(isContained); + Assert.That(isContained, Is.True); } [Test] @@ -420,7 +420,7 @@ bool isContained = loop.IsPointInLoopArea(point); // assert - Assert.IsFalse(isContained); + Assert.That(isContained, Is.False); } [Test] @@ -651,6 +651,6 @@ IList points = loop.Points; // assert - Assert.IsEmpty(points); + Assert.That(points, Is.Empty); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineShoulderAdapterTest.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineShoulderAdapterTest.cs (.../SurfaceLineShoulderAdapterTest.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/DikesDesign/SurfaceLineShoulderAdapterTest.cs (.../SurfaceLineShoulderAdapterTest.cs) (revision 4627) @@ -121,7 +121,7 @@ surfaceLine.EnsurePointOfType(pointAtSurfaceLevelInside.X, pointAtSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside); var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0); SurfaceLine2 constructNewSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(0, 0, false); - Assert.IsNotNull(constructNewSurfaceLine); + Assert.That(constructNewSurfaceLine, Is.Not.Null); } /// @@ -171,12 +171,12 @@ surfaceLine.EnsurePointOfType(pointAtTopPolder.X, pointAtTopPolder.Z, CharacteristicPointType.DikeTopAtPolder); surfaceLine.EnsurePointOfType(pointAtToePolder.X, pointAtToePolder.Z, CharacteristicPointType.DikeToeAtPolder); surfaceLine.EnsurePointOfType(pointAtSurfaceLevelInside.X, pointAtSurfaceLevelInside.Z, CharacteristicPointType.SurfaceLevelInside); - Assert.IsNull(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside)); - Assert.IsNull(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside)); + Assert.That(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside), Is.Null); + Assert.That(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside), Is.Null); var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0); SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); - Assert.IsNotNull(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside)); - Assert.IsNotNull(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside), Is.Not.Null); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside), Is.Not.Null); } /// @@ -232,7 +232,7 @@ double expectedShoulderHeight = Math.Min(shoulderHeight, surfaceLineAdapter.MaxShoulderLevel - pointAtToePolder.Z); var expectedPoint = new GeometryPoint(3.33, expectedShoulderHeight); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); } /// @@ -286,7 +286,7 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(3.5, 1); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); } /// @@ -342,7 +342,7 @@ var expectedPoint = new GeometryPoint( pointAtTopPolder.X + (1 - expectedShoulderHeight) + shoulderLength + expectedShoulderHeight * surfaceLineAdapter.SlopeOfNewShoulder, 0); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); } /// @@ -485,7 +485,7 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(3.66, 0.67); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); } [Test] @@ -650,8 +650,8 @@ double actualXValue = pointAtSurfaceLevelInside.X; Assert.That(actualPoint.X, Is.EqualTo(actualXValue).Within(pointCoordinateTolerance)); Assert.That(actualPoint.Z, Is.EqualTo(pointAtSurfaceLevelInside.Z).Within(pointCoordinateTolerance)); - Assert.IsTrue(adaptedSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(extraPoint2))); - Assert.IsFalse(adaptedSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(extraPoint1))); + Assert.That(adaptedSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(extraPoint2)), Is.True); + Assert.That(adaptedSurfaceLine.Geometry.Points.Any(p => p.LocationEquals(extraPoint1)), Is.False); } [Test] @@ -661,8 +661,8 @@ var location = new Location(); const int shoulderLength = 2; const int shoulderHeight = 1; - Assert.IsNull(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside)); - Assert.IsNull(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside)); + Assert.That(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside), Is.Null); + Assert.That(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside), Is.Null); var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0); SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); EvaluateAdaptedSurfaceLineWithSkewedSurfaceLevelInside(surfaceLine, adaptedSurfaceLine, shoulderHeight, shoulderLength); @@ -677,8 +677,8 @@ const int shoulderHeight = 1; surfaceLine.EnsurePoint(8, 1.9); surfaceLine.SortPoints(); - Assert.IsNull(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside)); - Assert.IsNull(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside)); + Assert.That(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside), Is.Null); + Assert.That(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside), Is.Null); var surfaceLineAdapter = new SurfaceLineShoulderAdapter(surfaceLine, location, 0); SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(7)); @@ -833,25 +833,25 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(3.5, 1); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); var expectedShoulderTopInside = new GeometryPoint(4.5, 1); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedShoulderTopInside.LocationEquals(actualPoint)); + Assert.That(expectedShoulderTopInside.LocationEquals(actualPoint), Is.True); var expectedDikeToePolder = new GeometryPoint(6.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedDikeToePolder.LocationEquals(actualPoint)); + Assert.That(expectedDikeToePolder.LocationEquals(actualPoint), Is.True); var expectedDitchDikeSide = new GeometryPoint(11.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide); - Assert.IsTrue(expectedDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchDikeSide = new GeometryPoint(12.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide); - Assert.IsTrue(expectedBottomDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchPolderSide = new GeometryPoint(13.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide); - Assert.IsTrue(expectedBottomDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchPolderSide.LocationEquals(actualPoint), Is.True); var expectedDitchPolderSide = new GeometryPoint(14.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); - Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchPolderSide.LocationEquals(actualPoint), Is.True); Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(9)); Assert.That(adaptedSurfaceLine.Geometry.Points.Count, Is.EqualTo(12)); } @@ -931,25 +931,25 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(3.5, 1); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); var expectedShoulderTopInside = new GeometryPoint(4.5, 1); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedShoulderTopInside.LocationEquals(actualPoint)); + Assert.That(expectedShoulderTopInside.LocationEquals(actualPoint), Is.True); var expectedDikeToePolder = new GeometryPoint(6.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedDikeToePolder.LocationEquals(actualPoint)); + Assert.That(expectedDikeToePolder.LocationEquals(actualPoint), Is.True); var expectedDitchDikeSide = new GeometryPoint(11.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide); - Assert.IsTrue(expectedDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchDikeSide = new GeometryPoint(12.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide); - Assert.IsTrue(expectedBottomDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchPolderSide = new GeometryPoint(13.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide); - Assert.IsTrue(expectedBottomDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchPolderSide.LocationEquals(actualPoint), Is.True); var expectedDitchPolderSide = new GeometryPoint(14.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); - Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchPolderSide.LocationEquals(actualPoint), Is.True); Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(9)); Assert.That(adaptedSurfaceLine.Geometry.Points.Count, Is.EqualTo(12)); } @@ -1035,13 +1035,13 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(3.5, 1); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); var expectedShoulderTopInside = new GeometryPoint(4.5, 1); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedShoulderTopInside.LocationEquals(actualPoint)); + Assert.That(expectedShoulderTopInside.LocationEquals(actualPoint), Is.True); var expectedDikeToePolder = new GeometryPoint(6.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedDikeToePolder.LocationEquals(actualPoint)); + Assert.That(expectedDikeToePolder.LocationEquals(actualPoint), Is.True); Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(10)); Assert.That(adaptedSurfaceLine.Geometry.Points.Count, Is.EqualTo(11)); } @@ -1133,25 +1133,25 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(3.5, 1); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); var expectedShoulderTopInside = new GeometryPoint(4.5, 1); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedShoulderTopInside.LocationEquals(actualPoint)); + Assert.That(expectedShoulderTopInside.LocationEquals(actualPoint), Is.True); var expectedDikeToePolder = new GeometryPoint(6.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedDikeToePolder.LocationEquals(actualPoint)); + Assert.That(expectedDikeToePolder.LocationEquals(actualPoint), Is.True); var expectedDitchDikeSide = new GeometryPoint(11.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide); - Assert.IsTrue(expectedDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchDikeSide = new GeometryPoint(12.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide); - Assert.IsTrue(expectedBottomDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchPolderSide = new GeometryPoint(13.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide); - Assert.IsTrue(expectedBottomDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchPolderSide.LocationEquals(actualPoint), Is.True); var expectedDitchPolderSide = new GeometryPoint(18.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); - Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchPolderSide.LocationEquals(actualPoint), Is.True); Assert.That(surfaceLine.Geometry.Points.Count, Is.EqualTo(11)); Assert.That(adaptedSurfaceLine.Geometry.Points.Count, Is.EqualTo(11)); } @@ -1250,28 +1250,28 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(3.5, 1); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); var expectedShoulderTopInside = new GeometryPoint(4.5, 1); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedShoulderTopInside.LocationEquals(actualPoint)); + Assert.That(expectedShoulderTopInside.LocationEquals(actualPoint), Is.True); var expectedDikeToePolder = new GeometryPoint(6.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedDikeToePolder.LocationEquals(actualPoint)); + Assert.That(expectedDikeToePolder.LocationEquals(actualPoint), Is.True); var expectedDitchDikeSide = new GeometryPoint(11.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide); - Assert.IsTrue(expectedDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchDikeSide = new GeometryPoint(12.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide); - Assert.IsTrue(expectedBottomDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchPolderSide = new GeometryPoint(13.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide); - Assert.IsTrue(expectedBottomDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchPolderSide.LocationEquals(actualPoint), Is.True); var expectedDitchPolderSide = new GeometryPoint(14.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); - Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchPolderSide.LocationEquals(actualPoint), Is.True); var expectedExtraPointBeyondDitchUnchanged = new GeometryPoint(20, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints[adaptedSurfaceLine.CharacteristicPoints.Count - 2]; - Assert.IsTrue(expectedExtraPointBeyondDitchUnchanged.LocationEquals(actualPoint)); + Assert.That(expectedExtraPointBeyondDitchUnchanged.LocationEquals(actualPoint), Is.True); Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(12)); Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(13)); } @@ -1373,31 +1373,31 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(3.5, 1); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); var expectedShoulderTopInside = new GeometryPoint(4.5, 1); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedShoulderTopInside.LocationEquals(actualPoint)); + Assert.That(expectedShoulderTopInside.LocationEquals(actualPoint), Is.True); var expectedDikeToePolder = new GeometryPoint(6.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedDikeToePolder.LocationEquals(actualPoint)); + Assert.That(expectedDikeToePolder.LocationEquals(actualPoint), Is.True); var expectedDitchDikeSide = new GeometryPoint(11.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide); - Assert.IsTrue(expectedDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchDikeSide = new GeometryPoint(12.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide); - Assert.IsTrue(expectedBottomDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchPolderSide = new GeometryPoint(13.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide); - Assert.IsTrue(expectedBottomDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchPolderSide.LocationEquals(actualPoint), Is.True); var expectedDitchPolderSide = new GeometryPoint(14.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); - Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchPolderSide.LocationEquals(actualPoint), Is.True); var expectedExtraPointBeyondDitchUnchanged1 = new GeometryPoint(19, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints[adaptedSurfaceLine.CharacteristicPoints.Count - 3]; - Assert.IsTrue(expectedExtraPointBeyondDitchUnchanged1.LocationEquals(actualPoint)); + Assert.That(expectedExtraPointBeyondDitchUnchanged1.LocationEquals(actualPoint), Is.True); var expectedExtraPointBeyondDitchUnchanged2 = new GeometryPoint(20, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints[adaptedSurfaceLine.CharacteristicPoints.Count - 2]; - Assert.IsTrue(expectedExtraPointBeyondDitchUnchanged2.LocationEquals(actualPoint)); + Assert.That(expectedExtraPointBeyondDitchUnchanged2.LocationEquals(actualPoint), Is.True); Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(12)); Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(14)); } @@ -1643,7 +1643,7 @@ double expectedShoulderHeight = Math.Min(shoulderHeight, surfaceLineAdapter.MaxShoulderLevel + surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z); var expectedPoint = new GeometryPoint(3.5, expectedShoulderHeight); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); } [Test] @@ -1697,7 +1697,7 @@ double expectedShoulderHeight = Math.Min(shoulderHeight, (surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z - surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z)); var expectedPoint = new GeometryPoint(3, expectedShoulderHeight); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); } [Test] @@ -1754,7 +1754,7 @@ double expectedShoulderHeight = Math.Min(shoulderHeight, surfaceLineAdapter.MaxShoulderLevel + surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z); var expectedPoint = new GeometryPoint(3.5, expectedShoulderHeight); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); } [Test] @@ -1809,13 +1809,13 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedBasePoint = new GeometryPoint(2.263, 0.737); GeometryPoint actualBasePoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedBasePoint.LocationEquals(actualBasePoint)); + Assert.That(expectedBasePoint.LocationEquals(actualBasePoint), Is.True); var expectedTopPoint = new GeometryPoint(7, 0.5); GeometryPoint actualTopPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedTopPoint.LocationEquals(actualTopPoint)); + Assert.That(expectedTopPoint.LocationEquals(actualTopPoint), Is.True); var expectedToePoint = new GeometryPoint(8.5, 0.0); GeometryPoint actualToePoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedToePoint.LocationEquals(actualToePoint)); + Assert.That(expectedToePoint.LocationEquals(actualToePoint), Is.True); } [Test] @@ -1935,13 +1935,13 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedBasePoint = new GeometryPoint(2.5, 0.5); GeometryPoint actualBasePoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedBasePoint.LocationEquals(actualBasePoint)); + Assert.That(expectedBasePoint.LocationEquals(actualBasePoint), Is.True); var expectedTopPoint = new GeometryPoint(7, 0.5); GeometryPoint actualTopPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedTopPoint.LocationEquals(actualTopPoint)); + Assert.That(expectedTopPoint.LocationEquals(actualTopPoint), Is.True); var expectedToePoint = new GeometryPoint(7.5, 0.0); GeometryPoint actualToePoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedToePoint.LocationEquals(actualToePoint)); + Assert.That(expectedToePoint.LocationEquals(actualToePoint), Is.True); } [Test] @@ -1997,13 +1997,13 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedBasePoint = new GeometryPoint(2.5, 0.5); GeometryPoint actualBasePoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedBasePoint.LocationEquals(actualBasePoint)); + Assert.That(expectedBasePoint.LocationEquals(actualBasePoint), Is.True); var expectedTopPoint = new GeometryPoint(7, 0.5); GeometryPoint actualTopPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedTopPoint.LocationEquals(actualTopPoint)); + Assert.That(expectedTopPoint.LocationEquals(actualTopPoint), Is.True); var expectedToePoint = new GeometryPoint(8, 0.0); GeometryPoint actualToePoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedToePoint.LocationEquals(actualToePoint)); + Assert.That(expectedToePoint.LocationEquals(actualToePoint), Is.True); } [Test] @@ -2147,25 +2147,25 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(3.5, 1); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); var expectedShoulderTopInside = new GeometryPoint(4.5, 1); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedShoulderTopInside.LocationEquals(actualPoint)); + Assert.That(expectedShoulderTopInside.LocationEquals(actualPoint), Is.True); var expectedDikeToePolder = new GeometryPoint(6.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedDikeToePolder.LocationEquals(actualPoint)); + Assert.That(expectedDikeToePolder.LocationEquals(actualPoint), Is.True); var expectedDitchDikeSide = new GeometryPoint(7.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide); - Assert.IsTrue(expectedDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchDikeSide = new GeometryPoint(8.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide); - Assert.IsTrue(expectedBottomDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchPolderSide = new GeometryPoint(9.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide); - Assert.IsTrue(expectedBottomDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchPolderSide.LocationEquals(actualPoint), Is.True); var expectedDitchPolderSide = new GeometryPoint(10.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); - Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchPolderSide.LocationEquals(actualPoint), Is.True); Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(11)); Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(11)); } @@ -2259,25 +2259,25 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(3.5, 1); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); var expectedShoulderTopInside = new GeometryPoint(4.5, 1); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedShoulderTopInside.LocationEquals(actualPoint)); + Assert.That(expectedShoulderTopInside.LocationEquals(actualPoint), Is.True); var expectedDikeToePolder = new GeometryPoint(6.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedDikeToePolder.LocationEquals(actualPoint)); + Assert.That(expectedDikeToePolder.LocationEquals(actualPoint), Is.True); var expectedDitchDikeSide = new GeometryPoint(37.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide); - Assert.IsTrue(expectedDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchDikeSide = new GeometryPoint(38.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide); - Assert.IsTrue(expectedBottomDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchPolderSide = new GeometryPoint(39.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide); - Assert.IsTrue(expectedBottomDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchPolderSide.LocationEquals(actualPoint), Is.True); var expectedDitchPolderSide = new GeometryPoint(40.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); - Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchPolderSide.LocationEquals(actualPoint), Is.True); Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(11)); Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(14)); } @@ -2465,25 +2465,25 @@ SurfaceLine2 adaptedSurfaceLine = surfaceLineAdapter.ConstructNewSurfaceLine(shoulderLength, shoulderHeight, false); var expectedPoint = new GeometryPoint(3.5, 1); GeometryPoint actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside); - Assert.IsTrue(expectedPoint.LocationEquals(actualPoint)); + Assert.That(expectedPoint.LocationEquals(actualPoint), Is.True); var expectedShoulderTopInside = new GeometryPoint(4.5, 1); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside); - Assert.IsTrue(expectedShoulderTopInside.LocationEquals(actualPoint)); + Assert.That(expectedShoulderTopInside.LocationEquals(actualPoint), Is.True); var expectedDikeToePolder = new GeometryPoint(6.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder); - Assert.IsTrue(expectedDikeToePolder.LocationEquals(actualPoint)); + Assert.That(expectedDikeToePolder.LocationEquals(actualPoint), Is.True); var expectedDitchDikeSide = new GeometryPoint(7.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide); - Assert.IsTrue(expectedDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchDikeSide = new GeometryPoint(9.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide); - Assert.IsTrue(expectedBottomDitchDikeSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchDikeSide.LocationEquals(actualPoint), Is.True); var expectedBottomDitchPolderSide = new GeometryPoint(11.5, -2); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide); - Assert.IsTrue(expectedBottomDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedBottomDitchPolderSide.LocationEquals(actualPoint), Is.True); var expectedDitchPolderSide = new GeometryPoint(13.5, 0); actualPoint = adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide); - Assert.IsTrue(expectedDitchPolderSide.LocationEquals(actualPoint)); + Assert.That(expectedDitchPolderSide.LocationEquals(actualPoint), Is.True); Assert.That(surfaceLine.Geometry.Count, Is.EqualTo(11)); Assert.That(adaptedSurfaceLine.Geometry.Count, Is.EqualTo(11)); } @@ -2636,8 +2636,8 @@ private void EvaluateAdaptedSurfaceLineWithSkewedSurfaceLevelInside(SurfaceLine2 surfaceLine, SurfaceLine2 adaptedSurfaceLine, double shoulderHeight, double shoulderLength) { const double cTolerance = 0.0000001; - Assert.IsNotNull(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside)); - Assert.IsNotNull(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside)); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside), Is.Not.Null); + Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderTopInside), Is.Not.Null); Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).Z, Is.EqualTo(surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z + shoulderHeight).Within(cTolerance)); double intersectionInsideSlopeWithDikeBaseXCoordinate = surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).X + (surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder).Z - surfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder).Z); Assert.That(adaptedSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseInside).X, Is.EqualTo(intersectionInsideSlopeWithDikeBaseXCoordinate - shoulderHeight).Within(cTolerance)); Index: DamEngine/trunk/src/build/Test.targets =================================================================== diff -u -r4608 -r4627 --- DamEngine/trunk/src/build/Test.targets (.../Test.targets) (revision 4608) +++ DamEngine/trunk/src/build/Test.targets (.../Test.targets) (revision 4627) @@ -9,14 +9,12 @@ - 3.13.3 + 4.1.0 - 4.4.2 + 4.6.0 - - 17.5.0 - + 4.5.4 Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs (.../Geometry2DSectionAssemblerTest.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/Assemblers/Geometry2DSectionAssemblerTest.cs (.../Geometry2DSectionAssemblerTest.cs) (revision 4627) @@ -146,18 +146,18 @@ XElement soilProfileElement = soilProfileCollectionElements.Single(); - Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeName), $"{XMLAttributes.XmlAttributeName}"); + Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeName), Is.Not.Null, $"{XMLAttributes.XmlAttributeName}"); Assert.That(soilProfileElement.AttributeAs(XMLAttributes.XmlAttributeName), Is.EqualTo(geometry2DSectionParameters.SoilProfile.Name), $"{XMLAttributes.XmlAttributeName}"); - Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeXCoordinate), $"{XMLAttributes.XmlAttributeXCoordinate}"); - Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeYCoordinate), $"{XMLAttributes.XmlAttributeYCoordinate}"); - Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributePhreaticLevel), $"{XMLAttributes.XmlAttributePhreaticLevel}"); - Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeHasPhreaticLevel), $"{XMLAttributes.XmlAttributeHasPhreaticLevel}"); - Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeBottomLevel), $"{XMLAttributes.XmlAttributeBottomLevel}"); + Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeXCoordinate), Is.Not.Null, $"{XMLAttributes.XmlAttributeXCoordinate}"); + Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeYCoordinate), Is.Not.Null, $"{XMLAttributes.XmlAttributeYCoordinate}"); + Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributePhreaticLevel), Is.Not.Null, $"{XMLAttributes.XmlAttributePhreaticLevel}"); + Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeHasPhreaticLevel), Is.Not.Null, $"{XMLAttributes.XmlAttributeHasPhreaticLevel}"); + Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeBottomLevel), Is.Not.Null, $"{XMLAttributes.XmlAttributeBottomLevel}"); Assert.That(soilProfileElement.AttributeAs(XMLAttributes.XmlAttributeBottomLevel), Is.EqualTo(geometry2DSectionParameters.SoilProfile.BottomLevel).Within(cTolerance), $"{XMLAttributes.XmlAttributeBottomLevel}"); // Created no PL line so characteristic layers are unassigned - Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeBottomSandLayerID), XMLAttributes.XmlAttributeBottomSandLayerID); - Assert.IsNotNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeInBetweenSandLayerID), XMLAttributes.XmlAttributeInBetweenSandLayerID); - Assert.IsNull(soilProfileElement.Attribute(XMLAttributes.XmlAttributeInfiltrationLayerID), XMLAttributes.XmlAttributeInfiltrationLayerID); + Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeBottomSandLayerID), Is.Not.Null, XMLAttributes.XmlAttributeBottomSandLayerID); + Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeInBetweenSandLayerID), Is.Not.Null, XMLAttributes.XmlAttributeInBetweenSandLayerID); + Assert.That(soilProfileElement.Attribute(XMLAttributes.XmlAttributeInfiltrationLayerID), Is.Null, XMLAttributes.XmlAttributeInfiltrationLayerID); // Profile layers IEnumerable layersCollectionElements = from element in soilProfileElement.Descendants() @@ -177,11 +177,11 @@ { layerElementEnumerator.MoveNext(); XElement layerElement = layerElementEnumerator.Current; - Assert.IsNotNull(layerElement.Attribute(XMLAttributes.XmlAttributeID), $"{$"ID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"}"); + Assert.That(layerElement.Attribute(XMLAttributes.XmlAttributeID), Is.Not.Null, $"ID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); Assert.That(layerElement.AttributeAs(XMLAttributes.XmlAttributeID), Is.EqualTo(layer.Name), $"ID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); - Assert.IsNotNull(layerElement.Attribute(XMLAttributes.XmlAttributeSoilID), $"{$"SoilID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"}"); + Assert.That(layerElement.Attribute(XMLAttributes.XmlAttributeSoilID), Is.Not.Null, $"SoilID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); Assert.That(layerElement.AttributeAs(XMLAttributes.XmlAttributeSoilID), Is.EqualTo(layer.Soil.Name), $"SoilID of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); - Assert.IsNotNull(layerElement.Attribute(XMLAttributes.XmlAttributeTopLevel), $"{$"TopLevel of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"}"); + Assert.That(layerElement.Attribute(XMLAttributes.XmlAttributeTopLevel), Is.Not.Null, $"TopLevel of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); Assert.That(layerElement.AttributeAs(XMLAttributes.XmlAttributeTopLevel), Is.EqualTo(layer.TopLevel), $"TopLevel of layer #{geometry2DSectionParameters.SoilProfile.Layers.IndexOf(layer)}"); } } @@ -193,9 +193,9 @@ Geometry2DSectionParameters geometry2DSectionParameters = assembler.CreateOutputObject(doc); Assert.That(geometry2DSectionParameters.SoilProfile.Layers.Count, Is.EqualTo(6)); Assert.That(geometry2DSectionParameters.SoilProfile.BottomLevel, Is.EqualTo(-10).Within(cTolerance)); - Assert.IsTrue(geometry2DSectionParameters.SoilProfile.Layers[3].SoilName.Equals("DKN3")); + Assert.That(geometry2DSectionParameters.SoilProfile.Layers[3].SoilName.Equals("DKN3"), Is.True); Assert.That(geometry2DSectionParameters.SoilProfile.Layers[3].TopLevel, Is.EqualTo(-2.8).Within(cTolerance)); - Assert.IsTrue(geometry2DSectionParameters.SoilGeometry2DName.Equals("1D1.sti")); + Assert.That(geometry2DSectionParameters.SoilGeometry2DName.Equals("1D1.sti"), Is.True); Assert.That(geometry2DSectionParameters.XCoordinateSection, Is.EqualTo(64.0).Within(cTolerance)); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs (.../DesignCalculatorTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/DesignCalculatorTests.cs (.../DesignCalculatorTests.cs) (revision 4627) @@ -82,8 +82,7 @@ // As the data is not entirely correct for the new kernel, we expect 1 error. Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(1)); - Assert.IsTrue(output.Results.CalculationMessages[0].Message1.Contains( - "De berekening is mislukt met de volgende foutmelding"), output.Results.CalculationMessages[0].Message1); + Assert.That(output.Results.CalculationMessages[0].Message1, Does.Contain("De berekening is mislukt met de volgende foutmelding"), output.Results.CalculationMessages[0].Message1); } [Test] @@ -99,6 +98,6 @@ // We get 606 warnings in total when using the official release of the macro stability kernel. When we use the latest trunk version, we get 619 errors // So as long as the latest version is not (yet) released we have to check both values because otherwise it will either fail locally or on TC. - Assert.IsTrue(606 == output.Results.CalculationMessages.Length || 619 == output.Results.CalculationMessages.Length, "Number of messages found = " + output.Results.CalculationMessages.Length); + Assert.That(output.Results.CalculationMessages.Length, Is.EqualTo(606).Or.EqualTo(619), "Number of messages found = " + output.Results.CalculationMessages.Length); } } \ No newline at end of file Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs =================================================================== diff -u -r4624 -r4627 --- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs (.../OperationalGrebbedijkTests.cs) (revision 4624) +++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/OperationalGrebbedijkTests.cs (.../OperationalGrebbedijkTests.cs) (revision 4627) @@ -100,7 +100,7 @@ inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used var engineInterface = new EngineInterface(inputString); - Assert.IsNotNull(engineInterface.DamProjectData); + Assert.That(engineInterface.DamProjectData, Is.Not.Null); engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.FailureMechanismSystemType = FailureMechanismSystemType.Piping; engineInterface.DamProjectData.DamProjectCalculationSpecification.CurrentSpecification.PipingModelType = pipingModel;