Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsOutput.cs =================================================================== diff -u -r038a3c3f2afc97dcbdf59316a281730e608a4cf0 -rb8493c6fb982b455e36129083cc009c5c07a7d05 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsOutput.cs (.../MacroStabilityInwardsOutput.cs) (revision 038a3c3f2afc97dcbdf59316a281730e608a4cf0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsOutput.cs (.../MacroStabilityInwardsOutput.cs) (revision b8493c6fb982b455e36129083cc009c5c07a7d05) @@ -33,17 +33,32 @@ /// /// Creates a new instance of . /// + /// The sliding curve result. + /// The slip plane uplift Van result. /// The container of the properties for the /// . - /// Thrown when the + /// Thrown when any parameter /// is null. - public MacroStabilityInwardsOutput(ConstructionProperties properties) + public MacroStabilityInwardsOutput(MacroStabilityInwardsSlidingCurve slidingCurve, + MacroStabilityInwardsSlipPlaneUpliftVan slipPlane, + ConstructionProperties properties) { + if (slidingCurve == null) + { + throw new ArgumentNullException(nameof(slidingCurve)); + } + if (slipPlane == null) + { + throw new ArgumentNullException(nameof(slipPlane)); + } if (properties == null) { throw new ArgumentNullException(nameof(properties)); } + SlidingCurve = slidingCurve; + SlipPlane = slipPlane; + FactorOfStability = properties.FactorOfStability; ZValue = properties.ZValue; ForbiddenZonesXEntryMin = properties.ForbiddenZonesXEntryMin; @@ -55,6 +70,16 @@ #region properties /// + /// Gets the sliding curve. + /// + public MacroStabilityInwardsSlidingCurve SlidingCurve { get; } + + /// + /// Gets the slip plane. + /// + public MacroStabilityInwardsSlipPlaneUpliftVan SlipPlane { get; } + + /// /// Gets the factor of stability of the upliftVan calculation. /// public double FactorOfStability { get; } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs =================================================================== diff -u -r038a3c3f2afc97dcbdf59316a281730e608a4cf0 -rb8493c6fb982b455e36129083cc009c5c07a7d05 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision 038a3c3f2afc97dcbdf59316a281730e608a4cf0) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Service/MacroStabilityInwardsCalculationService.cs (.../MacroStabilityInwardsCalculationService.cs) (revision b8493c6fb982b455e36129083cc009c5c07a7d05) @@ -26,6 +26,7 @@ using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.KernelWrapper; using Ringtoets.MacroStabilityInwards.KernelWrapper.SubCalculator; +using Ringtoets.MacroStabilityInwards.Service.Converters; using Ringtoets.MacroStabilityInwards.Service.Properties; using RingtoetsCommonServiceResources = Ringtoets.Common.Service.Properties.Resources; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; @@ -95,14 +96,17 @@ IMacroStabilityInwardsCalculator calculator = MacroStabilityInwardsCalculatorFactory.Instance.CreateCalculator(CreateInputFromData(calculation.InputParameters), MacroStabilityInwardsSubCalculatorFactory.Instance); MacroStabilityInwardsCalculatorResult macroStabilityInwardsResult = calculator.Calculate(); - calculation.Output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties + calculation.Output = new MacroStabilityInwardsOutput( + MacroStabilityInwardsCurveConverter.Convert(macroStabilityInwardsResult.SlidingCurve), + MacroStabilityInwardsSlipPlaneUpliftVanConverter.Convert(macroStabilityInwardsResult.UpliftVanCalculationGrid), + new MacroStabilityInwardsOutput.ConstructionProperties { FactorOfStability = macroStabilityInwardsResult.FactorOfStability, ZValue = macroStabilityInwardsResult.ZValue, ForbiddenZonesXEntryMin = macroStabilityInwardsResult.ForbiddenZonesXEntryMin, ForbiddenZonesXEntryMax = macroStabilityInwardsResult.ForbiddenZonesXEntryMax, ForbiddenZonesAutomaticallyCalculated = macroStabilityInwardsResult.ForbiddenZonesAutomaticallyCalculated, - GridAutomaticallyCalculated = macroStabilityInwardsResult.GridAutomaticallyCalculated, + GridAutomaticallyCalculated = macroStabilityInwardsResult.GridAutomaticallyCalculated }); } finally Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsOutputTest.cs =================================================================== diff -u -r038a3c3f2afc97dcbdf59316a281730e608a4cf0 -rb8493c6fb982b455e36129083cc009c5c07a7d05 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsOutputTest.cs (.../MacroStabilityInwardsOutputTest.cs) (revision 038a3c3f2afc97dcbdf59316a281730e608a4cf0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsOutputTest.cs (.../MacroStabilityInwardsOutputTest.cs) (revision b8493c6fb982b455e36129083cc009c5c07a7d05) @@ -24,28 +24,99 @@ using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Calculation; +using Ringtoets.MacroStabilityInwards.Data.TestUtil; namespace Ringtoets.MacroStabilityInwards.Data.Test { [TestFixture] public class MacroStabilityInwardsOutputTest { [Test] + public void Constructor_SlidingCurveNull_ThrowsArgumentNullException() + { + // Setup + var slipPlane = new MacroStabilityInwardsSlipPlaneUpliftVan(MacroStabilityInwardsGridOutputTestFactory.Create(), + MacroStabilityInwardsGridOutputTestFactory.Create(), + new double[0]); + + // Call + TestDelegate call = () => new MacroStabilityInwardsOutput(null, slipPlane, new MacroStabilityInwardsOutput.ConstructionProperties()); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("slidingCurve", exception.ParamName); + } + + [Test] + public void Constructor_SlipPlaneNull_ThrowsArgumentNullException() + { + // Setup + var slidingCurve = new MacroStabilityInwardsSlidingCurve(MacroStabilityInwardsSlidingCircleTestFactory.Create(), + MacroStabilityInwardsSlidingCircleTestFactory.Create(), + new MacroStabilityInwardsSlice[0], 0, 0); + // Call + TestDelegate call = () => new MacroStabilityInwardsOutput(slidingCurve, null, + new MacroStabilityInwardsOutput.ConstructionProperties()); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("slipPlane", exception.ParamName); + } + + [Test] public void Constructor_ConstructionPropertiesNull_ThrowsArgumentNullException() { + // Setup + var slidingCurve = new MacroStabilityInwardsSlidingCurve(MacroStabilityInwardsSlidingCircleTestFactory.Create(), + MacroStabilityInwardsSlidingCircleTestFactory.Create(), + new MacroStabilityInwardsSlice[0], 0, 0); + + var slipPlane = new MacroStabilityInwardsSlipPlaneUpliftVan(MacroStabilityInwardsGridOutputTestFactory.Create(), + MacroStabilityInwardsGridOutputTestFactory.Create(), + new double[0]); + // Call - TestDelegate call = () => new MacroStabilityInwardsOutput(null); + TestDelegate call = () => new MacroStabilityInwardsOutput(slidingCurve, slipPlane, null); // Assert var exception = Assert.Throws(call); Assert.AreEqual("properties", exception.ParamName); } [Test] + public void Constructor_WithParameters_ExpectedValues() + { + // Setup + var slidingCurve = new MacroStabilityInwardsSlidingCurve(MacroStabilityInwardsSlidingCircleTestFactory.Create(), + MacroStabilityInwardsSlidingCircleTestFactory.Create(), + new MacroStabilityInwardsSlice[0], 0, 0); + + var slipPlane = new MacroStabilityInwardsSlipPlaneUpliftVan(MacroStabilityInwardsGridOutputTestFactory.Create(), + MacroStabilityInwardsGridOutputTestFactory.Create(), + new double[0]); + + // Call + var output = new MacroStabilityInwardsOutput(slidingCurve, slipPlane, new MacroStabilityInwardsOutput.ConstructionProperties()); + + // Assert + Assert.AreSame(slidingCurve, output.SlidingCurve); + Assert.AreSame(slipPlane, output.SlipPlane); + } + + [Test] public void Constructor_ConstructionPropertiesWithoutValuesSet_PropertiesAreDefault() { + // Setup + var slidingCurve = new MacroStabilityInwardsSlidingCurve(MacroStabilityInwardsSlidingCircleTestFactory.Create(), + MacroStabilityInwardsSlidingCircleTestFactory.Create(), + new MacroStabilityInwardsSlice[0], 0, 0); + + var slipPlane = new MacroStabilityInwardsSlipPlaneUpliftVan(MacroStabilityInwardsGridOutputTestFactory.Create(), + MacroStabilityInwardsGridOutputTestFactory.Create(), + new double[0]); + // Call - var output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + var output = new MacroStabilityInwardsOutput(slidingCurve, slipPlane, new MacroStabilityInwardsOutput.ConstructionProperties()); // Assert Assert.IsNaN(output.FactorOfStability); @@ -60,6 +131,14 @@ public void Constructor_ExpectedValues() { // Setup + var slidingCurve = new MacroStabilityInwardsSlidingCurve(MacroStabilityInwardsSlidingCircleTestFactory.Create(), + MacroStabilityInwardsSlidingCircleTestFactory.Create(), + new MacroStabilityInwardsSlice[0], 0, 0); + + var slipPlane = new MacroStabilityInwardsSlipPlaneUpliftVan(MacroStabilityInwardsGridOutputTestFactory.Create(), + MacroStabilityInwardsGridOutputTestFactory.Create(), + new double[0]); + var random = new Random(21); double factorOfStability = random.NextDouble(); double zValue = random.NextDouble(); @@ -79,7 +158,7 @@ }; // Call - var output = new MacroStabilityInwardsOutput(properties); + var output = new MacroStabilityInwardsOutput(slidingCurve, slipPlane, properties); // Assert Assert.IsInstanceOf(output); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsOutput.cs =================================================================== diff -u -r1bb88ae89a19c2213d616243bca2a3a6326c5612 -rb8493c6fb982b455e36129083cc009c5c07a7d05 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsOutput.cs (.../TestMacroStabilityInwardsOutput.cs) (revision 1bb88ae89a19c2213d616243bca2a3a6326c5612) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsOutput.cs (.../TestMacroStabilityInwardsOutput.cs) (revision b8493c6fb982b455e36129083cc009c5c07a7d05) @@ -27,9 +27,22 @@ /// public class TestMacroStabilityInwardsOutput : MacroStabilityInwardsOutput { - public TestMacroStabilityInwardsOutput() : base(new ConstructionProperties + public TestMacroStabilityInwardsOutput() + : this(new ConstructionProperties + { + FactorOfStability = 1.1 + }) {} + + public TestMacroStabilityInwardsOutput(ConstructionProperties properties) + : base (new MacroStabilityInwardsSlidingCurve(MacroStabilityInwardsSlidingCircleTestFactory.Create(), + MacroStabilityInwardsSlidingCircleTestFactory.Create(), + new MacroStabilityInwardsSlice[0], 0, 0), + new MacroStabilityInwardsSlipPlaneUpliftVan(MacroStabilityInwardsGridOutputTestFactory.Create(), + MacroStabilityInwardsGridOutputTestFactory.Create(), + new double[0]), + properties) { - FactorOfStability = 1.1 - }) {} + + } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs =================================================================== diff -u -r3fe99efe7580ec1d9eb850908c001c990dc43fe5 -rb8493c6fb982b455e36129083cc009c5c07a7d05 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs (.../MacroStabilityInwardsOutputContextPropertiesTest.cs) (revision 3fe99efe7580ec1d9eb850908c001c990dc43fe5) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs (.../MacroStabilityInwardsOutputContextPropertiesTest.cs) (revision b8493c6fb982b455e36129083cc009c5c07a7d05) @@ -66,7 +66,7 @@ macroStabilityInwardsReliability, macroStabilityInwardsFactorOfSafety); - var output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties() + var output = new TestMacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties() { FactorOfStability = macroStabilityInwardsFactorOfStability }); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs =================================================================== diff -u -r1bb88ae89a19c2213d616243bca2a3a6326c5612 -rb8493c6fb982b455e36129083cc009c5c07a7d05 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs (.../MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs) (revision 1bb88ae89a19c2213d616243bca2a3a6326c5612) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs (.../MacroStabilityInwardsStochasticSoilModelReplaceDataStrategyTest.cs) (revision b8493c6fb982b455e36129083cc009c5c07a7d05) @@ -174,7 +174,7 @@ var calculation = new MacroStabilityInwardsCalculationScenario(); calculation.InputParameters.StochasticSoilModel = existingModel; calculation.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[0]; - calculation.Output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + calculation.Output = new TestMacroStabilityInwardsOutput(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs =================================================================== diff -u -r0ca80ea0128c50442c9ab707f715125d65cf7fa0 -rb8493c6fb982b455e36129083cc009c5c07a7d05 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs (.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs) (revision 0ca80ea0128c50442c9ab707f715125d65cf7fa0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs (.../MacroStabilityInwardsStochasticSoilModelUpdateDataStrategyTest.cs) (revision b8493c6fb982b455e36129083cc009c5c07a7d05) @@ -277,12 +277,12 @@ var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[0]; - calculationWithNotUpdatedProfile.Output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + calculationWithNotUpdatedProfile.Output = new TestMacroStabilityInwardsOutput(); var calculationWithDeletedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithDeletedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithDeletedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[1]; - calculationWithDeletedProfile.Output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + calculationWithDeletedProfile.Output = new TestMacroStabilityInwardsOutput(); failureMechanism.CalculationsGroup.Children.Add(calculationWithDeletedProfile); failureMechanism.CalculationsGroup.Children.Add(calculationWithNotUpdatedProfile); @@ -332,12 +332,12 @@ var calculationWithUpdatedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithUpdatedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[0]; - calculationWithUpdatedProfile.Output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + calculationWithUpdatedProfile.Output = new TestMacroStabilityInwardsOutput(); var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[1]; - calculationWithNotUpdatedProfile.Output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + calculationWithNotUpdatedProfile.Output = new TestMacroStabilityInwardsOutput(); failureMechanism.CalculationsGroup.Children.Add(calculationWithNotUpdatedProfile); failureMechanism.CalculationsGroup.Children.Add(calculationWithUpdatedProfile); @@ -394,12 +394,12 @@ var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[0]; - calculationWithNotUpdatedProfile.Output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + calculationWithNotUpdatedProfile.Output = new TestMacroStabilityInwardsOutput(); var calculationWithUpdatedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithUpdatedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithUpdatedProfile.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[1]; - calculationWithUpdatedProfile.Output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + calculationWithUpdatedProfile.Output = new TestMacroStabilityInwardsOutput(); failureMechanism.CalculationsGroup.Children.Add(calculationWithUpdatedProfile); failureMechanism.CalculationsGroup.Children.Add(calculationWithNotUpdatedProfile); @@ -443,7 +443,7 @@ var calculation = new MacroStabilityInwardsCalculationScenario(); calculation.InputParameters.StochasticSoilModel = existingModel; calculation.InputParameters.StochasticSoilProfile = existingModel.StochasticSoilProfiles[0]; - calculation.Output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + calculation.Output = new TestMacroStabilityInwardsOutput(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(calculation); @@ -492,12 +492,12 @@ var calculationWithRemovedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithRemovedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithRemovedProfile.InputParameters.StochasticSoilProfile = removedProfile; - calculationWithRemovedProfile.Output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + calculationWithRemovedProfile.Output = new TestMacroStabilityInwardsOutput(); var calculationWithNotUpdatedProfile = new MacroStabilityInwardsCalculationScenario(); calculationWithNotUpdatedProfile.InputParameters.StochasticSoilModel = existingModel; calculationWithNotUpdatedProfile.InputParameters.StochasticSoilProfile = unaffectedProfile; - calculationWithNotUpdatedProfile.Output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + calculationWithNotUpdatedProfile.Output = new TestMacroStabilityInwardsOutput(); failureMechanism.CalculationsGroup.Children.Add(calculationWithNotUpdatedProfile); failureMechanism.CalculationsGroup.Children.Add(calculationWithRemovedProfile); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs =================================================================== diff -u -r1bb88ae89a19c2213d616243bca2a3a6326c5612 -rb8493c6fb982b455e36129083cc009c5c07a7d05 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs) (revision 1bb88ae89a19c2213d616243bca2a3a6326c5612) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineReplaceDataStrategyTest.cs) (revision b8493c6fb982b455e36129083cc009c5c07a7d05) @@ -29,6 +29,7 @@ using Ringtoets.Common.Data.UpdateDataStrategies; using Ringtoets.Common.IO.SurfaceLines; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Plugin.FileImporter; using Ringtoets.MacroStabilityInwards.Primitives; @@ -189,7 +190,7 @@ { SurfaceLine = existingSurfaceLine }, - Output = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()) + Output = new TestMacroStabilityInwardsOutput() }; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs =================================================================== diff -u -rc7e7d504e9f3cc517e8ef3b9216a858b7fe63424 -rb8493c6fb982b455e36129083cc009c5c07a7d05 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs (.../MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs) (revision c7e7d504e9f3cc517e8ef3b9216a858b7fe63424) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs (.../MacroStabilityInwardsSemiProbabilisticCalculationServiceTest.cs) (revision b8493c6fb982b455e36129083cc009c5c07a7d05) @@ -24,6 +24,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; using Ringtoets.MacroStabilityInwards.Data; +using Ringtoets.MacroStabilityInwards.Data.TestUtil; namespace Ringtoets.MacroStabilityInwards.Service.Test { @@ -74,7 +75,7 @@ double expectedResult) { // Setup - var calculatorResult = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + var calculatorResult = new TestMacroStabilityInwardsOutput(); var probabilityAssessmentInput = new MacroStabilityInwardsProbabilityAssessmentInput { SectionLength = assessmentSectionLength @@ -100,7 +101,7 @@ double contribution) { // Setup - var calculatorResult = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + var calculatorResult = new TestMacroStabilityInwardsOutput(); var probabilityAssessmentInput = new MacroStabilityInwardsProbabilityAssessmentInput { SectionLength = assessmentSectionLength @@ -131,7 +132,7 @@ [Values(12, 24)] double contribution) { // Setup - var calculatorResult = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties()); + var calculatorResult = new TestMacroStabilityInwardsOutput(); var probabilityAssessmentInput = new MacroStabilityInwardsProbabilityAssessmentInput { SectionLength = assessmentSectionLength @@ -158,7 +159,7 @@ { // Setup var random = new Random(21); - var calculatorResult = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties + var calculatorResult = new TestMacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties { FactorOfStability = factorOfStability }); @@ -187,7 +188,7 @@ { // Setup var random = new Random(21); - var calculatorResult = new MacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties + var calculatorResult = new TestMacroStabilityInwardsOutput(new MacroStabilityInwardsOutput.ConstructionProperties { FactorOfStability = factorOfStability });