Index: Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r7869115120e7341826283ec22afdf03634d13775 --- Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision 7869115120e7341826283ec22afdf03634d13775) @@ -113,6 +113,33 @@ } /// + /// Gets the value of a property of an instance. + /// + /// Type of the property. + /// Instance holding the property. Cannot be null. + /// Name of the property. + /// The value of the property. + /// Thrown when + /// doesn't have a property with the name . + /// Thrown when any input argument is null. + /// This method can be used for properties of any visibility. + public static T GetProperty(object instance, string propertyName) + { + if (instance == null) + { + throw new ArgumentNullException(nameof(instance)); + } + PropertyInfo propertyInfo = + instance.GetType().GetProperty(propertyName, BindingFlags.NonPublic | BindingFlags.Instance | BindingFlags.Public); + if (propertyInfo == null) + { + throw new ArgumentOutOfRangeException(nameof(propertyInfo)); + } + MethodInfo getter = propertyInfo.GetGetMethod(true); + return (T) getter.Invoke(instance, null); + } + + /// /// Gets the value of a field of an instance. /// /// Instance holding the field. Cannot be null. Index: Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r7869115120e7341826283ec22afdf03634d13775 --- Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs (.../TypeUtilsTest.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Common/test/Core.Common.Utils.Test/Reflection/TypeUtilsTest.cs (.../TypeUtilsTest.cs) (revision 7869115120e7341826283ec22afdf03634d13775) @@ -244,6 +244,101 @@ } [Test] + public void GetProperty_InstanceNull_ThrowArgumentNullException() + { + // Call + TestDelegate call = () => TypeUtils.GetProperty(null, "A"); + + // Assert + string paramName = Assert.Throws(call).ParamName; + Assert.AreEqual("instance", paramName); + } + + [Test] + public void GetProperty_PropertyNameIsNull_ThrowArgumentNullException() + { + // Setup + var testClass = new TestClass(22); + + // Call + TestDelegate call = () => TypeUtils.GetProperty(testClass, null); + + // Assert + Assert.Throws(call); + } + + [Test] + public void GetProperty_PrivateProperty_ReturnPropertyValue() + { + // Setup + var testClass = new TestClass(); + + // Call + var privateIntValue = TypeUtils.GetProperty(testClass, "PrivateIntProperty"); + + // Assert + Assert.AreEqual(102, privateIntValue); + } + + [Test] + public void GetProperty_PrivatePropertyOfDerivedClass_ReturnPropertyValue() + { + // Setup + var testClass = new DerivedTestClass(); + + // Call + var privateIntValue = TypeUtils.GetProperty(testClass, "PrivateIntProperty"); + + // Assert + Assert.AreEqual(102, privateIntValue); + } + + [Test] + public void GetProperty_PublicProperty_ReturnPublicPropertyValue() + { + // Setup + var testClass = new TestClass + { + PublicProperty = 1234.0 + }; + + // Call + var publicPropertyValue = TypeUtils.GetProperty(testClass, "PublicProperty"); + + // Assert + Assert.AreEqual(testClass.PublicProperty, publicPropertyValue); + } + + [Test] + public void GetProperty_PublicPropertyFromBaseClass_ReturnPublicPropertyValue() + { + // Setup + var derivedTestClass = new DerivedTestClass(1) + { + PublicProperty = 2.0 + }; + + // Call + var publicPropertyValue = TypeUtils.GetProperty(derivedTestClass, "PublicProperty"); + + // Assert + Assert.AreEqual(derivedTestClass.PublicProperty, publicPropertyValue); + } + + [Test] + public void GetProperty_GetNonExistingPrivateProperty_ThrowsArgumentOutOfRangeException() + { + // Setup + var testClass = new TestClass(0); + + // Call + TestDelegate call = () => TypeUtils.GetProperty(testClass, "nonExistingProperty"); + + // Assert + Assert.Throws(call); + } + + [Test] public void SetField_InstanceNull_ThrowArgumentNullException() { // Call @@ -541,8 +636,18 @@ this.privateInt = privateInt; } + public double PublicProperty { get; set; } + public double PublicPropertyPrivateSetter { get; private set; } + protected int PrivateIntProperty + { + get + { + return 102; + } + } + // ReSharper disable once UnusedMember.Local private int PrivateMethod(int i) { @@ -552,6 +657,8 @@ private class DerivedTestClass : TestClass { + public DerivedTestClass() {} + public DerivedTestClass(int privateInt) : base(privateInt) {} } } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs =================================================================== diff -u -r24c1404b1f8e7a8ae1f13bc2990062caa13b9aa3 -r7869115120e7341826283ec22afdf03634d13775 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs (.../WaternetKernelWrapper.cs) (revision 24c1404b1f8e7a8ae1f13bc2990062caa13b9aa3) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.KernelWrapper/Kernels/Waternet/WaternetKernelWrapper.cs (.../WaternetKernelWrapper.cs) (revision 7869115120e7341826283ec22afdf03634d13775) @@ -36,14 +36,12 @@ /// internal abstract class WaternetKernelWrapper : IWaternetKernel { - private readonly StabilityModel stabilityModel; - /// /// Creates a new instance of . /// protected WaternetKernelWrapper() { - stabilityModel = new StabilityModel(); + StabilityModel = new StabilityModel(); } public abstract StabilityLocation Location { set; } @@ -94,16 +92,20 @@ /// /// Gets the stability model of the kernel. /// - protected StabilityModel StabilityModel - { - get - { - return stabilityModel; - } - } + protected StabilityModel StabilityModel { get; } + /// + /// Creates the Waternet XML result with the supplied calculation. + /// + /// The calculation to create the Waternet from. + /// The Waternet XML result. protected abstract string CreateWaternetXmlResult(WTIStabilityCalculation waternetCalculation); + /// + /// Reads the from the supplied XML result. + /// + /// The Waternet XML result to read. + /// The parsed Waternet result. protected abstract WtiStabilityWaternet ReadResult(string waternetXmlResult); /// Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetDailyKernelWrapperTest.cs =================================================================== diff -u -r68f204f50eaf5f1e881c18fb2d878a17c722f75a -r7869115120e7341826283ec22afdf03634d13775 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetDailyKernelWrapperTest.cs (.../WaternetDailyKernelWrapperTest.cs) (revision 68f204f50eaf5f1e881c18fb2d878a17c722f75a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetDailyKernelWrapperTest.cs (.../WaternetDailyKernelWrapperTest.cs) (revision 7869115120e7341826283ec22afdf03634d13775) @@ -59,7 +59,7 @@ }; // Assert - var stabilityModel = TypeUtils.GetField(kernel, "stabilityModel"); + var stabilityModel = TypeUtils.GetProperty(kernel, "StabilityModel"); Assert.AreSame(stabilityLocation, stabilityModel.LocationDaily); Assert.AreSame(surfaceLine, stabilityModel.SurfaceLine2); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetExtremeKernelWrapperTest.cs =================================================================== diff -u -r68f204f50eaf5f1e881c18fb2d878a17c722f75a -r7869115120e7341826283ec22afdf03634d13775 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetExtremeKernelWrapperTest.cs (.../WaternetExtremeKernelWrapperTest.cs) (revision 68f204f50eaf5f1e881c18fb2d878a17c722f75a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetExtremeKernelWrapperTest.cs (.../WaternetExtremeKernelWrapperTest.cs) (revision 7869115120e7341826283ec22afdf03634d13775) @@ -59,7 +59,7 @@ }; // Assert - var stabilityModel = TypeUtils.GetField(kernel, "stabilityModel"); + var stabilityModel = TypeUtils.GetProperty(kernel, "StabilityModel"); Assert.AreSame(stabilityLocation, stabilityModel.Location); Assert.AreSame(surfaceLine, stabilityModel.SurfaceLine2); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs =================================================================== diff -u -r68f204f50eaf5f1e881c18fb2d878a17c722f75a -r7869115120e7341826283ec22afdf03634d13775 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs (.../WaternetKernelWrapperTest.cs) (revision 68f204f50eaf5f1e881c18fb2d878a17c722f75a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.Test/Kernels/Waternet/WaternetKernelWrapperTest.cs (.../WaternetKernelWrapperTest.cs) (revision 7869115120e7341826283ec22afdf03634d13775) @@ -61,7 +61,7 @@ }; // Assert - var stabilityModel = TypeUtils.GetField(kernel, "stabilityModel"); + var stabilityModel = TypeUtils.GetProperty(kernel, "StabilityModel"); Assert.AreSame(stabilityLocation, stabilityModel.Location); Assert.AreSame(surfaceLine, stabilityModel.SurfaceLine2); @@ -73,7 +73,7 @@ } [Test] - public void Calculate_ExceptionInWrappedKernel_ThrowsWaternetKernelWrapperException() + public void Calculate_ExceptionInWrappedKernel_ThrowsWaternetKernelWrapperExceptionAndWaternetNotSet() { // Setup var kernel = new TestWaternetKernelWrapper(); @@ -85,19 +85,6 @@ var exception = Assert.Throws(test); Assert.IsNotNull(exception.InnerException); Assert.AreEqual(exception.InnerException.Message, exception.Message); - } - - [Test] - public void Calculate_ExceptionDuringCalculation_OutputPropertiesNotSet() - { - // Setup - var kernel = new TestWaternetKernelWrapper(); - - // Call - TestDelegate test = () => kernel.Calculate(); - - // Assert - Assert.Throws(test); Assert.IsNull(kernel.Waternet); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/TestMacroStabilityInwardsCalculatorFactoryTest.cs =================================================================== diff -u -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 -r7869115120e7341826283ec22afdf03634d13775 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/TestMacroStabilityInwardsCalculatorFactoryTest.cs (.../TestMacroStabilityInwardsCalculatorFactoryTest.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/TestMacroStabilityInwardsCalculatorFactoryTest.cs (.../TestMacroStabilityInwardsCalculatorFactoryTest.cs) (revision 7869115120e7341826283ec22afdf03634d13775) @@ -82,11 +82,11 @@ SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), SoilProfile = new TestSoilProfile(), PhreaticLineOffsets = new PhreaticLineOffsets(), - DrainageConstruction = new DrainageConstruction(), + DrainageConstruction = new DrainageConstruction() }); // Call - var calculator = (WaternetCalculatorStub) factory.CreateWaternetExtremeCalculator(input, new TestMacroStabilityInwardsKernelFactory()); + var calculator = (WaternetCalculatorStub) factory.CreateWaternetExtremeCalculator(input, null); // Assert Assert.IsInstanceOf(calculator); @@ -103,11 +103,11 @@ SurfaceLine = new MacroStabilityInwardsSurfaceLine("test"), SoilProfile = new TestSoilProfile(), PhreaticLineOffsets = new PhreaticLineOffsets(), - DrainageConstruction = new DrainageConstruction(), + DrainageConstruction = new DrainageConstruction() }); // Call - var calculator = (WaternetCalculatorStub) factory.CreateWaternetDailyCalculator(input, new TestMacroStabilityInwardsKernelFactory()); + var calculator = (WaternetCalculatorStub) factory.CreateWaternetDailyCalculator(input, null); // Assert Assert.IsInstanceOf(calculator); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Input/WaternetCalculatorInputTestFactoryTest.cs =================================================================== diff -u -r4061c28197adfa0f3dc171c74fbe300ecb3a89c4 -r7869115120e7341826283ec22afdf03634d13775 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Input/WaternetCalculatorInputTestFactoryTest.cs (.../WaternetCalculatorInputTestFactoryTest.cs) (revision 4061c28197adfa0f3dc171c74fbe300ecb3a89c4) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Input/WaternetCalculatorInputTestFactoryTest.cs (.../WaternetCalculatorInputTestFactoryTest.cs) (revision 7869115120e7341826283ec22afdf03634d13775) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Linq; using Core.Common.Base.Geometry; using NUnit.Framework; @@ -53,11 +54,14 @@ Assert.IsFalse(double.IsNaN(input.PiezometricHeadPhreaticLine2Outwards)); Assert.IsFalse(double.IsNaN(input.PiezometricHeadPhreaticLine2Inwards)); Assert.IsFalse(double.IsNaN(input.PenetrationLength)); - Assert.IsNotNull(input.AdjustPhreaticLine3And4ForUplift); - Assert.IsNotNull(input.DikeSoilScenario); AssertSurfaceLine(input.SurfaceLine); AssertSoilProfile(input.SoilProfile, input.SurfaceLine); + + Assert.AreEqual(WaternetCreationMode.CreateWaternet, input.WaternetCreationMode); + Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, input.PlLineCreationMethod); + Assert.AreEqual(LandwardDirection.PositiveX, input.LandwardDirection); + Assert.IsTrue(Enum.IsDefined(typeof(MacroStabilityInwardsDikeSoilScenario), input.DikeSoilScenario)); } [Test] @@ -84,6 +88,11 @@ AssertSurfaceLine(input.SurfaceLine); AssertSoilProfile(input.SoilProfile, input.SurfaceLine); + + Assert.AreEqual(WaternetCreationMode.CreateWaternet, input.WaternetCreationMode); + Assert.AreEqual(PlLineCreationMethod.RingtoetsWti2017, input.PlLineCreationMethod); + Assert.AreEqual(LandwardDirection.PositiveX, input.LandwardDirection); + Assert.IsTrue(Enum.IsDefined(typeof(MacroStabilityInwardsDikeSoilScenario), input.DikeSoilScenario)); } private static void AssertSoilProfile(SoilProfile soilProfile, MacroStabilityInwardsSurfaceLine surfaceLine) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Output/WaternetCalculatorResultTestFactoryTest.cs =================================================================== diff -u -r38b96b5fe034945cfa33600ec134e21507b40922 -r7869115120e7341826283ec22afdf03634d13775 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Output/WaternetCalculatorResultTestFactoryTest.cs (.../WaternetCalculatorResultTestFactoryTest.cs) (revision 38b96b5fe034945cfa33600ec134e21507b40922) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil.Test/Calculators/Waternet/Output/WaternetCalculatorResultTestFactoryTest.cs (.../WaternetCalculatorResultTestFactoryTest.cs) (revision 7869115120e7341826283ec22afdf03634d13775) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections.Generic; using System.Linq; using Core.Common.Base.Geometry; using NUnit.Framework; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/KernelInputAssert.cs =================================================================== diff -u -rf2838b78c54529e9b15208b44de854f7760e350f -r7869115120e7341826283ec22afdf03634d13775 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/KernelInputAssert.cs (.../KernelInputAssert.cs) (revision f2838b78c54529e9b15208b44de854f7760e350f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.KernelWrapper.TestUtil/Kernels/UpliftVan/Input/KernelInputAssert.cs (.../KernelInputAssert.cs) (revision 7869115120e7341826283ec22afdf03634d13775) @@ -71,6 +71,7 @@ /// is not equal to . public static void AssertStabilityLocations(StabilityLocation expected, StabilityLocation actual) { + Assert.AreEqual(expected.StabilityModel, actual.StabilityModel); Assert.AreEqual(expected.DikeSoilScenario, actual.DikeSoilScenario); Assert.AreEqual(expected.WaternetCreationMode, actual.WaternetCreationMode); Assert.AreEqual(expected.PlLineCreationMethod, actual.PlLineCreationMethod); @@ -96,6 +97,17 @@ Assert.AreEqual(expected.LeakageLengthInwardsPl3, actual.LeakageLengthInwardsPl3); Assert.AreEqual(expected.LeakageLengthOutwardsPl4, actual.LeakageLengthOutwardsPl4); Assert.AreEqual(expected.LeakageLengthInwardsPl4, actual.LeakageLengthInwardsPl4); + Assert.AreEqual(expected.HeadInPlLine3, actual.HeadInPlLine3); + Assert.AreEqual(expected.HeadInPlLine4, actual.HeadInPlLine4); + Assert.AreEqual(expected.X, actual.X); + Assert.AreEqual(expected.Y, actual.Y); + Assert.AreEqual(expected.PiezometricHeads.Name, actual.PiezometricHeads.Name); + Assert.AreEqual(expected.PiezometricHeads.HeadPl1, actual.PiezometricHeads.HeadPl1); + Assert.AreEqual(expected.PiezometricHeads.HeadPl2, actual.PiezometricHeads.HeadPl2); + Assert.AreEqual(expected.PiezometricHeads.HeadPl3, actual.PiezometricHeads.HeadPl3); + Assert.AreEqual(expected.PiezometricHeads.HeadPl4, actual.PiezometricHeads.HeadPl4); + Assert.AreEqual(expected.PiezometricHeads.DampingFactorPl3, actual.PiezometricHeads.DampingFactorPl3); + Assert.AreEqual(expected.PiezometricHeads.DampingFactorPl4, actual.PiezometricHeads.DampingFactorPl4); } /// @@ -126,13 +138,14 @@ for (var i = 0; i < expected.Length; i++) { - SoilLayer2D expectedSurface = expected[i]; - SoilLayer2D actualSurface = actual[i]; + SoilLayer2D expectedSoilLayer = expected[i]; + SoilLayer2D actualSoilLayer = actual[i]; - Assert.AreEqual(expectedSurface.IsAquifer, actualSurface.IsAquifer); - AssertGeometrySurfaces(expectedSurface.GeometrySurface, actualSurface.GeometrySurface); - AssertSoils(expectedSurface.Soil, actualSurface.Soil); - Assert.AreEqual(expectedSurface.WaterpressureInterpolationModel, actualSurface.WaterpressureInterpolationModel); + Assert.AreEqual(expectedSoilLayer.Name, actualSoilLayer.Name); + Assert.AreEqual(expectedSoilLayer.IsAquifer, actualSoilLayer.IsAquifer); + AssertGeometrySurfaces(expectedSoilLayer.GeometrySurface, actualSoilLayer.GeometrySurface); + AssertSoils(expectedSoilLayer.Soil, actualSoilLayer.Soil); + Assert.AreEqual(expectedSoilLayer.WaterpressureInterpolationModel, actualSoilLayer.WaterpressureInterpolationModel); } } @@ -152,6 +165,7 @@ PreConsolidationStress expectedPreconsolidationStress = expected[i]; PreConsolidationStress actualPreconsolidationStress = actual[i]; + Assert.AreEqual(expectedPreconsolidationStress.Name, actualPreconsolidationStress.Name); Assert.AreEqual(expectedPreconsolidationStress.StressValue, actualPreconsolidationStress.StressValue); Assert.AreEqual(expectedPreconsolidationStress.X, actualPreconsolidationStress.X); Assert.AreEqual(expectedPreconsolidationStress.Z, actualPreconsolidationStress.Z); @@ -198,6 +212,10 @@ Assert.AreEqual(expected.StrengthIncreaseExponent, actual.StrengthIncreaseExponent); Assert.AreEqual(expected.PoP, actual.PoP); Assert.AreEqual(expected.DilatancyType, actual.DilatancyType); + Assert.AreEqual(expected.CuBottom, actual.CuBottom); + Assert.AreEqual(expected.CuTop, actual.CuTop); + Assert.AreEqual(expected.Ocr, actual.Ocr); + Assert.AreEqual(expected.RatioCuPc, actual.RatioCuPc); } /// @@ -215,6 +233,7 @@ CollectionAssert.AreEqual(expected.Curves, actual.Curves, new GeometryCurveComparer()); CollectionAssert.AreEqual(expected.Points, actual.Points, new StabilityPointComparer()); + Assert.AreEqual(expected.Name, actual.Name); Assert.AreEqual(expected.Bottom, actual.Bottom); Assert.AreEqual(expected.Left, actual.Left); Assert.AreEqual(expected.Right, actual.Right); @@ -247,6 +266,7 @@ private static void AssertCharacteristicPointSets(CharacteristicPointSet expected, CharacteristicPointSet actual) { Assert.AreEqual(expected.Count, actual.Count); + Assert.AreEqual(expected.GeometryMustContainPoint, actual.GeometryMustContainPoint); for (var i = 0; i < expected.Count; i++) { @@ -284,6 +304,8 @@ /// is not equal to . private static void AssertGeometryPoints(GeometryPoint expected, GeometryPoint actual) { + Assert.AreEqual(expected.Name, actual.Name); + Assert.AreEqual(expected.Owner, actual.Owner); Assert.AreEqual(expected.X, actual.X); Assert.AreEqual(expected.Z, actual.Z); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -r11f07beedffdae5eee71141830eb73827dd3ae94 -r7869115120e7341826283ec22afdf03634d13775 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 11f07beedffdae5eee71141830eb73827dd3ae94) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 7869115120e7341826283ec22afdf03634d13775) @@ -331,7 +331,7 @@ calculatorFactory.LastCreatedUpliftVanCalculator.ThrowExceptionOnValidate = true; // Call - Action call = () => { MacroStabilityInwardsCalculationService.Validate(testCalculation); }; + Action call = () => MacroStabilityInwardsCalculationService.Validate(testCalculation); // Assert TestHelper.AssertLogMessagesWithLevelAndLoggedExceptions(call, tuples =>