Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Forms.Test/Views/ClosingStructuresFailureMechanismResultViewTest.cs (.../ClosingStructuresFailureMechanismResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -204,7 +204,7 @@ } [TestFixture] - public class ClosingStructuresFailureMechanismAssemblyControlTest : FailureMechanismAssemblyControlTester< + public class ClosingStructuresFailureMechanismAssemblyControlTest : FailureMechanismAssemblyResultWithProbabilityControlTestFixture< ClosingStructuresFailureMechanismResultView, ClosingStructuresFailureMechanism, ClosingStructuresFailureMechanismSectionResult, Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTestFixture.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTestFixture.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTestFixture.cs (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -0,0 +1,192 @@ +// 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.Linq; +using System.Windows.Forms; +using Core.Common.Controls; +using Core.Common.Util.Reflection; +using NUnit.Extensions.Forms; +using NUnit.Framework; +using Ringtoets.AssemblyTool.Data; +using Ringtoets.AssemblyTool.KernelWrapper.Calculators; +using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; +using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; +using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Forms.Controls; +using Ringtoets.Common.Forms.Views; + +namespace Ringtoets.Common.Forms.TestUtil +{ + /// + /// Test fixture class for testing data and styling in a view with a . + /// + /// The type of the view to test. + /// The type of the failure mechanism the view belongs to. + /// The type of the section results shown in the view. + /// The type of the presentation objects used in the view. + [TestFixture] + public abstract class FailureMechanismAssemblyCategoryGroupControlTestFixture + where TView : FailureMechanismResultView + where TFailureMechanism : IFailureMechanism, IHasSectionResults, new() + where TSectionResult : FailureMechanismSectionResult + where TResultRow : FailureMechanismSectionResultRow + { + private Form testForm; + + [SetUp] + public void Setup() + { + testForm = new Form(); + } + + [TearDown] + public void TearDown() + { + testForm.Dispose(); + } + + [Test] + public void FailureMechanismResultsView_Always_FailureMechanismResultControlCorrectlyInitialized() + { + // Setup + var failureMechanism = new TFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + + // Call + using (new AssemblyToolCalculatorFactoryConfig()) + using (ShowFailureMechanismResultsView(failureMechanism)) + { + // Assert + var assemblyResultPanel = (TableLayoutPanel) new ControlTester("TableLayoutPanel").TheObject; + var assemblyResultControl = (FailureMechanismAssemblyCategoryGroupControl) assemblyResultPanel.GetControlFromPosition(1, 0); + + Assert.IsInstanceOf(assemblyResultControl); + Assert.AreEqual(DockStyle.Left, assemblyResultControl.Dock); + } + } + + [Test] + public void GivenFailureMechanismResultsView_WhenCalculatorThrowsException_ErrorSetToControl() + { + // Given + var failureMechanism = new TFailureMechanism(); + + using (new AssemblyToolCalculatorFactoryConfig()) + using (ShowFailureMechanismResultsView(failureMechanism)) + { + // Precondition + FailureMechanismAssemblyControl assemblyControl = GetFailureMechanismAssemblyControl(); + ErrorProvider errorProvider = GetErrorProvider(assemblyControl); + Assert.IsEmpty(errorProvider.GetError(assemblyControl)); + + // When + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismAssemblyCalculator; + calculator.ThrowExceptionOnCalculate = true; + failureMechanism.NotifyObservers(); + + // Assert + Assert.AreEqual("Message", errorProvider.GetError(assemblyControl)); + } + } + + [Test] + public void GivenFailureMechanismResultsView_WhenNoExceptionThrownByCalculator_ErrorCleared() + { + // Given + var failureMechanism = new TFailureMechanism(); + + using (new AssemblyToolCalculatorFactoryConfig()) + using (ShowFailureMechanismResultsView(failureMechanism)) + { + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismAssemblyCalculator; + + calculator.ThrowExceptionOnCalculate = true; + failureMechanism.NotifyObservers(); + + // Precondition + FailureMechanismAssemblyControl assemblyControl = GetFailureMechanismAssemblyControl(); + ErrorProvider errorProvider = GetErrorProvider(assemblyControl); + Assert.AreEqual("Message", errorProvider.GetError(assemblyControl)); + + // When + calculator.ThrowExceptionOnCalculate = false; + failureMechanism.NotifyObservers(); + + // Then + Assert.IsEmpty(errorProvider.GetError(assemblyControl)); + } + } + + [Test] + public void GivenFailureMechanismResultsViewWithAssemblyResult_FailureMechanismAssemblyResultChangedAndSectionResultNotified_FailureMechanismAssemblyResultUpdated() + { + // Given + var failureMechanism = new TFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + + using (new AssemblyToolCalculatorFactoryConfig()) + using (ShowFailureMechanismResultsView(failureMechanism)) + { + // Precondition + var assemblyGroupLabel = (BorderedLabel) new ControlTester("GroupLabel").TheObject; + Assert.AreEqual("IIt", assemblyGroupLabel.Text); + + // When + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismAssemblyCalculator; + calculator.FailureMechanismAssemblyCategoryGroupOutput = FailureMechanismAssemblyCategoryGroup.VIt; + failureMechanism.SectionResults.Single().NotifyObservers(); + + // Then + Assert.AreEqual("VIt", assemblyGroupLabel.Text); + } + } + + /// + /// Method for creating an instance of . + /// + /// The failure mechanism to create the view for. + /// A new . + protected abstract TView CreateResultView(TFailureMechanism failureMechanism); + + private TView ShowFailureMechanismResultsView(TFailureMechanism failureMechanism) + { + TView failureMechanismResultView = CreateResultView(failureMechanism); + testForm.Controls.Add(failureMechanismResultView); + testForm.Show(); + + return failureMechanismResultView; + } + + private static ErrorProvider GetErrorProvider(FailureMechanismAssemblyControl control) + { + return TypeUtils.GetField(control, "ErrorProvider"); + } + + private static FailureMechanismAssemblyControl GetFailureMechanismAssemblyControl() + { + return (FailureMechanismAssemblyControl) ((TableLayoutPanel) new ControlTester("TableLayoutPanel").TheObject).GetControlFromPosition(1, 0); + } + } +} \ No newline at end of file Fisheye: Tag abff4c96abe92244fa1cea606223edb85f59e1fd refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyCategoryGroupControlTester.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs =================================================================== diff -u --- Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs (revision 0) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTestFixture.cs (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -0,0 +1,282 @@ +// 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.Linq; +using System.Windows.Forms; +using Core.Common.Controls; +using Core.Common.Util.Reflection; +using NUnit.Extensions.Forms; +using NUnit.Framework; +using Ringtoets.AssemblyTool.Data; +using Ringtoets.AssemblyTool.KernelWrapper.Calculators; +using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators; +using Ringtoets.AssemblyTool.KernelWrapper.TestUtil.Calculators.Assembly; +using Ringtoets.Common.Data.Calculation; +using Ringtoets.Common.Data.FailureMechanism; +using Ringtoets.Common.Data.TestUtil; +using Ringtoets.Common.Forms.Controls; +using Ringtoets.Common.Forms.Views; + +namespace Ringtoets.Common.Forms.TestUtil +{ + /// + /// Test fixture class for testing data and styling in a view with a . + /// + /// The type of the view to test. + /// The type of the failure mechanism the view belongs to. + /// The type of the section results shown in the view. + /// The type of the presentation objects used in the view. + /// The type of calculations to get the input from. + /// The type of the input of a calculation. + [TestFixture] + public abstract class FailureMechanismAssemblyResultWithProbabilityControlTestFixture + where TView : FailureMechanismResultView + where TFailureMechanism : IFailureMechanism, IHasSectionResults, ICalculatableFailureMechanism, new() + where TSectionResult : FailureMechanismSectionResult + where TResultRow : FailureMechanismSectionResultRow + where TCalculation : ICalculation + where TCalculationInput : ICalculationInput + { + private Form testForm; + + [SetUp] + public void Setup() + { + testForm = new Form(); + } + + [TearDown] + public void TearDown() + { + testForm.Dispose(); + } + + [Test] + public void FailureMechanismResultsView_Always_FailureMechanismResultControlCorrectlyInitialized() + { + // Setup + var failureMechanism = new TFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + + // Call + using (new AssemblyToolCalculatorFactoryConfig()) + using (ShowFailureMechanismResultsView(failureMechanism)) + { + // Assert + var assemblyResultPanel = (TableLayoutPanel) new ControlTester("TableLayoutPanel").TheObject; + var assemblyResultControl = (FailureMechanismAssemblyControl) assemblyResultPanel.GetControlFromPosition(1, 0); + + Assert.IsInstanceOf(assemblyResultControl); + Assert.AreEqual(DockStyle.Left, assemblyResultControl.Dock); + } + } + + [Test] + public void GivenFailureMechanismResultsView_WhenNoExceptionThrownByCalculator_ErrorSetToControl() + { + // Given + var failureMechanism = new TFailureMechanism(); + + using (new AssemblyToolCalculatorFactoryConfig()) + using (ShowFailureMechanismResultsView(failureMechanism)) + { + // Precondition + FailureMechanismAssemblyControl assemblyControl = GetFailureMechanismAssemblyControl(); + ErrorProvider errorProvider = GetErrorProvider(assemblyControl); + Assert.IsEmpty(errorProvider.GetError(assemblyControl)); + + // When + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismAssemblyCalculator; + calculator.ThrowExceptionOnCalculate = true; + failureMechanism.NotifyObservers(); + + // Then + Assert.AreEqual("Message", errorProvider.GetError(assemblyControl)); + } + } + + [Test] + public void GivenFailureMechanismResultsView_WhenNoExceptionThrownByCalculator_ErrorCleared() + { + // Given + var failureMechanism = new TFailureMechanism(); + + using (new AssemblyToolCalculatorFactoryConfig()) + using (ShowFailureMechanismResultsView(failureMechanism)) + { + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismAssemblyCalculator; + + calculator.ThrowExceptionOnCalculate = true; + failureMechanism.NotifyObservers(); + + // Precondition + FailureMechanismAssemblyControl assemblyControl = GetFailureMechanismAssemblyControl(); + ErrorProvider errorProvider = GetErrorProvider(assemblyControl); + Assert.AreEqual("Message", errorProvider.GetError(assemblyControl)); + + // When + calculator.ThrowExceptionOnCalculate = false; + failureMechanism.NotifyObservers(); + + // Then + Assert.IsEmpty(errorProvider.GetError(assemblyControl)); + } + } + + [Test] + public void GivenFailureMechanismResultsViewWithAssemblyResult_WhenFailureMechanismAssemblyResultChangedAndSectionResultNotified_FailureMechanismAssemblyResultUpdated() + { + // Given + var failureMechanism = new TFailureMechanism(); + failureMechanism.AddSection(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + + using (new AssemblyToolCalculatorFactoryConfig()) + using (ShowFailureMechanismResultsView(failureMechanism)) + { + // Precondition + BorderedLabel assemblyGroupLabel = GetGroupLabel(); + BorderedLabel assemblyProbabilityLabel = GetProbabilityLabelControl(); + Assert.AreEqual("1/1", assemblyProbabilityLabel.Text); + Assert.AreEqual("IIIt", assemblyGroupLabel.Text); + + // When + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismAssemblyCalculator; + calculator.FailureMechanismAssemblyOutput = new FailureMechanismAssembly(0.5, FailureMechanismAssemblyCategoryGroup.VIt); + failureMechanism.SectionResults.Single().NotifyObservers(); + + // Then + Assert.AreEqual("1/2", assemblyProbabilityLabel.Text); + Assert.AreEqual("VIt", assemblyGroupLabel.Text); + } + } + + [Test] + public void GivenFailureMechanismResultsViewWithAssemblyResult_WhenFailureMechanismAssemblyResultChangedAndCalculationNotified_FailureMechanismAssemblyResultUpdated() + { + // Given + var failureMechanism = new TFailureMechanism(); + TCalculation calculation = CreateCalculation(); + failureMechanism.CalculationsGroup.Children.Add(calculation); + + using (new AssemblyToolCalculatorFactoryConfig()) + using (ShowFailureMechanismResultsView(failureMechanism)) + { + // Precondition + BorderedLabel assemblyGroupLabel = GetGroupLabel(); + BorderedLabel assemblyProbabilityLabel = GetProbabilityLabelControl(); + Assert.AreEqual("1/1", assemblyProbabilityLabel.Text); + Assert.AreEqual("IIIt", assemblyGroupLabel.Text); + + // When + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismAssemblyCalculator; + calculator.FailureMechanismAssemblyOutput = new FailureMechanismAssembly(0.5, FailureMechanismAssemblyCategoryGroup.VIt); + calculation.NotifyObservers(); + + // Then + Assert.AreEqual("1/2", assemblyProbabilityLabel.Text); + Assert.AreEqual("VIt", assemblyGroupLabel.Text); + } + } + + [Test] + public void GivenFailureMechanismResultsViewWithAssemblyResult_WhenFailureMechanismAssemblyResultChangedAndCalculationInputNotified_FailureMechanismAssemblyResultUpdated() + { + // Given + var failureMechanism = new TFailureMechanism(); + TCalculation calculation = CreateCalculation(); + failureMechanism.CalculationsGroup.Children.Add(calculation); + + using (new AssemblyToolCalculatorFactoryConfig()) + using (ShowFailureMechanismResultsView(failureMechanism)) + { + // Precondition + BorderedLabel assemblyGroupLabel = GetGroupLabel(); + BorderedLabel assemblyProbabilityLabel = GetProbabilityLabelControl(); + Assert.AreEqual("1/1", assemblyProbabilityLabel.Text); + Assert.AreEqual("IIIt", assemblyGroupLabel.Text); + + // When + var calculatorfactory = (TestAssemblyToolCalculatorFactory) AssemblyToolCalculatorFactory.Instance; + FailureMechanismAssemblyCalculatorStub calculator = calculatorfactory.LastCreatedFailureMechanismAssemblyCalculator; + calculator.FailureMechanismAssemblyOutput = new FailureMechanismAssembly(0.5, FailureMechanismAssemblyCategoryGroup.VIt); + GetInput(calculation).NotifyObservers(); + + // Then + Assert.AreEqual("1/2", assemblyProbabilityLabel.Text); + Assert.AreEqual("VIt", assemblyGroupLabel.Text); + } + } + + /// + /// Method for creating an instance of . + /// + /// The failure mechanism to create the view for. + /// A new . + protected abstract TView CreateResultView(TFailureMechanism failureMechanism); + + /// + /// Method for creating an instance of . + /// + /// A new . + protected abstract TCalculation CreateCalculation(); + + /// + /// Method to get the from a + /// . + /// + /// The calculation to get the input from. + /// A new . + protected abstract TCalculationInput GetInput(TCalculation calculation); + + private static BorderedLabel GetGroupLabel() + { + return (BorderedLabel) new ControlTester("GroupLabel").TheObject; + } + + private static BorderedLabel GetProbabilityLabelControl() + { + return (BorderedLabel) new ControlTester("ProbabilityLabel").TheObject; + } + + private static ErrorProvider GetErrorProvider(FailureMechanismAssemblyControl control) + { + return TypeUtils.GetField(control, "ErrorProvider"); + } + + private static FailureMechanismAssemblyControl GetFailureMechanismAssemblyControl() + { + return (FailureMechanismAssemblyControl) ((TableLayoutPanel) new ControlTester("TableLayoutPanel").TheObject).GetControlFromPosition(1, 0); + } + + private TView ShowFailureMechanismResultsView(TFailureMechanism failureMechanism) + { + TView failureMechanismResultView = CreateResultView(failureMechanism); + testForm.Controls.Add(failureMechanismResultView); + testForm.Show(); + + return failureMechanismResultView; + } + } +} \ No newline at end of file Fisheye: Tag abff4c96abe92244fa1cea606223edb85f59e1fd refers to a dead (removed) revision in file `Ringtoets/Common/test/Ringtoets.Common.Forms.TestUtil/FailureMechanismAssemblyResultWithProbabilityControlTester.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs (.../DuneErosionFailureMechanismResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/Views/DuneErosionFailureMechanismResultViewTest.cs (.../DuneErosionFailureMechanismResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -165,7 +165,7 @@ } [TestFixture] - public class DuneErosionFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTester< + public class DuneErosionFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture< DuneErosionFailureMechanismResultView, DuneErosionFailureMechanism, DuneErosionFailureMechanismSectionResult, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/Views/GrassCoverErosionInwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionInwardsFailureMechanismResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -203,7 +203,7 @@ } [TestFixture] - public class GrassCoverErosionInwardsFailureMechanismAssemblyControlTest : FailureMechanismAssemblyControlTester< + public class GrassCoverErosionInwardsFailureMechanismAssemblyControlTest : FailureMechanismAssemblyResultWithProbabilityControlTestFixture< GrassCoverErosionInwardsFailureMechanismResultView, GrassCoverErosionInwardsFailureMechanism, GrassCoverErosionInwardsFailureMechanismSectionResult, Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs (.../GrassCoverErosionOutwardsFailureMechanismResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -166,7 +166,7 @@ } [TestFixture] - public class GrassCoverErosionOutwardsFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTester< + public class GrassCoverErosionOutwardsFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture< GrassCoverErosionOutwardsFailureMechanismResultView, GrassCoverErosionOutwardsFailureMechanism, GrassCoverErosionOutwardsFailureMechanismSectionResult, Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Forms.Test/Views/HeightStructuresFailureMechanismResultViewTest.cs (.../HeightStructuresFailureMechanismResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -205,7 +205,7 @@ } [TestFixture] - public class HeightStructuresFailureMechanismAssemblyControlTest : FailureMechanismAssemblyControlTester< + public class HeightStructuresFailureMechanismAssemblyControlTest : FailureMechanismAssemblyResultWithProbabilityControlTestFixture< HeightStructuresFailureMechanismResultView, HeightStructuresFailureMechanism, HeightStructuresFailureMechanismSectionResult, Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -162,7 +162,7 @@ } [TestFixture] - public class GrassCoverSlipOffInwardsFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTester< + public class GrassCoverSlipOffInwardsFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture< GrassCoverSlipOffInwardsResultView, GrassCoverSlipOffInwardsFailureMechanism, GrassCoverSlipOffInwardsFailureMechanismSectionResult, Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs (.../GrassCoverSlipOffOutwardsResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs (.../GrassCoverSlipOffOutwardsResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -164,7 +164,7 @@ } [TestFixture] - public class GrassCoverSlipOffOutwardsFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTester< + public class GrassCoverSlipOffOutwardsFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture< GrassCoverSlipOffOutwardsResultView, GrassCoverSlipOffOutwardsFailureMechanism, GrassCoverSlipOffOutwardsFailureMechanismSectionResult, Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs (.../MacroStabilityOutwardsResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacroStabilityOutwardsResultViewTest.cs (.../MacroStabilityOutwardsResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -205,7 +205,7 @@ } [TestFixture] - public class MacroStabilityOutwardsFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTester< + public class MacroStabilityOutwardsFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture< MacroStabilityOutwardsResultView, MacroStabilityOutwardsFailureMechanism, MacroStabilityOutwardsFailureMechanismSectionResult, Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs (.../MicrostabilityResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs (.../MicrostabilityResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -162,7 +162,7 @@ } [TestFixture] - public class MicrostabilityFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTester< + public class MicrostabilityFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture< MicrostabilityResultView, MicrostabilityFailureMechanism, MicrostabilityFailureMechanismSectionResult, Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs (.../PipingStructureResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs (.../PipingStructureResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -162,7 +162,7 @@ } [TestFixture] - public class PipingStructureFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTester< + public class PipingStructureFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture< PipingStructureResultView, PipingStructureFailureMechanism, PipingStructureFailureMechanismSectionResult, Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -151,7 +151,7 @@ } [TestFixture] - public class StrengthStabilityLengthwiseConstructionFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTester< + public class StrengthStabilityLengthwiseConstructionFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture< StrengthStabilityLengthwiseConstructionResultView, StrengthStabilityLengthwiseConstructionFailureMechanism, StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult, Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs (.../TechnicalInnovationResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs (.../TechnicalInnovationResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -151,7 +151,7 @@ } [TestFixture] - public class TechnicalInnovationFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTester< + public class TechnicalInnovationFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture< TechnicalInnovationResultView, TechnicalInnovationFailureMechanism, TechnicalInnovationFailureMechanismSectionResult, Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs (.../WaterPressureAsphaltCoverResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs (.../WaterPressureAsphaltCoverResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -151,7 +151,7 @@ } [TestFixture] - public class WaterPressureAsphaltCoverFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTester< + public class WaterPressureAsphaltCoverFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture< WaterPressureAsphaltCoverResultView, WaterPressureAsphaltCoverFailureMechanism, WaterPressureAsphaltCoverFailureMechanismSectionResult, Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsFailureMechanismResultViewTest.cs (.../MacroStabilityInwardsFailureMechanismResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -206,7 +206,7 @@ } [TestFixture] - public class MacroStabilityInwardsFailureMechanismAssemblyControlTest : FailureMechanismAssemblyControlTester< + public class MacroStabilityInwardsFailureMechanismAssemblyControlTest : FailureMechanismAssemblyResultWithProbabilityControlTestFixture< MacroStabilityInwardsFailureMechanismResultView, MacroStabilityInwardsFailureMechanism, MacroStabilityInwardsFailureMechanismSectionResult, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -206,7 +206,7 @@ } [TestFixture] - public class PipingFailureMechanismAssemblyControlTest : FailureMechanismAssemblyControlTester< + public class PipingFailureMechanismAssemblyControlTest : FailureMechanismAssemblyResultWithProbabilityControlTestFixture< PipingFailureMechanismResultView, PipingFailureMechanism, PipingFailureMechanismSectionResult, Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Forms.Test/Views/StabilityPointStructuresFailureMechanismResultViewTest.cs (.../StabilityPointStructuresFailureMechanismResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -207,7 +207,7 @@ } [TestFixture] - public class StabilityPointStructuresFailureMechanismAssemblyControlTest : FailureMechanismAssemblyControlTester< + public class StabilityPointStructuresFailureMechanismAssemblyControlTest : FailureMechanismAssemblyResultWithProbabilityControlTestFixture< StabilityPointStructuresFailureMechanismResultView, StabilityPointStructuresFailureMechanism, StabilityPointStructuresFailureMechanismSectionResult, Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/Views/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -166,7 +166,7 @@ } [TestFixture] - public class StabilityStoneCoverFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTester< + public class StabilityStoneCoverFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture< StabilityStoneCoverResultView, StabilityStoneCoverFailureMechanism, StabilityStoneCoverFailureMechanismSectionResult, Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs =================================================================== diff -u -r50b3a6c556aace513b84909963bbc0ad37ee4374 -rabff4c96abe92244fa1cea606223edb85f59e1fd --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision 50b3a6c556aace513b84909963bbc0ad37ee4374) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/Views/WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs (.../WaveImpactAsphaltCoverFailureMechanismResultViewTest.cs) (revision abff4c96abe92244fa1cea606223edb85f59e1fd) @@ -166,7 +166,7 @@ } [TestFixture] - public class WaveImpactAsphaltCoverFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTester< + public class WaveImpactAsphaltCoverFailureMechanismResultControlTest : FailureMechanismAssemblyCategoryGroupControlTestFixture< WaveImpactAsphaltCoverFailureMechanismResultView, WaveImpactAsphaltCoverFailureMechanism, WaveImpactAsphaltCoverFailureMechanismSectionResult,