Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -rce2a9d3eda76fc57ba2b4028a69dca48ae7106f4 -r68ad84fe675e6137242c39d2c874d80d9e3db293 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision ce2a9d3eda76fc57ba2b4028a69dca48ae7106f4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/DesignWaterLevelLocationsViewTest.cs (.../DesignWaterLevelLocationsViewTest.cs) (revision 68ad84fe675e6137242c39d2c874d80d9e3db293) @@ -124,26 +124,26 @@ testForm); // Assert - DataGridView locationsDataGridView = GetCalculationsDataGridView(); - Assert.AreEqual(6, locationsDataGridView.ColumnCount); + DataGridView calculationsDataGridView = GetCalculationsDataGridView(); + Assert.AreEqual(6, calculationsDataGridView.ColumnCount); - var locationCalculateColumn = (DataGridViewCheckBoxColumn) locationsDataGridView.Columns[calculateColumnIndex]; - Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText); + var calculateColumn = (DataGridViewCheckBoxColumn) calculationsDataGridView.Columns[calculateColumnIndex]; + Assert.AreEqual("Berekenen", calculateColumn.HeaderText); - var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) locationsDataGridView.Columns[includeIllustrationPointsColumnIndex]; + var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) calculationsDataGridView.Columns[includeIllustrationPointsColumnIndex]; Assert.AreEqual("Illustratiepunten inlezen", includeIllustrationPointsColumn.HeaderText); - var locationNameColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationNameColumnIndex]; + var locationNameColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[locationNameColumnIndex]; Assert.AreEqual("Naam", locationNameColumn.HeaderText); - var locationIdColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationIdColumnIndex]; + var locationIdColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[locationIdColumnIndex]; Assert.AreEqual("ID", locationIdColumn.HeaderText); - var locationColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationColumnIndex]; + var locationColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[locationColumnIndex]; Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText); - var locationDesignWaterLevelColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[designWaterLevelColumnIndex]; - Assert.AreEqual("Toetspeil [m+NAP]", locationDesignWaterLevelColumn.HeaderText); + var designWaterLevelColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[designWaterLevelColumnIndex]; + Assert.AreEqual("Toetspeil [m+NAP]", designWaterLevelColumn.HeaderText); var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First(); Assert.IsFalse(button.Enabled); @@ -152,15 +152,12 @@ [Test] public void Constructor_WithCalculations_DataGridViewCorrectlyInitialized() { - // Setup - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - // Call - ShowFullyConfiguredDesignWaterLevelLocationsView(testHydraulicBoundaryDatabase.Locations, testForm); + ShowFullyConfiguredDesignWaterLevelLocationsView(GetTestHydraulicBoundaryLocationCalculations(), testForm); // Assert - DataGridViewControl locationsDataGridViewControl = GetCalculationsDataGridViewControl(); - DataGridViewRowCollection rows = locationsDataGridViewControl.Rows; + DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); + DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; Assert.AreEqual(4, rows.Count); DataGridViewCellCollection cells = rows[0].Cells; @@ -204,33 +201,30 @@ public void DesignWaterLevelLocationsView_CalculationsUpdated_DataGridViewCorrectlyUpdated() { // Setup - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - ObservableList locations = testHydraulicBoundaryDatabase.Locations; - ShowFullyConfiguredDesignWaterLevelLocationsView(locations, testForm); + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + ShowFullyConfiguredDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations, testForm); + const double designWaterLevel = 10.23; - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0) + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)) { - DesignWaterLevelCalculation1 = + InputParameters = { - InputParameters = - { - ShouldIllustrationPointsBeCalculated = true - }, - Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel) - } + ShouldIllustrationPointsBeCalculated = true + }, + Output = new TestHydraulicBoundaryLocationOutput(designWaterLevel) }; // Precondition - DataGridViewControl locationsDataGridViewControl = GetCalculationsDataGridViewControl(); - DataGridViewRowCollection rows = locationsDataGridViewControl.Rows; + DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); + DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; Assert.AreEqual(4, rows.Count); - locations.Clear(); - locations.Add(hydraulicBoundaryLocation); + hydraulicBoundaryLocationCalculations.Clear(); + hydraulicBoundaryLocationCalculations.Add(hydraulicBoundaryLocationCalculation); // Call - locations.NotifyObservers(); + hydraulicBoundaryLocationCalculations.NotifyObservers(); // Assert Assert.AreEqual(1, rows.Count); @@ -248,22 +242,22 @@ public void DesignWaterLevelLocationsView_CalculationUpdated_DataGridViewCorrectlyUpdated() { // Setup - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - ObservableList locations = testHydraulicBoundaryDatabase.Locations; - ShowFullyConfiguredDesignWaterLevelLocationsView(locations, testForm); + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + ShowFullyConfiguredDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations, testForm); + // Precondition - DataGridViewControl locationsDataGridViewControl = GetCalculationsDataGridViewControl(); - DataGridViewRowCollection rows = locationsDataGridViewControl.Rows; + DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); + DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; DataGridViewCellCollection cells = rows[0].Cells; Assert.AreEqual(6, cells.Count); Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue); - HydraulicBoundaryLocation location = locations.First(); + HydraulicBoundaryLocationCalculation calculation = hydraulicBoundaryLocationCalculations.First(); // Call - location.DesignWaterLevelCalculation1.InputParameters.ShouldIllustrationPointsBeCalculated = true; - location.NotifyObservers(); + calculation.InputParameters.ShouldIllustrationPointsBeCalculated = true; + calculation.NotifyObservers(); // Assert Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue); @@ -273,14 +267,14 @@ public void DesignWaterLevelLocationsView_CalculationUpdated_IllustrationPointsControlCorrectlyUpdated() { // Setup - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - ObservableList locations = testHydraulicBoundaryDatabase.Locations; - ShowFullyConfiguredDesignWaterLevelLocationsView(locations, testForm); + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + ShowFullyConfiguredDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations, testForm); + IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl(); - DataGridViewControl locationsDataGridViewControl = GetCalculationsDataGridViewControl(); + DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); - locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(2, 0)); + calculationsDataGridViewControl.SetCurrentCell(calculationsDataGridViewControl.GetCell(2, 0)); // Precondition CollectionAssert.IsEmpty(illustrationPointsControl.Data); @@ -295,9 +289,9 @@ var output = new TestHydraulicBoundaryLocationOutput(generalResult); // Call - HydraulicBoundaryLocation hydraulicBoundaryLocation = locations[2]; - hydraulicBoundaryLocation.DesignWaterLevelCalculation1.Output = output; - hydraulicBoundaryLocation.NotifyObservers(); + HydraulicBoundaryLocationCalculation boundaryLocationCalculation = hydraulicBoundaryLocationCalculations[2]; + boundaryLocationCalculation.Output = output; + boundaryLocationCalculation.NotifyObservers(); // Assert IEnumerable expectedControlItems = CreateControlItems(generalResult); @@ -308,11 +302,12 @@ public void CalculateForSelectedButton_OneSelected_CallsCalculateDesignWaterLevels() { // Setup - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(testHydraulicBoundaryDatabase.Locations, testForm); + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); - DataGridViewControl locationsDataGridViewControl = GetCalculationsDataGridViewControl(); - DataGridViewRowCollection rows = locationsDataGridViewControl.Rows; + DesignWaterLevelLocationsView view = ShowFullyConfiguredDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations, testForm); + + DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); + DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; rows[0].Cells[calculateColumnIndex].Value = true; var guiService = mockRepository.StrictMock(); @@ -330,18 +325,17 @@ // Assert Assert.AreEqual(1, performedCalculations.Length); - Assert.AreSame(testHydraulicBoundaryDatabase.Locations.First(), performedCalculations.First().HydraulicBoundaryLocation); + Assert.AreSame(hydraulicBoundaryLocationCalculations.First(), performedCalculations.First()); } [Test] public void CalculateForSelectedButton_OneSelectedButCalculationGuiServiceNotSet_DoesNotThrowException() { // Setup - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - ShowFullyConfiguredDesignWaterLevelLocationsView(testHydraulicBoundaryDatabase.Locations, testForm); + ShowFullyConfiguredDesignWaterLevelLocationsView(GetTestHydraulicBoundaryLocationCalculations(), testForm); - DataGridViewControl locationsDataGridViewControl = GetCalculationsDataGridViewControl(); - DataGridViewRowCollection rows = locationsDataGridViewControl.Rows; + DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); + DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; rows[0].Cells[calculateColumnIndex].Value = true; var button = new ButtonTester("CalculateForSelectedButton", testForm); @@ -362,7 +356,7 @@ const string categoryBoundaryName = "Category"; var assessmentSection = mockRepository.Stub(); - var hydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = databaseFilePath }; @@ -392,9 +386,16 @@ mockRepository.ReplayAll(); - DesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, categoryBoundaryName, testForm); - DataGridView locationsDataGridView = GetCalculationsDataGridView(); - DataGridViewRowCollection rows = locationsDataGridView.Rows; + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + + DesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations, + assessmentSection, + norm, + categoryBoundaryName, + testForm); + + DataGridView calculationsDataGridView = GetCalculationsDataGridView(); + DataGridViewRowCollection rows = calculationsDataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; view.CalculationGuiService = guiService; @@ -411,7 +412,7 @@ Assert.AreEqual("", preprocessorDirectoryValue); Assert.AreEqual(norm, normValue); Assert.AreEqual(1, performedCalculations.Length); - Assert.AreSame(hydraulicBoundaryDatabase.Locations.First(), performedCalculations.First().HydraulicBoundaryLocation); + Assert.AreSame(hydraulicBoundaryLocationCalculations.First(), performedCalculations.First()); } [Test] @@ -424,7 +425,7 @@ const string categoryBoundaryName = "Category"; var assessmentSection = mockRepository.Stub(); - var hydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = databaseFilePath, CanUsePreprocessor = true, @@ -457,9 +458,16 @@ mockRepository.ReplayAll(); - DesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, categoryBoundaryName, testForm); - DataGridView locationsDataGridView = GetCalculationsDataGridView(); - DataGridViewRowCollection rows = locationsDataGridView.Rows; + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + + DesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations, + assessmentSection, + norm, + categoryBoundaryName, + testForm); + + DataGridView calculationsDataGridView = GetCalculationsDataGridView(); + DataGridViewRowCollection rows = calculationsDataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; view.CalculationGuiService = guiService; @@ -476,7 +484,7 @@ Assert.AreEqual(preprocessorDirectory, preprocessorDirectoryValue); Assert.AreEqual(norm, normValue); Assert.AreEqual(1, performedCalculations.Length); - Assert.AreSame(hydraulicBoundaryDatabase.Locations.First(), performedCalculations.First().HydraulicBoundaryLocation); + Assert.AreSame(hydraulicBoundaryLocationCalculations.First(), performedCalculations.First()); } [Test] @@ -488,7 +496,7 @@ const string categoryBoundaryName = "Category"; var assessmentSection = mockRepository.Stub(); - var hydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = databaseFilePath, CanUsePreprocessor = true, @@ -521,9 +529,16 @@ mockRepository.ReplayAll(); - DesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, categoryBoundaryName, testForm); - DataGridView locationsDataGridView = GetCalculationsDataGridView(); - DataGridViewRowCollection rows = locationsDataGridView.Rows; + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + + DesignWaterLevelLocationsView view = ShowDesignWaterLevelLocationsView(hydraulicBoundaryLocationCalculations, + assessmentSection, + norm, + categoryBoundaryName, + testForm); + + DataGridView calculationsDataGridView = GetCalculationsDataGridView(); + DataGridViewRowCollection rows = calculationsDataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; view.CalculationGuiService = guiService; @@ -540,7 +555,7 @@ Assert.AreEqual(string.Empty, preprocessorDirectoryValue); Assert.AreEqual(norm, normValue); Assert.AreEqual(1, performedCalculations.Length); - Assert.AreSame(hydraulicBoundaryDatabase.Locations.First(), performedCalculations.First().HydraulicBoundaryLocation); + Assert.AreSame(hydraulicBoundaryLocationCalculations.First(), performedCalculations.First()); } private DataGridView GetCalculationsDataGridView() @@ -598,7 +613,7 @@ return ShowDesignWaterLevelLocationsView(calculations, assessmentSection, 0.01, "Category", form); } - private ObservableList GetTestHydraulicBoundaryLocationCalculations() + private static ObservableList GetTestHydraulicBoundaryLocationCalculations() { var topLevelIllustrationPoints = new[] { @@ -638,9 +653,9 @@ } [TestFixture] - private class ViewSynchronizationTest : LocationsViewSynchronizationTester + private class ViewSynchronizationTest : LocationsViewSynchronizationTester { - private ObservableList locations; + private readonly ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); protected override int OutputColumnIndex { @@ -650,29 +665,21 @@ } } - [SetUp] - public override void Setup() + protected override object GetLocationSelection(LocationsView view, object selectedRowObject) { - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - locations = testHydraulicBoundaryDatabase.Locations; - base.Setup(); - } - - protected override object GetLocationSelection(LocationsView view, object selectedRowObject) - { HydraulicBoundaryLocation hydraulicBoundaryLocation = ((HydraulicBoundaryLocationRow) selectedRowObject).CalculatableObject; return new DesignWaterLevelCalculationContext(GetCalculationForLocation(hydraulicBoundaryLocation)); } - protected override LocationsView ShowFullyConfiguredLocationsView(Form form) + protected override LocationsView ShowFullyConfiguredLocationsView(Form form) { - return ShowFullyConfiguredDesignWaterLevelLocationsView(locations, form); + return ShowFullyConfiguredDesignWaterLevelLocationsView(calculations, form); } - protected override ObservableList GetLocationsInView(LocationsView view) + protected override ObservableList GetLocationsInView(LocationsView view) { - return locations; + return calculations; } protected override HydraulicBoundaryLocationCalculation GetCalculationForLocation(HydraulicBoundaryLocation hydraulicBoundaryLocation) Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs =================================================================== diff -u -rce2a9d3eda76fc57ba2b4028a69dca48ae7106f4 -r68ad84fe675e6137242c39d2c874d80d9e3db293 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs (.../WaveHeightLocationsViewTest.cs) (revision ce2a9d3eda76fc57ba2b4028a69dca48ae7106f4) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/Views/WaveHeightLocationsViewTest.cs (.../WaveHeightLocationsViewTest.cs) (revision 68ad84fe675e6137242c39d2c874d80d9e3db293) @@ -124,26 +124,26 @@ testForm); // Assert - DataGridView locationsDataGridView = GetCalculationsDataGridView(); - Assert.AreEqual(6, locationsDataGridView.ColumnCount); + DataGridView calculationsDataGridView = GetCalculationsDataGridView(); + Assert.AreEqual(6, calculationsDataGridView.ColumnCount); - var locationCalculateColumn = (DataGridViewCheckBoxColumn) locationsDataGridView.Columns[calculateColumnIndex]; - Assert.AreEqual("Berekenen", locationCalculateColumn.HeaderText); + var calculateColumn = (DataGridViewCheckBoxColumn) calculationsDataGridView.Columns[calculateColumnIndex]; + Assert.AreEqual("Berekenen", calculateColumn.HeaderText); - var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) locationsDataGridView.Columns[includeIllustrationPointsColumnIndex]; + var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) calculationsDataGridView.Columns[includeIllustrationPointsColumnIndex]; Assert.AreEqual("Illustratiepunten inlezen", includeIllustrationPointsColumn.HeaderText); - var locationNameColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationNameColumnIndex]; + var locationNameColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[locationNameColumnIndex]; Assert.AreEqual("Naam", locationNameColumn.HeaderText); - var locationIdColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationIdColumnIndex]; + var locationIdColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[locationIdColumnIndex]; Assert.AreEqual("ID", locationIdColumn.HeaderText); - var locationColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[locationColumnIndex]; + var locationColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[locationColumnIndex]; Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText); - var locationWaveHeightColumn = (DataGridViewTextBoxColumn) locationsDataGridView.Columns[waveHeightColumnIndex]; - Assert.AreEqual("Hs [m]", locationWaveHeightColumn.HeaderText); + var waveHeightColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[waveHeightColumnIndex]; + Assert.AreEqual("Hs [m]", waveHeightColumn.HeaderText); var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First(); Assert.IsFalse(button.Enabled); @@ -152,15 +152,12 @@ [Test] public void Constructor_WithCalculations_DataGridViewCorrectlyInitialized() { - // Setup - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - // Call - ShowFullyConfiguredWaveHeightLocationsView(testHydraulicBoundaryDatabase.Locations, testForm); + ShowFullyConfiguredWaveHeightLocationsView(GetTestHydraulicBoundaryLocationCalculations(), testForm); // Assert - DataGridViewControl locationsDataGridViewControl = GetCalculationsDataGridViewControl(); - DataGridViewRowCollection rows = locationsDataGridViewControl.Rows; + DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); + DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; Assert.AreEqual(4, rows.Count); DataGridViewCellCollection cells = rows[0].Cells; @@ -204,33 +201,30 @@ public void WaveHeightLocationsView_CalculationsUpdated_DataGridViewCorrectlyUpdated() { // Setup - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - ObservableList locations = testHydraulicBoundaryDatabase.Locations; - ShowFullyConfiguredWaveHeightLocationsView(locations, testForm); + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + ShowFullyConfiguredWaveHeightLocationsView(hydraulicBoundaryLocationCalculations, testForm); + const double waveHeight = 10.23; - var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0) + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)) { - WaveHeightCalculation1 = + InputParameters = { - InputParameters = - { - ShouldIllustrationPointsBeCalculated = true - }, - Output = new TestHydraulicBoundaryLocationOutput(waveHeight) - } + ShouldIllustrationPointsBeCalculated = true + }, + Output = new TestHydraulicBoundaryLocationOutput(waveHeight) }; // Precondition - DataGridViewControl locationsDataGridViewControl = GetCalculationsDataGridViewControl(); - DataGridViewRowCollection rows = locationsDataGridViewControl.Rows; + DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); + DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; Assert.AreEqual(4, rows.Count); - locations.Clear(); - locations.Add(hydraulicBoundaryLocation); + hydraulicBoundaryLocationCalculations.Clear(); + hydraulicBoundaryLocationCalculations.Add(hydraulicBoundaryLocationCalculation); // Call - locations.NotifyObservers(); + hydraulicBoundaryLocationCalculations.NotifyObservers(); // Assert Assert.AreEqual(1, rows.Count); @@ -248,22 +242,22 @@ public void WaveHeightLocationsView_CalculationUpdated_DataGridViewCorrectlyUpdated() { // Setup - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - ObservableList locations = testHydraulicBoundaryDatabase.Locations; - ShowFullyConfiguredWaveHeightLocationsView(locations, testForm); + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + ShowFullyConfiguredWaveHeightLocationsView(hydraulicBoundaryLocationCalculations, testForm); + // Precondition - DataGridViewControl locationsDataGridViewControl = GetCalculationsDataGridViewControl(); - DataGridViewRowCollection rows = locationsDataGridViewControl.Rows; + DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); + DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; DataGridViewCellCollection cells = rows[0].Cells; Assert.AreEqual(6, cells.Count); Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue); - HydraulicBoundaryLocation location = locations.First(); + HydraulicBoundaryLocationCalculation calculation = hydraulicBoundaryLocationCalculations.First(); // Call - location.WaveHeightCalculation1.InputParameters.ShouldIllustrationPointsBeCalculated = true; - location.NotifyObservers(); + calculation.InputParameters.ShouldIllustrationPointsBeCalculated = true; + calculation.NotifyObservers(); // Assert Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue); @@ -273,15 +267,15 @@ public void WaveHeightLocationsView_CalculationUpdated_IllustrationPointsControlCorrectlyUpdated() { // Setup - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - ObservableList locations = testHydraulicBoundaryDatabase.Locations; - ShowFullyConfiguredWaveHeightLocationsView(locations, testForm); - IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl(); + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); - DataGridViewControl locationsDataGridViewControl = GetCalculationsDataGridViewControl(); + ShowFullyConfiguredWaveHeightLocationsView(hydraulicBoundaryLocationCalculations, testForm); - locationsDataGridViewControl.SetCurrentCell(locationsDataGridViewControl.GetCell(2, 0)); + IllustrationPointsControl illustrationPointsControl = GetIllustrationPointsControl(); + DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); + calculationsDataGridViewControl.SetCurrentCell(calculationsDataGridViewControl.GetCell(2, 0)); + // Precondition CollectionAssert.IsEmpty(illustrationPointsControl.Data); @@ -295,9 +289,9 @@ var output = new TestHydraulicBoundaryLocationOutput(generalResult); // Call - HydraulicBoundaryLocation hydraulicBoundaryLocation = locations[2]; - hydraulicBoundaryLocation.WaveHeightCalculation1.Output = output; - hydraulicBoundaryLocation.NotifyObservers(); + HydraulicBoundaryLocationCalculation hydraulicBoundaryLocationCalculation = hydraulicBoundaryLocationCalculations[2]; + hydraulicBoundaryLocationCalculation.Output = output; + hydraulicBoundaryLocationCalculation.NotifyObservers(); // Assert IEnumerable expectedControlItems = CreateControlItems(generalResult); @@ -308,11 +302,12 @@ public void CalculateForSelectedButton_OneSelected_CallsCalculateWaveHeights() { // Setup - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(testHydraulicBoundaryDatabase.Locations, testForm); + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); - DataGridViewControl locationsDataGridViewControl = GetCalculationsDataGridViewControl(); - DataGridViewRowCollection rows = locationsDataGridViewControl.Rows; + WaveHeightLocationsView view = ShowFullyConfiguredWaveHeightLocationsView(hydraulicBoundaryLocationCalculations, testForm); + + DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); + DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; rows[0].Cells[calculateColumnIndex].Value = true; var guiService = mockRepository.StrictMock(); @@ -330,18 +325,17 @@ // Assert Assert.AreEqual(1, performedCalculations.Length); - Assert.AreSame(testHydraulicBoundaryDatabase.Locations.First(), performedCalculations.First().HydraulicBoundaryLocation); + Assert.AreSame(hydraulicBoundaryLocationCalculations.First(), performedCalculations.First()); } [Test] public void CalculateForSelectedButton_OneSelectedButCalculationGuiServiceNotSet_DoesNotThrowException() { // Setup - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - ShowFullyConfiguredWaveHeightLocationsView(testHydraulicBoundaryDatabase.Locations, testForm); + ShowFullyConfiguredWaveHeightLocationsView(GetTestHydraulicBoundaryLocationCalculations(), testForm); - DataGridViewControl locationsDataGridViewControl = GetCalculationsDataGridViewControl(); - DataGridViewRowCollection rows = locationsDataGridViewControl.Rows; + DataGridViewControl calculationsDataGridViewControl = GetCalculationsDataGridViewControl(); + DataGridViewRowCollection rows = calculationsDataGridViewControl.Rows; rows[0].Cells[calculateColumnIndex].Value = true; var button = new ButtonTester("CalculateForSelectedButton", testForm); @@ -362,7 +356,7 @@ const string categoryBoundaryName = "Category"; var assessmentSection = mockRepository.Stub(); - var hydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = databaseFilePath }; @@ -392,9 +386,16 @@ mockRepository.ReplayAll(); - WaveHeightLocationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, categoryBoundaryName, testForm); - DataGridView locationsDataGridView = GetCalculationsDataGridView(); - DataGridViewRowCollection rows = locationsDataGridView.Rows; + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + + WaveHeightLocationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryLocationCalculations, + assessmentSection, + norm, + categoryBoundaryName, + testForm); + + DataGridView calculationsDataGridView = GetCalculationsDataGridView(); + DataGridViewRowCollection rows = calculationsDataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; view.CalculationGuiService = guiService; @@ -411,7 +412,7 @@ Assert.AreEqual("", preprocessorDirectoryValue); Assert.AreEqual(norm, normValue); Assert.AreEqual(1, performedCalculations.Length); - Assert.AreSame(hydraulicBoundaryDatabase.Locations.First(), performedCalculations.First().HydraulicBoundaryLocation); + Assert.AreSame(hydraulicBoundaryLocationCalculations.First(), performedCalculations.First()); } [Test] @@ -424,7 +425,7 @@ const string categoryBoundaryName = "Category"; var assessmentSection = mockRepository.Stub(); - var hydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = databaseFilePath, CanUsePreprocessor = true, @@ -457,9 +458,16 @@ mockRepository.ReplayAll(); - WaveHeightLocationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, categoryBoundaryName, testForm); - DataGridView locationsDataGridView = GetCalculationsDataGridView(); - DataGridViewRowCollection rows = locationsDataGridView.Rows; + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + + WaveHeightLocationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryLocationCalculations, + assessmentSection, + norm, + categoryBoundaryName, + testForm); + + DataGridView calculationsDataGridView = GetCalculationsDataGridView(); + DataGridViewRowCollection rows = calculationsDataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; view.CalculationGuiService = guiService; @@ -476,7 +484,7 @@ Assert.AreEqual(preprocessorDirectory, preprocessorDirectoryValue); Assert.AreEqual(norm, normValue); Assert.AreEqual(1, performedCalculations.Length); - Assert.AreSame(hydraulicBoundaryDatabase.Locations.First(), performedCalculations.First().HydraulicBoundaryLocation); + Assert.AreSame(hydraulicBoundaryLocationCalculations.First(), performedCalculations.First()); } [Test] @@ -488,7 +496,7 @@ const string categoryBoundaryName = "Category"; var assessmentSection = mockRepository.Stub(); - var hydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = databaseFilePath, CanUsePreprocessor = true, @@ -521,9 +529,16 @@ mockRepository.ReplayAll(); - WaveHeightLocationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryDatabase.Locations, assessmentSection, norm, categoryBoundaryName, testForm); - DataGridView locationsDataGridView = GetCalculationsDataGridView(); - DataGridViewRowCollection rows = locationsDataGridView.Rows; + ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + + WaveHeightLocationsView view = ShowWaveHeightLocationsView(hydraulicBoundaryLocationCalculations, + assessmentSection, + norm, + categoryBoundaryName, + testForm); + + DataGridView calculationsDataGridView = GetCalculationsDataGridView(); + DataGridViewRowCollection rows = calculationsDataGridView.Rows; rows[0].Cells[calculateColumnIndex].Value = true; view.CalculationGuiService = guiService; @@ -540,7 +555,7 @@ Assert.AreEqual(string.Empty, preprocessorDirectoryValue); Assert.AreEqual(norm, normValue); Assert.AreEqual(1, performedCalculations.Length); - Assert.AreSame(hydraulicBoundaryDatabase.Locations.First(), performedCalculations.First().HydraulicBoundaryLocation); + Assert.AreSame(hydraulicBoundaryLocationCalculations.First(), performedCalculations.First()); } private DataGridView GetCalculationsDataGridView() @@ -598,7 +613,7 @@ return ShowWaveHeightLocationsView(calculations, assessmentSection, 0.01, "Category", form); } - private ObservableList GetTestHydraulicBoundaryLocationCalculations() + private static ObservableList GetTestHydraulicBoundaryLocationCalculations() { var topLevelIllustrationPoints = new[] { @@ -638,9 +653,9 @@ } [TestFixture] - public class ViewSynchronizationTest : LocationsViewSynchronizationTester + public class ViewSynchronizationTest : LocationsViewSynchronizationTester { - private ObservableList locations; + private readonly ObservableList calculations = GetTestHydraulicBoundaryLocationCalculations(); protected override int OutputColumnIndex { @@ -650,29 +665,21 @@ } } - [SetUp] - public override void Setup() + protected override object GetLocationSelection(LocationsView view, object selectedRowObject) { - var testHydraulicBoundaryDatabase = new TestHydraulicBoundaryDatabase(); - locations = testHydraulicBoundaryDatabase.Locations; - base.Setup(); - } - - protected override object GetLocationSelection(LocationsView view, object selectedRowObject) - { HydraulicBoundaryLocation hydraulicBoundaryLocation = ((HydraulicBoundaryLocationRow) selectedRowObject).CalculatableObject; return new WaveHeightCalculationContext(GetCalculationForLocation(hydraulicBoundaryLocation)); } - protected override LocationsView ShowFullyConfiguredLocationsView(Form form) + protected override LocationsView ShowFullyConfiguredLocationsView(Form form) { - return ShowFullyConfiguredWaveHeightLocationsView(locations, form); + return ShowFullyConfiguredWaveHeightLocationsView(calculations, form); } - protected override ObservableList GetLocationsInView(LocationsView view) + protected override ObservableList GetLocationsInView(LocationsView view) { - return locations; + return calculations; } protected override HydraulicBoundaryLocationCalculation GetCalculationForLocation(HydraulicBoundaryLocation hydraulicBoundaryLocation)