Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs =================================================================== diff -u -r456902fa04e4ec7359fe49348d5d7df56c18b1fd -r7d699456f50b25493e9a9f25667470efcc30b1b7 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs (.../DesignWaterLevelCalculationsViewTest.cs) (revision 456902fa04e4ec7359fe49348d5d7df56c18b1fd) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/DesignWaterLevelCalculationsViewTest.cs (.../DesignWaterLevelCalculationsViewTest.cs) (revision 7d699456f50b25493e9a9f25667470efcc30b1b7) @@ -25,7 +25,6 @@ using System.Linq; using System.Windows.Forms; using Core.Common.Base; -using Core.Common.Base.Geometry; using Core.Common.Controls.DataGrid; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -49,7 +48,7 @@ private const int includeIllustrationPointsColumnIndex = 1; private const int locationNameColumnIndex = 2; private const int locationIdColumnIndex = 3; - private const int locationColumnIndex = 4; + private const int hydraulicBoundaryDatabaseFileNameColumnIndex = 4; private const int designWaterLevelColumnIndex = 5; private Form testForm; @@ -144,24 +143,27 @@ var calculateColumn = (DataGridViewCheckBoxColumn) calculationsDataGridView.Columns[calculateColumnIndex]; Assert.AreEqual("Berekenen", calculateColumn.HeaderText); + Assert.IsTrue(calculateColumn.Visible); var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) calculationsDataGridView.Columns[includeIllustrationPointsColumnIndex]; Assert.AreEqual("Illustratiepunten inlezen", includeIllustrationPointsColumn.HeaderText); + Assert.IsTrue(includeIllustrationPointsColumn.Visible); var locationNameColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[locationNameColumnIndex]; Assert.AreEqual("Naam", locationNameColumn.HeaderText); + Assert.IsTrue(locationNameColumn.Visible); var locationIdColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[locationIdColumnIndex]; Assert.AreEqual("ID", locationIdColumn.HeaderText); + Assert.IsTrue(locationIdColumn.Visible); - var locationColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[locationColumnIndex]; - Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText); + var hydraulicBoundaryDatabaseFileNameColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[hydraulicBoundaryDatabaseFileNameColumnIndex]; + Assert.AreEqual("HRD bestand", hydraulicBoundaryDatabaseFileNameColumn.HeaderText); + Assert.IsFalse(hydraulicBoundaryDatabaseFileNameColumn.Visible); var designWaterLevelColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[designWaterLevelColumnIndex]; Assert.AreEqual("Waterstand [m+NAP]", designWaterLevelColumn.HeaderText); - - var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First(); - Assert.IsFalse(button.Enabled); + Assert.IsTrue(designWaterLevelColumn.Visible); } [Test] @@ -181,7 +183,7 @@ Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue); Assert.AreEqual("1", cells[locationNameColumnIndex].FormattedValue); Assert.AreEqual("1", cells[locationIdColumnIndex].FormattedValue); - Assert.AreEqual(new Point2D(1, 1).ToString(), cells[locationColumnIndex].FormattedValue); + Assert.AreEqual("database1", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue); Assert.AreEqual("-", cells[designWaterLevelColumnIndex].FormattedValue); cells = rows[1].Cells; @@ -190,7 +192,7 @@ Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue); Assert.AreEqual("2", cells[locationNameColumnIndex].FormattedValue); Assert.AreEqual("2", cells[locationIdColumnIndex].FormattedValue); - Assert.AreEqual(new Point2D(2, 2).ToString(), cells[locationColumnIndex].FormattedValue); + Assert.AreEqual("database1", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue); Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), cells[designWaterLevelColumnIndex].FormattedValue); cells = rows[2].Cells; @@ -199,7 +201,7 @@ Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue); Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue); Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue); - Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue); + Assert.AreEqual("database2", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue); Assert.AreEqual("-", cells[designWaterLevelColumnIndex].FormattedValue); cells = rows[3].Cells; @@ -208,7 +210,7 @@ Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue); Assert.AreEqual("4", cells[locationNameColumnIndex].FormattedValue); Assert.AreEqual("4", cells[locationIdColumnIndex].FormattedValue); - Assert.AreEqual(new Point2D(4, 4).ToString(), cells[locationColumnIndex].FormattedValue); + Assert.AreEqual("database2", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue); Assert.AreEqual(1.01.ToString(CultureInfo.CurrentCulture), cells[designWaterLevelColumnIndex].FormattedValue); } @@ -217,11 +219,14 @@ { // Setup ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + AssessmentSectionStub assessmentSection = GetConfiguredAssessmentSectionStub(hydraulicBoundaryLocationCalculations); + ShowDesignWaterLevelCalculationsView(hydraulicBoundaryLocationCalculations, assessmentSection, testForm); - ShowFullyConfiguredDesignWaterLevelCalculationsView(hydraulicBoundaryLocationCalculations, testForm); + var location = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0); + assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases[0].Locations.Add(location); const double designWaterLevel = 10.23; - var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)) + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(location) { InputParameters = { @@ -249,7 +254,7 @@ Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue); Assert.AreEqual("10", cells[locationNameColumnIndex].FormattedValue); Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue); - Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue); + Assert.AreEqual("database1", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue); Assert.AreEqual(designWaterLevel, cells[designWaterLevelColumnIndex].Value); } @@ -372,12 +377,8 @@ const double targetProbability = 0.01; const string calculationIdentifier = "1/100"; - var assessmentSection = mockRepository.Stub(); - assessmentSection.Stub(a => a.Id).Return(string.Empty); - assessmentSection.Stub(a => a.FailureMechanismContribution) - .Return(FailureMechanismContributionTestFactory.CreateFailureMechanismContribution()); - assessmentSection.Stub(a => a.Attach(null)).IgnoreArguments(); - assessmentSection.Stub(a => a.Detach(null)).IgnoreArguments(); + IObservableEnumerable hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + AssessmentSectionStub assessmentSection = GetConfiguredAssessmentSectionStub(hydraulicBoundaryLocationCalculations); var guiService = mockRepository.StrictMock(); @@ -396,8 +397,6 @@ mockRepository.ReplayAll(); - IObservableEnumerable hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); - DesignWaterLevelCalculationsView view = ShowDesignWaterLevelCalculationsView(hydraulicBoundaryLocationCalculations, assessmentSection, targetProbability, @@ -469,12 +468,18 @@ return view; } + private static DesignWaterLevelCalculationsView ShowDesignWaterLevelCalculationsView(IObservableEnumerable calculations, + IAssessmentSection assessmentSection, + Form form) + { + return ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, 0.01, "1/100", form); + } + private static DesignWaterLevelCalculationsView ShowFullyConfiguredDesignWaterLevelCalculationsView(IObservableEnumerable calculations, Form form) { - var assessmentSection = new AssessmentSectionStub(); - - return ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, 0.01, "1/100", form); + AssessmentSectionStub assessmentSection = GetConfiguredAssessmentSectionStub(calculations); + return ShowDesignWaterLevelCalculationsView(calculations, assessmentSection, form); } private static ObservableList GetTestHydraulicBoundaryLocationCalculations() @@ -516,6 +521,29 @@ }; } + private static AssessmentSectionStub GetConfiguredAssessmentSectionStub(IObservableEnumerable calculations) + { + var hydraulicBoundaryDatabase1 = new HydraulicBoundaryDatabase + { + FilePath = @"path\to\database1.sqlite" + }; + hydraulicBoundaryDatabase1.Locations.AddRange(calculations.Take(2).Select(c => c.HydraulicBoundaryLocation)); + + var hydraulicBoundaryDatabase2 = new HydraulicBoundaryDatabase + { + FilePath = @"path\to\database2.sqlite" + }; + hydraulicBoundaryDatabase2.Locations.AddRange(calculations.Skip(2).Select(c => c.HydraulicBoundaryLocation)); + + var assessmentSection = new AssessmentSectionStub(); + assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.AddRange(new[] + { + hydraulicBoundaryDatabase1, + hydraulicBoundaryDatabase2 + }); + return assessmentSection; + } + [TestFixture] private class ViewSynchronizationTest : HydraulicBoundaryCalculationsViewSynchronizationTester { Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs =================================================================== diff -u -r456902fa04e4ec7359fe49348d5d7df56c18b1fd -r7d699456f50b25493e9a9f25667470efcc30b1b7 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs (.../WaveHeightCalculationsViewTest.cs) (revision 456902fa04e4ec7359fe49348d5d7df56c18b1fd) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/Views/WaveHeightCalculationsViewTest.cs (.../WaveHeightCalculationsViewTest.cs) (revision 7d699456f50b25493e9a9f25667470efcc30b1b7) @@ -25,7 +25,6 @@ using System.Linq; using System.Windows.Forms; using Core.Common.Base; -using Core.Common.Base.Geometry; using Core.Common.Controls.DataGrid; using NUnit.Extensions.Forms; using NUnit.Framework; @@ -49,7 +48,7 @@ private const int includeIllustrationPointsColumnIndex = 1; private const int locationNameColumnIndex = 2; private const int locationIdColumnIndex = 3; - private const int locationColumnIndex = 4; + private const int hydraulicBoundaryDatabaseFileNameColumnIndex = 4; private const int waveHeightColumnIndex = 5; private Form testForm; @@ -144,24 +143,27 @@ var calculateColumn = (DataGridViewCheckBoxColumn) calculationsDataGridView.Columns[calculateColumnIndex]; Assert.AreEqual("Berekenen", calculateColumn.HeaderText); + Assert.IsTrue(calculateColumn.Visible); var includeIllustrationPointsColumn = (DataGridViewCheckBoxColumn) calculationsDataGridView.Columns[includeIllustrationPointsColumnIndex]; Assert.AreEqual("Illustratiepunten inlezen", includeIllustrationPointsColumn.HeaderText); + Assert.IsTrue(includeIllustrationPointsColumn.Visible); var locationNameColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[locationNameColumnIndex]; Assert.AreEqual("Naam", locationNameColumn.HeaderText); + Assert.IsTrue(locationNameColumn.Visible); var locationIdColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[locationIdColumnIndex]; Assert.AreEqual("ID", locationIdColumn.HeaderText); + Assert.IsTrue(locationIdColumn.Visible); - var locationColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[locationColumnIndex]; - Assert.AreEqual("Coördinaten [m]", locationColumn.HeaderText); + var hydraulicBoundaryDatabaseFileNameColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[hydraulicBoundaryDatabaseFileNameColumnIndex]; + Assert.AreEqual("HRD bestand", hydraulicBoundaryDatabaseFileNameColumn.HeaderText); + Assert.IsFalse(hydraulicBoundaryDatabaseFileNameColumn.Visible); var waveHeightColumn = (DataGridViewTextBoxColumn) calculationsDataGridView.Columns[waveHeightColumnIndex]; Assert.AreEqual("Golfhoogte [m]", waveHeightColumn.HeaderText); - - var button = (Button) testForm.Controls.Find("CalculateForSelectedButton", true).First(); - Assert.IsFalse(button.Enabled); + Assert.IsTrue(waveHeightColumn.Visible); } [Test] @@ -181,7 +183,7 @@ Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue); Assert.AreEqual("1", cells[locationNameColumnIndex].FormattedValue); Assert.AreEqual("1", cells[locationIdColumnIndex].FormattedValue); - Assert.AreEqual(new Point2D(1, 1).ToString(), cells[locationColumnIndex].FormattedValue); + Assert.AreEqual("database1", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue); Assert.AreEqual("-", cells[waveHeightColumnIndex].FormattedValue); cells = rows[1].Cells; @@ -190,7 +192,7 @@ Assert.AreEqual(false, cells[includeIllustrationPointsColumnIndex].FormattedValue); Assert.AreEqual("2", cells[locationNameColumnIndex].FormattedValue); Assert.AreEqual("2", cells[locationIdColumnIndex].FormattedValue); - Assert.AreEqual(new Point2D(2, 2).ToString(), cells[locationColumnIndex].FormattedValue); + Assert.AreEqual("database1", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue); Assert.AreEqual(1.23.ToString(CultureInfo.CurrentCulture), cells[waveHeightColumnIndex].FormattedValue); cells = rows[2].Cells; @@ -199,7 +201,7 @@ Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue); Assert.AreEqual("3", cells[locationNameColumnIndex].FormattedValue); Assert.AreEqual("3", cells[locationIdColumnIndex].FormattedValue); - Assert.AreEqual(new Point2D(3, 3).ToString(), cells[locationColumnIndex].FormattedValue); + Assert.AreEqual("database2", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue); Assert.AreEqual("-", cells[waveHeightColumnIndex].FormattedValue); cells = rows[3].Cells; @@ -208,7 +210,7 @@ Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue); Assert.AreEqual("4", cells[locationNameColumnIndex].FormattedValue); Assert.AreEqual("4", cells[locationIdColumnIndex].FormattedValue); - Assert.AreEqual(new Point2D(4, 4).ToString(), cells[locationColumnIndex].FormattedValue); + Assert.AreEqual("database2", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue); Assert.AreEqual(1.01.ToString(CultureInfo.CurrentCulture), cells[waveHeightColumnIndex].FormattedValue); } @@ -217,11 +219,14 @@ { // Setup ObservableList hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + AssessmentSectionStub assessmentSection = GetConfiguredAssessmentSectionStub(hydraulicBoundaryLocationCalculations); + ShowWaveHeightCalculationsView(hydraulicBoundaryLocationCalculations, assessmentSection, testForm); - ShowFullyConfiguredWaveHeightCalculationsView(hydraulicBoundaryLocationCalculations, testForm); + var location = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0); + assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases[0].Locations.Add(location); const double waveHeight = 10.23; - var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(10, "10", 10.0, 10.0)) + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(location) { InputParameters = { @@ -249,7 +254,7 @@ Assert.AreEqual(true, cells[includeIllustrationPointsColumnIndex].FormattedValue); Assert.AreEqual("10", cells[locationNameColumnIndex].FormattedValue); Assert.AreEqual("10", cells[locationIdColumnIndex].FormattedValue); - Assert.AreEqual(new Point2D(10, 10).ToString(), cells[locationColumnIndex].FormattedValue); + Assert.AreEqual("database1", cells[hydraulicBoundaryDatabaseFileNameColumnIndex].FormattedValue); Assert.AreEqual(waveHeight, cells[waveHeightColumnIndex].Value); } @@ -372,12 +377,8 @@ const double targetProbability = 0.01; const string calculationIdentifier = "1/100"; - var assessmentSection = mockRepository.Stub(); - assessmentSection.Stub(a => a.Id).Return(string.Empty); - assessmentSection.Stub(a => a.FailureMechanismContribution) - .Return(FailureMechanismContributionTestFactory.CreateFailureMechanismContribution()); - assessmentSection.Stub(a => a.Attach(null)).IgnoreArguments(); - assessmentSection.Stub(a => a.Detach(null)).IgnoreArguments(); + IObservableEnumerable hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); + AssessmentSectionStub assessmentSection = GetConfiguredAssessmentSectionStub(hydraulicBoundaryLocationCalculations); var guiService = mockRepository.StrictMock(); @@ -396,8 +397,6 @@ mockRepository.ReplayAll(); - IObservableEnumerable hydraulicBoundaryLocationCalculations = GetTestHydraulicBoundaryLocationCalculations(); - WaveHeightCalculationsView view = ShowWaveHeightCalculationsView(hydraulicBoundaryLocationCalculations, assessmentSection, targetProbability, @@ -469,12 +468,18 @@ return view; } + private static WaveHeightCalculationsView ShowWaveHeightCalculationsView(IObservableEnumerable calculations, + IAssessmentSection assessmentSection, + Form form) + { + return ShowWaveHeightCalculationsView(calculations, assessmentSection, 0.01, "1/100", form); + } + private static WaveHeightCalculationsView ShowFullyConfiguredWaveHeightCalculationsView(IObservableEnumerable calculations, Form form) { - var assessmentSection = new AssessmentSectionStub(); - - return ShowWaveHeightCalculationsView(calculations, assessmentSection, 0.01, "1/100", form); + AssessmentSectionStub assessmentSection = GetConfiguredAssessmentSectionStub(calculations); + return ShowWaveHeightCalculationsView(calculations, assessmentSection, form); } private static ObservableList GetTestHydraulicBoundaryLocationCalculations() @@ -516,6 +521,29 @@ }; } + private static AssessmentSectionStub GetConfiguredAssessmentSectionStub(IObservableEnumerable calculations) + { + var hydraulicBoundaryDatabase1 = new HydraulicBoundaryDatabase + { + FilePath = @"path\to\database1.sqlite" + }; + hydraulicBoundaryDatabase1.Locations.AddRange(calculations.Take(2).Select(c => c.HydraulicBoundaryLocation)); + + var hydraulicBoundaryDatabase2 = new HydraulicBoundaryDatabase + { + FilePath = @"path\to\database2.sqlite" + }; + hydraulicBoundaryDatabase2.Locations.AddRange(calculations.Skip(2).Select(c => c.HydraulicBoundaryLocation)); + + var assessmentSection = new AssessmentSectionStub(); + assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases.AddRange(new[] + { + hydraulicBoundaryDatabase1, + hydraulicBoundaryDatabase2 + }); + return assessmentSection; + } + [TestFixture] private class ViewSynchronizationTest : HydraulicBoundaryCalculationsViewSynchronizationTester { Index: Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/HydraulicBoundaryCalculationsViewSynchronizationTester.cs =================================================================== diff -u -r456902fa04e4ec7359fe49348d5d7df56c18b1fd -r7d699456f50b25493e9a9f25667470efcc30b1b7 --- Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/HydraulicBoundaryCalculationsViewSynchronizationTester.cs (.../HydraulicBoundaryCalculationsViewSynchronizationTester.cs) (revision 456902fa04e4ec7359fe49348d5d7df56c18b1fd) +++ Riskeer/Common/test/Riskeer.Common.Forms.TestUtil/HydraulicBoundaryCalculationsViewSynchronizationTester.cs (.../HydraulicBoundaryCalculationsViewSynchronizationTester.cs) (revision 7d699456f50b25493e9a9f25667470efcc30b1b7) @@ -24,6 +24,7 @@ using Core.Common.Base; using Core.Common.Controls.DataGrid; using NUnit.Framework; +using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Data.TestUtil.IllustrationPoints; @@ -92,8 +93,12 @@ { ObservableList calculations = GetCalculationsInView(view); + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(10, "10", 10.0, 10.0); + IAssessmentSection assessmentSection = view.AssessmentSection; + assessmentSection.HydraulicBoundaryData.HydraulicBoundaryDatabases[0].Locations.Add(hydraulicBoundaryLocation); + calculations.Clear(); - calculations.Add(new HydraulicBoundaryLocationCalculation(new HydraulicBoundaryLocation(10, "10", 10.0, 10.0))); + calculations.Add(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation)); calculations.NotifyObservers(); }