Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -rd707a4abb863bf309335b4e228968b39dbaf9645 -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs) (revision d707a4abb863bf309335b4e228968b39dbaf9645)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -414,7 +414,7 @@
// Setup
var scenario = new MacroStabilityInwardsCalculationScenario
{
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var registry = new PersistenceRegistry();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs
===================================================================
diff -u -rf2ba7f68f5de2fc3c8dec8baf7326808120cee52 -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs (.../MacroStabilityInwardsCalculationScenarioTest.cs) (revision f2ba7f68f5de2fc3c8dec8baf7326808120cee52)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationScenarioTest.cs (.../MacroStabilityInwardsCalculationScenarioTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -84,7 +84,7 @@
var scenario = new MacroStabilityInwardsCalculationScenario
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput(expectedProbability)
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput(expectedProbability)
};
// Call
@@ -147,7 +147,7 @@
var scenario = new MacroStabilityInwardsCalculationScenario
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput(double.NaN)
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput(double.NaN)
};
// Call
@@ -166,7 +166,7 @@
var scenario = new MacroStabilityInwardsCalculationScenario
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput(expectedProbability)
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput(expectedProbability)
};
// Call
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs (.../MacroStabilityInwardsCalculationTest.cs) (revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsCalculationTest.cs (.../MacroStabilityInwardsCalculationTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -156,7 +156,7 @@
var calculation = new MacroStabilityInwardsCalculation
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
// Call
@@ -206,7 +206,7 @@
// Setup
var calculation = new MacroStabilityInwardsCalculation
{
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
// Call
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsSemiProbabilisticTestFactoryTest.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsSemiProbabilisticTestFactoryTest.cs (revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsSemiProbabilisticTestFactoryTest.cs (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -0,0 +1,73 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
+
+namespace Ringtoets.MacroStabilityInwards.Data.TestUtil.Test
+{
+ [TestFixture]
+ public class MacroStabilityInwardsSemiProbabilisticTestFactoryTest
+ {
+ [Test]
+ public void CreateOutput_WithoutProbability_ReturnsSemiProbabilisticOutput()
+ {
+ // Call
+ MacroStabilityInwardsSemiProbabilisticOutput output = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput();
+
+ // Assert
+ Assert.IsNotNull(output);
+
+ Assert.AreEqual(typeof(MacroStabilityInwardsSemiProbabilisticOutput), output.GetType());
+
+ Assert.AreEqual(0, output.FactorOfStability, output.FactorOfStability.GetAccuracy());
+ Assert.AreEqual(0, output.RequiredProbability);
+ Assert.AreEqual(0, output.RequiredReliability, output.RequiredReliability.GetAccuracy());
+ Assert.AreEqual(0, output.MacroStabilityInwardsProbability);
+ Assert.AreEqual(0, output.MacroStabilityInwardsReliability, output.MacroStabilityInwardsReliability.GetAccuracy());
+ Assert.AreEqual(0, output.MacroStabilityInwardsFactorOfSafety, output.MacroStabilityInwardsFactorOfSafety.GetAccuracy());
+ }
+
+ [Test]
+ public void CreateOutput_WithProbability_ReturnsSemiProbabilistyOutputWithProbability()
+ {
+ // Setup
+ var random = new Random(21);
+ var probability = random.NextDouble();
+
+ // Call
+ MacroStabilityInwardsSemiProbabilisticOutput output = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput(probability);
+
+ // Assert
+ Assert.IsNotNull(output);
+
+ Assert.AreEqual(typeof(MacroStabilityInwardsSemiProbabilisticOutput), output.GetType());
+
+ Assert.AreEqual(0, output.FactorOfStability, output.FactorOfStability.GetAccuracy());
+ Assert.AreEqual(0, output.RequiredProbability);
+ Assert.AreEqual(0, output.RequiredReliability, output.RequiredReliability.GetAccuracy());
+ Assert.AreEqual(probability, output.MacroStabilityInwardsProbability);
+ Assert.AreEqual(0, output.MacroStabilityInwardsReliability, output.MacroStabilityInwardsReliability.GetAccuracy());
+ Assert.AreEqual(0, output.MacroStabilityInwardsFactorOfSafety, output.MacroStabilityInwardsFactorOfSafety.GetAccuracy());
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj
===================================================================
diff -u -r14c118039f313ea66787d8065daad0aa783b731a -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj (.../Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj) (revision 14c118039f313ea66787d8065daad0aa783b731a)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj (.../Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -52,6 +52,7 @@
+
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsSemiProbabilisticOutputTestFactory.cs
===================================================================
diff -u
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsSemiProbabilisticOutputTestFactory.cs (revision 0)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsSemiProbabilisticOutputTestFactory.cs (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -0,0 +1,40 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+namespace Ringtoets.MacroStabilityInwards.Data.TestUtil
+{
+ ///
+ /// Factory that creates instances of
+ /// that can be used for testing.
+ ///
+ public static class MacroStabilityInwardsSemiProbabilisticOutputTestFactory
+ {
+ ///
+ /// Creates an instance of .
+ ///
+ /// The optional probability to set (set to 0 when not specified).
+ /// A .
+ public static MacroStabilityInwardsSemiProbabilisticOutput CreateOutput(double probability = 0)
+ {
+ return new MacroStabilityInwardsSemiProbabilisticOutput(0, 0, 0, probability, 0, 0);
+ }
+ }
+}
\ No newline at end of file
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs
===================================================================
diff -u -rb13759ad077f9e2b4104de000b5bdeafa9abe358 -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision b13759ad077f9e2b4104de000b5bdeafa9abe358)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsTestDataGenerator.cs (.../MacroStabilityInwardsTestDataGenerator.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -271,7 +271,7 @@
StochasticSoilModel = stochasticSoilModel1
},
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var calculationWithSurfaceLineAndSoilModel = new MacroStabilityInwardsCalculationScenario
{
@@ -292,7 +292,7 @@
StochasticSoilModel = stochasticSoilModel2
},
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var calculationWithHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario
{
@@ -322,7 +322,7 @@
StochasticSoilProfile = stochasticSoilModel2.StochasticSoilProfiles.ElementAt(0)
},
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var subCalculationWithOutputAndHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario
{
@@ -334,7 +334,7 @@
StochasticSoilProfile = stochasticSoilModel1.StochasticSoilProfiles.ElementAt(0)
},
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var subCalculationWithHydraulicBoundaryLocation = new MacroStabilityInwardsCalculationScenario
{
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj
===================================================================
diff -u -raeb13948dc79633899e041bd26c1694bfa56c21b -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj (.../Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj) (revision aeb13948dc79633899e041bd26c1694bfa56c21b)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj (.../Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -67,7 +67,7 @@
-
+
Fisheye: Tag c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/TestMacroStabilityInwardsSemiProbabilisticOutput.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs
===================================================================
diff -u -rd0c79a90e71905cc828aef00a9572cccd2202554 -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs (.../MacroStabilityInwardsOutputContextPropertiesTest.cs) (revision d0c79a90e71905cc828aef00a9572cccd2202554)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsOutputContextPropertiesTest.cs (.../MacroStabilityInwardsOutputContextPropertiesTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -49,7 +49,7 @@
public void Constructor_ExpectedValues()
{
// Setup
- var output = new TestMacroStabilityInwardsSemiProbabilisticOutput();
+ var output = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput();
// Call
var properties = new MacroStabilityInwardsOutputContextProperties(output);
@@ -98,7 +98,7 @@
public void GetProperties_WithZeroValues_ReturnTranslatedFormat()
{
// Call
- var properties = new MacroStabilityInwardsOutputContextProperties(new TestMacroStabilityInwardsSemiProbabilisticOutput());
+ var properties = new MacroStabilityInwardsOutputContextProperties(MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput());
// Assert
const string probability = "1/Oneindig";
@@ -110,7 +110,7 @@
public void Constructor_Always_PropertiesHaveExpectedAttributesValues()
{
// Call
- var properties = new MacroStabilityInwardsOutputContextProperties(new TestMacroStabilityInwardsSemiProbabilisticOutput());
+ var properties = new MacroStabilityInwardsOutputContextProperties(MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput());
// Assert
PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs
===================================================================
diff -u -r59adecfc7f82ab8277440ecae147453f5cbddbbf -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs) (revision 59adecfc7f82ab8277440ecae147453f5cbddbbf)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -121,7 +121,7 @@
// Execute the first calculation and ensure the data grid view is updated
const double probability = 1.0 / 31846382.0;
calculation1.Output = new TestMacroStabilityInwardsOutput();
- calculation1.SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput(probability);
+ calculation1.SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput(probability);
calculation1.NotifyObservers();
Assert.AreEqual(string.Format("1/{0:N0}", 1.0 / calculation1.Probability),
dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs
===================================================================
diff -u -rb13759ad077f9e2b4104de000b5bdeafa9abe358 -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision b13759ad077f9e2b4104de000b5bdeafa9abe358)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../MacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -357,7 +357,7 @@
SurfaceLine = surfaceLine
},
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var failureMechanism = new MacroStabilityInwardsFailureMechanism();
@@ -405,7 +405,7 @@
SurfaceLine = affectedSurfaceLine
},
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var unaffectedGeometry = new[]
@@ -422,7 +422,7 @@
SurfaceLine = unaffectedSurfaceLine
},
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var failureMechanism = new MacroStabilityInwardsFailureMechanism();
@@ -489,7 +489,7 @@
SurfaceLine = removedSurfaceLine
},
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var unaffectedGeometry = new[]
@@ -506,7 +506,7 @@
SurfaceLine = unaffectedSurfaceLine
},
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var failureMechanism = new MacroStabilityInwardsFailureMechanism();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsOutputContextPropertyInfoTest.cs
===================================================================
diff -u -rd0c79a90e71905cc828aef00a9572cccd2202554 -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsOutputContextPropertyInfoTest.cs (.../MacroStabilityInwardsOutputContextPropertyInfoTest.cs) (revision d0c79a90e71905cc828aef00a9572cccd2202554)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsOutputContextPropertyInfoTest.cs (.../MacroStabilityInwardsOutputContextPropertyInfoTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -63,7 +63,7 @@
// Setup
var scenario = new MacroStabilityInwardsCalculationScenario
{
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var context = new MacroStabilityInwardsOutputContext(scenario);
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0b660ff4f3aeb4be02ae4c5ea42813c28aeae8fe -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 0b660ff4f3aeb4be02ae4c5ea42813c28aeae8fe)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -190,7 +190,7 @@
group.Children.Add(new MacroStabilityInwardsCalculationScenario
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
});
var failureMechanism = new TestMacroStabilityInwardsFailureMechanism();
@@ -314,7 +314,7 @@
group.Children.Add(new MacroStabilityInwardsCalculationScenario
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
});
var failureMechanism = new TestMacroStabilityInwardsFailureMechanism();
@@ -918,12 +918,12 @@
MacroStabilityInwardsCalculationScenario calculation1 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput();
calculation1.Name = "A";
calculation1.Output = new TestMacroStabilityInwardsOutput();
- calculation1.SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput();
+ calculation1.SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput();
calculation1.Attach(calculation1Observer);
MacroStabilityInwardsCalculationScenario calculation2 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput();
calculation2.Name = "B";
calculation2.Output = new TestMacroStabilityInwardsOutput();
- calculation2.SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput();
+ calculation2.SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput();
calculation2.Attach(calculation2Observer);
var childGroup = new CalculationGroup();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs
===================================================================
diff -u -r10fc7315f4478647b2708f74c3e596cdf0e5a98c -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 10fc7315f4478647b2708f74c3e596cdf0e5a98c)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -110,7 +110,7 @@
var calculation = new MacroStabilityInwardsCalculationScenario
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var failureMechanism = new MacroStabilityInwardsFailureMechanism();
@@ -192,7 +192,7 @@
var calculation = new MacroStabilityInwardsCalculationScenario
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var failureMechanism = new TestMacroStabilityInwardsFailureMechanism();
var assessmentSection = mocks.Stub();
@@ -673,7 +673,7 @@
plugin.Gui = gui;
calculation.Output = new TestMacroStabilityInwardsOutput();
- calculation.SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput();
+ calculation.SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput();
calculation.Attach(observer);
string messageBoxText = null, messageBoxTitle = null;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs
===================================================================
diff -u -r0b660ff4f3aeb4be02ae4c5ea42813c28aeae8fe -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 0b660ff4f3aeb4be02ae4c5ea42813c28aeae8fe)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -220,12 +220,12 @@
var calculation1 = new MacroStabilityInwardsCalculationScenario
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var calculation2 = new MacroStabilityInwardsCalculationScenario
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var observer = mocks.StrictMock();
@@ -297,7 +297,7 @@
var calculation = new MacroStabilityInwardsCalculationScenario
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
failureMechanism.CalculationsGroup.Children.Add(calculation);
@@ -432,7 +432,7 @@
var calculation = new MacroStabilityInwardsCalculationScenario
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
var failureMechanism = new MacroStabilityInwardsFailureMechanism();
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs
===================================================================
diff -u -r7371a70ed0751d341d41a7b951b780d286f83791 -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision 7371a70ed0751d341d41a7b951b780d286f83791)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -83,7 +83,7 @@
{
// Setup
var originalOutput = new TestMacroStabilityInwardsOutput();
- var originalSemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput();
+ var originalSemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput();
MacroStabilityInwardsCalculationScenario invalidMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput();
invalidMacroStabilityInwardsCalculation.Output = originalOutput;
Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs
===================================================================
diff -u -rb57514896ac9566e5d0262cf66a37847ceb07eeb -rc4c3d9ffd55bea465d56419d1e6ddbfe35fe355a
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision b57514896ac9566e5d0262cf66a37847ceb07eeb)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsDataSynchronizationServiceTest.cs (.../MacroStabilityInwardsDataSynchronizationServiceTest.cs) (revision c4c3d9ffd55bea465d56419d1e6ddbfe35fe355a)
@@ -55,7 +55,7 @@
var calculation = new MacroStabilityInwardsCalculation
{
Output = new TestMacroStabilityInwardsOutput(),
- SemiProbabilisticOutput = new TestMacroStabilityInwardsSemiProbabilisticOutput()
+ SemiProbabilisticOutput = MacroStabilityInwardsSemiProbabilisticOutputTestFactory.CreateOutput()
};
// Call