Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs =================================================================== diff -u -r7d699456f50b25493e9a9f25667470efcc30b1b7 -r2e3df635a07b2924b1cbb89020ffb089fef5f7f9 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs (.../DesignWaterLevelCalculationsViewTest.cs) (revision 7d699456f50b25493e9a9f25667470efcc30b1b7) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs (.../DesignWaterLevelCalculationsViewTest.cs) (revision 2e3df635a07b2924b1cbb89020ffb089fef5f7f9) @@ -259,66 +259,6 @@ } [Test] - public void DesignWaterLevelCalculationsView_CalculationUpdated_DataGridViewCorrectlyUpdated() - { - // Setup - IObservableEnumerable hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); - - ShowFullyConfiguredDesignWaterLevelCalculationsView(hydraulicBoundaryLocationCalculations, testForm); - - // Precondition - DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); - DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; - DataGridViewCellCollection cells = rows[0].Cells; - Assert.AreEqual(6, cells.Count); - Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue); - - HydraulicBoundaryLocationCalculation calculation = hydraulicBoundaryLocationCalculations.First(); - - // Call - calculation.InputParameters.ShouldIllustrationPointsBeCalculated = true; - calculation.NotifyObservers(); - - // Assert - Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue); - } - - [Test] - public void DesignWaterLevelCalculationsView_CalculationUpdated_IllustrationPointsControlCorrectlyUpdated() - { - // Setup - IObservableEnumerable hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); - - ShowFullyConfiguredDesignWaterLevelCalculationsView(hydraulicBoundaryLocationCalculations, testForm); - - IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl(); - DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); - - calculationsDataGridViewControl.SetCurrentCell(calculationsDataGridViewControl.GetCell(2, 0)); - - // Precondition - CollectionAssert.IsEmpty(illustrationPointsControl.Data); - - var topLevelIllustrationPoints = new[] - { - new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(), - "Regular", - new TestSubMechanismIllustrationPoint()) - }; - var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints); - var output = new TestHydraulicBoundaryLocationCalculationOutput(generalResult); - - // Call - HydraulicBoundaryLocationCalculation boundaryLocationCalculation = hydraulicBoundaryLocationCalculations.ElementAt(2); - boundaryLocationCalculation.Output = output; - boundaryLocationCalculation.NotifyObservers(); - - // Assert - IEnumerable expectedControlItems = CreateControlItems(generalResult); - CollectionAssert.AreEqual(expectedControlItems, illustrationPointsControl.Data, new IllustrationPointControlItemComparer()); - } - - [Test] public void CalculateForSelectedButton_OneSelected_CallsCalculateDesignWaterLevels() { // Setup Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs =================================================================== diff -u -r944fdee64bdb19c321a106fef6a40263698644bd -r2e3df635a07b2924b1cbb89020ffb089fef5f7f9 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs (.../HydraulicBoundaryCalculationsViewTest.cs) (revision 944fdee64bdb19c321a106fef6a40263698644bd) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/HydraulicBoundaryCalculationsViewTest.cs (.../HydraulicBoundaryCalculationsViewTest.cs) (revision 2e3df635a07b2924b1cbb89020ffb089fef5f7f9) @@ -126,7 +126,7 @@ ShowTestHydraulicBoundaryCalculationsView(); // Assert - DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "dataGridView"); + DataGridView dataGridView = GetDataGridView(); Assert.AreEqual(5, dataGridView.ColumnCount); var calculateColumn = (DataGridViewCheckBoxColumn) dataGridView.Columns[calculateColumnIndex]; @@ -165,10 +165,10 @@ public void Constructor_CheckBoxCorrectlyInitialized() { // Setup & Call - TestHydraulicBoundaryCalculationsView view = ShowTestHydraulicBoundaryCalculationsView(); + ShowTestHydraulicBoundaryCalculationsView(); // Assert - var checkBox = (CheckBox) view.Controls.Find("showHydraulicBoundaryDatabaseFileNameColumnCheckBox", true)[0]; + CheckBox checkBox = GetSHowHydraulicBoundaryDatabaseFileNameCheckBox(); Assert.AreEqual("Toon HRD bestand", checkBox.Text); Assert.IsFalse(checkBox.Checked); } @@ -180,7 +180,7 @@ ShowFullyConfiguredTestHydraulicBoundaryCalculationsView(); // Assert - DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "dataGridView"); + DataGridView dataGridView = GetDataGridView(); DataGridViewRowCollection rows = dataGridView.Rows; Assert.AreEqual(3, rows.Count); @@ -214,7 +214,7 @@ { // Setup var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - + var topLevelIllustrationPoints = new[] { new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(), @@ -233,7 +233,7 @@ { calculation }; - + var assessmentSection = new AssessmentSectionStub(); assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase { @@ -244,10 +244,10 @@ }); // Call - TestHydraulicBoundaryCalculationsView view = ShowTestHydraulicBoundaryCalculationsView(calculations, assessmentSection); + ShowTestHydraulicBoundaryCalculationsView(calculations, assessmentSection); // Assert - var illustrationPointControl = (IllustrationPointsControl) view.Controls.Find("illustrationPointsControl", true).First(); + IllustrationPointsControl illustrationPointControl = GetIllustrationPointsControl(); IEnumerable expectedControlItems = CreateControlItems(generalResult); CollectionAssert.AreEqual(expectedControlItems, illustrationPointControl.Data, new IllustrationPointControlItemComparer()); @@ -273,7 +273,7 @@ var selectionChangedCount = 0; view.SelectionChanged += (sender, args) => selectionChangedCount++; - DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "DataGridView"); + DataGridView dataGridView = GetDataGridView(); // When dataGridView.CurrentCell = dataGridView.Rows[1].Cells[calculateColumnIndex]; @@ -289,7 +289,7 @@ // Setup ShowFullyConfiguredTestHydraulicBoundaryCalculationsView(); - DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "DataGridView"); + DataGridView dataGridView = GetDataGridView(); DataGridViewRowCollection rows = dataGridView.Rows; var button = new ButtonTester("SelectAllButton", testForm); @@ -311,7 +311,7 @@ // Setup ShowFullyConfiguredTestHydraulicBoundaryCalculationsView(); - DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "DataGridView"); + DataGridView dataGridView = GetDataGridView(); var button = new ButtonTester("DeselectAllButton", testForm); DataGridViewRowCollection rows = dataGridView.Rows; @@ -341,7 +341,7 @@ // Then var button = (Button) view.Controls.Find("CalculateForSelectedButton", true)[0]; Assert.IsFalse(button.Enabled); - var errorProvider = TypeUtils.GetField(view, "CalculateForSelectedButtonErrorProvider"); + ErrorProvider errorProvider = GetErrorProvider(view); Assert.AreEqual("Er zijn geen berekeningen geselecteerd.", errorProvider.GetError(button)); } @@ -350,15 +350,15 @@ { // Given TestHydraulicBoundaryCalculationsView view = ShowFullyConfiguredTestHydraulicBoundaryCalculationsView(); - DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "DataGridView"); + DataGridView dataGridView = GetDataGridView(); // When dataGridView.Rows[0].Cells[calculateColumnIndex].Value = true; // Then var button = (Button) view.Controls.Find("CalculateForSelectedButton", true)[0]; Assert.IsTrue(button.Enabled); - var errorProvider = TypeUtils.GetField(view, "CalculateForSelectedButtonErrorProvider"); + ErrorProvider errorProvider = GetErrorProvider(view); Assert.AreEqual("", errorProvider.GetError(button)); } @@ -373,7 +373,7 @@ TestHydraulicBoundaryCalculationsView view = ShowFullyConfiguredTestHydraulicBoundaryCalculationsView(); view.CalculationGuiService = guiService; - DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "DataGridView"); + DataGridView dataGridView = GetDataGridView(); DataGridViewRowCollection rows = dataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; @@ -400,7 +400,7 @@ // Setup ShowFullyConfiguredTestHydraulicBoundaryCalculationsView(); - DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "dataGridView"); + DataGridView dataGridView = GetDataGridView(); DataGridViewRowCollection rows = dataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; @@ -417,22 +417,129 @@ public void GivenView_WhenCheckingShowHydraulicBoundaryDatabaseFileNameColumnCheckBox_ThenColumnVisible() { // Given - TestHydraulicBoundaryCalculationsView view = ShowTestHydraulicBoundaryCalculationsView(); + ShowTestHydraulicBoundaryCalculationsView(); - DataGridView dataGridView = ControlTestHelper.GetDataGridView(testForm, "dataGridView"); + DataGridView dataGridView = GetDataGridView(); // Precondition var hydraulicBoundaryDatabaseFileNameColumn = (DataGridViewTextBoxColumn) dataGridView.Columns[hydraulicBoundaryDatabaseFileNameColumnIndex]; Assert.IsFalse(hydraulicBoundaryDatabaseFileNameColumn.Visible); // When - var checkBox = (CheckBox) view.Controls.Find("showHydraulicBoundaryDatabaseFileNameColumnCheckBox", true)[0]; + CheckBox checkBox = GetSHowHydraulicBoundaryDatabaseFileNameCheckBox(); checkBox.Checked = true; // Then Assert.IsTrue(hydraulicBoundaryDatabaseFileNameColumn.Visible); } + [Test] + public void GivenView_WhenCalculationUpdated_ThenDataGridViewCorrectlyUpdated() + { + // Given + var location = new TestHydraulicBoundaryLocation(); + var calculation = new HydraulicBoundaryLocationCalculation(location); + + var assessmentSection = new AssessmentSectionStub(); + assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase + { + Locations = + { + location + } + }); + + ShowTestHydraulicBoundaryCalculationsView(new ObservableList + { + calculation + }, assessmentSection); + + // Precondition + DataGridViewControl calculationsDataGridViewControl = GetDataGridViewControl(); + DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; + DataGridViewCellCollection cells = rows[0].Cells; + Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue); + + // When + calculation.InputParameters.ShouldIllustrationPointsBeCalculated = true; + calculation.NotifyObservers(); + + // Then + Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue); + } + + [Test] + public void GivenView_WhenCalculationUpdated_ThenIllustrationPointsControlCorrectlyUpdated() + { + // Given + var location = new TestHydraulicBoundaryLocation(); + var calculation = new HydraulicBoundaryLocationCalculation(location); + + var assessmentSection = new AssessmentSectionStub(); + assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.Add(new HydraulicBoundaryDatabase + { + Locations = + { + location + } + }); + + ShowTestHydraulicBoundaryCalculationsView(new ObservableList + { + calculation + }, assessmentSection); + + IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl(); + DataGridViewControl calculationsDataGridViewControl = GetDataGridViewControl(); + + calculationsDataGridViewControl.SetCurrentCell(calculationsDataGridViewControl.GetCell(0, 0)); + + // Precondition + CollectionAssert.IsEmpty(illustrationPointsControl.Data); + + var topLevelIllustrationPoints = new[] + { + new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(), + "Regular", + new TestSubMechanismIllustrationPoint()) + }; + var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints); + var output = new TestHydraulicBoundaryLocationCalculationOutput(generalResult); + + // Call + calculation.Output = output; + calculation.NotifyObservers(); + + // Assert + IEnumerable expectedControlItems = CreateControlItems(generalResult); + CollectionAssert.AreEqual(expectedControlItems, illustrationPointsControl.Data, new IllustrationPointControlItemComparer()); + } + + private DataGridView GetDataGridView() + { + return ControlTestHelper.GetDataGridView(testForm, "dataGridView"); + } + + private DataGridViewControl GetDataGridViewControl() + { + return ControlTestHelper.GetDataGridViewControl(testForm, "DataGridViewControl"); + } + + private static ErrorProvider GetErrorProvider(TestHydraulicBoundaryCalculationsView view) + { + return TypeUtils.GetField(view, "CalculateForSelectedButtonErrorProvider"); + } + + private CheckBox GetSHowHydraulicBoundaryDatabaseFileNameCheckBox() + { + return ControlTestHelper.GetControls(testForm, "showHydraulicBoundaryDatabaseFileNameColumnCheckBox").Single(); + } + + private IllustrationPointsControl GetIllustrationPointsControl() + { + return ControlTestHelper.GetControls(testForm, "IllustrationPointsControl").Single(); + } + private static IEnumerable CreateControlItems( GeneralResult generalResult) { Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs =================================================================== diff -u -r7d699456f50b25493e9a9f25667470efcc30b1b7 -r2e3df635a07b2924b1cbb89020ffb089fef5f7f9 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs (.../WaveHeightCalculationsViewTest.cs) (revision 7d699456f50b25493e9a9f25667470efcc30b1b7) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs (.../WaveHeightCalculationsViewTest.cs) (revision 2e3df635a07b2924b1cbb89020ffb089fef5f7f9) @@ -259,66 +259,6 @@ } [Test] - public void WaveHeightCalculationsView_CalculationUpdated_DataGridViewCorrectlyUpdated() - { - // Setup - IObservableEnumerable hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); - - ShowFullyConfiguredWaveHeightCalculationsView(hydraulicBoundaryLocationCalculations, testForm); - - // Precondition - DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); - DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; - DataGridViewCellCollection cells = rows[0].Cells; - Assert.AreEqual(6, cells.Count); - Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue); - - HydraulicBoundaryLocationCalculation calculation = hydraulicBoundaryLocationCalculations.First(); - - // Call - calculation.InputParameters.ShouldIllustrationPointsBeCalculated = true; - calculation.NotifyObservers(); - - // Assert - Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue); - } - - [Test] - public void WaveHeightCalculationsView_CalculationUpdated_IllustrationPointsControlCorrectlyUpdated() - { - // Setup - IObservableEnumerable hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); - - ShowFullyConfiguredWaveHeightCalculationsView(hydraulicBoundaryLocationCalculations, testForm); - - IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl(); - DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); - - calculationsDataGridViewControl.SetCurrentCell(calculationsDataGridViewControl.GetCell(2, 0)); - - // Precondition - CollectionAssert.IsEmpty(illustrationPointsControl.Data); - - var topLevelIllustrationPoints = new[] - { - new TopLevelSubMechanismIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(), - "Regular", - new TestSubMechanismIllustrationPoint()) - }; - var generalResult = new TestGeneralResultSubMechanismIllustrationPoint(topLevelIllustrationPoints); - var output = new TestHydraulicBoundaryLocationCalculationOutput(generalResult); - - // Call - HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = hydraulicBoundaryLocationCalculations.ElementAt(2); - hydraulicBoundaryLocationCalculation.Output = output; - hydraulicBoundaryLocationCalculation.NotifyObservers(); - - // Assert - IEnumerable expectedControlItems = CreateControlItems(generalResult); - CollectionAssert.AreEqual(expectedControlItems, illustrationPointsControl.Data, new IllustrationPointControlItemComparer()); - } - - [Test] public void CalculateForSelectedButton_OneSelected_CallsCalculateWaveHeights() { // Setup