Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs =================================================================== diff -u -r25203ba6733ffccfb7ed425251669c0f25f8ef89 -rf9aefa56762ac1dd731bc4bfed955d651781d598 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs (.../GrassCoverErosionInwardsInputViewInfoTest.cs) (revision 25203ba6733ffccfb7ed425251669c0f25f8ef89) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/ViewInfos/GrassCoverErosionInwardsInputViewInfoTest.cs (.../GrassCoverErosionInwardsInputViewInfoTest.cs) (revision f9aefa56762ac1dd731bc4bfed955d651781d598) @@ -61,7 +61,7 @@ { // Assert Assert.AreEqual(typeof(GrassCoverErosionInwardsInputContext), info.DataType); - Assert.AreEqual(typeof(GrassCoverErosionInwardsInput), info.ViewDataType); + Assert.AreEqual(typeof(GrassCoverErosionInwardsCalculation), info.ViewDataType); TestHelper.AssertImagesAreEqual(RingtoetsCommonFormsResources.GenericInputOutputIcon, info.Image); } @@ -71,18 +71,18 @@ // Setup using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView()) { - GrassCoverErosionInwardsInput input = new GrassCoverErosionInwardsInput(); + GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation(); // Call - string viewName = info.GetViewName(view, input); + string viewName = info.GetViewName(view, calculation); // Assert Assert.AreEqual(Resources.GrassCoverErosionInwardsInputContext_NodeDisplayName, viewName); } } [Test] - public void GetViewData_Always_ReturnsWrappedInput() + public void GetViewData_Always_ReturnsWrappedCalculation() { // Setup IAssessmentSection assessmentSection = mocks.StrictMock(); @@ -98,7 +98,7 @@ object viewData = info.GetViewData(context); // Assert - Assert.AreEqual(input, viewData); + Assert.AreEqual(calculation, viewData); mocks.VerifyAll(); } @@ -116,7 +116,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -144,7 +144,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -172,7 +172,7 @@ assessmentSection); using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -200,7 +200,7 @@ assessmentSection); using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -230,7 +230,7 @@ assessmentSection); using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -260,7 +260,7 @@ assessmentSection); using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -287,7 +287,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -314,7 +314,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -344,7 +344,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -374,7 +374,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -396,7 +396,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -417,7 +417,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -441,7 +441,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -465,7 +465,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -494,7 +494,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -524,7 +524,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = new GrassCoverErosionInwardsCalculation().InputParameters + Data = new GrassCoverErosionInwardsCalculation() }) { // Call @@ -557,7 +557,7 @@ using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView { - Data = calculation.InputParameters + Data = calculation }) { // Call @@ -601,31 +601,5 @@ mocks.VerifyAll(); } } - - [Test] - public void AfterCreate_Always_SetsCalculationOnView() - { - // Setup - IAssessmentSection assessmentSection = mocks.StrictMock(); - mocks.ReplayAll(); - - GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation(); - GrassCoverErosionInwardsInputContext context = new GrassCoverErosionInwardsInputContext(calculation.InputParameters, calculation, - new GrassCoverErosionInwardsFailureMechanism(), - assessmentSection); - - using (GrassCoverErosionInwardsInputView view = new GrassCoverErosionInwardsInputView - { - Data = calculation.InputParameters - }) - { - // Call - info.AfterCreate(view, context); - - // Assert - Assert.AreSame(calculation, view.Calculation); - mocks.VerifyAll(); - } - } } }