Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/DerivedMacroStabilityInwardsOutput.cs =================================================================== diff -u -r490ca61d1c7791776cc522141816391f075a9752 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/DerivedMacroStabilityInwardsOutput.cs (.../DerivedMacroStabilityInwardsOutput.cs) (revision 490ca61d1c7791776cc522141816391f075a9752) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/DerivedMacroStabilityInwardsOutput.cs (.../DerivedMacroStabilityInwardsOutput.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -82,20 +82,17 @@ } /// - /// Get the required reliability of the macro stability inwards failure mechanism, - /// which is a value greater than 0. + /// Get the required reliability of the macro stability inwards failure mechanism. /// public RoundedDouble RequiredReliability { get; } /// - /// Gets the factor of safety of the macro stability inwards failure mechanism, - /// which is a value greater than 0. + /// Gets the factor of safety of the macro stability inwards failure mechanism. /// public RoundedDouble MacroStabilityInwardsFactorOfSafety { get; } /// - /// Gets the reliability of the macro stability inwards failure mechanism, - /// which is a value greater than 0. + /// Gets the reliability of the macro stability inwards failure mechanism. /// public RoundedDouble MacroStabilityInwardsReliability { get; } Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs =================================================================== diff -u -r31eb717b3eae473dc7846e6dbe48d06e92b4b964 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs (.../MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs) (revision 31eb717b3eae473dc7846e6dbe48d06e92b4b964) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs (.../MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -70,10 +70,9 @@ throw new ArgumentNullException(nameof(assessmentSection)); } - List calculationScenarios = sectionResult + IEnumerable calculationScenarios = sectionResult .GetCalculationScenarios(calculations) - .Where(cs => cs.Status == CalculationScenarioStatus.Done) - .ToList(); + .Where(cs => cs.Status == CalculationScenarioStatus.Done); if (calculationScenarios.Any()) { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/WaternetCalculationServiceTest.cs =================================================================== diff -u -r68f204f50eaf5f1e881c18fb2d878a17c722f75a -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/WaternetCalculationServiceTest.cs (.../WaternetCalculationServiceTest.cs) (revision 68f204f50eaf5f1e881c18fb2d878a17c722f75a) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.CalculatedInput.Test/WaternetCalculationServiceTest.cs (.../WaternetCalculationServiceTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -40,7 +40,7 @@ [SetUp] public void Setup() { - testCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + testCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); } [Test] Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/DerivedMacroStabilityInwardsInputTest.cs =================================================================== diff -u -rc4392a12110e2bb3549c5fee1ec319c229b67198 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/DerivedMacroStabilityInwardsInputTest.cs (.../DerivedMacroStabilityInwardsInputTest.cs) (revision c4392a12110e2bb3549c5fee1ec319c229b67198) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/DerivedMacroStabilityInwardsInputTest.cs (.../DerivedMacroStabilityInwardsInputTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -47,7 +47,7 @@ public void WaternetExtreme_SoilProfileNull_ReturnMacroStabilityInwardsWaternet() { // Setup - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculation.InputParameters.StochasticSoilProfile = null; using (new MacroStabilityInwardsCalculatorFactoryConfig()) @@ -66,7 +66,7 @@ public void WaternetExtreme_SurfaceLineNull_ReturnMacroStabilityInwardsWaternet() { // Setup - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculation.InputParameters.SurfaceLine = null; using (new MacroStabilityInwardsCalculatorFactoryConfig()) @@ -85,7 +85,7 @@ public void WaternetExtreme_ValidInput_ReturnMacroStabilityInwardsWaternet() { // Setup - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); using (new MacroStabilityInwardsCalculatorFactoryConfig()) { @@ -103,7 +103,7 @@ public void WaternetDaily_SoilProfileNull_ReturnMacroStabilityInwardsWaternet() { // Setup - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculation.InputParameters.StochasticSoilProfile = null; using (new MacroStabilityInwardsCalculatorFactoryConfig()) @@ -122,7 +122,7 @@ public void WaternetDaily_SurfaceLineNull_ReturnMacroStabilityInwardsWaternet() { // Setup - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculation.InputParameters.SurfaceLine = null; using (new MacroStabilityInwardsCalculatorFactoryConfig()) @@ -141,7 +141,7 @@ public void WaternetDaily_ValidInput_ReturnMacroStabilityInwardsWaternet() { // Setup - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); using (new MacroStabilityInwardsCalculatorFactoryConfig()) { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/DerivedMacroStabilityInwardsOutputFactoryTest.cs =================================================================== diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/DerivedMacroStabilityInwardsOutputFactoryTest.cs (.../DerivedMacroStabilityInwardsOutputFactoryTest.cs) (revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/DerivedMacroStabilityInwardsOutputFactoryTest.cs (.../DerivedMacroStabilityInwardsOutputFactoryTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -99,13 +99,16 @@ IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - MacroStabilityInwardsOutput output = MacroStabilityInwardsOutputTestFactory.CreateRandomOutput(); + MacroStabilityInwardsOutput output = MacroStabilityInwardsOutputTestFactory.CreateOutput(new MacroStabilityInwardsOutput.ConstructionProperties + { + FactorOfStability = new Random(21).NextDouble() + }); // Call DerivedMacroStabilityInwardsOutput derivedOutput = DerivedMacroStabilityInwardsOutputFactory.Create(output, failureMechanism, assessmentSection); // Assert - Assert.AreEqual(0.697, derivedOutput.FactorOfStability, derivedOutput.FactorOfStability.GetAccuracy()); + Assert.AreEqual(output.FactorOfStability, derivedOutput.FactorOfStability, derivedOutput.FactorOfStability.GetAccuracy()); Assert.AreEqual(0.707, derivedOutput.MacroStabilityInwardsFactorOfSafety, derivedOutput.MacroStabilityInwardsFactorOfSafety.GetAccuracy()); Assert.AreEqual(0.073605149538226278, derivedOutput.MacroStabilityInwardsProbability, 1e-6); Assert.AreEqual(1.44946, derivedOutput.MacroStabilityInwardsReliability, derivedOutput.MacroStabilityInwardsReliability.GetAccuracy()); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/DerivedMacroStabilityInwardsOutputTest.cs =================================================================== diff -u -rd57b5fdfd92270ac6eff490b438bbe90f0296a4d -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/DerivedMacroStabilityInwardsOutputTest.cs (.../DerivedMacroStabilityInwardsOutputTest.cs) (revision d57b5fdfd92270ac6eff490b438bbe90f0296a4d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/DerivedMacroStabilityInwardsOutputTest.cs (.../DerivedMacroStabilityInwardsOutputTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -68,7 +68,7 @@ [TestCase(0.0)] [TestCase(0.123456789)] [TestCase(1.0)] - public void RequiredProbability_SetValidValues_ReturnNewlySetValue(double requiredProbability) + public void Constructor_ValidRequiredProbability_ExpectedValues(double requiredProbability) { // Setup var random = new Random(21); @@ -99,7 +99,7 @@ [TestCase(-346587.456)] [TestCase(1.0 + 1e-6)] [TestCase(346587.456)] - public void RequiredProbability_SetInvalidValues_ThrowArgumentOutOfRangeException(double requiredProbability) + public void Constructor_InvalidRequiredProbability_ThrowsArgumentOutOfRangeException(double requiredProbability) { // Setup var random = new Random(21); @@ -128,7 +128,7 @@ [TestCase(0.0)] [TestCase(0.123456789)] [TestCase(1.0)] - public void MacroStabilityInwardsProbability_SetValidValues_ReturnNewlySetValue(double macroStabilityInwardsProbability) + public void Constructor_ValidMacroStabilityInwardsProbability_ExpectedValues(double macroStabilityInwardsProbability) { // Setup var random = new Random(21); @@ -159,7 +159,7 @@ [TestCase(-346587.456)] [TestCase(1.0 + 1e-2)] [TestCase(346587.456)] - public void MacroStabilityInwardsProbability_SetInvalidValues_ThrowArgumentOutOfRangeException(double macroStabilityInwardsProbability) + public void Constructor_InvalidMacroStabilityInwardsProbability_ThrowsArgumentOutOfRangeException(double macroStabilityInwardsProbability) { // Setup var random = new Random(21); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensionsTest.cs =================================================================== diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensionsTest.cs) (revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensionsTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -130,10 +130,10 @@ const double factorOfStability1 = 1.0 / 1000000.0; const double factorOfStability2 = 1.0 / 2000000.0; - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario1 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenario(factorOfStability1, section); - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario2 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenario(factorOfStability2, section); - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario3 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenario(0.0, section); - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario4 = MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario1 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(factorOfStability1, section); + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario2 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(factorOfStability2, section); + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario3 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(0.0, section); + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario4 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); macroStabilityInwardsCalculationScenario1.IsRelevant = true; macroStabilityInwardsCalculationScenario1.Contribution = (RoundedDouble) contribution1; @@ -162,7 +162,7 @@ } [Test] - public void GetAssessmentLayerTwoA_NoScenarios_ReturnsZero() + public void GetAssessmentLayerTwoA_NoScenarios_ReturnsNaN() { // Setup var mocks = new MockRepository(); @@ -184,7 +184,7 @@ } [Test] - public void GetAssessmentLayerTwoA_NoRelevantScenarios_ReturnsZero() + public void GetAssessmentLayerTwoA_NoRelevantScenarios_ReturnsNaN() { // Setup var mocks = new MockRepository(); @@ -196,8 +196,8 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - MacroStabilityInwardsCalculationScenario calculationScenario1 = MacroStabilityInwardsCalculationScenarioFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(section); - MacroStabilityInwardsCalculationScenario calculationScenario2 = MacroStabilityInwardsCalculationScenarioFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario calculationScenario1 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario calculationScenario2 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(section); var calculationScenarios = new[] { @@ -216,7 +216,7 @@ } [Test] - public void GetAssessmentLayerTwoA_ScenarioNotCalculated_ReturnsZero() + public void GetAssessmentLayerTwoA_ScenarioNotCalculated_ReturnsNaN() { // Setup var mocks = new MockRepository(); @@ -228,7 +228,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); // Call double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new[] @@ -257,8 +257,8 @@ const double contribution1 = 0.2; const double contribution2 = 0.8; - MacroStabilityInwardsCalculationScenario calculationScenario1 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenario(0, section); - MacroStabilityInwardsCalculationScenario calculationScenario2 = MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario calculationScenario1 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(0, section); + MacroStabilityInwardsCalculationScenario calculationScenario2 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); calculationScenario1.IsRelevant = true; calculationScenario1.Contribution = (RoundedDouble)contribution1; @@ -288,13 +288,13 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); macroStabilityInwardsCalculationScenario.Contribution = (RoundedDouble) 0.3; - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario2 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(section); + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario2 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(section); macroStabilityInwardsCalculationScenario2.Contribution = (RoundedDouble) 0.5; - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario3 = MacroStabilityInwardsCalculationScenarioFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario3 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(section); var calculationScenarios = new[] { @@ -317,7 +317,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); // Call CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] @@ -336,8 +336,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(section); - macroStabilityInwardsCalculationScenario.Contribution = (RoundedDouble) 1.0; + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(section); // Call CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] @@ -350,18 +349,15 @@ } [Test] - public void GetCalculationScenarioStatus_ScenarioNaNOutputAndNotCalculated_ReturnsStatusNotCalculated() + public void GetCalculationScenarioStatus_ScenariosWithNotCalculatedScenario_ReturnsStatusNotCalculated() { // Setup FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); - macroStabilityInwardsCalculationScenario.IsRelevant = true; + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario2 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(section); - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario2 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(section); - macroStabilityInwardsCalculationScenario2.Contribution = (RoundedDouble) 1.0; - var calculationScenarios = new[] { macroStabilityInwardsCalculationScenario, @@ -376,13 +372,13 @@ } [Test] - public void GetCalculationScenarioStatus_ScenariosCalculated_ReturnsStatusDone() + public void GetCalculationScenarioStatus_ScenarioCalculated_ReturnsStatusDone() { // Setup FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new MacroStabilityInwardsFailureMechanismSectionResult(section); - MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenario(0.1, section); + MacroStabilityInwardsCalculationScenario macroStabilityInwardsCalculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(0.1, section); macroStabilityInwardsCalculationScenario.Contribution = (RoundedDouble) 1.0; // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs =================================================================== diff -u -rfb3c4216478c0f072cf2f1a94053e81756ced5c7 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultTest.cs) (revision fb3c4216478c0f072cf2f1a94053e81756ced5c7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.Test/MacroStabilityInwardsFailureMechanismSectionResultTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -50,7 +50,6 @@ Assert.IsInstanceOf(sectionResult); Assert.AreSame(section, sectionResult.Section); Assert.IsNaN(sectionResult.AssessmentLayerThree); - Assert.IsNaN(sectionResult.GetAssessmentLayerTwoA(new MacroStabilityInwardsCalculationScenario[0], failureMechanism, assessmentSection)); mocks.VerifyAll(); } Fisheye: Tag 5c7faf8283e49113a2c7b9e17086148a99f13d2e refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioFactoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -0,0 +1,385 @@ +// 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 Core.Common.Base.Data; +using Core.Common.Base.Geometry; +using NUnit.Framework; +using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.Probabilistics; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; +using Ringtoets.MacroStabilityInwards.Primitives; +using Ringtoets.MacroStabilityInwards.Service; + +namespace Ringtoets.MacroStabilityInwards.Data.TestUtil.Test +{ + [TestFixture] + public class MacroStabilityInwardsCalculationScenarioTestFactoryTest + { + [Test] + public void CreateMacroStabilityInwardsCalculationScenario_WithNoSection_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(double.NaN, null); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("section", paramName); + } + + [Test] + [TestCase(double.NaN, TestName = "CreateCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSet(NaN)")] + [TestCase(0.0, TestName = "CreateCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSet(0.0)")] + [TestCase(0.8, TestName = "CreateCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSet(0.8)")] + [TestCase(1.0, TestName = "CreateCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSet(1.0)")] + public void CreateMacroStabilityInwardsCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSet(double factoryOfStability) + { + // Setup + FailureMechanismSection section = CreateSection(); + + // Call + MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(factoryOfStability, section); + + // Assert + Assert.IsNotNull(scenario.Output); + Assert.AreEqual(factoryOfStability, scenario.Output.FactorOfStability, 1e-6); + Assert.IsTrue(scenario.IsRelevant); + } + + [Test] + public void CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput_WithNoSection_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(null); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("section", paramName); + } + + [Test] + public void CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput_WithSection_CreatesRelevantCalculationWithOutputSetToNaN() + { + // Setup + FailureMechanismSection section = CreateSection(); + + // Call + MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(section); + + // Assert + Assert.IsNotNull(scenario.Output); + Assert.IsNaN(scenario.Output.FactorOfStability); + Assert.IsTrue(scenario.IsRelevant); + } + + [Test] + public void CreateIrrelevantMacroStabilityInwardsCalculationScenario_WithNoSection_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(null); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("section", paramName); + } + + [Test] + public void CreateIrrelevantMacroStabilityInwardsCalculationScenario_WithSection_CreatesIrrelevantCalculation() + { + // Setup + FailureMechanismSection section = CreateSection(); + + // Call + MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(section); + + // Assert + Assert.IsFalse(scenario.IsRelevant); + Assert.IsNotNull(scenario.Output); + Assert.AreEqual(0.2, scenario.Output.FactorOfStability); + } + + [Test] + public void CreateNotCalculatedMacroStabilityInwardsCalculationScenario_WithNoSection_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(null); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("section", paramName); + } + + [Test] + public void CreateNotCalculatedMacroStabilityInwardsCalculationScenario_WithSection_CreatesRelevantCalculationWithoutOutput() + { + // Setup + FailureMechanismSection section = CreateSection(); + + // Call + MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + + // Assert + Assert.IsNull(scenario.Output); + Assert.IsTrue(scenario.IsRelevant); + } + + [Test] + public void CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput_ReturnMacroStabilityInwardsCalculationScenario() + { + // Call + MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); + + // Assert + Assert.IsFalse(MacroStabilityInwardsCalculationService.Validate(scenario, (RoundedDouble) 1.1)); + } + + [Test] + public void CreateMacroStabilityInwardsCalculationScenarioWithValidInput_ReturnMacroStabilityInwardsCalculationScenario() + { + // Call + MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + + // Assert + Assert.IsTrue(MacroStabilityInwardsCalculationService.Validate(scenario, (RoundedDouble) 1.1)); + } + + [Test] + public void CreateCalculatedMacroStabilityInwardsCalculationScenario_ReturnMacroStabilityInwardsCalculationScenario() + { + // Call + MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateCalculatedMacroStabilityInwardsCalculationScenario(); + + // Assert + AssertInput(scenario.InputParameters); + + MacroStabilityInwardsOutput output = scenario.Output; + Assert.IsNotNull(output); + Assert.AreEqual(0.69717486793975103, output.FactorOfStability); + Assert.AreEqual(0.040462733730889267, output.ZValue); + Assert.AreEqual(0.97911632898222489, output.ForbiddenZonesXEntryMax); + Assert.AreEqual(0.44677048942389452, output.ForbiddenZonesXEntryMin); + Assert.IsNotNull(output.SlidingCurve); + Assert.IsNotNull(output.SlipPlane); + } + + private static void AssertInput(MacroStabilityInwardsInput inputParameters) + { + Assert.AreEqual(MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, + inputParameters.DikeSoilScenario); + Assert.AreEqual(1, inputParameters.PiezometricHeadPhreaticLine2Outwards, + inputParameters.PiezometricHeadPhreaticLine2Outwards.GetAccuracy()); + Assert.AreEqual(1, inputParameters.PiezometricHeadPhreaticLine2Inwards, + inputParameters.PiezometricHeadPhreaticLine2Inwards.GetAccuracy()); + Assert.IsTrue(inputParameters.AdjustPhreaticLine3And4ForUplift); + Assert.AreEqual(1, inputParameters.LeakageLengthOutwardsPhreaticLine3, + inputParameters.LeakageLengthOutwardsPhreaticLine3.GetAccuracy()); + Assert.AreEqual(1, inputParameters.LeakageLengthInwardsPhreaticLine3, + inputParameters.LeakageLengthInwardsPhreaticLine3.GetAccuracy()); + Assert.AreEqual(1, inputParameters.LeakageLengthInwardsPhreaticLine4, + inputParameters.LeakageLengthInwardsPhreaticLine4.GetAccuracy()); + Assert.AreEqual(1, inputParameters.LeakageLengthOutwardsPhreaticLine4, + inputParameters.LeakageLengthOutwardsPhreaticLine4.GetAccuracy()); + Assert.AreEqual(1, inputParameters.SlipPlaneMinimumDepth, + inputParameters.SlipPlaneMinimumDepth.GetAccuracy()); + Assert.AreEqual(1, inputParameters.SlipPlaneMinimumLength, + inputParameters.SlipPlaneMinimumLength.GetAccuracy()); + Assert.AreEqual(1, inputParameters.MinimumLevelPhreaticLineAtDikeTopPolder, + inputParameters.MinimumLevelPhreaticLineAtDikeTopPolder.GetAccuracy()); + Assert.AreEqual(1, inputParameters.MinimumLevelPhreaticLineAtDikeTopRiver, + inputParameters.MinimumLevelPhreaticLineAtDikeTopRiver.GetAccuracy()); + + Assert.AreEqual(0.5, inputParameters.LocationInputExtreme.WaterLevelPolder, + inputParameters.LocationInputExtreme.WaterLevelPolder.GetAccuracy()); + Assert.IsFalse(inputParameters.LocationInputExtreme.UseDefaultOffsets); + Assert.AreEqual(1, inputParameters.LocationInputExtreme.PhreaticLineOffsetBelowDikeTopAtRiver, + inputParameters.LocationInputExtreme.PhreaticLineOffsetBelowDikeTopAtRiver.GetAccuracy()); + Assert.AreEqual(1, inputParameters.LocationInputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder, + inputParameters.LocationInputExtreme.PhreaticLineOffsetBelowDikeToeAtPolder.GetAccuracy()); + Assert.AreEqual(1, inputParameters.LocationInputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder, + inputParameters.LocationInputExtreme.PhreaticLineOffsetBelowDikeTopAtPolder.GetAccuracy()); + Assert.AreEqual(1, inputParameters.LocationInputExtreme.PhreaticLineOffsetBelowShoulderBaseInside, + inputParameters.LocationInputExtreme.PhreaticLineOffsetBelowShoulderBaseInside.GetAccuracy()); + Assert.AreEqual(1, inputParameters.LocationInputExtreme.PenetrationLength, + inputParameters.LocationInputExtreme.PenetrationLength.GetAccuracy()); + + Assert.AreEqual(0.5, inputParameters.LocationInputDaily.WaterLevelPolder); + Assert.IsFalse(inputParameters.LocationInputDaily.UseDefaultOffsets); + Assert.AreEqual(1, inputParameters.LocationInputDaily.PhreaticLineOffsetBelowDikeTopAtRiver, + inputParameters.LocationInputDaily.PhreaticLineOffsetBelowDikeTopAtRiver.GetAccuracy()); + Assert.AreEqual(1, inputParameters.LocationInputDaily.PhreaticLineOffsetBelowDikeToeAtPolder, + inputParameters.LocationInputDaily.PhreaticLineOffsetBelowDikeToeAtPolder.GetAccuracy()); + Assert.AreEqual(1, inputParameters.LocationInputDaily.PhreaticLineOffsetBelowDikeTopAtPolder, + inputParameters.LocationInputDaily.PhreaticLineOffsetBelowDikeTopAtPolder.GetAccuracy()); + Assert.AreEqual(1, inputParameters.LocationInputDaily.PhreaticLineOffsetBelowShoulderBaseInside, + inputParameters.LocationInputDaily.PhreaticLineOffsetBelowShoulderBaseInside.GetAccuracy()); + Assert.AreEqual(0, inputParameters.LocationInputDaily.PenetrationLength, + inputParameters.LocationInputDaily.PenetrationLength.GetAccuracy()); + + Assert.IsTrue(inputParameters.DrainageConstructionPresent); + Assert.AreEqual(0.35, inputParameters.XCoordinateDrainageConstruction, + inputParameters.XCoordinateDrainageConstruction.GetAccuracy()); + Assert.AreEqual(1, inputParameters.ZCoordinateDrainageConstruction, + inputParameters.ZCoordinateDrainageConstruction.GetAccuracy()); + Assert.AreEqual(MacroStabilityInwardsGridDeterminationType.Manual, inputParameters.GridDeterminationType); + Assert.AreEqual(MacroStabilityInwardsTangentLineDeterminationType.Specified, inputParameters.TangentLineDeterminationType); + Assert.AreEqual(2, inputParameters.TangentLineZTop, + inputParameters.TangentLineZTop.GetAccuracy()); + Assert.AreEqual(1, inputParameters.TangentLineZBottom, + inputParameters.TangentLineZBottom.GetAccuracy()); + Assert.AreEqual(10, inputParameters.TangentLineNumber); + Assert.AreEqual(0.3, inputParameters.LeftGrid.XLeft, + inputParameters.LeftGrid.XLeft.GetAccuracy()); + Assert.AreEqual(0.4, inputParameters.LeftGrid.XRight, + inputParameters.LeftGrid.XRight.GetAccuracy()); + Assert.AreEqual(2, inputParameters.LeftGrid.ZTop, + inputParameters.LeftGrid.ZTop.GetAccuracy()); + Assert.AreEqual(1, inputParameters.LeftGrid.ZBottom, + inputParameters.LeftGrid.ZBottom.GetAccuracy()); + Assert.AreEqual(1, inputParameters.LeftGrid.NumberOfVerticalPoints); + Assert.AreEqual(1, inputParameters.LeftGrid.NumberOfHorizontalPoints); + + Assert.AreEqual(0.4, inputParameters.RightGrid.XLeft, + inputParameters.RightGrid.XLeft.GetAccuracy()); + Assert.AreEqual(0.5, inputParameters.RightGrid.XRight, + inputParameters.RightGrid.XRight.GetAccuracy()); + Assert.AreEqual(2, inputParameters.RightGrid.ZTop, + inputParameters.RightGrid.ZTop.GetAccuracy()); + Assert.AreEqual(1, inputParameters.RightGrid.ZBottom, + inputParameters.RightGrid.ZBottom.GetAccuracy()); + Assert.AreEqual(1, inputParameters.RightGrid.NumberOfVerticalPoints); + Assert.AreEqual(1, inputParameters.RightGrid.NumberOfHorizontalPoints); + + Assert.IsTrue(inputParameters.CreateZones); + Assert.AreEqual(MacroStabilityInwardsZoningBoundariesDeterminationType.Manual, inputParameters.ZoningBoundariesDeterminationType); + Assert.AreEqual(0.1, inputParameters.ZoneBoundaryLeft, inputParameters.ZoneBoundaryLeft.GetAccuracy()); + Assert.AreEqual(0.2, inputParameters.ZoneBoundaryRight, inputParameters.ZoneBoundaryRight.GetAccuracy()); + + Assert.AreEqual(0, inputParameters.StochasticSoilProfile.Probability); + Assert.AreEqual("Ondergrondschematisatie", inputParameters.StochasticSoilProfile.SoilProfile.Name); + Assert.IsInstanceOf(inputParameters.StochasticSoilProfile.SoilProfile); + var soilProfile1D = (MacroStabilityInwardsSoilProfile1D) inputParameters.StochasticSoilProfile.SoilProfile; + Assert.AreEqual(0, soilProfile1D.Bottom); + CollectionAssert.AreEqual(new[] + { + new MacroStabilityInwardsSoilLayer1D(10.56) + { + Data = + { + MaterialName = "Clay", + IsAquifer = false, + Cohesion = new VariationCoefficientLogNormalDistribution(), + FrictionAngle = new VariationCoefficientLogNormalDistribution(), + AbovePhreaticLevel = + { + Mean = (RoundedDouble) 0.3, + CoefficientOfVariation = (RoundedDouble) 0.2, + Shift = (RoundedDouble) 0.1 + }, + BelowPhreaticLevel = + { + Mean = (RoundedDouble) 15, + CoefficientOfVariation = (RoundedDouble) 0.5, + Shift = (RoundedDouble) 0.2 + } + } + }, + new MacroStabilityInwardsSoilLayer1D(6.0) + { + Data = + { + MaterialName = "Sand", + IsAquifer = true, + Cohesion = new VariationCoefficientLogNormalDistribution(), + FrictionAngle = new VariationCoefficientLogNormalDistribution(), + AbovePhreaticLevel = + { + Mean = (RoundedDouble) 0.3, + CoefficientOfVariation = (RoundedDouble) 0.2, + Shift = (RoundedDouble) 0.1 + }, + BelowPhreaticLevel = + { + Mean = (RoundedDouble) 15, + CoefficientOfVariation = (RoundedDouble) 0.5, + Shift = (RoundedDouble) 0.2 + } + } + }, + new MacroStabilityInwardsSoilLayer1D(0.1) + { + Data = + { + MaterialName = "Soil", + IsAquifer = false, + Cohesion = new VariationCoefficientLogNormalDistribution(), + FrictionAngle = new VariationCoefficientLogNormalDistribution(), + AbovePhreaticLevel = + { + Mean = (RoundedDouble) 0.3, + CoefficientOfVariation = (RoundedDouble) 0.2, + Shift = (RoundedDouble) 0.1 + }, + BelowPhreaticLevel = + { + Mean = (RoundedDouble) 15, + CoefficientOfVariation = (RoundedDouble) 0.5, + Shift = (RoundedDouble) 0.2 + } + } + } + }, soilProfile1D.Layers); + + var expectedSurfaceLine = new MacroStabilityInwardsSurfaceLine("Test"); + var firstCharacteristicPointLocation = new Point3D(0.1, 0.0, 2); + var secondCharacteristicPointLocation = new Point3D(0.2, 0.0, 2); + var thirdCharacteristicPointLocation = new Point3D(0.3, 0.0, 3); + var fourthCharacteristicPointLocation = new Point3D(0.4, 0.0, 3); + var fifthCharacteristicPointLocation = new Point3D(0.5, 0.0, 1); + var sixthCharacteristicPointLocation = new Point3D(0.6, 0.0, 1); + + expectedSurfaceLine.SetGeometry(new[] + { + firstCharacteristicPointLocation, + secondCharacteristicPointLocation, + thirdCharacteristicPointLocation, + fourthCharacteristicPointLocation, + fifthCharacteristicPointLocation, + sixthCharacteristicPointLocation + }); + expectedSurfaceLine.SetSurfaceLevelOutsideAt(firstCharacteristicPointLocation); + expectedSurfaceLine.SetDikeToeAtRiverAt(secondCharacteristicPointLocation); + expectedSurfaceLine.SetDikeTopAtRiverAt(thirdCharacteristicPointLocation); + expectedSurfaceLine.SetDikeTopAtPolderAt(fourthCharacteristicPointLocation); + expectedSurfaceLine.SetDikeToeAtPolderAt(fifthCharacteristicPointLocation); + expectedSurfaceLine.SetSurfaceLevelInsideAt(sixthCharacteristicPointLocation); + Assert.AreEqual(expectedSurfaceLine, inputParameters.SurfaceLine); + } + + private static FailureMechanismSection CreateSection() + { + return new FailureMechanismSection("name", new[] + { + new Point2D(0, 0) + }); + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj =================================================================== diff -u -r894fafdb01491d4abea54966afd68c69508dbcc1 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj (.../Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj) (revision 894fafdb01491d4abea54966afd68c69508dbcc1) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj (.../Ringtoets.MacroStabilityInwards.Data.TestUtil.Test.csproj) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -15,7 +15,7 @@ - + Fisheye: Tag 5c7faf8283e49113a2c7b9e17086148a99f13d2e refers to a dead (removed) revision in file `Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioTestFactory.cs =================================================================== diff -u --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioTestFactory.cs (revision 0) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/MacroStabilityInwardsCalculationScenarioTestFactory.cs (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -0,0 +1,326 @@ +// 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 System.Linq; +using Core.Common.Base.Data; +using Core.Common.Base.Geometry; +using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.Probabilistics; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.MacroStabilityInwards.Data.SoilProfile; +using Ringtoets.MacroStabilityInwards.Primitives; + +namespace Ringtoets.MacroStabilityInwards.Data.TestUtil +{ + /// + /// Helper class for creating different instances of + /// for easier testing. + /// + public static class MacroStabilityInwardsCalculationScenarioTestFactory + { + /// + /// Creates a calculated scenario for which the surface line on the input intersects with . + /// + /// The value for . + /// The section for which an intersection will be created. + /// A new . + /// Thrown when is null. + public static MacroStabilityInwardsCalculationScenario CreateMacroStabilityInwardsCalculationScenario(double factorOfStability, + FailureMechanismSection section) + { + MacroStabilityInwardsCalculationScenario scenario = CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + scenario.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(new MacroStabilityInwardsOutput.ConstructionProperties + { + FactorOfStability = factorOfStability + }); + + return scenario; + } + + /// + /// Creates a calculated scenario for which the surface line on the input intersects with and + /// the calculation has as factor of stability. + /// + /// The section for which an intersection will be created. + /// A new . + /// Thrown when is null. + public static MacroStabilityInwardsCalculationScenario CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(FailureMechanismSection section) + { + return CreateMacroStabilityInwardsCalculationScenario(double.NaN, section); + } + + /// + /// Creates a scenario for which the surface line on the input intersects with and + /// is marked as not relevant for the assessment. + /// + /// The section for which an intersection will be created. + /// A new . + /// Thrown when is null. + public static MacroStabilityInwardsCalculationScenario CreateIrrelevantMacroStabilityInwardsCalculationScenario(FailureMechanismSection section) + { + MacroStabilityInwardsCalculationScenario scenario = CreateMacroStabilityInwardsCalculationScenario(0.2, section); + scenario.IsRelevant = false; + return scenario; + } + + /// + /// Creates a scenario for which the surface line on the input intersects with and + /// the calculation has not been performed. + /// + /// The section for which an intersection will be created. + /// A new . + /// Thrown when is null. + public static MacroStabilityInwardsCalculationScenario CreateNotCalculatedMacroStabilityInwardsCalculationScenario(FailureMechanismSection section) + { + if (section == null) + { + throw new ArgumentNullException(nameof(section)); + } + + var surfaceLine = new MacroStabilityInwardsSurfaceLine(string.Empty); + Point2D p = section.Points.First(); + surfaceLine.SetGeometry(new[] + { + new Point3D(p.X, p.Y, 0), + new Point3D(p.X + 2, p.Y + 2, 0) + }); + surfaceLine.ReferenceLineIntersectionWorldPoint = section.Points.First(); + + var scenario = new MacroStabilityInwardsCalculationScenario + { + IsRelevant = true, + InputParameters = + { + SurfaceLine = surfaceLine + } + }; + return scenario; + } + + /// + /// Creates a scenario with invalid input. + /// + /// A new . + public static MacroStabilityInwardsCalculationScenario CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput() + { + return new MacroStabilityInwardsCalculationScenario(); + } + + /// + /// Creates a scenario with valid input. + /// + /// A new . + public static MacroStabilityInwardsCalculationScenario CreateMacroStabilityInwardsCalculationScenarioWithValidInput() + { + const double top = 10.56; + var stochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, new MacroStabilityInwardsSoilProfile1D("Ondergrondschematisatie", 0.0, new[] + { + new MacroStabilityInwardsSoilLayer1D(top) + { + Data = + { + MaterialName = "Clay", + IsAquifer = false, + Cohesion = new VariationCoefficientLogNormalDistribution(), + FrictionAngle = new VariationCoefficientLogNormalDistribution(), + AbovePhreaticLevel = + { + Mean = (RoundedDouble) 0.3, + CoefficientOfVariation = (RoundedDouble) 0.2, + Shift = (RoundedDouble) 0.1 + }, + BelowPhreaticLevel = + { + Mean = (RoundedDouble) 15, + CoefficientOfVariation = (RoundedDouble) 0.5, + Shift = (RoundedDouble) 0.2 + } + } + }, + new MacroStabilityInwardsSoilLayer1D(6.0) + { + Data = + { + MaterialName = "Sand", + IsAquifer = true, + Cohesion = new VariationCoefficientLogNormalDistribution(), + FrictionAngle = new VariationCoefficientLogNormalDistribution(), + AbovePhreaticLevel = + { + Mean = (RoundedDouble) 0.3, + CoefficientOfVariation = (RoundedDouble) 0.2, + Shift = (RoundedDouble) 0.1 + }, + BelowPhreaticLevel = + { + Mean = (RoundedDouble) 15, + CoefficientOfVariation = (RoundedDouble) 0.5, + Shift = (RoundedDouble) 0.2 + } + } + }, + new MacroStabilityInwardsSoilLayer1D(0.1) + { + Data = + { + MaterialName = "Soil", + IsAquifer = false, + Cohesion = new VariationCoefficientLogNormalDistribution(), + FrictionAngle = new VariationCoefficientLogNormalDistribution(), + AbovePhreaticLevel = + { + Mean = (RoundedDouble) 0.3, + CoefficientOfVariation = (RoundedDouble) 0.2, + Shift = (RoundedDouble) 0.1 + }, + BelowPhreaticLevel = + { + Mean = (RoundedDouble) 15, + CoefficientOfVariation = (RoundedDouble) 0.5, + Shift = (RoundedDouble) 0.2 + } + } + } + })); + + var surfaceLine = new MacroStabilityInwardsSurfaceLine("Test"); + var firstCharacteristicPointLocation = new Point3D(0.1, 0.0, 2); + var secondCharacteristicPointLocation = new Point3D(0.2, 0.0, 2); + var thirdCharacteristicPointLocation = new Point3D(0.3, 0.0, 3); + var fourthCharacteristicPointLocation = new Point3D(0.4, 0.0, 3); + var fifthCharacteristicPointLocation = new Point3D(0.5, 0.0, 1); + var sixthCharacteristicPointLocation = new Point3D(0.6, 0.0, 1); + + surfaceLine.SetGeometry(new[] + { + firstCharacteristicPointLocation, + secondCharacteristicPointLocation, + thirdCharacteristicPointLocation, + fourthCharacteristicPointLocation, + fifthCharacteristicPointLocation, + sixthCharacteristicPointLocation + }); + surfaceLine.SetSurfaceLevelOutsideAt(firstCharacteristicPointLocation); + surfaceLine.SetDikeToeAtRiverAt(secondCharacteristicPointLocation); + surfaceLine.SetDikeTopAtRiverAt(thirdCharacteristicPointLocation); + surfaceLine.SetDikeTopAtPolderAt(fourthCharacteristicPointLocation); + surfaceLine.SetDikeToeAtPolderAt(fifthCharacteristicPointLocation); + surfaceLine.SetSurfaceLevelInsideAt(sixthCharacteristicPointLocation); + + HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation + { + DesignWaterLevelCalculation2 = + { + Output = new TestHydraulicBoundaryLocationOutput(1.1) + }, + DesignWaterLevelCalculation3 = + { + Output = new TestHydraulicBoundaryLocationOutput(2.2) + } + }; + + return new MacroStabilityInwardsCalculationScenario + { + InputParameters = + { + SurfaceLine = surfaceLine, + StochasticSoilProfile = stochasticSoilProfile, + HydraulicBoundaryLocation = hydraulicBoundaryLocation, + DikeSoilScenario = MacroStabilityInwardsDikeSoilScenario.SandDikeOnClay, + WaterLevelRiverAverage = (RoundedDouble) 0.4, + LocationInputExtreme = + { + WaterLevelPolder = (RoundedDouble) 0.5, + UseDefaultOffsets = false, + PenetrationLength = (RoundedDouble) 1.0, + PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) 1.0, + PhreaticLineOffsetBelowDikeTopAtPolder = (RoundedDouble) 1.0, + PhreaticLineOffsetBelowDikeTopAtRiver = (RoundedDouble) 1.0, + PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble) 1.0 + }, + LocationInputDaily = + { + WaterLevelPolder = new RoundedDouble(5, 0.5), + UseDefaultOffsets = false, + PhreaticLineOffsetBelowDikeToeAtPolder = (RoundedDouble) 1.0, + PhreaticLineOffsetBelowDikeTopAtPolder = (RoundedDouble) 1.0, + PhreaticLineOffsetBelowDikeTopAtRiver = (RoundedDouble) 1.0, + PhreaticLineOffsetBelowShoulderBaseInside = (RoundedDouble) 1.0 + }, + PiezometricHeadPhreaticLine2Outwards = (RoundedDouble) 1.0, + PiezometricHeadPhreaticLine2Inwards = (RoundedDouble) 1.0, + AdjustPhreaticLine3And4ForUplift = true, + LeakageLengthInwardsPhreaticLine3 = (RoundedDouble) 1.0, + LeakageLengthOutwardsPhreaticLine3 = (RoundedDouble) 1.0, + LeakageLengthOutwardsPhreaticLine4 = (RoundedDouble) 1.0, + LeakageLengthInwardsPhreaticLine4 = (RoundedDouble) 1.0, + SlipPlaneMinimumLength = (RoundedDouble) 1.0, + SlipPlaneMinimumDepth = (RoundedDouble) 1.0, + MinimumLevelPhreaticLineAtDikeTopPolder = (RoundedDouble) 1.0, + MinimumLevelPhreaticLineAtDikeTopRiver = (RoundedDouble) 1.0, + DrainageConstructionPresent = true, + XCoordinateDrainageConstruction = (RoundedDouble) 0.35, + ZCoordinateDrainageConstruction = (RoundedDouble) 1.0, + GridDeterminationType = MacroStabilityInwardsGridDeterminationType.Manual, + TangentLineDeterminationType = MacroStabilityInwardsTangentLineDeterminationType.Specified, + TangentLineZTop = (RoundedDouble) 2.0, + TangentLineZBottom = (RoundedDouble) 1.0, + TangentLineNumber = 10, + LeftGrid = + { + XLeft = (RoundedDouble) 0.3, + XRight = (RoundedDouble) 0.4, + ZTop = (RoundedDouble) 2.0, + ZBottom = (RoundedDouble) 1.0, + NumberOfVerticalPoints = 1, + NumberOfHorizontalPoints = 1 + }, + RightGrid = + { + XLeft = (RoundedDouble) 0.4, + XRight = (RoundedDouble) 0.5, + ZTop = (RoundedDouble) 2.0, + ZBottom = (RoundedDouble) 1.0, + NumberOfVerticalPoints = 1, + NumberOfHorizontalPoints = 1 + }, + CreateZones = true, + ZoningBoundariesDeterminationType = MacroStabilityInwardsZoningBoundariesDeterminationType.Manual, + ZoneBoundaryLeft = (RoundedDouble) 0.1, + ZoneBoundaryRight = (RoundedDouble) 0.2 + } + }; + } + + /// + /// Creates a scenario with valid input and output. + /// + /// A new . + public static MacroStabilityInwardsCalculationScenario CreateCalculatedMacroStabilityInwardsCalculationScenario() + { + MacroStabilityInwardsCalculationScenario calculation = CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateRandomOutput(); + return calculation; + } + } +} \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj =================================================================== diff -u -rd57b5fdfd92270ac6eff490b438bbe90f0296a4d -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj (.../Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj) (revision d57b5fdfd92270ac6eff490b438bbe90f0296a4d) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil/Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj (.../Ringtoets.MacroStabilityInwards.Data.TestUtil.csproj) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -18,7 +18,7 @@ - + Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs =================================================================== diff -u -r9b2bb9a809f4b42bd06b910dde1f6eb8e546356f -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs (.../MacroStabilityInwardsMapDataFeaturesFactoryTest.cs) (revision 9b2bb9a809f4b42bd06b910dde1f6eb8e546356f) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Factories/MacroStabilityInwardsMapDataFeaturesFactoryTest.cs (.../MacroStabilityInwardsMapDataFeaturesFactoryTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -173,8 +173,8 @@ public void CreateCalculationFeatures_GivenCalculations_ReturnsCalculationFeaturesCollection() { // Setup - MacroStabilityInwardsCalculationScenario calculationA = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); - MacroStabilityInwardsCalculationScenario calculationB = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculationA = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculationB = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculationA.InputParameters.SurfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(1.0, 3.0); calculationB.InputParameters.SurfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(1.0, 4.0); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs =================================================================== diff -u -rb2f4b307c254c747a5cf01d2fb94970e5e954c36 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision b2f4b307c254c747a5cf01d2fb94970e5e954c36) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -78,7 +78,7 @@ var handler = mocks.Stub(); mocks.ReplayAll(); - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); // Call var row = new MacroStabilityInwardsCalculationRow(calculation, handler); @@ -101,7 +101,7 @@ var handler = mocks.Stub(); mocks.ReplayAll(); - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); // Call var row = new MacroStabilityInwardsCalculationRow(calculation, handler); @@ -127,7 +127,7 @@ const string newValue = "Test new name"; - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); var row = new MacroStabilityInwardsCalculationRow(calculation, handler); calculation.Attach(observer); @@ -284,7 +284,7 @@ MacroStabilityInwardsOutput assignedOutput = null; - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); if (hasOutput) { assignedOutput = MacroStabilityInwardsOutputTestFactory.CreateOutput(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -rb0ab8bebd62aad140b166271c7519f182c933648 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision b0ab8bebd62aad140b166271c7519f182c933648) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -307,7 +307,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); using (MacroStabilityInwardsFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(failureMechanism)) { - MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenario( + MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario( 1.0 / 1000.0, failureMechanism.Sections.First()); calculationScenario.Contribution = (RoundedDouble) 0.3; @@ -342,7 +342,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); using (MacroStabilityInwardsFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(failureMechanism)) { - MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenario( + MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario( (RoundedDouble) 1e-3, failureMechanism.Sections.First()); failureMechanism.CalculationsGroup.Children.Add(calculationScenario); @@ -375,7 +375,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); using (ShowFullyConfiguredFailureMechanismResultsView(failureMechanism)) { - MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario( + MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario( failureMechanism.Sections.First()); failureMechanism.CalculationsGroup.Children.Add(calculationScenario); @@ -406,7 +406,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); using (MacroStabilityInwardsFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(failureMechanism)) { - MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput( + MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput( failureMechanism.Sections.First()); failureMechanism.CalculationsGroup.Children.Add(calculationScenario); view.Data = failureMechanism.SectionResults; @@ -465,7 +465,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); using (ShowFullyConfiguredFailureMechanismResultsView(failureMechanism)) { - MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario( + MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario( failureMechanism.Sections.First()); failureMechanism.CalculationsGroup.Children.Add(calculationScenario); @@ -494,7 +494,7 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); using (ShowFullyConfiguredFailureMechanismResultsView(failureMechanism)) { - MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput( + MacroStabilityInwardsCalculationScenario calculationScenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput( failureMechanism.Sections.First()); failureMechanism.CalculationsGroup.Children.Add(calculationScenario); @@ -524,11 +524,11 @@ var failureMechanism = new MacroStabilityInwardsFailureMechanism(); using (MacroStabilityInwardsFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(failureMechanism)) { - MacroStabilityInwardsCalculationScenario calculationScenario1 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenario( + MacroStabilityInwardsCalculationScenario calculationScenario1 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario( 0.1, failureMechanism.Sections.First()); calculationScenario1.Contribution = (RoundedDouble) 0.6; - MacroStabilityInwardsCalculationScenario calculationScenario2 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenario( + MacroStabilityInwardsCalculationScenario calculationScenario2 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario( 0.2, failureMechanism.Sections.First()); calculationScenario2.Contribution = (RoundedDouble) 0.4; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs) (revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -170,9 +170,9 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); MacroStabilityInwardsCalculationScenario scenarioA = - MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); MacroStabilityInwardsCalculationScenario scenarioB = - MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); scenarioA.Contribution = (RoundedDouble) contributionA; scenarioB.Contribution = (RoundedDouble) contributionB; @@ -203,7 +203,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); + MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); var result = new MacroStabilityInwardsFailureMechanismSectionResult(section); var row = new MacroStabilityInwardsFailureMechanismSectionResultRow(result, new[] @@ -231,7 +231,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); MacroStabilityInwardsCalculationScenario scenario = - MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenario(0.2, section); + MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(0.2, section); scenario.Contribution = (RoundedDouble) 1.0; var result = new MacroStabilityInwardsFailureMechanismSectionResult(section); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs =================================================================== diff -u -r6b2660c8a0d2fa638554f54825ea2e7ff34e1398 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision 6b2660c8a0d2fa638554f54825ea2e7ff34e1398) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismViewTest.cs (.../MacroStabilityInwardsFailureMechanismViewTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -300,9 +300,9 @@ stochasticSoilModel2 }, arbitraryFilePath); - MacroStabilityInwardsCalculationScenario calculationA = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculationA = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculationA.InputParameters.SurfaceLine = surfaceLineA; - MacroStabilityInwardsCalculationScenario calculationB = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculationB = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculationB.InputParameters.SurfaceLine = surfaceLineB; failureMechanism.CalculationsGroup.Children.Add(calculationA); failureMechanism.CalculationsGroup.Children.Add(calculationB); @@ -664,9 +664,9 @@ surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3); surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5); - MacroStabilityInwardsCalculationScenario calculationA = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculationA = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculationA.InputParameters.SurfaceLine = surfaceLineA; - MacroStabilityInwardsCalculationScenario calculationB = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculationB = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculationB.InputParameters.SurfaceLine = surfaceLineB; failureMechanism.CalculationsGroup.Children.Add(calculationA); @@ -713,7 +713,7 @@ surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3); surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5); - MacroStabilityInwardsCalculationScenario calculationA = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculationA = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculationA.InputParameters.SurfaceLine = surfaceLineA; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); @@ -763,7 +763,7 @@ surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3); surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5); - MacroStabilityInwardsCalculationScenario calculationA = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculationA = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculationA.InputParameters.SurfaceLine = surfaceLineA; var failureMechanism = new MacroStabilityInwardsFailureMechanism(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs =================================================================== diff -u -ra371ae048cf582e8a9cad8436a21c2b9b18dc793 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision a371ae048cf582e8a9cad8436a21c2b9b18dc793) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputChartControlTest.cs (.../MacroStabilityInwardsOutputChartControlTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -84,7 +84,7 @@ // Setup using (var control = new MacroStabilityInwardsOutputChartControl()) { - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); // Call control.Data = calculation; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs =================================================================== diff -u -rb513e76d805898795483251f7d070489dfd20b9b -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs (.../MacroStabilityInwardsOutputViewTest.cs) (revision b513e76d805898795483251f7d070489dfd20b9b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsOutputViewTest.cs (.../MacroStabilityInwardsOutputViewTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -108,7 +108,7 @@ MacroStabilityInwardsOutputChartControl chartControl = GetChartControl(form); - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); // Call @@ -124,7 +124,7 @@ public void Data_SetToNull_ChartControlDataNull() { // Setup - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculation.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); using (var form = new Form()) Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenarioRowTest.cs =================================================================== diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenarioRowTest.cs (.../MacroStabilityInwardsScenarioRowTest.cs) (revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenarioRowTest.cs (.../MacroStabilityInwardsScenarioRowTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -63,7 +63,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); // Call TestDelegate test = () => new MacroStabilityInwardsScenarioRow(calculation, null, assessmentSection); @@ -78,7 +78,7 @@ public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { // Setup - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); var failureMechanism = new MacroStabilityInwardsFailureMechanism(); // Call @@ -93,7 +93,7 @@ public void Constructor_WithCalculationWithOutput_PropertiesFromCalculation() { // Setup - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateCalculatedMacroStabilityInwardsCalculationScenario(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateCalculatedMacroStabilityInwardsCalculationScenario(); var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); var mocks = new MockRepository(); @@ -119,7 +119,7 @@ public void Constructor_WithCalculationWithoutSemiProbabilisticOutput_PropertiesFromCalculation() { // Setup - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); var mocks = new MockRepository(); @@ -145,7 +145,7 @@ { // Setup var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); @@ -170,7 +170,7 @@ { // Setup var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rb116b56a97e5a4aee668e9dda089e8a2e2d45e57 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision b116b56a97e5a4aee668e9dda089e8a2e2d45e57) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -567,7 +567,7 @@ { Children = { - MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput() + MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput() } }; @@ -617,7 +617,7 @@ { Children = { - MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput() + MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput() } }; @@ -779,9 +779,9 @@ // Setup using (var treeViewControl = new TreeViewControl()) { - MacroStabilityInwardsCalculationScenario validCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario validCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); validCalculation.Name = "A"; - MacroStabilityInwardsCalculationScenario invalidCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); + MacroStabilityInwardsCalculationScenario invalidCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); invalidCalculation.Name = "B"; var childGroup = new CalculationGroup(); @@ -847,9 +847,9 @@ { var mainWindow = mocks.Stub(); - MacroStabilityInwardsCalculationScenario validCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario validCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); validCalculation.Name = "A"; - MacroStabilityInwardsCalculationScenario invalidCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); + MacroStabilityInwardsCalculationScenario invalidCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); invalidCalculation.Name = "B"; var childGroup = new CalculationGroup(); @@ -918,11 +918,11 @@ calculation2Observer.Expect(o => o.UpdateObserver()); } - MacroStabilityInwardsCalculationScenario calculation1 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation1 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculation1.Name = "A"; calculation1.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); calculation1.Attach(calculation1Observer); - MacroStabilityInwardsCalculationScenario calculation2 = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation2 = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); calculation2.Name = "B"; calculation2.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); calculation2.Attach(calculation2Observer); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -rb116b56a97e5a4aee668e9dda089e8a2e2d45e57 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision b116b56a97e5a4aee668e9dda089e8a2e2d45e57) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -576,7 +576,7 @@ // Given using (var treeViewControl = new TreeViewControl()) { - MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); failureMechanism.AddSection(new FailureMechanismSection("A", new[] { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rb116b56a97e5a4aee668e9dda089e8a2e2d45e57 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision b116b56a97e5a4aee668e9dda089e8a2e2d45e57) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -472,7 +472,7 @@ { Children = { - MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput() + MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput() } } }; @@ -519,7 +519,7 @@ { Children = { - MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput() + MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput() } } }; @@ -639,9 +639,9 @@ using (var treeViewControl = new TreeViewControl()) { var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); - MacroStabilityInwardsCalculationScenario validCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario validCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); validCalculation.Name = "A"; - MacroStabilityInwardsCalculationScenario invalidCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); + MacroStabilityInwardsCalculationScenario invalidCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); invalidCalculation.Name = "B"; failureMechanism.CalculationsGroup.Children.Add(validCalculation); @@ -685,9 +685,9 @@ using (var treeViewControl = new TreeViewControl()) { var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); - MacroStabilityInwardsCalculationScenario validCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario validCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); validCalculation.Name = "A"; - MacroStabilityInwardsCalculationScenario invalidCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); + MacroStabilityInwardsCalculationScenario invalidCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); invalidCalculation.Name = "B"; failureMechanism.CalculationsGroup.Children.Add(validCalculation); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs =================================================================== diff -u -r3407ec4aaf9a98e3f5c7ba5d3b61939bd2773b4c -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision 3407ec4aaf9a98e3f5c7ba5d3b61939bd2773b4c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationActivityTest.cs (.../MacroStabilityInwardsCalculationActivityTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -71,7 +71,7 @@ // Setup MacroStabilityInwardsOutput originalOutput = MacroStabilityInwardsOutputTestFactory.CreateOutput(); - MacroStabilityInwardsCalculationScenario invalidMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); + MacroStabilityInwardsCalculationScenario invalidMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); invalidMacroStabilityInwardsCalculation.Output = originalOutput; var activity = new MacroStabilityInwardsCalculationActivity(invalidMacroStabilityInwardsCalculation, GetTestNormativeAssessmentLevel()); @@ -101,7 +101,7 @@ public void Run_ValidMacroStabilityInwardsCalculation_PerformMacroStabilityInwardsValidationAndCalculationAndLogStartAndEnd() { // Setup - MacroStabilityInwardsCalculationScenario validMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario validMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); validMacroStabilityInwardsCalculation.Output = null; using (new MacroStabilityInwardsCalculatorFactoryConfig()) @@ -137,7 +137,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - MacroStabilityInwardsCalculationScenario validMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + MacroStabilityInwardsCalculationScenario validMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); validMacroStabilityInwardsCalculation.Output = null; validMacroStabilityInwardsCalculation.Attach(observer); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs =================================================================== diff -u -ra709afbb7fec6c6505239f54a358492c77182249 -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision a709afbb7fec6c6505239f54a358492c77182249) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsCalculationServiceTest.cs (.../MacroStabilityInwardsCalculationServiceTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -47,7 +47,7 @@ [SetUp] public void Setup() { - testCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); + testCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); } [Test] @@ -85,7 +85,7 @@ { // Setup MacroStabilityInwardsOutput output = MacroStabilityInwardsOutputTestFactory.CreateOutput(); - MacroStabilityInwardsCalculation invalidMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); + MacroStabilityInwardsCalculation invalidMacroStabilityInwardsCalculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithInvalidInput(); invalidMacroStabilityInwardsCalculation.Output = output; // Call Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputValidatorTest.cs =================================================================== diff -u -rd248ea3daa427ead16113a43fdab6267d061680e -r5c7faf8283e49113a2c7b9e17086148a99f13d2e --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputValidatorTest.cs (.../MacroStabilityInwardsInputValidatorTest.cs) (revision d248ea3daa427ead16113a43fdab6267d061680e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Service.Test/MacroStabilityInwardsInputValidatorTest.cs (.../MacroStabilityInwardsInputValidatorTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) @@ -41,7 +41,7 @@ [SetUp] public void Setup() { - input = MacroStabilityInwardsCalculationScenarioFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput().InputParameters; + input = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput().InputParameters; } [Test]