Index: Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs =================================================================== diff -u -r7f321a7efae09f2bb00034e80af09f722fd7504b -rf8a7d087f4e89f29701f22a26df10ba70de34948 --- Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision 7f321a7efae09f2bb00034e80af09f722fd7504b) +++ Riskeer/Common/test/Riskeer.Common.Forms.Test/GuiServices/HydraulicBoundaryLocationCalculationGuiServiceTest.cs (.../HydraulicBoundaryLocationCalculationGuiServiceTest.cs) (revision f8a7d087f4e89f29701f22a26df10ba70de34948) @@ -140,29 +140,6 @@ } [Test] - public void CalculateDesignWaterLevels_InvalidTargetProbability_LogsError() - { - // Setup - var mocks = new MockRepository(); - var viewParent = mocks.Stub(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - mocks.ReplayAll(); - - assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath; - HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); - - var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); - - // Call - void Call() => guiService.CalculateDesignWaterLevels(Enumerable.Empty(), assessmentSection, 1.0, "1/1"); - - // Assert - TestHelper.AssertLogMessageIsGenerated(Call, "Berekeningen konden niet worden gestart. Doelkans is te groot om een berekening uit te kunnen voeren."); - - mocks.VerifyAll(); - } - - [Test] public void CalculateDesignWaterLevels_ValidPathEmptyCalculationList_NoLog() { // Setup @@ -320,28 +297,6 @@ } [Test] - public void CalculateWaveHeights_InvalidTargetProbability_LogsError() - { - // Setup - var mocks = new MockRepository(); - var viewParent = mocks.Stub(); - IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(mocks); - mocks.ReplayAll(); - - assessmentSection.HydraulicBoundaryDatabase.FilePath = validFilePath; - HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); - - var guiService = new HydraulicBoundaryLocationCalculationGuiService(viewParent); - - // Call - void Call() => guiService.CalculateWaveHeights(Enumerable.Empty(), assessmentSection, 1.0, "1/1"); - - // Assert - TestHelper.AssertLogMessageIsGenerated(Call, "Berekeningen konden niet worden gestart. Doelkans is te groot om een berekening uit te kunnen voeren."); - mocks.VerifyAll(); - } - - [Test] public void CalculateWaveHeights_ValidPathEmptyCalculationList_NoLog() { // Setup Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs =================================================================== diff -u -r5f3415e34c9038f35208cfcde244311bf8c5ccd3 -rf8a7d087f4e89f29701f22a26df10ba70de34948 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 5f3415e34c9038f35208cfcde244311bf8c5ccd3) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision f8a7d087f4e89f29701f22a26df10ba70de34948) @@ -27,7 +27,6 @@ using Riskeer.Common.Data.AssessmentSection; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.IO.HydraRing; -using Riskeer.Common.Service; using Riskeer.DuneErosion.Data; using Riskeer.DuneErosion.Service; using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources; @@ -91,11 +90,6 @@ preprocessorDirectory, hydraulicLocationConfigurationSettings.UsePreprocessorClosure); - if (string.IsNullOrEmpty(validationProblem)) - { - TargetProbabilityCalculationServiceHelper.ValidateTargetProbability(targetProbability, logMessage => validationProblem = logMessage); - } - if (!string.IsNullOrEmpty(validationProblem)) { log.ErrorFormat(RiskeerCommonFormsResources.CalculateHydraulicBoundaryLocation_Start_calculation_failed_0_, Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs =================================================================== diff -u -r853afa8062b4c071e59465213a1a20de97b7afa2 -rf8a7d087f4e89f29701f22a26df10ba70de34948 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs (.../DuneLocationCalculationGuiServiceTest.cs) (revision 853afa8062b4c071e59465213a1a20de97b7afa2) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs (.../DuneLocationCalculationGuiServiceTest.cs) (revision f8a7d087f4e89f29701f22a26df10ba70de34948) @@ -130,33 +130,6 @@ } [Test] - public void Calculate_InvalidTargetProbability_LogsError() - { - // Setup - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase - { - FilePath = validFilePath - }; - HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); - - var mocks = new MockRepository(); - var viewParent = mocks.Stub(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase) - .Return(hydraulicBoundaryDatabase); - mocks.ReplayAll(); - - var guiService = new DuneLocationCalculationGuiService(viewParent); - - // Call - void Call() => guiService.Calculate(Enumerable.Empty(), assessmentSection, 1.0, "1/1"); - - // Assert - TestHelper.AssertLogMessageIsGenerated(Call, "Berekeningen konden niet worden gestart. Doelkans is te groot om een berekening uit te kunnen voeren."); - mocks.VerifyAll(); - } - - [Test] public void Calculate_ValidPathEmptyCalculationList_NoLog() { // Setup