Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs =================================================================== diff -u -r560ea9f96409cc65f4666adf212a1c135c5e626f -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../ProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 560ea9f96409cc65f4666adf212a1c135c5e626f) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/TreeNodeInfos/ProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs (.../ProbabilityFailureMechanismSectionResultContextTreeNodeInfoTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -73,26 +73,16 @@ public void Text_Always_ReturnsName() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - using (var plugin = new ClosingStructuresPlugin()) { TreeNodeInfo info = GetInfo(plugin); - var mechanism = new ClosingStructuresFailureMechanism(); - var context = new ProbabilityFailureMechanismSectionResultContext>(mechanism.SectionResults, mechanism, - assessmentSection); - // Call - string text = info.Text(context); + string text = info.Text(null); // Assert Assert.AreEqual("Resultaat", text); } - - mocks.VerifyAll(); } [Test] Index: Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs =================================================================== diff -u -r5c7faf8283e49113a2c7b9e17086148a99f13d2e -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs (.../MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Data/MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs (.../MacroStabilityInwardsFailureMechanismSection2aAssessmentResultExtensions.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -71,8 +71,8 @@ } IEnumerable calculationScenarios = sectionResult - .GetCalculationScenarios(calculations) - .Where(cs => cs.Status == CalculationScenarioStatus.Done); + .GetCalculationScenarios(calculations) + .Where(cs => cs.Status == CalculationScenarioStatus.Done); if (calculationScenarios.Any()) { @@ -85,6 +85,7 @@ totalAssessmentLayerTwoA += derivedOutput.MacroStabilityInwardsProbability * (double) scenario.Contribution; } + return totalAssessmentLayerTwoA; } @@ -100,8 +101,8 @@ IEnumerable calculations) { return (RoundedDouble) macroStabilityInwardsFailureMechanismSectionResult - .GetCalculationScenarios(calculations) - .Aggregate(0, (current, calculationScenario) => current + calculationScenario.Contribution); + .GetCalculationScenarios(calculations) + .Aggregate(0, (current, calculationScenario) => current + calculationScenario.Contribution); } /// @@ -138,7 +139,7 @@ if (!Enum.IsDefined(typeof(CalculationScenarioStatus), calculationScenarioStatus)) { throw new InvalidEnumArgumentException(nameof(macroStabilityInwardsFailureMechanismSectionResult), - (int)calculationScenarioStatus, + (int) calculationScenarioStatus, typeof(CalculationScenarioStatus)); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs =================================================================== diff -u -r5c7faf8283e49113a2c7b9e17086148a99f13d2e -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs (.../MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs (.../MacroStabilityInwardsCalculationScenarioTestFactoryTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -54,7 +54,7 @@ public void CreateMacroStabilityInwardsCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSet(double factoryOfStability) { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenario(factoryOfStability, section); @@ -80,7 +80,7 @@ public void CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput_WithSection_CreatesRelevantCalculationWithOutputSetToNaN() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithNaNOutput(section); @@ -106,7 +106,7 @@ public void CreateIrrelevantMacroStabilityInwardsCalculationScenario_WithSection_CreatesIrrelevantCalculation() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(section); @@ -132,7 +132,7 @@ public void CreateNotCalculatedMacroStabilityInwardsCalculationScenario_WithSection_CreatesRelevantCalculationWithoutOutput() { // Setup - FailureMechanismSection section = CreateSection(); + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateNotCalculatedMacroStabilityInwardsCalculationScenario(section); @@ -173,10 +173,10 @@ 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.IsFalse(double.IsNaN(output.FactorOfStability) && double.IsInfinity(output.FactorOfStability)); + Assert.IsFalse(double.IsNaN(output.ZValue) && double.IsInfinity(output.ZValue)); + Assert.IsFalse(double.IsNaN(output.ForbiddenZonesXEntryMax) && double.IsInfinity(output.ForbiddenZonesXEntryMax)); + Assert.IsFalse(double.IsNaN(output.ForbiddenZonesXEntryMin) && double.IsInfinity(output.ForbiddenZonesXEntryMin)); Assert.IsNotNull(output.SlidingCurve); Assert.IsNotNull(output.SlipPlane); } @@ -373,13 +373,5 @@ 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/MacroStabilityInwardsOutputTestFactoryTest.cs =================================================================== diff -u -re38673ff639b5d86a2f55997e2d0d876ba4737f7 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsOutputTestFactoryTest.cs (.../MacroStabilityInwardsOutputTestFactoryTest.cs) (revision e38673ff639b5d86a2f55997e2d0d876ba4737f7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsOutputTestFactoryTest.cs (.../MacroStabilityInwardsOutputTestFactoryTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -101,10 +101,10 @@ // Assert 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.IsFalse(double.IsNaN(output.FactorOfStability) && double.IsInfinity(output.FactorOfStability)); + Assert.IsFalse(double.IsNaN(output.ZValue) && double.IsInfinity(output.ZValue)); + Assert.IsFalse(double.IsNaN(output.ForbiddenZonesXEntryMax) && double.IsInfinity(output.ForbiddenZonesXEntryMax)); + Assert.IsFalse(double.IsNaN(output.ForbiddenZonesXEntryMin) && double.IsInfinity(output.ForbiddenZonesXEntryMin)); Assert.IsNotNull(output.SlidingCurve); Assert.IsNotNull(output.SlipPlane); } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r5c7faf8283e49113a2c7b9e17086148a99f13d2e -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -486,7 +486,7 @@ } [Test] - public void FailureMechanismResultView_AssessmentLayerOneStateSufficientAndAssessmentLayerTwoAHasError_DoesNotShowError() + public void FailureMechanismResultView_AssessmentLayerOneStateSufficientAndAssessmentLayerTwoAHasNaNOutput_DoesNotShowError() { // Setup const int rowIndex = 0; @@ -514,13 +514,9 @@ } [Test] - [TestCase(AssessmentLayerOneState.NotAssessed)] - [TestCase(AssessmentLayerOneState.NoVerdict)] - public void GivenFailureMechanismResultView_WhenFailureMechanismNotifiesObserver_ThenViewUpdated(AssessmentLayerOneState assessmentLayerOneState) + public void GivenFailureMechanismResultView_WhenFailureMechanismNotifiesObserver_ThenViewUpdated() { // Given - const int rowIndex = 0; - var failureMechanism = new MacroStabilityInwardsFailureMechanism(); using (MacroStabilityInwardsFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(failureMechanism)) { @@ -540,8 +536,6 @@ var gridTester = new ControlTester("dataGridView"); var dataGridView = (DataGridView) gridTester.TheObject; - dataGridView.Rows[rowIndex].Cells[assessmentLayerOneIndex].Value = assessmentLayerOneState; - MacroStabilityInwardsFailureMechanismSectionResultRow[] sectionResultRows = dataGridView.Rows.Cast() .Select(r => r.DataBoundItem) .Cast() Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -r5c7faf8283e49113a2c7b9e17086148a99f13d2e -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultRowTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -220,6 +220,34 @@ } [Test] + public void AssessmentLayerTwoA_NoRelevantScenarios_ReturnNaN() + { + // Setup + var mocks = new MockRepository(); + var assessmentSection = mocks.Stub(); + mocks.ReplayAll(); + + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); + + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + + MacroStabilityInwardsCalculationScenario scenario = MacroStabilityInwardsCalculationScenarioTestFactory.CreateIrrelevantMacroStabilityInwardsCalculationScenario(section); + + var result = new MacroStabilityInwardsFailureMechanismSectionResult(section); + var row = new MacroStabilityInwardsFailureMechanismSectionResultRow(result, new[] + { + scenario + }, failureMechanism, assessmentSection); + + // Call + double assessmentLayerTwoA = row.AssessmentLayerTwoA; + + // Assert + Assert.IsNaN(assessmentLayerTwoA); + mocks.VerifyAll(); + } + + [Test] public void AssessmentLayerTwoA_RelevantScenariosDone_ResultOfSection() { // Setup Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenarioRowTest.cs =================================================================== diff -u -r5c7faf8283e49113a2c7b9e17086148a99f13d2e -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenarioRowTest.cs (.../MacroStabilityInwardsScenarioRowTest.cs) (revision 5c7faf8283e49113a2c7b9e17086148a99f13d2e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenarioRowTest.cs (.../MacroStabilityInwardsScenarioRowTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -94,7 +94,7 @@ { // Setup MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateCalculatedMacroStabilityInwardsCalculationScenario(); - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); @@ -120,7 +120,7 @@ { // Setup MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); @@ -144,7 +144,7 @@ public void IsRelevant_AlwaysOnChange_NotifyObserversAndCalculationPropertyChanged(bool newValue) { // Setup - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); var mocks = new MockRepository(); @@ -169,7 +169,7 @@ public void Contribution_AlwaysOnChange_NotifyObserverAndCalculationPropertyChanged() { // Setup - var failureMechanism = new TestMacroStabilityInwardsFailureMechanism(); + var failureMechanism = new MacroStabilityInwardsFailureMechanism(); MacroStabilityInwardsCalculationScenario calculation = MacroStabilityInwardsCalculationScenarioTestFactory.CreateMacroStabilityInwardsCalculationScenarioWithValidInput(); var mocks = new MockRepository(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs =================================================================== diff -u -rb0ab8bebd62aad140b166271c7519f182c933648 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs (.../MacroStabilityInwardsScenariosViewTest.cs) (revision b0ab8bebd62aad140b166271c7519f182c933648) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsScenariosViewTest.cs (.../MacroStabilityInwardsScenariosViewTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -233,7 +233,7 @@ Assert.IsTrue(Convert.ToBoolean(cells[isRelevantColumnIndex].FormattedValue)); Assert.AreEqual(100.ToString(CultureInfo.CurrentCulture), cells[contributionColumnIndex].FormattedValue); Assert.AreEqual("Calculation 2", cells[nameColumnIndex].FormattedValue); - Assert.AreEqual(ProbabilityFormattingHelper.Format(7.14e-2), cells[failureProbabilityColumnIndex].FormattedValue); + Assert.AreEqual(ProbabilityFormattingHelper.Format(1), cells[failureProbabilityColumnIndex].FormattedValue); } [Test] @@ -402,7 +402,10 @@ { SurfaceLine = surfaceLine2 }, - Output = MacroStabilityInwardsOutputTestFactory.CreateRandomOutput() + Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(new MacroStabilityInwardsOutput.ConstructionProperties + { + FactorOfStability = 0.2 + }) } } }; Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs =================================================================== diff -u -rfb3c4216478c0f072cf2f1a94053e81756ced5c7 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs) (revision fb3c4216478c0f072cf2f1a94053e81756ced5c7) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Integration.Test/MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewIntegrationTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -27,6 +27,7 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Forms.Helpers; using Ringtoets.Integration.Data; using Ringtoets.Integration.TestUtil; using Ringtoets.MacroStabilityInwards.Data; @@ -120,17 +121,20 @@ dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); // Execute the first calculation and ensure the data grid view is updated - calculation1.Output = MacroStabilityInwardsOutputTestFactory.CreateRandomOutput(); + calculation1.Output = MacroStabilityInwardsOutputTestFactory.CreateOutput(new MacroStabilityInwardsOutput.ConstructionProperties + { + FactorOfStability = 0.5 + }); calculation1.NotifyObservers(); - Assert.AreEqual("1/14", + Assert.AreEqual(ProbabilityFormattingHelper.Format(0.5), dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); Assert.IsEmpty(dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); // Add another, nested calculation without surface line and ensure the data grid view is updated when the surface line is set var calculation3 = new MacroStabilityInwardsCalculationScenario(); nestedCalculationGroup.Children.Add(calculation3); nestedCalculationGroup.NotifyObservers(); - Assert.AreEqual("1/14", + Assert.AreEqual(ProbabilityFormattingHelper.Format(0.5), dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); Assert.IsEmpty(dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); @@ -164,7 +168,7 @@ // Set contribution again so we have a probability. calculation1.Contribution = (RoundedDouble) 1.0; calculation1.NotifyObservers(); - Assert.AreEqual("1/14", + Assert.AreEqual(ProbabilityFormattingHelper.Format(0.5), dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].FormattedValue); Assert.IsEmpty(dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsOutputPropertyInfoTest.cs =================================================================== diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsOutputPropertyInfoTest.cs (.../MacroStabilityInwardsOutputPropertyInfoTest.cs) (revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/PropertyInfos/MacroStabilityInwardsOutputPropertyInfoTest.cs (.../MacroStabilityInwardsOutputPropertyInfoTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -61,7 +61,7 @@ } [Test] - public void CreateInstance_Always_NewPropertiesWithOutputAsData() + public void CreateInstance_ValidData_NewPropertiesWithOutputAsData() { // Setup var failureMechanism = new MacroStabilityInwardsFailureMechanism(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsScenariosContextTreeNodeInfoTest.cs =================================================================== diff -u -r5a67fdd92b4e69e1fde669dd27605d0eeaad734b -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsScenariosContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsScenariosContextTreeNodeInfoTest.cs) (revision 5a67fdd92b4e69e1fde669dd27605d0eeaad734b) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsScenariosContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsScenariosContextTreeNodeInfoTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -81,68 +81,42 @@ [Test] public void Text_Always_ReturnScenarios() { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var group = new CalculationGroup(); - var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var context = new MacroStabilityInwardsScenariosContext(group, failureMechanism, assessmentSection); - // Call - string text = info.Text(context); + string text = info.Text(null); // Assert Assert.AreEqual("Scenario's", text); - mocks.VerifyAll(); } [Test] public void Image_Always_ReturnExpectedImage() { - // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var group = new CalculationGroup(); - var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var context = new MacroStabilityInwardsScenariosContext(group, failureMechanism, assessmentSection); - // Call - Image image = info.Image(context); + Image image = info.Image(null); // Assert TestHelper.AssertImagesAreEqual(Resources.ScenariosIcon, image); - mocks.VerifyAll(); } [Test] public void ContextMenuStrip_Always_CallsBuilder() { // Setup var mocks = new MockRepository(); - - var assessmentSection = mocks.Stub(); var menuBuilder = mocks.StrictMock(); menuBuilder.Expect(mb => mb.AddOpenItem()).Return(menuBuilder); menuBuilder.Expect(mb => mb.Build()).Return(null); - var group = new CalculationGroup(); - var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - var context = new MacroStabilityInwardsScenariosContext(group, failureMechanism, assessmentSection); - using (var treeViewControl = new TreeViewControl()) { var gui = mocks.Stub(); - gui.Stub(g => g.Get(context, treeViewControl)).Return(menuBuilder); + gui.Stub(g => g.Get(null, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); plugin.Gui = gui; // Call - info.ContextMenuStrip(context, null, treeViewControl); + info.ContextMenuStrip(null, null, treeViewControl); // Assert mocks.VerifyAll(); Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/DerivedPipingOutput.cs =================================================================== diff -u -r642a4946d235601302d544697856fed3b5c7a2bd -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/DerivedPipingOutput.cs (.../DerivedPipingOutput.cs) (revision 642a4946d235601302d544697856fed3b5c7a2bd) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/DerivedPipingOutput.cs (.../DerivedPipingOutput.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -57,10 +57,10 @@ /// Thrown when setting a probability that falls /// outside the [0.0, 1.0] range or isn't . public DerivedPipingOutput(double upliftFactorOfSafety, double upliftReliability, double upliftProbability, - double heaveFactorOfSafety, double heaveReliability, double heaveProbability, - double sellmeijerFactorOfSafety, double sellmeijerReliability, double sellmeijerProbability, - double requiredProbability, double requiredReliability, - double pipingProbability, double pipingReliability, double pipingFactorOfSafety) + double heaveFactorOfSafety, double heaveReliability, double heaveProbability, + double sellmeijerFactorOfSafety, double sellmeijerReliability, double sellmeijerProbability, + double requiredProbability, double requiredReliability, + double pipingProbability, double pipingReliability, double pipingFactorOfSafety) { UpliftFactorOfSafety = new RoundedDouble(3, upliftFactorOfSafety); UpliftReliability = new RoundedDouble(5, upliftReliability); @@ -99,20 +99,17 @@ } /// - /// Get the required reliability of the piping failure mechanism, - /// which is a value greater than 0. + /// Get the required reliability of the piping failure mechanism. /// public RoundedDouble RequiredReliability { get; } /// - /// Gets the factor of safety of the piping failure mechanism, - /// which is a value greater than 0. + /// Gets the factor of safety of the piping failure mechanism. /// public RoundedDouble PipingFactorOfSafety { get; } /// - /// Gets the reliability of the piping failure mechanism, - /// which is a value greater than 0. + /// Gets the reliability of the piping failure mechanism. /// public RoundedDouble PipingReliability { get; } @@ -136,14 +133,12 @@ } /// - /// Gets the factor of safety for the uplift sub mechanism, - /// which is a value greater than 0. + /// Gets the factor of safety for the uplift sub mechanism. /// public RoundedDouble UpliftFactorOfSafety { get; } /// - /// Gets the reliability for the uplift sub mechanism, - /// which is a value greater than 0. + /// Gets the reliability for the uplift sub mechanism. /// public RoundedDouble UpliftReliability { get; } @@ -167,14 +162,12 @@ } /// - /// Gets the factor of safety for the heave sub mechanism, - /// which is a value greater than 0. + /// Gets the factor of safety for the heave sub mechanism. /// public RoundedDouble HeaveFactorOfSafety { get; } /// - /// Gets the reliability for the heave sub mechanism, - /// which is a value greater than 0. + /// Gets the reliability for the heave sub mechanism. /// public RoundedDouble HeaveReliability { get; } @@ -198,14 +191,12 @@ } /// - /// Gets the factor of safety for the Sellmeijer sub mechanism, - /// which is a value greater than 0. + /// Gets the factor of safety for the Sellmeijer sub mechanism. /// public RoundedDouble SellmeijerFactorOfSafety { get; } /// - /// Gets the reliability for the Sellmeijer sub mechanism, - /// which is a value greater than 0. + /// Gets the reliability for the Sellmeijer sub mechanism. /// public RoundedDouble SellmeijerReliability { get; } Index: Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs =================================================================== diff -u -r8ab72c61cfda487718df57b1e2a441394804f529 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs (.../PipingFailureMechanismSection2aAssessmentResultExtensions.cs) (revision 8ab72c61cfda487718df57b1e2a441394804f529) +++ Ringtoets/Piping/src/Ringtoets.Piping.Data/PipingFailureMechanismSection2aAssessmentResultExtensions.cs (.../PipingFailureMechanismSection2aAssessmentResultExtensions.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -70,10 +70,9 @@ throw new ArgumentNullException(nameof(assessmentSection)); } - List calculationScenarios = sectionResult - .GetCalculationScenarios(calculations) - .Where(cs => cs.Status == CalculationScenarioStatus.Done) - .ToList(); + IEnumerable calculationScenarios = sectionResult + .GetCalculationScenarios(calculations) + .Where(cs => cs.Status == CalculationScenarioStatus.Done); if (calculationScenarios.Any()) { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingOutputContext.cs =================================================================== diff -u -r0f2cc55f2217e523d55eb173d3769f764ebc28a0 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingOutputContext.cs (.../PipingOutputContext.cs) (revision 0f2cc55f2217e523d55eb173d3769f764ebc28a0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PresentationObjects/PipingOutputContext.cs (.../PipingOutputContext.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -55,8 +55,14 @@ AssessmentSection = assessmentSection; } + /// + /// Gets the failure mechanism. + /// public PipingFailureMechanism FailureMechanism { get; } + /// + /// Gets the assessment section. + /// public IAssessmentSection AssessmentSection { get; } } } \ No newline at end of file Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputProperties.cs =================================================================== diff -u -r8ab72c61cfda487718df57b1e2a441394804f529 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputProperties.cs (.../PipingOutputProperties.cs) (revision 8ab72c61cfda487718df57b1e2a441394804f529) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/PropertyClasses/PipingOutputProperties.cs (.../PipingOutputProperties.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -28,6 +28,7 @@ using Ringtoets.Common.Forms.Helpers; using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.Properties; +using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; namespace Ringtoets.Piping.Forms.PropertyClasses { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingOutputTest.cs =================================================================== diff -u -r642a4946d235601302d544697856fed3b5c7a2bd -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingOutputTest.cs (.../DerivedPipingOutputTest.cs) (revision 642a4946d235601302d544697856fed3b5c7a2bd) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/DerivedPipingOutputTest.cs (.../DerivedPipingOutputTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -97,7 +97,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); @@ -144,7 +144,7 @@ [TestCase(-346587.456)] [TestCase(1.0 + 1e-6)] [TestCase(346587.456)] - public void RequiredProbability_SetInvalidValues_ThrowArgumentOutOfRangeException(double requiredProbability) + public void Constructor_InvalidRequiredProbability_ThrowArgumentOutOfRangeException(double requiredProbability) { // Setup var random = new Random(21); @@ -189,7 +189,7 @@ [TestCase(0.0)] [TestCase(0.123456789)] [TestCase(1.0)] - public void SellmeijerProbability_SetValidValues_ReturnNewlySetValue(double sellmeijerProbability) + public void Constructor_ValidSellmeijerProbability_ExpectedValues(double sellmeijerProbability) { // Setup var random = new Random(21); @@ -236,7 +236,7 @@ [TestCase(-346587.456)] [TestCase(1.0 + 1e-6)] [TestCase(346587.456)] - public void SellmeijerProbability_SetInvalidValues_ThrowArgumentOutOfRangeException(double sellmeijerProbability) + public void Constructor_InvalidSellmeijerProbability_ThrowArgumentOutOfRangeException(double sellmeijerProbability) { // Setup var random = new Random(21); @@ -281,7 +281,7 @@ [TestCase(0.0)] [TestCase(0.123456789)] [TestCase(1.0)] - public void HeaveProbability_SetValidValues_ReturnNewlySetValue(double heaveProbability) + public void Constructor_ValidHeaveProbability_ExpectedValues(double heaveProbability) { // Setup var random = new Random(21); @@ -328,7 +328,7 @@ [TestCase(-346587.456)] [TestCase(1.0 + 1e-2)] [TestCase(346587.456)] - public void HeaveProbability_SetInvalidValues_ThrowArgumentOutOfRangeException(double heaveProbability) + public void Constructor_InvalidHeaveProbability_ThrowArgumentOutOfRangeException(double heaveProbability) { // Setup var random = new Random(21); @@ -373,7 +373,7 @@ [TestCase(0.0)] [TestCase(0.123456789)] [TestCase(1.0)] - public void UpliftProbability_SetValidValues_ReturnNewlySetValue(double upliftProbability) + public void Constructor_ValidUpliftProbability_ExpectedValues(double upliftProbability) { // Setup var random = new Random(21); @@ -420,7 +420,7 @@ [TestCase(-346587.456)] [TestCase(1.0 + 1e-6)] [TestCase(346587.456)] - public void UpliftProbability_SetInvalidValues_ThrowArgumentOutOfRangeException(double upliftProbability) + public void Constructor_InvalidUpliftProbability_ThrowArgumentOutOfRangeException(double upliftProbability) { // Setup var random = new Random(21); @@ -465,7 +465,7 @@ [TestCase(0.0)] [TestCase(0.123456789)] [TestCase(1.0)] - public void PipingProbability_SetValidValues_ReturnNewlySetValue(double pipingProbability) + public void Constructor_ValidPipingProbability_ExpectedValues(double pipingProbability) { // Setup var random = new Random(21); @@ -512,7 +512,7 @@ [TestCase(-346587.456)] [TestCase(1.0 + 1e-2)] [TestCase(346587.456)] - public void PipingProbability_SetInvalidValues_ThrowArgumentOutOfRangeException(double pipingProbability) + public void Constructor_InvalidPipingProbability_ThrowArgumentOutOfRangeException(double pipingProbability) { // Setup var random = new Random(21); Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs =================================================================== diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs (.../PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs) (revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs (.../PipingFailureMechanismSection2aAssessmentResultExtensionsTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -124,10 +124,10 @@ const double contribution1 = 0.2; const double contribution2 = 0.8; - PipingCalculationScenario pipingCalculationScenario1 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(section); - PipingCalculationScenario pipingCalculationScenario2 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(section); - PipingCalculationScenario pipingCalculationScenario3 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(section); - PipingCalculationScenario pipingCalculationScenario4 = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); + PipingCalculationScenario pipingCalculationScenario1 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); + PipingCalculationScenario pipingCalculationScenario2 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); + PipingCalculationScenario pipingCalculationScenario3 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); + PipingCalculationScenario pipingCalculationScenario4 = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); pipingCalculationScenario1.IsRelevant = true; pipingCalculationScenario1.Contribution = (RoundedDouble) contribution1; @@ -156,7 +156,7 @@ } [Test] - public void GetAssessmentLayerTwoA_NoScenarios_ReturnsZero() + public void GetAssessmentLayerTwoA_NoScenarios_ReturnsNaN() { // Setup var mocks = new MockRepository(); @@ -179,7 +179,7 @@ } [Test] - public void GetAssessmentLayerTwoA_NoRelevantScenarios_ReturnsZero() + public void GetAssessmentLayerTwoA_NoRelevantScenarios_ReturnsNaN() { // Setup var mocks = new MockRepository(); @@ -191,8 +191,8 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); - PipingCalculationScenario calculationScenario1 = PipingCalculationScenarioFactory.CreateIrrelevantPipingCalculationScenario(section); - PipingCalculationScenario calculationScenario2 = PipingCalculationScenarioFactory.CreateIrrelevantPipingCalculationScenario(section); + PipingCalculationScenario calculationScenario1 = PipingCalculationScenarioTestFactory.CreateIrrelevantPipingCalculationScenario(section); + PipingCalculationScenario calculationScenario2 = PipingCalculationScenarioTestFactory.CreateIrrelevantPipingCalculationScenario(section); var calculationScenarios = new[] { @@ -211,7 +211,7 @@ } [Test] - public void GetAssessmentLayerTwoA_ScenarioNotCalculated_ReturnsZero() + public void GetAssessmentLayerTwoA_ScenarioNotCalculated_ReturnsNaN() { // Setup var mocks = new MockRepository(); @@ -223,7 +223,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); - PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); + PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); // Call double assessmentLayerTwoA = failureMechanismSectionResult.GetAssessmentLayerTwoA(new[] @@ -252,8 +252,8 @@ const double contribution1 = 0.2; const double contribution2 = 0.8; - PipingCalculationScenario pipingCalculationScenario1 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(section); - PipingCalculationScenario pipingCalculationScenario2 = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); + PipingCalculationScenario pipingCalculationScenario1 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); + PipingCalculationScenario pipingCalculationScenario2 = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); pipingCalculationScenario1.IsRelevant = true; pipingCalculationScenario1.Contribution = (RoundedDouble) contribution1; @@ -283,13 +283,13 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); - PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); + PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); pipingCalculationScenario.Contribution = (RoundedDouble) 0.3; - PipingCalculationScenario pipingCalculationScenario2 = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); + PipingCalculationScenario pipingCalculationScenario2 = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); pipingCalculationScenario2.Contribution = (RoundedDouble) 0.5; - PipingCalculationScenario pipingCalculationScenario3 = PipingCalculationScenarioFactory.CreateIrrelevantPipingCalculationScenario(section); + PipingCalculationScenario pipingCalculationScenario3 = PipingCalculationScenarioTestFactory.CreateIrrelevantPipingCalculationScenario(section); var calculationScenarios = new[] { @@ -312,7 +312,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); - PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); + PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); // Call CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] @@ -325,14 +325,13 @@ } [Test] - public void GetCalculationScenarioStatus_ScenariosCalculated_ReturnsStatusDone() + public void GetCalculationScenarioStatus_ScenarioCalculated_ReturnsStatusDone() { // Setup FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); - PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(section); - pipingCalculationScenario.Contribution = (RoundedDouble) 1.0; + PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); // Call CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] @@ -357,5 +356,26 @@ // Assert Assert.AreEqual(CalculationScenarioStatus.Done, status); } + + [Test] + public void GetCalculationScenarioStatus_DifferentScenarios_ReturnsStatusNotCalculated() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + var failureMechanismSectionResult = new PipingFailureMechanismSectionResult(section); + + PipingCalculationScenario pipingCalculationScenario1 = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); + PipingCalculationScenario pipingCalculationScenario2 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); + + // Call + CalculationScenarioStatus status = failureMechanismSectionResult.GetCalculationScenarioStatus(new[] + { + pipingCalculationScenario1, + pipingCalculationScenario2 + }); + + // Assert + Assert.AreEqual(CalculationScenarioStatus.NotCalculated, status); + } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs =================================================================== diff -u -red08434acc8f5619842f1c6cb0b7f9a56cf8dad0 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision ed08434acc8f5619842f1c6cb0b7f9a56cf8dad0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingFailureMechanismSectionResultTest.cs (.../PipingFailureMechanismSectionResultTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -22,8 +22,6 @@ using System; using Core.Common.TestUtil; using NUnit.Framework; -using Rhino.Mocks; -using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; @@ -36,11 +34,6 @@ public void Constructor_WithParameters_ExpectedValues() { // Setup - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); - mocks.ReplayAll(); - - var failureMechanism = new PipingFailureMechanism(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); // Call @@ -50,8 +43,6 @@ Assert.IsInstanceOf(sectionResult); Assert.AreSame(section, sectionResult.Section); Assert.IsNaN(sectionResult.AssessmentLayerThree); - Assert.IsNaN(sectionResult.GetAssessmentLayerTwoA(new PipingCalculationScenario[0], failureMechanism, assessmentSection)); - mocks.VerifyAll(); } [Test] Fisheye: Tag 3bcc8993307e3b6dea8f496d6acbc9c474581787 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioFactoryTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioTestFactoryTest.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioTestFactoryTest.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/PipingCalculationScenarioTestFactoryTest.cs (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -0,0 +1,103 @@ +// 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 NUnit.Framework; +using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Piping.Service; + +namespace Ringtoets.Piping.Data.TestUtil.Test +{ + [TestFixture] + public class PipingCalculationScenarioTestFactoryTest + { + [Test] + public void CreateIrrelevantPipingCalculationScenario_WithNoSection_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => PipingCalculationScenarioTestFactory.CreateIrrelevantPipingCalculationScenario(null); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("section", paramName); + } + + [Test] + public void CreateIrrelevantPipingCalculationScenario_WithSection_CreatesIrrelevantCalculation() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + + // Call + PipingCalculationScenario scenario = PipingCalculationScenarioTestFactory.CreateIrrelevantPipingCalculationScenario(section); + + // Assert + Assert.IsFalse(scenario.IsRelevant); + } + + [Test] + public void CreateNotCalculatedPipingCalculationScenario_WithNoSection_ThrowsArgumentNullException() + { + // Call + TestDelegate test = () => PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(null); + + // Assert + string paramName = Assert.Throws(test).ParamName; + Assert.AreEqual("section", paramName); + } + + [Test] + public void CreateNotCalculatedPipingCalculationScenario_WithSection_CreatesRelevantCalculationWithoutOutput() + { + // Setup + FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); + + // Call + PipingCalculationScenario scenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); + + // Assert + Assert.IsNull(scenario.Output); + Assert.IsTrue(scenario.IsRelevant); + } + + [Test] + public void CreatePipingCalculationScenarioWithInvalidInput_CreatesPipingCalculationScenarioWithInvalidInput() + { + // Call + PipingCalculationScenario scenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); + + // Assert + Assert.IsFalse(PipingCalculationService.Validate(scenario, (RoundedDouble) 1.1)); + } + + [Test] + public void CreatePipingCalculationScenarioWithValidInput_CreatesPipingCalculationScenarioWithValidInput() + { + // Call + PipingCalculationScenario scenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); + + // Assert + Assert.IsTrue(PipingCalculationService.Validate(scenario, (RoundedDouble) 1.1)); + } + } +} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/Ringtoets.Piping.Data.TestUtil.Test.csproj =================================================================== diff -u -r63fc151e9cf722527465c1eddfa6567a90feb5e6 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/Ringtoets.Piping.Data.TestUtil.Test.csproj (.../Ringtoets.Piping.Data.TestUtil.Test.csproj) (revision 63fc151e9cf722527465c1eddfa6567a90feb5e6) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil.Test/Ringtoets.Piping.Data.TestUtil.Test.csproj (.../Ringtoets.Piping.Data.TestUtil.Test.csproj) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -15,7 +15,7 @@ - + Fisheye: Tag 3bcc8993307e3b6dea8f496d6acbc9c474581787 refers to a dead (removed) revision in file `Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioTestFactory.cs =================================================================== diff -u --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioTestFactory.cs (revision 0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationScenarioTestFactory.cs (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -0,0 +1,200 @@ +// 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.Piping.Data.SoilProfile; +using Ringtoets.Piping.Primitives; + +namespace Ringtoets.Piping.Data.TestUtil +{ + /// + /// Helper class for creating different instances of + /// for easier testing. + /// + public static class PipingCalculationScenarioTestFactory + { + /// + /// Creates a calculated scenario for which the surface line on the input intersects with . + /// + /// The section for which an intersection will be created. + /// A new . + /// Thrown when is null. + public static PipingCalculationScenario CreatePipingCalculationScenario(FailureMechanismSection section) + { + PipingCalculationScenario scenario = CreateNotCalculatedPipingCalculationScenario(section); + scenario.Output = new TestPipingOutput(); + + return scenario; + } + + /// + /// 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 PipingCalculationScenario CreateIrrelevantPipingCalculationScenario(FailureMechanismSection section) + { + PipingCalculationScenario scenario = CreateNotCalculatedPipingCalculationScenario(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 PipingCalculationScenario CreateNotCalculatedPipingCalculationScenario(FailureMechanismSection section) + { + if (section == null) + { + throw new ArgumentNullException(nameof(section)); + } + var pipingSurfaceLine = new PipingSurfaceLine(string.Empty); + Point2D p = section.Points.First(); + pipingSurfaceLine.SetGeometry(new[] + { + new Point3D(p.X, p.Y, 0), + new Point3D(p.X + 2, p.Y + 2, 0) + }); + pipingSurfaceLine.ReferenceLineIntersectionWorldPoint = section.Points.First(); + + var scenario = new PipingCalculationScenario(new GeneralPipingInput()) + { + IsRelevant = true, + InputParameters = + { + SurfaceLine = pipingSurfaceLine + } + }; + return scenario; + } + + /// + /// Creates a scenario with invalid input. + /// + /// A new . + public static PipingCalculationScenario CreatePipingCalculationScenarioWithInvalidInput() + { + return new PipingCalculationScenario(new GeneralPipingInput()); + } + + /// + /// Creates a scenario with valid input. + /// + /// A new . + public static PipingCalculationScenario CreatePipingCalculationScenarioWithValidInput() + { + const double bottom = 1.12; + const double top = 10.56; + var stochasticSoilProfile = new PipingStochasticSoilProfile( + 0.0, new PipingSoilProfile(string.Empty, 0.0, new[] + { + new PipingSoilLayer(top) + { + IsAquifer = false, + BelowPhreaticLevel = new LogNormalDistribution + { + Mean = (RoundedDouble) 17.5, + StandardDeviation = (RoundedDouble) 0, + Shift = (RoundedDouble) 10 + } + }, + new PipingSoilLayer(top / 2) + { + IsAquifer = true, + DiameterD70 = new VariationCoefficientLogNormalDistribution + { + Mean = (RoundedDouble) 4.0e-4, + CoefficientOfVariation = (RoundedDouble) 0 + }, + Permeability = new VariationCoefficientLogNormalDistribution + { + Mean = (RoundedDouble) 1.0, + CoefficientOfVariation = (RoundedDouble) 0.5 + } + } + }, SoilProfileType.SoilProfile1D)); + var surfaceLine = new PipingSurfaceLine(string.Empty); + var firstCharacteristicPointLocation = new Point3D(0.2, 0.0, bottom + 3 * top / 4); + var secondCharacteristicPointLocation = new Point3D(0.3, 0.0, bottom + 2 * top / 4); + var thirdCharacteristicPointLocation = new Point3D(0.4, 0.0, bottom + top / 4); + var fourthCharacteristicPointLocation = new Point3D(0.5, 0.0, bottom + 2 * top / 4); + var fifthCharacteristicPointLocation = new Point3D(0.6, 0.0, bottom + 3 * top / 4); + surfaceLine.SetGeometry(new[] + { + new Point3D(0.0, 0.0, 0.0), + firstCharacteristicPointLocation, + secondCharacteristicPointLocation, + thirdCharacteristicPointLocation, + fourthCharacteristicPointLocation, + fifthCharacteristicPointLocation, + new Point3D(1.0, 0.0, top) + }); + surfaceLine.SetDikeToeAtPolderAt(firstCharacteristicPointLocation); + surfaceLine.SetDitchDikeSideAt(secondCharacteristicPointLocation); + surfaceLine.SetBottomDitchDikeSideAt(thirdCharacteristicPointLocation); + surfaceLine.SetBottomDitchPolderSideAt(fourthCharacteristicPointLocation); + surfaceLine.SetDitchPolderSideAt(fifthCharacteristicPointLocation); + + HydraulicBoundaryLocation hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation + { + DesignWaterLevelCalculation2 = + { + Output = new TestHydraulicBoundaryLocationOutput(1.1) + }, + DesignWaterLevelCalculation3 = + { + Output = new TestHydraulicBoundaryLocationOutput(2.2) + } + }; + + return new PipingCalculationScenario(new GeneralPipingInput()) + { + InputParameters = + { + DampingFactorExit = + { + Mean = (RoundedDouble) 1.0 + }, + PhreaticLevelExit = + { + Mean = (RoundedDouble) 2.0 + }, + SurfaceLine = surfaceLine, + StochasticSoilProfile = stochasticSoilProfile, + HydraulicBoundaryLocation = hydraulicBoundaryLocation + } + }; + } + } +} \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj =================================================================== diff -u -r6800d784131bad796689d6d9a0af1a58776d57cc -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj (.../Ringtoets.Piping.Data.TestUtil.csproj) (revision 6800d784131bad796689d6d9a0af1a58776d57cc) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/Ringtoets.Piping.Data.TestUtil.csproj (.../Ringtoets.Piping.Data.TestUtil.csproj) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -17,7 +17,7 @@ - + Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs =================================================================== diff -u -r9b2bb9a809f4b42bd06b910dde1f6eb8e546356f -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs (.../PipingMapDataFeaturesFactoryTest.cs) (revision 9b2bb9a809f4b42bd06b910dde1f6eb8e546356f) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Factories/PipingMapDataFeaturesFactoryTest.cs (.../PipingMapDataFeaturesFactoryTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -173,8 +173,8 @@ public void CreateCalculationFeatures_GivenCalculations_ReturnsCalculationFeaturesCollection() { // Setup - PipingCalculationScenario calculationA = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); - PipingCalculationScenario calculationB = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculationA = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculationB = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); calculationA.InputParameters.SurfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(1.0, 3.0); calculationB.InputParameters.SurfaceLine.ReferenceLineIntersectionWorldPoint = new Point2D(1.0, 4.0); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs =================================================================== diff -u -r0f2cc55f2217e523d55eb173d3769f764ebc28a0 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs (.../PipingOutputContextTest.cs) (revision 0f2cc55f2217e523d55eb173d3769f764ebc28a0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PresentationObjects/PipingOutputContextTest.cs (.../PipingOutputContextTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -68,7 +68,7 @@ } [Test] - public void Constructore_AssessmentSectionNull_ThrowsArgumentNullException() + public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { // Call TestDelegate call = () => new PipingOutputContext(new TestPipingOutput(), new PipingFailureMechanism(), null); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputPropertiesTest.cs =================================================================== diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputPropertiesTest.cs (.../PipingOutputPropertiesTest.cs) (revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingOutputPropertiesTest.cs (.../PipingOutputPropertiesTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -71,7 +71,7 @@ } [Test] - public void Constructore_AssessmentSectionNull_ThrowsArgumentNullException() + public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { // Call TestDelegate call = () => new PipingOutputProperties(new TestPipingOutput(), new PipingFailureMechanism(), null); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs =================================================================== diff -u -rd485f27eb5a6d688406882dce60c3229e22f2ac2 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs (.../PipingCalculationRowTest.cs) (revision d485f27eb5a6d688406882dce60c3229e22f2ac2) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationRowTest.cs (.../PipingCalculationRowTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -79,7 +79,7 @@ var handler = mocks.Stub(); mocks.ReplayAll(); - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); // Call var row = new PipingCalculationRow(calculation, handler); @@ -106,7 +106,7 @@ var handler = mocks.Stub(); mocks.ReplayAll(); - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); // Call var row = new PipingCalculationRow(calculation, handler); @@ -132,7 +132,7 @@ const string newValue = "Test new name"; - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); var row = new PipingCalculationRow(calculation, handler); calculation.Attach(observer); @@ -350,7 +350,7 @@ public void EntryPointL_EntryPointNotBeforeExitPoint_ThrowsArgumentOutOfRangeExceptionDoesNotNotifyObservers(double newValue) { // Setup - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); var entryPointL = (RoundedDouble) newValue; // Call & Assert @@ -364,7 +364,7 @@ public void EntryPointL_NotOnSurfaceLine_ThrowsArgumentOutOfRangeExceptionAndDoesNotNotifyObservers() { // Setup - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); var entryPointL = (RoundedDouble) (-3.0); // Call & Assert @@ -377,7 +377,7 @@ public void ExitPointL_OnValidChange_NotifyObserverAndCalculationPropertyChanged() { // Setup - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); var exitPointL = (RoundedDouble) 0.3; // Call & Assert @@ -411,7 +411,7 @@ public void ExitPointL_ExitPointNotBeyondEntryPoint_ThrowsArgumentOutOfRangeExceptionDoesNotNotifyObservers(double newValue) { // Setup - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); var exitPointL = (RoundedDouble) newValue; // Call & Assert @@ -425,7 +425,7 @@ public void ExitPointL_NotOnSurfaceLine_ThrowsArgumentOutOfRangeExceptionAndDoesNotNotifyObservers() { // Setup - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); var exitPointL = (RoundedDouble) 3.0; // Call & Assert @@ -474,7 +474,7 @@ TestPipingOutput assignedOutput = null; - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); if (hasOutput) { assignedOutput = new TestPipingOutput(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs =================================================================== diff -u -r208f69e10634efd1657580dcf349224453be8a05 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 208f69e10634efd1657580dcf349224453be8a05) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -320,7 +320,7 @@ var pipingFailureMechanism = new PipingFailureMechanism(); using (PipingFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(pipingFailureMechanism)) { - PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario( + PipingCalculationScenario calculationScenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario( pipingFailureMechanism.Sections.First()); calculationScenario.Contribution = (RoundedDouble) 0.3; pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario); @@ -355,7 +355,7 @@ var pipingFailureMechanism = new PipingFailureMechanism(); using (PipingFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(pipingFailureMechanism)) { - PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario( + PipingCalculationScenario calculationScenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario( pipingFailureMechanism.Sections.First()); pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario); view.Data = pipingFailureMechanism.SectionResults; @@ -387,7 +387,7 @@ var pipingFailureMechanism = new PipingFailureMechanism(); using (ShowFullyConfiguredFailureMechanismResultsView(pipingFailureMechanism)) { - PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario( + PipingCalculationScenario calculationScenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario( pipingFailureMechanism.Sections.First()); pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario); @@ -418,7 +418,7 @@ var pipingFailureMechanism = new PipingFailureMechanism(); using (PipingFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(pipingFailureMechanism)) { - PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario( + PipingCalculationScenario calculationScenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario( pipingFailureMechanism.Sections.First()); calculationScenario.Output = new PipingOutput(new PipingOutput.ConstructionProperties()); pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario); @@ -478,7 +478,7 @@ var pipingFailureMechanism = new PipingFailureMechanism(); using (ShowFullyConfiguredFailureMechanismResultsView(pipingFailureMechanism)) { - PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreateIrrelevantPipingCalculationScenario( + PipingCalculationScenario calculationScenario = PipingCalculationScenarioTestFactory.CreateIrrelevantPipingCalculationScenario( pipingFailureMechanism.Sections.First()); pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario); @@ -499,15 +499,15 @@ } [Test] - public void FailureMechanismResultView_AssessmentLayerOneStateSufficientAndAssessmentLayerTwoAHasError_DoesNotShowError() + public void FailureMechanismResultView_AssessmentLayerOneStateSufficientAndAssessmentLayerTwoANaN_DoesNotShowError() { // Setup const int rowIndex = 0; var pipingFailureMechanism = new PipingFailureMechanism(); using (ShowFullyConfiguredFailureMechanismResultsView(pipingFailureMechanism)) { - PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario( + PipingCalculationScenario calculationScenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario( pipingFailureMechanism.Sections.First()); calculationScenario.Output = new PipingOutput(new PipingOutput.ConstructionProperties()); pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario); @@ -528,22 +528,16 @@ } [Test] - [TestCase(AssessmentLayerOneState.NotAssessed)] - [TestCase(AssessmentLayerOneState.NoVerdict)] - public void GivenFailureMechanismResultView_WhenFailureMechanismNotifiesObserver_ThenViewUpdated(AssessmentLayerOneState assessmentLayerOneState) + public void GivenFailureMechanismResultView_WhenFailureMechanismNotifiesObserver_ThenViewUpdated() { // Given - const int rowIndex = 0; - var pipingFailureMechanism = new PipingFailureMechanism(); using (PipingFailureMechanismResultView view = ShowFullyConfiguredFailureMechanismResultsView(pipingFailureMechanism)) { - PipingCalculationScenario calculationScenario1 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario( + PipingCalculationScenario calculationScenario1 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario( pipingFailureMechanism.Sections.First()); - calculationScenario1.Contribution = (RoundedDouble) 0.6; - PipingCalculationScenario calculationScenario2 = PipingCalculationScenarioFactory.CreatePipingCalculationScenario( + PipingCalculationScenario calculationScenario2 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario( pipingFailureMechanism.Sections.First()); - calculationScenario2.Contribution = (RoundedDouble) 0.4; pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario1); pipingFailureMechanism.CalculationsGroup.Children.Add(calculationScenario2); @@ -552,8 +546,6 @@ var gridTester = new ControlTester("dataGridView"); var dataGridView = (DataGridView) gridTester.TheObject; - dataGridView.Rows[rowIndex].Cells[assessmentLayerOneIndex].Value = assessmentLayerOneState; - PipingFailureMechanismSectionResultRow[] sectionResultRows = dataGridView.Rows.Cast() .Select(r => r.DataBoundItem) .Cast() Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs =================================================================== diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismSectionResultRowTest.cs (.../PipingFailureMechanismSectionResultRowTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -168,8 +168,8 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - PipingCalculationScenario scenarioA = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); - PipingCalculationScenario scenarioB = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); + PipingCalculationScenario scenarioA = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); + PipingCalculationScenario scenarioB = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); scenarioA.Contribution = (RoundedDouble) contributionA; scenarioB.Contribution = (RoundedDouble) contributionB; @@ -200,7 +200,7 @@ FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - PipingCalculationScenario scenario = PipingCalculationScenarioFactory.CreateNotCalculatedPipingCalculationScenario(section); + PipingCalculationScenario scenario = PipingCalculationScenarioTestFactory.CreateNotCalculatedPipingCalculationScenario(section); var result = new PipingFailureMechanismSectionResult(section); var row = new PipingFailureMechanismSectionResultRow(result, new[] @@ -227,7 +227,7 @@ mocks.ReplayAll(); FailureMechanismSection section = FailureMechanismSectionTestFactory.CreateFailureMechanismSection(); - PipingCalculationScenario scenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenario(section); + PipingCalculationScenario scenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenario(section); scenario.Contribution = (RoundedDouble) 1.0; var result = new PipingFailureMechanismSectionResult(section); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs =================================================================== diff -u -r6b2660c8a0d2fa638554f54825ea2e7ff34e1398 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision 6b2660c8a0d2fa638554f54825ea2e7ff34e1398) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -298,9 +298,9 @@ stochasticSoilModel2 }, arbitraryFilePath); - PipingCalculationScenario calculationA = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculationA = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); calculationA.InputParameters.SurfaceLine = surfaceLineA; - PipingCalculationScenario calculationB = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculationB = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); calculationB.InputParameters.SurfaceLine = surfaceLineB; failureMechanism.CalculationsGroup.Children.Add(calculationA); failureMechanism.CalculationsGroup.Children.Add(calculationB); @@ -661,9 +661,9 @@ surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3); surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5); - PipingCalculationScenario calculationA = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculationA = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); calculationA.InputParameters.SurfaceLine = surfaceLineA; - PipingCalculationScenario calculationB = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculationB = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); calculationB.InputParameters.SurfaceLine = surfaceLineB; failureMechanism.CalculationsGroup.Children.Add(calculationA); @@ -710,7 +710,7 @@ surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3); surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5); - PipingCalculationScenario calculationA = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculationA = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); calculationA.InputParameters.SurfaceLine = surfaceLineA; var failureMechanism = new PipingFailureMechanism(); @@ -760,7 +760,7 @@ surfaceLineA.ReferenceLineIntersectionWorldPoint = new Point2D(1.3, 1.3); surfaceLineB.ReferenceLineIntersectionWorldPoint = new Point2D(1.5, 1.5); - PipingCalculationScenario calculationA = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculationA = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); calculationA.InputParameters.SurfaceLine = surfaceLineA; var failureMechanism = new PipingFailureMechanism(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs =================================================================== diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs (.../PipingScenarioRowTest.cs) (revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenarioRowTest.cs (.../PipingScenarioRowTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -61,7 +61,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); // Call TestDelegate test = () => new PipingScenarioRow(calculation, null, assessmentSection); @@ -73,10 +73,10 @@ } [Test] - public void Constructore_AssessmentSectionNull_ThrowsArgumentNullException() + public void Constructor_AssessmentSectionNull_ThrowsArgumentNullException() { // Setup - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); // Call TestDelegate call = () => new PipingScenarioRow(calculation, new PipingFailureMechanism(), null); @@ -96,7 +96,7 @@ IAssessmentSection assessmentSection = AssessmentSectionHelper.CreateAssessmentSectionStub(failureMechanism, mocks); mocks.ReplayAll(); - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); calculation.Output = new TestPipingOutput(); // Call @@ -125,7 +125,7 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); // Call var row = new PipingScenarioRow(calculation, new PipingFailureMechanism(), assessmentSection); @@ -154,7 +154,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); calculation.Attach(observer); var row = new PipingScenarioRow(calculation, new PipingFailureMechanism(), assessmentSection); @@ -179,7 +179,7 @@ int newValue = new Random().Next(0, 100); - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); calculation.Attach(observer); var row = new PipingScenarioRow(calculation, new PipingFailureMechanism(), assessmentSection); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs =================================================================== diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs (.../PipingCalculationConfigurationExporterTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Configurations/PipingCalculationConfigurationExporterTest.cs (.../PipingCalculationConfigurationExporterTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -110,7 +110,7 @@ protected override PipingCalculationScenario CreateCalculation() { - return PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + return PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); } protected override PipingCalculationConfigurationExporter CallConfigurationFilePathConstructor(IEnumerable calculations, string filePath) Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs =================================================================== diff -u -r715999e4f5efc2e78494f1b38532975ac02bcd77 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 715999e4f5efc2e78494f1b38532975ac02bcd77) +++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -43,7 +43,7 @@ public static void CalculateEffectiveThicknessCoverageLayer_InvalidPipingCalculationWithOutput_ReturnsNaN() { // Setup - PipingCalculation invalidPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculation invalidPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); // Make invalid by having surface line partially above soil profile: double highestLevelSurfaceLine = invalidPipingCalculation.InputParameters.SurfaceLine.Points.Max(p => p.Z); @@ -184,7 +184,7 @@ public static void CalculateEffectiveThicknessCoverageLayer_CompleteInput_InputSetOnSubCalculator() { // Setup - PipingCalculation validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculation validPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); PipingInput input = validPipingCalculation.InputParameters; using (new PipingSubCalculatorFactoryConfig()) @@ -216,7 +216,7 @@ public static void CalculatePiezometricHeadAtExit_CompleteInput_InputSetOnSubCalculator() { // Setup - PipingCalculation validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculation validPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); PipingInput input = validPipingCalculation.InputParameters; using (new PipingSubCalculatorFactoryConfig()) Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingOutputPropertyInfoTest.cs =================================================================== diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingOutputPropertyInfoTest.cs (.../PipingOutputPropertyInfoTest.cs) (revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PropertyInfos/PipingOutputPropertyInfoTest.cs (.../PipingOutputPropertyInfoTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -60,7 +60,7 @@ } [Test] - public void CreateInstance_Always_NewPropertiesWithPipingOutputAsData() + public void CreateInstance_ValidData_NewPropertiesWithPipingOutputAsData() { // Setup var failureMechanism = new PipingFailureMechanism(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r3b1be2b494c30728564f41d6d8d14fc6a762957d -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 3b1be2b494c30728564f41d6d8d14fc6a762957d) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -581,7 +581,7 @@ { Children = { - PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput() + PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput() } }; @@ -631,7 +631,7 @@ { Children = { - PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput() + PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput() } }; @@ -759,7 +759,7 @@ { Children = { - PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput() + PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput() } }; @@ -798,7 +798,7 @@ { var pipingFailureMechanism = new TestPipingFailureMechanism(); var assessmentSection = mocks.Stub(); - PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario pipingCalculationScenario = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); var group = new CalculationGroup { Children = @@ -961,9 +961,9 @@ // Setup using (var treeViewControl = new TreeViewControl()) { - PipingCalculationScenario validCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario validCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); validCalculation.Name = "A"; - PipingCalculationScenario invalidCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput(); + PipingCalculationScenario invalidCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); invalidCalculation.Name = "B"; var childGroup = new CalculationGroup(); @@ -1028,9 +1028,9 @@ { var mainWindow = mocks.Stub(); - PipingCalculationScenario validCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario validCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); validCalculation.Name = "A"; - PipingCalculationScenario invalidCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput(); + PipingCalculationScenario invalidCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); invalidCalculation.Name = "B"; var childGroup = new CalculationGroup(); @@ -1100,11 +1100,11 @@ calculation2Observer.Expect(o => o.UpdateObserver()); } - PipingCalculationScenario calculation1 = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation1 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); calculation1.Name = "A"; calculation1.Output = new TestPipingOutput(); calculation1.Attach(calculation1Observer); - PipingCalculationScenario calculation2 = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation2 = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); calculation2.Name = "B"; calculation2.Output = new TestPipingOutput(); calculation2.Attach(calculation2Observer); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r3b1be2b494c30728564f41d6d8d14fc6a762957d -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 3b1be2b494c30728564f41d6d8d14fc6a762957d) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -975,7 +975,7 @@ // Given using (var treeViewControl = new TreeViewControl()) { - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario calculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); var pipingFailureMechanism = new TestPipingFailureMechanism(); pipingFailureMechanism.AddSection(new FailureMechanismSection("A", new[] { Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r5b421f80047c5b98776fb1c6f4a216775066e805 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 5b421f80047c5b98776fb1c6f4a216775066e805) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -489,7 +489,7 @@ { Children = { - PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput() + PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput() } } }; @@ -536,7 +536,7 @@ { Children = { - PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput() + PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput() } } }; @@ -656,9 +656,9 @@ using (var treeViewControl = new TreeViewControl()) { var failureMechanism = new TestPipingFailureMechanism(); - PipingCalculationScenario validCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario validCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); validCalculation.Name = "A"; - PipingCalculationScenario invalidCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput(); + PipingCalculationScenario invalidCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); invalidCalculation.Name = "B"; failureMechanism.CalculationsGroup.Children.Add(validCalculation); @@ -701,9 +701,9 @@ using (var treeViewControl = new TreeViewControl()) { var failureMechanism = new TestPipingFailureMechanism(); - PipingCalculationScenario validCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario validCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); validCalculation.Name = "A"; - PipingCalculationScenario invalidCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput(); + PipingCalculationScenario invalidCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); invalidCalculation.Name = "B"; failureMechanism.CalculationsGroup.Children.Add(validCalculation); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingScenariosContextTreeNodeInfoTest.cs =================================================================== diff -u -r171eda478707e1f059c568074c7be10ecc93abb8 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingScenariosContextTreeNodeInfoTest.cs (.../PipingScenariosContextTreeNodeInfoTest.cs) (revision 171eda478707e1f059c568074c7be10ecc93abb8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingScenariosContextTreeNodeInfoTest.cs (.../PipingScenariosContextTreeNodeInfoTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -122,27 +122,21 @@ public void ContextMenuStrip_Always_CallsBuilder() { // Setup - var group = new CalculationGroup(); - var failureMechanism = new PipingFailureMechanism(); - var mocks = new MockRepository(); - var assessmentSection = mocks.Stub(); var menuBuilder = mocks.StrictMock(); menuBuilder.Expect(mb => mb.AddOpenItem()).Return(menuBuilder); menuBuilder.Expect(mb => mb.Build()).Return(null); var gui = mocks.Stub(); - var context = new PipingScenariosContext(group, failureMechanism, assessmentSection); - using (var treeViewControl = new TreeViewControl()) { - gui.Stub(g => g.Get(context, treeViewControl)).Return(menuBuilder); + gui.Stub(g => g.Get(null, treeViewControl)).Return(menuBuilder); mocks.ReplayAll(); plugin.Gui = gui; // Call - info.ContextMenuStrip(context, null, treeViewControl); + info.ContextMenuStrip(null, null, treeViewControl); // Assert mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs =================================================================== diff -u -raee2e55bc9dbf0bbe1fac86898575c7faa33162c -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs (.../PipingFailureMechanismResultViewInfoTest.cs) (revision aee2e55bc9dbf0bbe1fac86898575c7faa33162c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingFailureMechanismResultViewInfoTest.cs (.../PipingFailureMechanismResultViewInfoTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -94,11 +94,10 @@ var assessmentSection = mocks.Stub(); mocks.ReplayAll(); - var failureMechanism = new PipingFailureMechanism(); using (var view = new PipingFailureMechanismResultView(assessmentSection)) { // Call - string viewName = info.GetViewName(view, failureMechanism.SectionResults); + string viewName = info.GetViewName(view, null); // Assert Assert.AreEqual("Resultaat", viewName); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs =================================================================== diff -u -r3407ec4aaf9a98e3f5c7ba5d3b61939bd2773b4c -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 3407ec4aaf9a98e3f5c7ba5d3b61939bd2773b4c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationActivityTest.cs (.../PipingCalculationActivityTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -72,7 +72,7 @@ // Setup var originalOutput = new TestPipingOutput(); - PipingCalculationScenario invalidPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput(); + PipingCalculationScenario invalidPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); invalidPipingCalculation.Output = originalOutput; var activity = new PipingCalculationActivity(invalidPipingCalculation, @@ -105,7 +105,7 @@ public void Run_ValidPipingCalculation_PerformPipingValidationAndCalculationAndLogStartAndEnd() { // Setup - PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); validPipingCalculation.Output = null; var activity = new PipingCalculationActivity(validPipingCalculation, @@ -139,7 +139,7 @@ observer.Expect(o => o.UpdateObserver()); mocks.ReplayAll(); - PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + PipingCalculationScenario validPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); validPipingCalculation.Output = null; validPipingCalculation.Attach(observer); Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -rb116b56a97e5a4aee668e9dda089e8a2e2d45e57 -r3bcc8993307e3b6dea8f496d6acbc9c474581787 --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision b116b56a97e5a4aee668e9dda089e8a2e2d45e57) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 3bcc8993307e3b6dea8f496d6acbc9c474581787) @@ -48,7 +48,7 @@ [SetUp] public void Setup() { - testCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); + testCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithValidInput(); testSurfaceLineTopLevel = testCalculation.InputParameters.SurfaceLine.Points.Max(p => p.Z); } @@ -83,7 +83,7 @@ { // Setup var output = new TestPipingOutput(); - PipingCalculation invalidPipingCalculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithInvalidInput(); + PipingCalculation invalidPipingCalculation = PipingCalculationScenarioTestFactory.CreatePipingCalculationScenarioWithInvalidInput(); invalidPipingCalculation.Output = output; // Call