Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs =================================================================== diff -u -r0fdde49cfbdc5a411fac387d6a99484f05112700 -r87fcb2097e3a58e611c0de6913cb48851006f7af --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs (.../PipingInputViewInfoTest.cs) (revision 0fdde49cfbdc5a411fac387d6a99484f05112700) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingInputViewInfoTest.cs (.../PipingInputViewInfoTest.cs) (revision 87fcb2097e3a58e611c0de6913cb48851006f7af) @@ -65,37 +65,35 @@ } [Test] - public void GetViewName_Always_ReturnsCalculationName() + public void GetViewName_Always_ReturnsInputResourceName() { // Setup - PipingInputView view = new PipingInputView(); - PipingInput pipingInput = new PipingInput(new GeneralPipingInput()); + using (PipingInputView view = new PipingInputView()) + { + PipingInput pipingInput = new PipingInput(new GeneralPipingInput()); - // Call - string viewName = info.GetViewName(view, pipingInput); + // Call + string viewName = info.GetViewName(view, pipingInput); - // Assert - Assert.AreEqual(PipingFormsResources.PipingInputContext_NodeDisplayName, viewName); + // Assert + Assert.AreEqual(PipingFormsResources.PipingInputContext_NodeDisplayName, viewName); + } } [Test] - public void GetViewData_Always_ReturnsWrappedCalculation() + public void GetViewData_Always_ReturnsWrappedInput() { // Setup IAssessmentSection assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); PipingInput pipingInput = new PipingInput(new GeneralPipingInput()); - string name = "Calculation name"; - PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()) - { - Name = name - }; + PipingCalculationScenario calculation = new PipingCalculationScenario(new GeneralPipingInput()); PipingInputContext calculationInputContext = new PipingInputContext(pipingInput, calculation, Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); // Call object viewData = info.GetViewData(calculationInputContext); @@ -114,22 +112,23 @@ PipingCalculationScenario pipingCalculation = new PipingCalculationScenario(new GeneralPipingInput()); PipingCalculationScenarioContext pipingCalculationScenarioContext = new PipingCalculationScenarioContext(pipingCalculation, - Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); - PipingInputView view = new PipingInputView + using (PipingInputView view = new PipingInputView { Data = pipingCalculation.InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, pipingCalculationScenarioContext); - // Call - bool closeForData = info.CloseForData(view, pipingCalculationScenarioContext); - - // Assert - Assert.IsTrue(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsTrue(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -143,22 +142,23 @@ PipingCalculationScenario calculationToRemove = new PipingCalculationScenario(new GeneralPipingInput()); PipingCalculationScenarioContext pipingCalculationScenarioContext = new PipingCalculationScenarioContext(calculationToRemove, - Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); - PipingInputView view = new PipingInputView + using (PipingInputView view = new PipingInputView { Data = pipingCalculation.InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, pipingCalculationScenarioContext); - // Call - bool closeForData = info.CloseForData(view, pipingCalculationScenarioContext); - - // Assert - Assert.IsFalse(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsFalse(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -173,21 +173,22 @@ calculationGroup.Children.Add(calculation); PipingCalculationGroupContext calculationGroupContext = new PipingCalculationGroupContext(calculationGroup, - Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); - PipingInputView view = new PipingInputView + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); + using (PipingInputView view = new PipingInputView { Data = calculation.InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, calculationGroupContext); - // Call - bool closeForData = info.CloseForData(view, calculationGroupContext); - - // Assert - Assert.IsTrue(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsTrue(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -201,22 +202,23 @@ CalculationGroup calculationGroup = new CalculationGroup(); calculationGroup.Children.Add(calculation); - PipingCalculationGroupContext calculationGroupContext = new PipingCalculationGroupContext(new CalculationGroup(), - Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); - PipingInputView view = new PipingInputView + PipingCalculationGroupContext calculationGroupContext = new PipingCalculationGroupContext(new CalculationGroup(), + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); + using (PipingInputView view = new PipingInputView { Data = calculation.InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, calculationGroupContext); - // Call - bool closeForData = info.CloseForData(view, calculationGroupContext); - - // Assert - Assert.IsFalse(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsFalse(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -233,21 +235,22 @@ calculationGroup.Children.Add(nestedGroup); PipingCalculationGroupContext calculationGroupContext = new PipingCalculationGroupContext(calculationGroup, - Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); - PipingInputView view = new PipingInputView + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); + using (PipingInputView view = new PipingInputView { Data = calculation.InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, calculationGroupContext); - // Call - bool closeForData = info.CloseForData(view, calculationGroupContext); - - // Assert - Assert.IsTrue(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsTrue(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -263,22 +266,23 @@ nestedGroup.Children.Add(calculation); calculationGroup.Children.Add(nestedGroup); - PipingCalculationGroupContext calculationGroupContext = new PipingCalculationGroupContext(new CalculationGroup(), - Enumerable.Empty(), - Enumerable.Empty(), - new PipingFailureMechanism(), - assessmentSection); - PipingInputView view = new PipingInputView + PipingCalculationGroupContext calculationGroupContext = new PipingCalculationGroupContext(new CalculationGroup(), + Enumerable.Empty(), + Enumerable.Empty(), + new PipingFailureMechanism(), + assessmentSection); + using (PipingInputView view = new PipingInputView { Data = calculation.InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, calculationGroupContext); - // Call - bool closeForData = info.CloseForData(view, calculationGroupContext); - - // Assert - Assert.IsFalse(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsFalse(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -294,17 +298,18 @@ PipingFailureMechanismContext failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection); - PipingInputView view = new PipingInputView + using (PipingInputView view = new PipingInputView { Data = calculation.InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, failureMechanismContext); - // Call - bool closeForData = info.CloseForData(view, failureMechanismContext); - - // Assert - Assert.IsTrue(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsTrue(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -320,17 +325,18 @@ PipingFailureMechanismContext failureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSection); - PipingInputView view = new PipingInputView + using (PipingInputView view = new PipingInputView { Data = calculation.InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, failureMechanismContext); - // Call - bool closeForData = info.CloseForData(view, failureMechanismContext); - - // Assert - Assert.IsFalse(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsFalse(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -349,17 +355,18 @@ PipingFailureMechanismContext failureMechanismContext = new PipingFailureMechanismContext(failureMechanism, assessmentSection); - PipingInputView view = new PipingInputView + using (PipingInputView view = new PipingInputView { Data = calculation.InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, failureMechanismContext); - // Call - bool closeForData = info.CloseForData(view, failureMechanismContext); - - // Assert - Assert.IsTrue(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsTrue(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -378,17 +385,18 @@ PipingFailureMechanismContext failureMechanismContext = new PipingFailureMechanismContext(new PipingFailureMechanism(), assessmentSection); - PipingInputView view = new PipingInputView + using (PipingInputView view = new PipingInputView { Data = calculation.InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, failureMechanismContext); - // Call - bool closeForData = info.CloseForData(view, failureMechanismContext); - - // Assert - Assert.IsFalse(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsFalse(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -407,17 +415,18 @@ mocks.ReplayAll(); - PipingInputView view = new PipingInputView + using (PipingInputView view = new PipingInputView { Data = calculation.InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, assessmentSection); - // Call - bool closeForData = info.CloseForData(view, assessmentSection); - - // Assert - Assert.IsTrue(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsTrue(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -436,17 +445,18 @@ mocks.ReplayAll(); - PipingInputView view = new PipingInputView + using (PipingInputView view = new PipingInputView { Data = new PipingCalculationScenario(new GeneralPipingInput()).InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, assessmentSection); - // Call - bool closeForData = info.CloseForData(view, assessmentSection); - - // Assert - Assert.IsFalse(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsFalse(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -468,17 +478,18 @@ mocks.ReplayAll(); - PipingInputView view = new PipingInputView + using (PipingInputView view = new PipingInputView { Data = calculation.InputParameters - }; + }) + { + // Call + bool closeForData = info.CloseForData(view, assessmentSection); - // Call - bool closeForData = info.CloseForData(view, assessmentSection); - - // Assert - Assert.IsTrue(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsTrue(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -500,17 +511,18 @@ mocks.ReplayAll(); - PipingInputView view = new PipingInputView + using (PipingInputView view = new PipingInputView { - Data = new PipingCalculationScenario(new GeneralPipingInput()).InputParameters - }; + Data = new PipingCalculationScenario(new GeneralPipingInput()) + }) + { + // Call + bool closeForData = info.CloseForData(view, assessmentSection); - // Call - bool closeForData = info.CloseForData(view, assessmentSection); - - // Assert - Assert.IsFalse(closeForData); - mocks.VerifyAll(); + // Assert + Assert.IsFalse(closeForData); + mocks.VerifyAll(); + } } [Test] @@ -527,17 +539,18 @@ new PipingFailureMechanism(), assessmentSection); - PipingInputView view = new PipingInputView + using (PipingInputView view = new PipingInputView { Data = pipingCalculation.InputParameters - }; + }) + { + // Call + info.AfterCreate(view, context); - // Call - info.AfterCreate(view, context); - - // Assert - Assert.AreSame(pipingCalculation, view.Calculation); - mocks.VerifyAll(); + // Assert + Assert.AreSame(pipingCalculation, view.Calculation); + mocks.VerifyAll(); + } } } } \ No newline at end of file