Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4f7dea208a70e4e3862a47a44028d6601e6f695f --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/RingtoetsDataSynchronizationServiceTest.cs (.../RingtoetsDataSynchronizationServiceTest.cs) (revision 4f7dea208a70e4e3862a47a44028d6601e6f695f) @@ -48,10 +48,7 @@ using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.WaveImpactAsphaltCover.Data; -using GeneralPipingInput = Ringtoets.Piping.Data.GeneralPipingInput; -using PipingCalculation = Ringtoets.Piping.Data.PipingCalculation; -using PipingCalculationScenario = Ringtoets.Piping.Data.PipingCalculationScenario; -using StochasticSoilModel = Ringtoets.Piping.Data.StochasticSoilModel; +using PipingStochasticSoilModel = Ringtoets.Piping.Data.StochasticSoilModel; namespace Ringtoets.Integration.Service.Test { @@ -1434,7 +1431,7 @@ { yield return calculationBase; } - foreach (StochasticSoilModel stochasticSoilModel in failureMechanism.StochasticSoilModels) + foreach (PipingStochasticSoilModel stochasticSoilModel in failureMechanism.StochasticSoilModels) { yield return stochasticSoilModel; } Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioFactoryTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4f7dea208a70e4e3862a47a44028d6601e6f695f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioFactoryTest.cs (.../MacroStabilityInwardsCalculationScenarioFactoryTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Data.TestUtil.Test/MacroStabilityInwardsCalculationScenarioFactoryTest.cs (.../MacroStabilityInwardsCalculationScenarioFactoryTest.cs) (revision 4f7dea208a70e4e3862a47a44028d6601e6f695f) @@ -42,10 +42,10 @@ } [Test] - [TestCase(double.NaN)] - [TestCase(0.0)] - [TestCase(0.8)] - [TestCase(1.0)] + [TestCase(double.NaN, TestName = "CreateCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSet(NaN)")] + [TestCase(0.0, TestName = "CreateCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSet(0.0)")] + [TestCase(0.8, TestName = "CreateCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSet(0.8)")] + [TestCase(1.0, TestName = "CreateCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSet(1.0)")] public void CreateMacroStabilityInwardsCalculationScenario_WithSection_CreatesRelevantCalculationWithOutputSet(double probability) { // Setup Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4f7dea208a70e4e3862a47a44028d6601e6f695f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/Views/MacroStabilityInwardsCalculationsViewTest.cs (.../MacroStabilityInwardsCalculationsViewTest.cs) (revision 4f7dea208a70e4e3862a47a44028d6601e6f695f) @@ -616,7 +616,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(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Builders/SoilLayer1DTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4f7dea208a70e4e3862a47a44028d6601e6f695f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Builders/SoilLayer1DTest.cs (.../SoilLayer1DTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Builders/SoilLayer1DTest.cs (.../SoilLayer1DTest.cs) (revision 4f7dea208a70e4e3862a47a44028d6601e6f695f) @@ -51,7 +51,7 @@ [TestCase(1.0)] [TestCase(1.0 + 1e-12)] [TestCase(2.0)] - public void AsMacroStabilityInwardsSoilLayer_PropertiesSetWithCorrectDistributionsAndDifferentLayerParameters_PropertiesAreSetInMacroStabilityInwardsSoilLayer(double isAquifer) + public void AsMacroStabilityInwardsSoilLayer_PropertiesSetWithCorrectParameters_PropertiesAreSetInMacroStabilityInwardsSoilLayer(double isAquifer) { // Setup var random = new Random(22); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Importers/MacroStabilityInwardsCalculationConfigurationImporterTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4f7dea208a70e4e3862a47a44028d6601e6f695f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Importers/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Importers/MacroStabilityInwardsCalculationConfigurationImporterTest.cs (.../MacroStabilityInwardsCalculationConfigurationImporterTest.cs) (revision 4f7dea208a70e4e3862a47a44028d6601e6f695f) @@ -278,9 +278,9 @@ } [Test] - [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml", false)] - [TestCase("validConfigurationFullCalculationContainingAssessmentLevel.xml", true)] - public void Import_ValidConfigurationWithValidHydraulicBoundaryData_DataAddedToModel(string file, bool manualAssessmentLevel) + [TestCase(false, "validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml")] + [TestCase(true, "validConfigurationFullCalculationContainingAssessmentLevel.xml")] + public void Import_ValidConfigurationWithValidHydraulicBoundaryData_DataAddedToModel(bool manualAssessmentLevel, string file) { // Setup string filePath = Path.Combine(readerPath, file); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Readers/MacroStabilityInwardsCalculationConfigurationReaderTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4f7dea208a70e4e3862a47a44028d6601e6f695f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Readers/MacroStabilityInwardsCalculationConfigurationReaderTest.cs (.../MacroStabilityInwardsCalculationConfigurationReaderTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/Readers/MacroStabilityInwardsCalculationConfigurationReaderTest.cs (.../MacroStabilityInwardsCalculationConfigurationReaderTest.cs) (revision 4f7dea208a70e4e3862a47a44028d6601e6f695f) @@ -171,9 +171,9 @@ [Test] [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation.xml", - TestName = "Read_ValidConfigurationWithFullCalculationContainingHydraulicBoundaryLocation_ReturnMacroStabilityInwardsCalculation(HydraulicBoundaryLocation)")] + TestName = "Read_ValidConfigurationWithFullCalculationContainingHydraulicBoundaryLocation_ReturnCalculation(HydraulicBoundaryLocation)")] [TestCase("validConfigurationFullCalculationContainingHydraulicBoundaryLocation_differentOrder.xml", - TestName = "Read_ValidConfigurationWithFullCalculationContainingHydraulicBoundaryLocation_ReturnMacroStabilityInwardsCalculation(HydraulicBoundaryLocation_differentOrder)")] + TestName = "Read_ValidConfigurationWithFullCalculationContainingHydraulicBoundaryLocation_ReturnCalculation(HydraulicBoundaryLocation_differentOrder)")] public void Read_ValidConfigurationWithFullCalculationContainingHydraulicBoundaryLocation_ReturnExpectedReadMacroStabilityInwardsCalculation(string fileName) { // Setup @@ -197,9 +197,9 @@ [Test] [TestCase("validConfigurationFullCalculationContainingAssessmentLevel.xml", - TestName = "Read_ValidConfigurationWithFullCalculationContainingAssessmentLevel_ReturnMacroStabilityInwardsCalculation(AssessmentLevel)")] + TestName = "Read_ValidConfigurationWithFullCalculationContainingAssessmentLevel_ReturnCalculation(AssessmentLevel)")] [TestCase("validConfigurationFullCalculationContainingAssessmentLevel_differentOrder.xml", - TestName = "Read_ValidConfigurationWithFullCalculationContainingAssessmentLevel_ReturnMacroStabilityInwardsCalculation(AssessmentLevel_differentOrder)")] + TestName = "Read_ValidConfigurationWithFullCalculationContainingAssessmentLevel_ReturnCalculation(AssessmentLevel_differentOrder)")] public void Read_ValidConfigurationWithFullCalculationContainingAssessmentLevel_ReturnExpectedReadMacroStabilityInwardsCalculation(string fileName) { // Setup Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/MacroStabilityInwardsSoilProfileReaderTest.cs =================================================================== diff -u -r616d3ed2e3262894d16948262fa1b223d2bc806e -r4f7dea208a70e4e3862a47a44028d6601e6f695f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/MacroStabilityInwardsSoilProfileReaderTest.cs (.../MacroStabilityInwardsSoilProfileReaderTest.cs) (revision 616d3ed2e3262894d16948262fa1b223d2bc806e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.IO.Test/SoilProfile/MacroStabilityInwardsSoilProfileReaderTest.cs (.../MacroStabilityInwardsSoilProfileReaderTest.cs) (revision 4f7dea208a70e4e3862a47a44028d6601e6f695f) @@ -303,11 +303,10 @@ } [Test] - [TestCase("incorrectValue2dStochastProperty.soil", "Ondergrondschematisatie bevat geen geldige waarde in kolom \'BelowPhreaticLevelMean\'.")] [TestCase("incorrectValue2dProperty.soil", "Ondergrondschematisatie bevat geen geldige waarde in kolom \'Color\'.")] [TestCase("invalidTop1dProfile.soil", "Ondergrondschematisatie bevat geen geldige waarde in kolom \'Top\'.")] [TestCase("invalidBottom1dProfile.soil", "Ondergrondschematisatie bevat geen geldige waarde in kolom \'Bottom\'.")] - public void ReadProfile_DatabaseProfileWithLayerWithIncorrectDistributionForBelowPhreaticLevelProperty_ThrowsMacroStabilityInwardsSoilProfileReadException( + public void ReadProfile_ProfileWithLayerIncorrectColumnValue_ThrowsMacroStabilityInwardsSoilProfileReadException( string testFile, string expectedMessage) { Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4f7dea208a70e4e3862a47a44028d6601e6f695f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs (.../RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategyTest.cs) (revision 4f7dea208a70e4e3862a47a44028d6601e6f695f) @@ -933,59 +933,6 @@ } [Test] - public void UpdateSurfaceLinesWithImportedData_WithCalculationAssignedToRemovedLine_UpdatesCalculationAndDoesNotRemoveStochasticSoilModelInput() - { - // Setup - var soilModel = new StochasticSoilModel(1, "A", "B") - { - Geometry = - { - new Point2D(2, -1), - new Point2D(2, 1) - } - }; - - RingtoetsMacroStabilityInwardsSurfaceLine surfaceLine = CreateValidSurfaceLineForCalculations(); - var calculation = new MacroStabilityInwardsCalculation(new GeneralMacroStabilityInwardsInput()) - { - InputParameters = - { - SurfaceLine = surfaceLine, - StochasticSoilModel = soilModel - } - }; - - var failureMechanism = new MacroStabilityInwardsFailureMechanism(); - failureMechanism.CalculationsGroup.Children.Add(calculation); - failureMechanism.SurfaceLines.AddRange(new[] - { - surfaceLine - }, "path"); - failureMechanism.StochasticSoilModels.AddRange(new[] - { - soilModel - }, "path"); - - var strategy = new RingtoetsMacroStabilityInwardsSurfaceLineUpdateDataStrategy(failureMechanism); - - // Call - IEnumerable affectedObjects = strategy.UpdateSurfaceLinesWithImportedData(failureMechanism.SurfaceLines, - Enumerable.Empty(), - "path").ToArray(); - - // Assert - MacroStabilityInwardsInput calculationInput = calculation.InputParameters; - CollectionAssert.AreEquivalent(new IObservable[] - { - failureMechanism.SurfaceLines, - calculationInput - }, affectedObjects); - Assert.IsNull(calculationInput.SurfaceLine); - Assert.AreSame(soilModel, calculationInput.StochasticSoilModel); - Assert.IsNull(calculationInput.StochasticSoilProfile); - } - - [Test] public void UpdateSurfaceLinesWithImportedData_MultipleCalculations_OnlyUpdatesCalculationWithUpdatedSurfaceLine() { // Setup Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r616d3ed2e3262894d16948262fa1b223d2bc806e -r4f7dea208a70e4e3862a47a44028d6601e6f695f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 616d3ed2e3262894d16948262fa1b223d2bc806e) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 4f7dea208a70e4e3862a47a44028d6601e6f695f) @@ -885,8 +885,8 @@ } [Test] - [TestCase(false)] - [TestCase(true)] + [TestCase(false, TestName = "ContextMenuStrip_ClearOutput_ClearOutputCalculationsAndNotifyObservers(false)")] + [TestCase(true, TestName = "ContextMenuStrip_ClearOutput_ClearOutputCalculationsAndNotifyObservers(true)")] public void ContextMenuStrip_ClickOnClearOutputItem_ClearOutputAllChildCalculationsAndNotifyCalculationObservers(bool confirm) { // Setup Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4f7dea208a70e4e3862a47a44028d6601e6f695f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 4f7dea208a70e4e3862a47a44028d6601e6f695f) @@ -392,7 +392,7 @@ [Test] [TestCase(true)] [TestCase(false)] - public void OnNodeRemoved_ParentIsMacroStabilityInwardsCalculationGroupContext_RemoveCalculationFromGroup(bool groupNameEditable) + public void OnNodeRemoved_ParentIsCalculationGroupContext_RemoveCalculationFromGroup(bool groupNameEditable) { // Setup var observer = mocks.StrictMock(); @@ -435,7 +435,7 @@ [Test] [TestCase(true)] [TestCase(false)] - public void OnNodeRemoved_ParentIsMacroStabilityInwardsCalculationGroupContext_RemoveCalculationFromSectionResult(bool groupNameEditable) + public void OnNodeRemoved_ParentIsCalculationGroupContext_RemoveCalculationFromSectionResult(bool groupNameEditable) { // Setup var observer = mocks.StrictMock(); @@ -662,8 +662,8 @@ } [Test] - [TestCase(true)] - [TestCase(false)] + [TestCase(true, "GivenCalculation_WhenClearingOutputFromContextMenu_ThenOutputClearedAndNotified(true)")] + [TestCase(false, "GivenCalculation_WhenClearingOutputFromContextMenu_ThenOutputClearedAndNotified(false)")] public void GivenCalculationWithOutput_WhenClearingOutputFromContextMenu_ThenCalculationOutputClearedAndNotified(bool confirm) { // Given @@ -725,19 +725,6 @@ } } - private static void ChangeSurfaceLine(RingtoetsMacroStabilityInwardsSurfaceLine surfaceLine) - { - surfaceLine.SetGeometry(new[] - { - new Point3D(0, 0, 0), - new Point3D(1, 0, 2), - new Point3D(2, 0, 3), - new Point3D(3, 0, 0), - new Point3D(4, 0, 2), - new Point3D(5, 0, 3) - }); - } - public override void TearDown() { plugin.Dispose(); Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r650fc7b43cb6729baee51d079f0377df8d7a3de9 -r4f7dea208a70e4e3862a47a44028d6601e6f695f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 650fc7b43cb6729baee51d079f0377df8d7a3de9) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 4f7dea208a70e4e3862a47a44028d6601e6f695f) @@ -219,8 +219,8 @@ } [Test] - [TestCase(false)] - [TestCase(true)] + [TestCase(false, TestName = "GivenMultipleCalculations_WhenClearingOutputFromContextMenu_ThenOutputCleared(false)")] + [TestCase(true, TestName = "GivenMultipleCalculations_WhenClearingOutputFromContextMenu_ThenOutputCleared(true)")] public void GivenMultipleCalculationsWithOutput_WhenClearingOutputFromContextMenu_ThenOutputCleared(bool confirm) { // Given