Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -r66fb38e5d68e4b1f7720d24221ef4868b55cd9b8 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 66fb38e5d68e4b1f7720d24221ef4868b55cd9b8) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -79,7 +79,7 @@ /// The id of the ring to perform the calculation for. /// A on a successful calculation, null otherwise. internal static ReliabilityIndexCalculationOutput Calculate(IAssessmentSection assessmentSection, HydraulicBoundaryDatabase hydraulicBoundaryDatabase, - HydraulicBoundaryLocation hydraulicBoundaryLocation, string ringId) + HydraulicBoundaryLocation hydraulicBoundaryLocation, string ringId) { var hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabase.FilePath); var input = CreateInput(assessmentSection, hydraulicBoundaryLocation); Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs =================================================================== diff -u -r66fb38e5d68e4b1f7720d24221ef4868b55cd9b8 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 66fb38e5d68e4b1f7720d24221ef4868b55cd9b8) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -79,7 +79,7 @@ /// The id of the ring to perform the calculation for. /// A on a successful calculation, null otherwise. internal static ReliabilityIndexCalculationOutput Calculate(IAssessmentSection assessmentSection, HydraulicBoundaryDatabase hydraulicBoundaryDatabase, - HydraulicBoundaryLocation hydraulicBoundaryLocation, string ringId) + HydraulicBoundaryLocation hydraulicBoundaryLocation, string ringId) { var hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabase.FilePath); var input = CreateInput(assessmentSection, hydraulicBoundaryLocation); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r7a61196d689922cf6df102fb0d81c43267c7b22b -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision 7a61196d689922cf6df102fb0d81c43267c7b22b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/DesignWaterLevelLocationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelLocationsContextTreeNodeInfoTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -47,6 +47,7 @@ [TestFixture] public class DesignWaterLevelLocationsContextTreeNodeInfoTest : NUnitFormTest { + private const int contextMenuRunAssessmentLevelCalculationsIndex = 1; private MockRepository mockRepository; [SetUp] @@ -337,8 +338,6 @@ mockRepository.VerifyAll(); } - private const int contextMenuRunAssessmentLevelCalculationsIndex = 1; - private static TreeNodeInfo GetInfo(RingtoetsPlugin plugin) { return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(DesignWaterLevelLocationsContext)); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs (.../FailureMechanismContextTreeNodeInfoTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/FailureMechanismContextTreeNodeInfoTest.cs (.../FailureMechanismContextTreeNodeInfoTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -50,6 +50,7 @@ [TestFixture] public class FailureMechanismContextTreeNodeInfoTest { + private const int contextMenuRelevancyIndex = 0; private MockRepository mocks; [SetUp] @@ -514,8 +515,6 @@ mocks.VerifyAll(); } - private const int contextMenuRelevancyIndex = 0; - private TreeNodeInfo GetInfo(RingtoetsPlugin plugin) { return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(FailureMechanismContext)); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r7a61196d689922cf6df102fb0d81c43267c7b22b -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision 7a61196d689922cf6df102fb0d81c43267c7b22b) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/TreeNodeInfos/WaveHeightLocationsContextTreeNodeInfoTest.cs (.../WaveHeightLocationsContextTreeNodeInfoTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -47,6 +47,7 @@ [TestFixture] public class WaveHeightLocationsContextTreeNodeInfoTest : NUnitFormTest { + private const int contextMenuRunWaveHeightCalculationsIndex = 1; private MockRepository mockRepository; [SetUp] @@ -342,8 +343,6 @@ mockRepository.VerifyAll(); } - private const int contextMenuRunWaveHeightCalculationsIndex = 1; - private static TreeNodeInfo GetInfo(RingtoetsPlugin plugin) { return plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(WaveHeightLocationsContext)); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs =================================================================== diff -u -r38ee40c1f98ff4b1921d4de64fd032c8fbcadf92 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision 38ee40c1f98ff4b1921d4de64fd032c8fbcadf92) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/AssessmentSectionViewTest.cs (.../AssessmentSectionViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -41,6 +41,9 @@ [TestFixture] public class AssessmentSectionViewTest { + private const int referenceLineIndex = 0; + private const int hydraulicBoundaryDatabaseIndex = 1; + [Test] public void DefaultConstructor_DefaultValues() { @@ -326,9 +329,6 @@ } } - private const int referenceLineIndex = 0; - private const int hydraulicBoundaryDatabaseIndex = 1; - private static void AssertHydraulicBoundaryDatabaseData(MapDataCollection mapData, HydraulicBoundaryDatabase hydraulicBoundaryDatabase) { var hrLocationsMapData = (MapPointData) mapData.Collection.ElementAt(hydraulicBoundaryDatabaseIndex); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -r6934a7d7ed89278606e2c6d634d0c831c9878477 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision 6934a7d7ed89278606e2c6d634d0c831c9878477) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -42,6 +42,11 @@ [TestFixture] public class DesignWaterLevelLocationsViewTest { + private const int locationCalculateColumnIndex = 0; + private const int locationNameColumnIndex = 1; + private const int locationIdColumnIndex = 2; + private const int locationColumnIndex = 3; + private const int locationDesignWaterlevelColumnIndex = 4; private Form testForm; [SetUp] @@ -249,12 +254,6 @@ Assert.DoesNotThrow(test); } - private const int locationCalculateColumnIndex = 0; - private const int locationNameColumnIndex = 1; - private const int locationIdColumnIndex = 2; - private const int locationColumnIndex = 3; - private const int locationDesignWaterlevelColumnIndex = 4; - private DesignWaterLevelLocationsView ShowDesignWaterLevelLocationsView() { var view = new DesignWaterLevelLocationsView(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs =================================================================== diff -u -re6e269c7e76da1cb92e1808ea80d977747393df1 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision e6e269c7e76da1cb92e1808ea80d977747393df1) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/FailureMechanismContributionViewTest.cs (.../FailureMechanismContributionViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -41,6 +41,14 @@ [TestFixture] public class FailureMechanismContributionViewTest : NUnitFormTest { + private const string normInputTextBoxName = "normInput"; + private const string dataGridViewControlName = "dataGridView"; + private const string assessmentSectionCompositionComboBoxName = "assessmentSectionCompositionComboBox"; + private const int isRelevantColumnIndex = 0; + private const int nameColumnIndex = 1; + private const int codeColumnIndex = 2; + private const int contributionColumnIndex = 3; + private const int probabilitySpaceColumnIndex = 4; private Form testForm; [SetUp] @@ -806,15 +814,6 @@ } } - private const string normInputTextBoxName = "normInput"; - private const string dataGridViewControlName = "dataGridView"; - private const string assessmentSectionCompositionComboBoxName = "assessmentSectionCompositionComboBox"; - private const int isRelevantColumnIndex = 0; - private const int nameColumnIndex = 1; - private const int codeColumnIndex = 2; - private const int contributionColumnIndex = 3; - private const int probabilitySpaceColumnIndex = 4; - private void AssertDataGridViewDataSource(IEnumerable expectedDistributionElements, DataGridView dataGridView) { FailureMechanismContributionItem[] itemArray = expectedDistributionElements.ToArray(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs =================================================================== diff -u -r1cb502fa23ab44e793e419f99ef20039e3c4c87a -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs (.../HydraulicBoundaryLocationsViewTest.cs) (revision 1cb502fa23ab44e793e419f99ef20039e3c4c87a) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs (.../HydraulicBoundaryLocationsViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -44,6 +44,10 @@ [TestFixture] public class HydraulicBoundaryLocationsViewTest { + private const int locationCalculateColumnIndex = 0; + private const int locationNameColumnIndex = 1; + private const int locationIdColumnIndex = 2; + private const int locationColumnIndex = 3; private Form testForm; [SetUp] @@ -402,11 +406,6 @@ Assert.DoesNotThrow(test); } - private const int locationCalculateColumnIndex = 0; - private const int locationNameColumnIndex = 1; - private const int locationIdColumnIndex = 2; - private const int locationColumnIndex = 3; - private TestHydraulicBoundaryLocationsView ShowTestHydraulicBoundaryLocationsView() { var view = new TestHydraulicBoundaryLocationsView(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/ClosingStructureResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/ClosingStructureResultViewTest.cs (.../ClosingStructureResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/ClosingStructureResultViewTest.cs (.../ClosingStructureResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -39,13 +39,18 @@ [TestFixture] public class ClosingStructureResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerTwoAIndex = 2; + private const int assessmentLayerThreeIndex = 3; + [Test] public void GivenFormWithClosingStructureFailureMechanismResultView_ThenExpectedColumnsAreVisible() { // Given using (var form = new Form()) - using (var view = new ClosingStructureResultView()) - { + using (var view = new ClosingStructureResultView()) + { form.Controls.Add(view); form.Show(); @@ -220,11 +225,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs (.../DuneErosionResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/DuneErosionResultViewTest.cs (.../DuneErosionResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -36,6 +36,10 @@ [TestFixture] public class DuneErosionResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerTwoAIndex = 1; + private const int assessmentLayerThreeIndex = 2; + [Test] public void GivenFormWithDuneErosionFailureMechanismResultView_WhenShown_ThenExpectedColumnsAreVisible() { @@ -155,9 +159,5 @@ Assert.AreEqual(0, rows.Count); } } - - private const int nameColumnIndex = 0; - private const int assessmentLayerTwoAIndex = 1; - private const int assessmentLayerThreeIndex = 2; } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverErosionOutwardsResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverErosionOutwardsResultViewTest.cs (.../GrassCoverErosionOutwardsResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverErosionOutwardsResultViewTest.cs (.../GrassCoverErosionOutwardsResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -37,6 +37,11 @@ [TestFixture] public class GrassCoverErosionOutwardsResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerTwoAIndex = 2; + private const int assessmentLayerThreeIndex = 3; + [Test] public void GivenFormWithGrassCoverErosionOutwardsFailureMechanismResultView_WhenShown_ThenExpectedColumnsAreVisible() { @@ -212,11 +217,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffInwardsResultViewTest.cs (.../GrassCoverSlipOffInwardsResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -37,6 +37,11 @@ [TestFixture] public class GrassCoverSlipOffInwardsResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerTwoAIndex = 2; + private const int assessmentLayerThreeIndex = 3; + [Test] public void GivenFormWithGrassCoverSlipOffInwardsFailureMechanismResultView_WhenShown_ThenExpectedColumnsAreVisible() { @@ -212,11 +217,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs (.../GrassCoverSlipOffOutwardsResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/GrassCoverSlipOffOutwardsResultViewTest.cs (.../GrassCoverSlipOffOutwardsResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -37,6 +37,11 @@ [TestFixture] public class GrassCoverSlipOffOutwardsResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerTwoAIndex = 2; + private const int assessmentLayerThreeIndex = 3; + [Test] public void GivenFormWithGrassCoverSlipOffOutwardsFailureMechanismResultView_WhenShown_ThenExpectedColumnsAreVisible() { @@ -212,11 +217,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityInwardsResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityInwardsResultViewTest.cs (.../MacrostabilityInwardsResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityInwardsResultViewTest.cs (.../MacrostabilityInwardsResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -39,6 +39,11 @@ [TestFixture] public class MacrostabilityInwardsResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerTwoAIndex = 2; + private const int assessmentLayerThreeIndex = 3; + [Test] public void GivenFormWithMacrostabilityInwardsFailureMechanismResultView_ThenExpectedColumnsAreVisible() { @@ -219,11 +224,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs (.../MacrostabilityOutwardsResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MacrostabilityOutwardsResultViewTest.cs (.../MacrostabilityOutwardsResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -39,6 +39,11 @@ [TestFixture] public class MacrostabilityOutwardsResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerTwoAIndex = 2; + private const int assessmentLayerThreeIndex = 3; + [Test] public void GivenFormWithMacrostabilityOutwardsFailureMechanismResultView_ThenExpectedColumnsAreVisible() { @@ -219,11 +224,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs (.../MicrostabilityResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/MicrostabilityResultViewTest.cs (.../MicrostabilityResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -37,6 +37,11 @@ [TestFixture] public class MicrostabilityResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerTwoAIndex = 2; + private const int assessmentLayerThreeIndex = 3; + [Test] public void GivenFormWithMicrostabilityFailureMechanismResultView_WhenShown_ThenExpectedColumnsAreVisible() { @@ -212,11 +217,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs (.../PipingStructureResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/PipingStructureResultViewTest.cs (.../PipingStructureResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -37,6 +37,11 @@ [TestFixture] public class PipingStructureResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerTwoAIndex = 2; + private const int assessmentLayerThreeIndex = 3; + [Test] public void GivenFormWithPipingStructureFailureMechanismResultView_WhenShown_ThenExpectedColumnsAreVisible() { @@ -212,11 +217,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StabilityStoneCoverResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StabilityStoneCoverResultViewTest.cs (.../StabilityStoneCoverResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -36,6 +36,10 @@ [TestFixture] public class StabilityStoneCoverResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerTwoAIndex = 1; + private const int assessmentLayerThreeIndex = 2; + [Test] public void GivenFormWithStabilityStoneCoverFailureMechanismResultView_WhenShown_ThenExpectedColumnsAreVisible() { @@ -155,9 +159,5 @@ Assert.AreEqual(0, rows.Count); } } - - private const int nameColumnIndex = 0; - private const int assessmentLayerTwoAIndex = 1; - private const int assessmentLayerThreeIndex = 2; } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityLengthwiseConstructionResultViewTest.cs (.../StrengthStabilityLengthwiseConstructionResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -37,6 +37,10 @@ [TestFixture] public class StrengthStabilityLengthwiseConstructionResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerThreeIndex = 2; + [Test] public void GivenFormWithStrengthStabilityLengthwiseConstructionResultView_ThenExpectedColumnsAreVisible() { @@ -199,10 +203,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerThreeIndex = 2; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityPointConstructionResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityPointConstructionResultViewTest.cs (.../StrengthStabilityPointConstructionResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/StrengthStabilityPointConstructionResultViewTest.cs (.../StrengthStabilityPointConstructionResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -38,6 +38,10 @@ [TestFixture] public class StrengthStabilityPointConstructionResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerTwoAIndex = 1; + private const int assessmentLayerThreeIndex = 2; + [Test] public void GivenFormWithStrengthStabilityPointConstructionFailureMechanismResultView_ThenExpectedColumnsAreVisible() { @@ -156,9 +160,5 @@ Assert.AreEqual(0, rows.Count); } } - - private const int nameColumnIndex = 0; - private const int assessmentLayerTwoAIndex = 1; - private const int assessmentLayerThreeIndex = 2; } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs (.../TechnicalInnovationResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/TechnicalInnovationResultViewTest.cs (.../TechnicalInnovationResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -37,6 +37,10 @@ [TestFixture] public class TechnicalInnovationResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerThreeIndex = 2; + [Test] public void GivenFormWithTechnicalInnovationFailureMechanismResultView_WhenShown_ThenExpectedColumnsAreVisible() { @@ -202,10 +206,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerThreeIndex = 2; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs (.../WaterPressureAsphaltCoverResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaterPressureAsphaltCoverResultViewTest.cs (.../WaterPressureAsphaltCoverResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -37,6 +37,10 @@ [TestFixture] public class WaterPressureAsphaltCoverResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerThreeIndex = 2; + [Test] public void GivenFormWithWaterPressureAsphaltCoverFailureMechanismResultView_ThenExpectedColumnsAreVisible() { @@ -207,10 +211,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerThreeIndex = 2; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaveImpactAsphaltCoverResultViewTest.cs =================================================================== diff -u -rf1bf048f691ca575f22e8807911ace0338fa425d -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaveImpactAsphaltCoverResultViewTest.cs (.../WaveImpactAsphaltCoverResultViewTest.cs) (revision f1bf048f691ca575f22e8807911ace0338fa425d) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/SectionResultViews/WaveImpactAsphaltCoverResultViewTest.cs (.../WaveImpactAsphaltCoverResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -37,6 +37,11 @@ [TestFixture] public class WaveImpactAsphaltCoverResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerTwoAIndex = 2; + private const int assessmentLayerThreeIndex = 3; + [Test] public void GivenFormWithWaveImpactAsphaltCoverFailureMechanismResultView_ThenExpectedColumnsAreVisible() { @@ -217,11 +222,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; - private void AssertCellIsDisabled(DataGridViewCell dataGridViewCell) { Assert.AreEqual(true, dataGridViewCell.ReadOnly); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationContextRowTest.cs =================================================================== diff -u -r9312943e6ef9894811d9b0b87239af47f79205ec -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationContextRowTest.cs (.../WaveHeightLocationContextRowTest.cs) (revision 9312943e6ef9894811d9b0b87239af47f79205ec) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationContextRowTest.cs (.../WaveHeightLocationContextRowTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -54,7 +54,7 @@ const string locationname = "LocationName"; const double coordinateX = 1.0; const double coordinateY = 2.0; - RoundedDouble waveHeight = (RoundedDouble)3.0; + RoundedDouble waveHeight = (RoundedDouble) 3.0; var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, locationname, coordinateX, coordinateY) { WaveHeight = waveHeight @@ -96,6 +96,6 @@ // Assert Assert.IsTrue(row.ToCalculate); - } + } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs =================================================================== diff -u -r6934a7d7ed89278606e2c6d634d0c831c9878477 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs (.../WaveHeightLocationsViewTest.cs) (revision 6934a7d7ed89278606e2c6d634d0c831c9878477) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs (.../WaveHeightLocationsViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -42,6 +42,11 @@ [TestFixture] public class WaveHeightLocationsViewTest { + private const int locationCalculateColumnIndex = 0; + private const int locationNameColumnIndex = 1; + private const int locationIdColumnIndex = 2; + private const int locationColumnIndex = 3; + private const int locationWaveHeightColumnIndex = 4; private Form testForm; [SetUp] @@ -245,12 +250,6 @@ Assert.DoesNotThrow(test); } - private const int locationCalculateColumnIndex = 0; - private const int locationNameColumnIndex = 1; - private const int locationIdColumnIndex = 2; - private const int locationColumnIndex = 3; - private const int locationWaveHeightColumnIndex = 4; - private WaveHeightLocationsView ShowWaveHeightLocationsView() { var view = new WaveHeightLocationsView(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs =================================================================== diff -u -r6934a7d7ed89278606e2c6d634d0c831c9878477 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs (.../DesignWaterLevelLocationsViewInfoTest.cs) (revision 6934a7d7ed89278606e2c6d634d0c831c9878477) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/DesignWaterLevelLocationsViewInfoTest.cs (.../DesignWaterLevelLocationsViewInfoTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -31,7 +31,6 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Forms.Properties; using Ringtoets.HydraRing.Data; -using Ringtoets.Integration.Forms.Commands; using Ringtoets.Integration.Forms.GuiServices; using Ringtoets.Integration.Forms.PresentationObjects; using Ringtoets.Integration.Forms.Views; Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs =================================================================== diff -u -r6934a7d7ed89278606e2c6d634d0c831c9878477 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs (.../WaveHeightLocationsViewInfoTest.cs) (revision 6934a7d7ed89278606e2c6d634d0c831c9878477) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/ViewInfos/WaveHeightLocationsViewInfoTest.cs (.../WaveHeightLocationsViewInfoTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -31,7 +31,6 @@ using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.Forms.Properties; using Ringtoets.HydraRing.Data; -using Ringtoets.Integration.Forms.Commands; using Ringtoets.Integration.Forms.GuiServices; using Ringtoets.Integration.Forms.PresentationObjects; using Ringtoets.Integration.Forms.Views; Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs =================================================================== diff -u -r640df7c0609a81e19cc3661323ee461d801049b0 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs (.../PipingInputView.cs) (revision 640df7c0609a81e19cc3661323ee461d801049b0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingInputView.cs (.../PipingInputView.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -98,12 +98,6 @@ soilLayerChartDataLookup = new List(); // Use lookup because the ordering in the chart data collection might change } - private void InitializeChartControl() - { - chartControl.LeftAxisTitle = RingtoetsCommonFormsResources.InputView_Height_DisplayName; - chartControl.BottomAxisTitle = RingtoetsCommonFormsResources.InputView_Distance_DisplayName; - } - public object Data { get @@ -148,6 +142,12 @@ base.Dispose(disposing); } + private void InitializeChartControl() + { + chartControl.LeftAxisTitle = RingtoetsCommonFormsResources.InputView_Height_DisplayName; + chartControl.BottomAxisTitle = RingtoetsCommonFormsResources.InputView_Distance_DisplayName; + } + private void UpdateChartTitle() { chartControl.ChartTitle = data != null ? data.Name : string.Empty; Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseVersionReader.cs =================================================================== diff -u -r8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseVersionReader.cs (.../SoilDatabaseVersionReader.cs) (revision 8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3) +++ Ringtoets/Piping/src/Ringtoets.Piping.IO/SoilProfile/SoilDatabaseVersionReader.cs (.../SoilDatabaseVersionReader.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Data; using System.Data.SQLite; using Core.Common.IO.Exceptions; Index: Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/InputParameterCalculationService.cs =================================================================== diff -u -r8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/InputParameterCalculationService.cs (.../InputParameterCalculationService.cs) (revision 8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3) +++ Ringtoets/Piping/src/Ringtoets.Piping.InputParameterCalculation/InputParameterCalculationService.cs (.../InputParameterCalculationService.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Core.Common.Base.Data; using Ringtoets.Piping.KernelWrapper; using Ringtoets.Piping.KernelWrapper.SubCalculator; Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs =================================================================== diff -u -r8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision 8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -371,7 +371,7 @@ // Setup PipingInput input = new PipingInput(new GeneralPipingInput()); - RoundedDouble testLevel = (RoundedDouble)new Random(21).NextDouble(); + RoundedDouble testLevel = (RoundedDouble) new Random(21).NextDouble(); input.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, string.Empty, 0.0, 0.0) { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs =================================================================== diff -u -r8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs (.../PipingCalculationFactory.cs) (revision 8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.TestUtil/PipingCalculationFactory.cs (.../PipingCalculationFactory.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Ringtoets.HydraRing.Data; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs =================================================================== diff -u -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PipingCalculationConfigurationHelperTest.cs (.../PipingCalculationConfigurationHelperTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -86,7 +86,7 @@ soilProfile1, soilProfile2 }); - StochasticSoilModel[] availableSoilModels = + StochasticSoilModel[] availableSoilModels = { soilModel }; @@ -146,7 +146,7 @@ SoilProfile = soilProfile2 } }); - StochasticSoilModel[] availableSoilModels = + StochasticSoilModel[] availableSoilModels = { soilModel }; @@ -248,7 +248,7 @@ SoilProfile = soilProfile2 } }); - StochasticSoilModel[] availableSoilModels = + StochasticSoilModel[] availableSoilModels = { soilModel }; @@ -428,7 +428,7 @@ // Assert var format = "Geen ondergrondschematisaties gevonden voor profielschematisatie '{0}'. De profielschematisatie is overgeslagen."; - Tuple[] expectedMessages = + Tuple[] expectedMessages = { Tuple.Create(string.Format(format, testName1), LogLevelConstant.Warn), Tuple.Create(string.Format(format, testName2), LogLevelConstant.Warn), @@ -486,7 +486,7 @@ new Point3D(3.0, -5.0, 0.0) }); - RingtoetsPipingSurfaceLine[] surfaceLines = + RingtoetsPipingSurfaceLine[] surfaceLines = { surfaceLine }; @@ -548,7 +548,7 @@ new Point3D(3.0, -5.0, 0.0) }); - RingtoetsPipingSurfaceLine[] surfaceLines = + RingtoetsPipingSurfaceLine[] surfaceLines = { surfaceLine }; @@ -606,7 +606,7 @@ SoilProfile = soilProfile2 } }); - StochasticSoilModel[] availableSoilModels = + StochasticSoilModel[] availableSoilModels = { soilModel }; @@ -623,7 +623,7 @@ new Point3D(5.0, 1.0, 0.0) }); - RingtoetsPipingSurfaceLine[] surfaceLines = + RingtoetsPipingSurfaceLine[] surfaceLines = { surfaceLine }; Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs =================================================================== diff -u -r111b85450cd8087a4d2518eb02346f760d263715 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs (.../PipingSemiProbabilisticOutputPropertiesTest.cs) (revision 111b85450cd8087a4d2518eb02346f760d263715) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/PipingSemiProbabilisticOutputPropertiesTest.cs (.../PipingSemiProbabilisticOutputPropertiesTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -195,7 +195,7 @@ var dynamicPropertyBag = new DynamicPropertyBag(properties); PropertyDescriptorCollection dynamicProperties = dynamicPropertyBag.GetProperties(new Attribute[] { - BrowsableAttribute.Yes + BrowsableAttribute.Yes }); Assert.AreEqual(13, dynamicProperties.Count); @@ -273,7 +273,7 @@ Assert.AreEqual(pipingCategory, requiredReliabilityProperty.Category); Assert.AreEqual("Betrouwbaarheidsindex faalkanseis [-]", requiredReliabilityProperty.DisplayName); Assert.AreEqual("De betrouwbaarheidsindex van de faalkanseis voor het toetsspoor piping.", requiredReliabilityProperty.Description); - + PropertyDescriptor pipingProbabilityProperty = dynamicProperties[10]; Assert.IsNotNull(pipingProbabilityProperty); Assert.IsTrue(pipingProbabilityProperty.IsReadOnly); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs =================================================================== diff -u -r914e5485443e63445865bf53e2995cf9015efd9e -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision 914e5485443e63445865bf53e2995cf9015efd9e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/StochasticSoilModelPropertiesTest.cs (.../StochasticSoilModelPropertiesTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -34,6 +34,12 @@ [TestFixture] public class StochasticSoilModelPropertiesTest { + private const int stochasticSoilModelIdPropertyIndex = 0; + private const int stochasticSoilModelNamePropertyIndex = 1; + private const int stochasticSoilModelSegmentNamePropertyIndex = 2; + private const int stochasticSoilModelGeometryPropertyIndex = 3; + private const int stochasticSoilModelStochasticSoilProfilesPropertyIndex = 4; + [Test] public void DefaultConstructor_ExpectedValues() { @@ -142,11 +148,5 @@ Assert.AreEqual("Ondergrondschematisaties", stochasticSoilModelStochasticSoilProfilesProperty.DisplayName); Assert.AreEqual("Ondergrondschematisaties uit de database.", stochasticSoilModelStochasticSoilProfilesProperty.Description); } - - private const int stochasticSoilModelIdPropertyIndex = 0; - private const int stochasticSoilModelNamePropertyIndex = 1; - private const int stochasticSoilModelSegmentNamePropertyIndex = 2; - private const int stochasticSoilModelGeometryPropertyIndex = 3; - private const int stochasticSoilModelStochasticSoilProfilesPropertyIndex = 4; } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r74277dcba6c041b998442f6342f844e519686719 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision 74277dcba6c041b998442f6342f844e519686719) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationGroupContextTreeNodeInfoTest.cs (.../PipingCalculationGroupContextTreeNodeInfoTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -54,6 +54,24 @@ [TestFixture] public class PipingCalculationGroupContextTreeNodeInfoTest : NUnitFormTest { + private const int contextMenuAddCalculationGroupIndexRootGroup = 4; + private const int contextMenuAddCalculationIndexRootGroup = 5; + private const int contextMenuRemoveAllChildrenIndexRootGroup = 7; + private const int contextMenuValidateAllIndexRootGroup = 9; + private const int contextMenuCalculateAllIndexRootGroup = 10; + private const int contextMenuClearOutputIndexRootGroup = 11; + private const int contextMenuExpandAllIndexRootGroup = 13; + private const int contextMenuCollapseAllIndexRootGroup = 14; + private const int contextMenuPropertiesIndexRootGroup = 16; + + private const int contextMenuAddCalculationGroupIndexNestedGroup = 0; + private const int contextMenuAddCalculationIndexNestedGroup = 1; + private const int contextMenuValidateAllIndexNestedGroup = 3; + private const int contextMenuCalculateAllIndexNestedGroup = 4; + private const int contextMenuClearOutputNestedGroupIndex = 5; + + private const int customOnlyContextMenuAddGenerateCalculationsIndex = 1; + private const int customOnlyContextMenuRemoveAllChildrenIndex = 6; private MockRepository mocks; private PipingPlugin plugin; private TreeNodeInfo info; @@ -1383,25 +1401,6 @@ base.TearDown(); } - private const int contextMenuAddCalculationGroupIndexRootGroup = 4; - private const int contextMenuAddCalculationIndexRootGroup = 5; - private const int contextMenuRemoveAllChildrenIndexRootGroup = 7; - private const int contextMenuValidateAllIndexRootGroup = 9; - private const int contextMenuCalculateAllIndexRootGroup = 10; - private const int contextMenuClearOutputIndexRootGroup = 11; - private const int contextMenuExpandAllIndexRootGroup = 13; - private const int contextMenuCollapseAllIndexRootGroup = 14; - private const int contextMenuPropertiesIndexRootGroup = 16; - - private const int contextMenuAddCalculationGroupIndexNestedGroup = 0; - private const int contextMenuAddCalculationIndexNestedGroup = 1; - private const int contextMenuValidateAllIndexNestedGroup = 3; - private const int contextMenuCalculateAllIndexNestedGroup = 4; - private const int contextMenuClearOutputNestedGroupIndex = 5; - - private const int customOnlyContextMenuAddGenerateCalculationsIndex = 1; - private const int customOnlyContextMenuRemoveAllChildrenIndex = 6; - /// /// Creates a new instance of with sections and a surface line. /// Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -65,14 +65,6 @@ info = plugin.GetTreeNodeInfos().First(tni => tni.TagType == typeof(PipingCalculationScenarioContext)); } - public override void TearDown() - { - plugin.Dispose(); - mocks.VerifyAll(); - - base.TearDown(); - } - [Test] public void Initialized_Always_ExpectedPropertiesSet() { @@ -632,6 +624,14 @@ } } + public override void TearDown() + { + plugin.Dispose(); + mocks.VerifyAll(); + + base.TearDown(); + } + /// /// Creates a new instance of with sections and a surface line. /// Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision 8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingFailureMechanismContextTreeNodeInfoTest.cs (.../PipingFailureMechanismContextTreeNodeInfoTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -55,6 +55,11 @@ [TestFixture] public class PipingFailureMechanismContextTreeNodeInfoTest : NUnitFormTest { + private const int contextMenuRelevancyIndexWhenRelevant = 1; + private const int contextMenuRelevancyIndexWhenNotRelevant = 0; + private const int contextMenuValidateAllIndex = 3; + private const int contextMenuCalculateAllIndex = 4; + private const int contextMenuClearIndex = 5; private MockRepository mocks; private PipingPlugin plugin; private TreeNodeInfo info; @@ -717,11 +722,5 @@ base.TearDown(); } - - private const int contextMenuRelevancyIndexWhenRelevant = 1; - private const int contextMenuRelevancyIndexWhenNotRelevant = 0; - private const int contextMenuValidateAllIndex = 3; - private const int contextMenuCalculateAllIndex = 4; - private const int contextMenuClearIndex = 5; } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -r0abf371c5f6f450232d49f3c1a031476063ce04b -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 0abf371c5f6f450232d49f3c1a031476063ce04b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -47,6 +47,15 @@ [TestFixture] public class PipingCalculationsViewTest : NUnitFormTest { + private const int nameColumnIndex = 0; + private const int stochasticSoilModelsColumnIndex = 1; + private const int stochasticSoilProfilesColumnIndex = 2; + private const int stochasticSoilProfilesProbabilityColumnIndex = 3; + private const int hydraulicBoundaryLocationsColumnIndex = 4; + private const int dampingFactorExitMeanColumnIndex = 5; + private const int phreaticLevelExitMeanColumnIndex = 6; + private const int entryPointLColumnIndex = 7; + private const int exitPointLColumnIndex = 8; private Form testForm; [SetUp] @@ -262,7 +271,7 @@ mocks.ReplayAll(); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; // Assert var soilProfilesComboboxItems = ((DataGridViewComboBoxCell) dataGridView.Rows[0].Cells[stochasticSoilProfilesColumnIndex]).Items; @@ -974,7 +983,7 @@ // Assert Assert.IsInstanceOf(selection); var dataRow = (PipingCalculationRow) dataGridView.Rows[selectedRow].DataBoundItem; - Assert.AreSame(dataRow.PipingCalculation, ((PipingInputContext)selection).PipingCalculation); + Assert.AreSame(dataRow.PipingCalculation, ((PipingInputContext) selection).PipingCalculation); mocks.VerifyAll(); } @@ -1001,7 +1010,7 @@ { pipingCalculationInputObserver.Expect(o => o.UpdateObserver()); } - + var assessmentSection = mocks.Stub(); var hydraulicBoundaryDatabase = mocks.StrictMock(); var pipingCalculationView = ShowFullyConfiguredPipingCalculationsView(assessmentSection, hydraulicBoundaryDatabase); @@ -1023,16 +1032,6 @@ mocks.VerifyAll(); } - private const int nameColumnIndex = 0; - private const int stochasticSoilModelsColumnIndex = 1; - private const int stochasticSoilProfilesColumnIndex = 2; - private const int stochasticSoilProfilesProbabilityColumnIndex = 3; - private const int hydraulicBoundaryLocationsColumnIndex = 4; - private const int dampingFactorExitMeanColumnIndex = 5; - private const int phreaticLevelExitMeanColumnIndex = 6; - private const int entryPointLColumnIndex = 7; - private const int exitPointLColumnIndex = 8; - private PipingCalculationsView ShowFullyConfiguredPipingCalculationsView(IAssessmentSection assessmentSection, HydraulicBoundaryDatabase hydraulicBoundaryDatabase) { var hydraulicBoundaryLocation1 = new HydraulicBoundaryLocation(1, "Location 1", 1.1, 2.2); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs =================================================================== diff -u -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismResultViewTest.cs (.../PipingFailureMechanismResultViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -39,6 +39,10 @@ [TestFixture] public class PipingFailureMechanismResultViewTest { + private const int nameColumnIndex = 0; + private const int assessmentLayerOneIndex = 1; + private const int assessmentLayerTwoAIndex = 2; + private const int assessmentLayerThreeIndex = 3; private Form testForm; [SetUp] @@ -480,11 +484,6 @@ } } - private const int nameColumnIndex = 0; - private const int assessmentLayerOneIndex = 1; - private const int assessmentLayerTwoAIndex = 2; - private const int assessmentLayerThreeIndex = 3; - private PipingFailureMechanismResultView ShowFullyConfiguredFailureMechanismResultsView(PipingFailureMechanism failureMechanism) { failureMechanism.AddSection(new FailureMechanismSection("Section 1", new List Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs =================================================================== diff -u -rf3906150407f2d0a49d621ceb83087690b669b15 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision f3906150407f2d0a49d621ceb83087690b669b15) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingFailureMechanismViewTest.cs (.../PipingFailureMechanismViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -48,6 +48,14 @@ [TestFixture] public class PipingFailureMechanismViewTest { + private const int referenceLineIndex = 0; + private const int sectionsIndex = 1; + private const int stochasticSoilModelsIndex = 2; + private const int surfaceLinesIndex = 3; + private const int sectionsStartPointIndex = 4; + private const int sectionsEndPointIndex = 5; + private const int hydraulicBoundaryDatabaseIndex = 6; + [Test] public void DefaultConstructor_DefaultValues() { @@ -534,14 +542,6 @@ } } - private const int referenceLineIndex = 0; - private const int sectionsIndex = 1; - private const int stochasticSoilModelsIndex = 2; - private const int surfaceLinesIndex = 3; - private const int sectionsStartPointIndex = 4; - private const int sectionsEndPointIndex = 5; - private const int hydraulicBoundaryDatabaseIndex = 6; - private static void AssertReferenceLineMapData(ReferenceLine referenceLine, MapData mapData) { Assert.IsInstanceOf(mapData); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs =================================================================== diff -u -r38ee40c1f98ff4b1921d4de64fd032c8fbcadf92 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision 38ee40c1f98ff4b1921d4de64fd032c8fbcadf92) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingInputViewTest.cs (.../PipingInputViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -38,6 +38,17 @@ [TestFixture] public class PipingInputViewTest { + private const int soilProfileIndex = 0; + private const int surfaceLineIndex = 1; + private const int ditchPolderSideIndex = 2; + private const int bottomDitchPolderSideIndex = 3; + private const int bottomDitchDikeSideIndex = 4; + private const int ditchDikeSideIndex = 5; + private const int dikeToeAtPolderIndex = 6; + private const int dikeToeAtRiverIndex = 7; + private const int exitPointIndex = 8; + private const int entryPointIndex = 9; + [Test] public void DefaultConstructor_DefaultValues() { @@ -535,17 +546,6 @@ } } - private const int soilProfileIndex = 0; - private const int surfaceLineIndex = 1; - private const int ditchPolderSideIndex = 2; - private const int bottomDitchPolderSideIndex = 3; - private const int bottomDitchDikeSideIndex = 4; - private const int ditchDikeSideIndex = 5; - private const int dikeToeAtPolderIndex = 6; - private const int dikeToeAtRiverIndex = 7; - private const int exitPointIndex = 8; - private const int entryPointIndex = 9; - private static StochasticSoilProfile GetStochasticSoilProfile() { return new StochasticSoilProfile(0.5, SoilProfileType.SoilProfile1D, 1) Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs =================================================================== diff -u -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingScenariosViewTest.cs (.../PipingScenariosViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -43,6 +43,13 @@ [TestFixture] public class PipingScenariosViewTest : NUnitFormTest { + private const int isRelevantColumnIndex = 0; + private const int contributionColumnIndex = 1; + private const int nameColumnIndex = 2; + private const int failureProbabilityPipingColumnIndex = 3; + private const int failureProbabilityUpliftColumnIndex = 4; + private const int failureProbabilityHeaveColumnIndex = 5; + private const int failureProbabilitySellmeijerColumnIndex = 6; private Form testForm; [SetUp] @@ -296,14 +303,6 @@ mocks.VerifyAll(); } - private const int isRelevantColumnIndex = 0; - private const int contributionColumnIndex = 1; - private const int nameColumnIndex = 2; - private const int failureProbabilityPipingColumnIndex = 3; - private const int failureProbabilityUpliftColumnIndex = 4; - private const int failureProbabilityHeaveColumnIndex = 5; - private const int failureProbabilitySellmeijerColumnIndex = 6; - private PipingScenariosView ShowFullyConfiguredPipingScenarioView() { var surfaceLine1 = new RingtoetsPipingSurfaceLine Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSurfaceLineSelectionViewTest.cs =================================================================== diff -u -rac2a8327f9ce8b42d2e2740a0cda030385c5c63c -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSurfaceLineSelectionViewTest.cs (.../PipingSurfaceLineSelectionViewTest.cs) (revision ac2a8327f9ce8b42d2e2740a0cda030385c5c63c) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingSurfaceLineSelectionViewTest.cs (.../PipingSurfaceLineSelectionViewTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -33,6 +33,8 @@ [TestFixture] public class PipingSurfaceLineSelectionViewTest { + private const int surfaceLineNameColumnIndex = 1; + private const int selectedColumnIndex = 0; private Form testForm; [SetUp] @@ -281,9 +283,6 @@ Assert.IsEmpty(surfaceLines); } - private const int surfaceLineNameColumnIndex = 1; - private const int selectedColumnIndex = 0; - private void ShowPipingCalculationsView(PipingSurfaceLineSelectionView pipingCalculationsView) { testForm.Controls.Add(pipingCalculationsView); Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs =================================================================== diff -u -r8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs (.../PipingSoilProfileReaderTest.cs) (revision 8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/PipingSoilProfileReaderTest.cs (.../PipingSoilProfileReaderTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using System.Collections.ObjectModel; using System.Drawing; Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilLayer2DReaderTest.cs =================================================================== diff -u -r2d7f22520e157ccfefbf12a4d9845de8bfb04f50 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilLayer2DReaderTest.cs (.../SoilLayer2DReaderTest.cs) (revision 2d7f22520e157ccfefbf12a4d9845de8bfb04f50) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/SoilLayer2DReaderTest.cs (.../SoilLayer2DReaderTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -21,7 +21,6 @@ using System; using System.Collections.Generic; -using System.Collections.ObjectModel; using System.Globalization; using System.Linq; using System.Xml.Linq; @@ -213,7 +212,7 @@ // Assert Assert.NotNull(result); Segment2D expectedSegment = new Segment2D(new Point2D(parsedX1, parsedY1), new Point2D(parsedX2, parsedY2)); - var expectedCollection = new [] + var expectedCollection = new[] { new List { Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs =================================================================== diff -u -r8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision 8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3) +++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/SoilProfile/StochasticSoilModelReaderTest.cs (.../StochasticSoilModelReaderTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using System.IO; using System.Linq; Index: Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs =================================================================== diff -u -r8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision 8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3) +++ Ringtoets/Piping/test/Ringtoets.Piping.InputParameterCalculation.Test/InputParameterCalculationServiceTest.cs (.../InputParameterCalculationServiceTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -19,7 +19,6 @@ // 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; Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs =================================================================== diff -u -rbe66e1bec38a780abb27fedea8632acf4d24a173 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision be66e1bec38a780abb27fedea8632acf4d24a173) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingCalculationsViewIntegrationTest.cs (.../PipingCalculationsViewIntegrationTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -36,6 +36,12 @@ [TestFixture] public class PipingCalculationsViewIntegrationTest { + private const int nameColumnIndex = 0; + private const int stochasticSoilModelsColumnIndex = 1; + private const int stochasticSoilProfilesColumnIndex = 2; + private const int hydraulicBoundaryLocationsColumnIndex = 4; + private const int exitPointLColumnIndex = 8; + [Test] public void PipingCalculationsView_DataImportedOrChanged_ChangesCorrectlyObservedAndSynced() { @@ -129,11 +135,5 @@ Assert.AreEqual(111.11.ToString(CultureInfo.CurrentCulture), dataGridView.Rows[1].Cells[exitPointLColumnIndex].FormattedValue); } } - - private const int nameColumnIndex = 0; - private const int stochasticSoilModelsColumnIndex = 1; - private const int stochasticSoilProfilesColumnIndex = 2; - private const int hydraulicBoundaryLocationsColumnIndex = 4; - private const int exitPointLColumnIndex = 8; } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs =================================================================== diff -u -rea8d46d1ac88024537a4316b3020b6281986c063 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision ea8d46d1ac88024537a4316b3020b6281986c063) +++ Ringtoets/Piping/test/Ringtoets.Piping.Integration.Test/PipingFailureMechanismResultViewIntegrationTest.cs (.../PipingFailureMechanismResultViewIntegrationTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -36,6 +36,8 @@ [TestFixture] public class PipingFailureMechanismResultViewIntegrationTest { + private const int assessmentLayerTwoAIndex = 2; + [Test] public void FailureMechanismResultView_DataImportedOrChanged_ChangesCorrectlyObservedAndSynced() { @@ -155,7 +157,5 @@ Assert.AreEqual("Niet alle berekeningen voor dit vak zijn uitgevoerd.", dataGridView.Rows[22].Cells[assessmentLayerTwoAIndex].ErrorText); } } - - private const int assessmentLayerTwoAIndex = 2; } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSurfaceLineCreatorTest.cs =================================================================== diff -u -r375ff37edf7bfb578e804373044eab32700f0e07 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSurfaceLineCreatorTest.cs (.../PipingSurfaceLineCreatorTest.cs) (revision 375ff37edf7bfb578e804373044eab32700f0e07) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.Test/PipingSurfaceLineCreatorTest.cs (.../PipingSurfaceLineCreatorTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -110,7 +110,7 @@ // Assert var length = Math.Sqrt(2*2 + 3*3); const double secondCoordinateFactor = (2.0*1.0 + 3.0*2.0)/(2.0*2.0 + 3.0*3.0); - double[] expectedCoordinatesX = + double[] expectedCoordinatesX = { 0.0, secondCoordinateFactor*length, @@ -141,7 +141,7 @@ PipingSurfaceLine actual = PipingSurfaceLineCreator.Create(surfaceLine); // Assert - double[] expectedCoordinatesX = + double[] expectedCoordinatesX = { 0.0 }; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs =================================================================== diff -u -r0abf371c5f6f450232d49f3c1a031476063ce04b -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs (.../PipingCalculationsViewInfoTest.cs) (revision 0abf371c5f6f450232d49f3c1a031476063ce04b) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/ViewInfos/PipingCalculationsViewInfoTest.cs (.../PipingCalculationsViewInfoTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -78,7 +78,6 @@ var calculationGroup = new CalculationGroup(); var calculationGroupContext = new PipingCalculationGroupContext(calculationGroup, Enumerable.Empty(), Enumerable.Empty(), failureMechanism, assessmentSectionMock); - // Call & Assert Assert.AreEqual(calculationGroup, info.GetViewData(calculationGroupContext)); mocks.VerifyAll(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/Properties/AssemblyInfo.cs =================================================================== diff -u -r2c6171c45fe80090abcff004a03b8023196a7fe7 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision 2c6171c45fe80090abcff004a03b8023196a7fe7) +++ Ringtoets/Piping/test/Ringtoets.Piping.Primitives.Test/Properties/AssemblyInfo.cs (.../AssemblyInfo.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -24,4 +24,4 @@ [assembly: AssemblyTitle("Ringtoets.Piping.Primitives.Test")] [assembly: AssemblyProduct("Ringtoets.Piping.Primitives.Test")] -[assembly: Guid("fe0bd5f7-1028-4b71-a2cd-ffd36dccf994")] +[assembly: Guid("fe0bd5f7-1028-4b71-a2cd-ffd36dccf994")] \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs =================================================================== diff -u -r8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3 -rcd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d --- Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision 8a2cbeb8a9c5b0c8d5062af1a2a825d2b9134bf3) +++ Ringtoets/Piping/test/Ringtoets.Piping.Service.Test/PipingCalculationServiceTest.cs (.../PipingCalculationServiceTest.cs) (revision cd7fd343b85d2c9272033a59a0f1bc50bc8a8d0d) @@ -272,14 +272,14 @@ const string name = ""; var profile = new PipingSoilProfile(string.Empty, 0.0, - new[] + new[] { new PipingSoilLayer(2.0) { IsAquifer = false } }, - SoilProfileType.SoilProfile1D, -1); + SoilProfileType.SoilProfile1D, -1); PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput(); calculation.InputParameters.StochasticSoilProfile.SoilProfile = profile; @@ -557,7 +557,7 @@ } }, SoilProfileType.SoilProfile1D, -1); - + PipingCalculation calculation = PipingCalculationFactory.CreateCalculationWithValidInput(); calculation.InputParameters.StochasticSoilProfile.SoilProfile = profile; calculation.Name = name;