Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs =================================================================== diff -u -r8dd568726bfcaf1f2c517f6e7c76ebe2b0f7e8b1 -r1d87f0ce3727b1ef85f5d9e739bc642bddf960a4 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision 8dd568726bfcaf1f2c517f6e7c76ebe2b0f7e8b1) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationRowTest.cs (.../MacroStabilityInwardsCalculationRowTest.cs) (revision 1d87f0ce3727b1ef85f5d9e739bc642bddf960a4) @@ -30,6 +30,7 @@ using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.PropertyClasses; using Riskeer.Common.Forms.TestUtil; +using Riskeer.Common.Forms.Views; using Riskeer.MacroStabilityInwards.Data; using Riskeer.MacroStabilityInwards.Data.SoilProfile; using Riskeer.MacroStabilityInwards.Data.TestUtil; @@ -72,6 +73,8 @@ var row = new MacroStabilityInwardsCalculationRow(calculation, handler); // Assert + Assert.IsInstanceOf>(row); + Assert.AreSame(calculation, row.Calculation); Assert.AreEqual(calculation.Name, row.Name); Assert.AreSame(calculation.InputParameters.StochasticSoilModel, row.StochasticSoilModel.WrappedObject); Index: Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs =================================================================== diff -u -ra7a5111f48d0187ac735816b8366df498d237524 -r1d87f0ce3727b1ef85f5d9e739bc642bddf960a4 --- Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision a7a5111f48d0187ac735816b8366df498d237524) +++ Riskeer/MacroStabilityInwards/test/Riskeer.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 1d87f0ce3727b1ef85f5d9e739bc642bddf960a4) @@ -100,7 +100,7 @@ } [Test] - public void MacroStabilityInwardsCalculationsView_CalculationsWithCorrespondingStochasticSoilModel_StochasticSoilModelsComboboxCorrectlyInitialized() + public void CalculationsView_FailureMechanismWithCorrespondingStochasticSoilModels_StochasticSoilModelsComboboxCorrectlyInitialized() { // Setup var mocks = new MockRepository(); @@ -132,7 +132,7 @@ } [Test] - public void MacroStabilityInwardsCalculationsView_CalculationsWithCorrespondingSoilProfiles_SoilProfilesComboboxCorrectlyInitialized() + public void CalculationsView_FailureMechanismWithCorrespondingSoilProfiles_SoilProfilesComboboxCorrectlyInitialized() { // Setup var mocks = new MockRepository(); @@ -164,7 +164,7 @@ } [Test] - public void MacroStabilityInwardsCalculationsView_CalculationsWithAllDataSet_DataGridViewCorrectlyInitialized() + public void CalculationsView_CalculationsWithAllDataSet_DataGridViewCorrectlyInitialized() { // Setup var mocks = new MockRepository(); @@ -290,7 +290,7 @@ } [Test] - public void GivenMacroStabilityInwardsCalculationsView_WhenGenerateScenariosButtonClicked_ThenShowViewWithSurfaceLines() + public void GivenCalculationsView_WhenGenerateScenariosButtonClicked_ThenShowViewWithSurfaceLines() { // Given var mocks = new MockRepository(); @@ -337,7 +337,7 @@ [Test] [TestCase("DoForSelectedButton")] [TestCase("CustomCancelButton")] - public void GivenMacroStabilityInwardsCalculationsViewGenerateScenariosButtonClicked_WhenDialogClosed_ThenNotifyCalculationGroup(string buttonName) + public void GivenCalculationsViewGenerateScenariosButtonClicked_WhenDialogClosed_ThenNotifyCalculationGroup(string buttonName) { // Given var mocks = new MockRepository(); @@ -381,7 +381,7 @@ } [Test] - public void GivenMacroStabilityInwardsCalculationsViewGenerateScenariosButtonClicked_WhenSurfaceLineSelectedAndDialogClosed_ThenUpdateSectionResultScenarios() + public void GivenCalculationsViewGenerateScenariosButtonClicked_WhenSurfaceLineSelectedAndDialogClosed_ThenUpdateSectionResultScenarios() { // Given var mocks = new MockRepository(); @@ -424,7 +424,7 @@ } [Test] - public void GivenMacroStabilityInwardsCalculationsViewGenerateScenariosCancelButtonClicked_WhenDialogClosed_CalculationsNotUpdated() + public void GivenCalculationsViewGenerateScenariosCancelButtonClicked_WhenDialogClosed_CalculationsNotUpdated() { // Given var mocks = new MockRepository(); @@ -594,7 +594,7 @@ [TestCase(stochasticSoilProfilesColumnIndex, null, false)] [TestCase(selectableHydraulicBoundaryLocationsColumnIndex, null, true)] [TestCase(selectableHydraulicBoundaryLocationsColumnIndex, null, false)] - public void MacroStabilityInwardsCalculationsView_EditingPropertyViaDataGridView_ObserversCorrectlyNotified( + public void CalculationsView_EditingPropertyViaDataGridView_ObserversCorrectlyNotified( int cellIndex, object newValue, bool useCalculationWithOutput) @@ -649,7 +649,7 @@ } [Test] - public void GivenMacroStabilityInwardsCalculationsViewWithStochasticSoilProfile_WhenProbabilityChangesAndNotified_ThenNewProbabilityVisible() + public void GivenCalculationsViewWithStochasticSoilProfile_WhenProbabilityChangesAndNotified_ThenNewProbabilityVisible() { // Given var mocks = new MockRepository(); @@ -689,7 +689,7 @@ } [Test] - public void GivenMacroStabilityInwardsCalculationsViewWithCalculations_WhenSurfaceLineLocatedOutsideSectionAfterUpdateAndObserversNotified_ThenDataGridViewUpdated() + public void GivenCalculationsViewWithCalculations_WhenSurfaceLineLocatedOutsideSectionAfterUpdateAndObserversNotified_ThenDataGridViewUpdated() { // Given var mocks = new MockRepository(); @@ -748,7 +748,7 @@ [TestCase(true)] [TestCase(false)] - public void MacroStabilityInwardsCalculationsViewWithHydraulicLocation_SpecificUseAssessmentLevelManualInputState_SelectableHydraulicLocationReadonlyAccordingly(bool useAssessmentLevelManualInput) + public void CalculationsViewWithHydraulicLocation_SpecificUseAssessmentLevelManualInputState_SelectableHydraulicLocationReadonlyAccordingly(bool useAssessmentLevelManualInput) { // Setup var mocks = new MockRepository(); Index: Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -ra7a5111f48d0187ac735816b8366df498d237524 -r1d87f0ce3727b1ef85f5d9e739bc642bddf960a4 --- Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision a7a5111f48d0187ac735816b8366df498d237524) +++ Riskeer/Piping/test/Riskeer.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 1d87f0ce3727b1ef85f5d9e739bc642bddf960a4) @@ -110,7 +110,7 @@ } [Test] - public void PipingCalculationsView_CalculationsWithCorrespondingStochasticSoilModel_StochasticSoilModelsComboboxCorrectlyInitialized() + public void CalculationsView_FailureMechanismWithStochasticSoilModels_StochasticSoilModelsComboboxCorrectlyInitialized() { // Setup var mocks = new MockRepository(); @@ -142,7 +142,7 @@ } [Test] - public void PipingCalculationsView_CalculationsWithCorrespondingSoilProfiles_SoilProfilesComboboxCorrectlyInitialized() + public void CalculationsView_FailureMechanismWithCorrespondingSoilProfiles_SoilProfilesComboboxCorrectlyInitialized() { // Setup var mocks = new MockRepository(); @@ -174,7 +174,7 @@ } [Test] - public void PipingCalculationsView_CalculationsWithAllDataSet_DataGridViewCorrectlyInitialized() + public void CalculationsView_CalculationsWithAllDataSet_DataGridViewCorrectlyInitialized() { // Setup var mocks = new MockRepository(); @@ -230,7 +230,7 @@ [TestCase(";/[].,~!@#$%^&*()_-+={}|?", phreaticLevelExitMeanColumnIndex)] [TestCase(";/[].,~!@#$%^&*()_-+={}|?", entryPointLColumnIndex)] [TestCase(";/[].,~!@#$%^&*()_-+={}|?", exitPointLColumnIndex)] - public void PipingCalculationsView_EditValueInvalid_ShowsErrorTooltip(string newValue, int cellIndex) + public void CalculationsView_EditValueInvalid_ShowsErrorTooltip(string newValue, int cellIndex) { // Setup var mocks = new MockRepository(); @@ -311,7 +311,7 @@ ShowPipingCalculationsView(new CalculationGroup(), failureMechanism, assessmentSection); - var button = (Button)new ControlTester("generateButton").TheObject; + var button = (Button) new ControlTester("generateButton").TheObject; // Call bool state = button.Enabled; @@ -338,7 +338,7 @@ ShowPipingCalculationsView(new CalculationGroup(), failureMechanism, assessmentSection); - var button = (Button)new ControlTester("generateButton").TheObject; + var button = (Button) new ControlTester("generateButton").TheObject; // Call bool state = button.Enabled; @@ -381,7 +381,7 @@ } [Test] - public void GivenPipingCalculationsView_WhenGenerateScenariosButtonClicked_ThenShowViewWithSurfaceLines() + public void GivenCalculationsView_WhenGenerateScenariosButtonClicked_ThenShowViewWithSurfaceLines() { // Given var mocks = new MockRepository(); @@ -428,7 +428,7 @@ [Test] [TestCase("DoForSelectedButton")] [TestCase("CustomCancelButton")] - public void GivenPipingCalculationsViewGenerateScenariosButtonClicked_WhenDialogClosed_ThenNotifyCalculationGroup(string buttonName) + public void GivenCalculationsViewGenerateScenariosButtonClicked_WhenDialogClosed_ThenNotifyCalculationGroup(string buttonName) { // Given var mocks = new MockRepository(); @@ -472,7 +472,7 @@ } [Test] - public void GivenPipingCalculationsViewGenerateScenariosButtonClicked_WhenSurfaceLineSelectedAndDialogClosed_ThenUpdateSectionResultScenarios() + public void GivenCalculationsViewGenerateScenariosButtonClicked_WhenSurfaceLineSelectedAndDialogClosed_ThenUpdateSectionResultScenarios() { // Given var mocks = new MockRepository(); @@ -515,7 +515,7 @@ } [Test] - public void GivenPipingCalculationsViewGenerateScenariosCancelButtonClicked_WhenDialogClosed_CalculationsNotUpdated() + public void GivenCalculationsViewGenerateScenariosCancelButtonClicked_WhenDialogClosed_CalculationsNotUpdated() { // Given var mocks = new MockRepository(); @@ -565,7 +565,7 @@ failureMechanism.NotifyObservers(); // Then - var button = (Button)new ControlTester("generateButton").TheObject; + var button = (Button) new ControlTester("generateButton").TheObject; Assert.IsFalse(button.Enabled); mocks.VerifyAll(); } @@ -590,7 +590,7 @@ failureMechanism.NotifyObservers(); // Then - var button = (Button)new ControlTester("generateButton").TheObject; + var button = (Button) new ControlTester("generateButton").TheObject; Assert.IsFalse(button.Enabled); mocks.VerifyAll(); } @@ -603,14 +603,14 @@ var assessmentSection = mocks.Stub(); ConfigureHydraulicBoundaryDatabase(assessmentSection); mocks.ReplayAll(); - + PipingFailureMechanism failureMechanism = ConfigureFailureMechanism(); - + ShowPipingCalculationsView(ConfigureCalculationGroup(assessmentSection, failureMechanism), failureMechanism, assessmentSection); - var dataGridView = (DataGridView)new ControlTester("dataGridView").TheObject; - var soilModelsComboBox = (DataGridViewComboBoxColumn)dataGridView.Columns[stochasticSoilModelsColumnIndex]; - var soilProfilesComboBox = (DataGridViewComboBoxColumn)dataGridView.Columns[stochasticSoilProfilesColumnIndex]; + var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; + var soilModelsComboBox = (DataGridViewComboBoxColumn) dataGridView.Columns[stochasticSoilModelsColumnIndex]; + var soilProfilesComboBox = (DataGridViewComboBoxColumn) dataGridView.Columns[stochasticSoilProfilesColumnIndex]; // Precondition Assert.AreEqual(4, soilModelsComboBox.Items.Count); @@ -668,7 +668,7 @@ [TestCase(entryPointLColumnIndex, 4.44)] [TestCase(exitPointLColumnIndex, 2.22)] [TestCase(exitPointLColumnIndex, 1.1)] - public void PipingCalculationsView_InvalidEntryOrExitPoint_ShowsErrorTooltip(int cellIndex, double newValue) + public void CalculationsView_InvalidEntryOrExitPoint_ShowsErrorTooltip(int cellIndex, double newValue) { // Setup var mocks = new MockRepository(); @@ -704,7 +704,7 @@ [TestCase(entryPointLColumnIndex, -1.0)] [TestCase(exitPointLColumnIndex, 10.1)] [TestCase(exitPointLColumnIndex, 11.0)] - public void PipingCalculationsView_EntryOrExitPointNotOnSurfaceLine_ShowsErrorToolTip(int cellIndex, double newValue) + public void CalculationsView_EntryOrExitPointNotOnSurfaceLine_ShowsErrorToolTip(int cellIndex, double newValue) { // Setup var mocks = new MockRepository(); @@ -780,7 +780,7 @@ [TestCase(entryPointLColumnIndex, 1.1, false)] [TestCase(exitPointLColumnIndex, 8.0, true)] [TestCase(exitPointLColumnIndex, 8.0, false)] - public void PipingCalculationsView_EditingPropertyViaDataGridView_ObserversCorrectlyNotified( + public void CalculationsView_EditingPropertyViaDataGridView_ObserversCorrectlyNotified( int cellIndex, object newValue, bool useCalculationWithOutput) @@ -835,7 +835,7 @@ } [Test] - public void GivenPipingCalculationsViewWithStochasticSoilProfile_WhenProbabilityChangesAndNotified_ThenNewProbabilityVisible() + public void GivenCalculationsViewWithStochasticSoilProfile_WhenProbabilityChangesAndNotified_ThenNewProbabilityVisible() { // Given var mocks = new MockRepository(); @@ -845,7 +845,7 @@ PipingFailureMechanism failureMechanism = ConfigureFailureMechanism(); CalculationGroup calculationGroup = ConfigureCalculationGroup(assessmentSection, failureMechanism); - + ShowPipingCalculationsView(calculationGroup, failureMechanism, assessmentSection); var calculation = (PipingCalculationScenario) calculationGroup.Children[1]; @@ -875,7 +875,7 @@ } [Test] - public void GivenPipingCalculationsViewWithCalculations_WhenSurfaceLineLocatedOutsideSectionAfterUpdateAndObserversNotified_ThenDataGridViewUpdated() + public void GivenCalculationsViewWithCalculations_WhenSurfaceLineLocatedOutsideSectionAfterUpdateAndObserversNotified_ThenDataGridViewUpdated() { // Given var mocks = new MockRepository(); @@ -934,7 +934,7 @@ [TestCase(true)] [TestCase(false)] - public void PipingCalculationsViewWithHydraulicLocation_SpecificUseAssessmentLevelManualInputState_SelectableHydraulicLocationReadonlyAccordingly(bool useAssessmentLevelManualInput) + public void CalculationsViewWithHydraulicLocation_SpecificUseAssessmentLevelManualInputState_SelectableHydraulicLocationReadonlyAccordingly(bool useAssessmentLevelManualInput) { // Setup var mocks = new MockRepository();