Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -rd84083bdbd06350e904ba709cdd0a760f6f62b75 -r2ce40d38e1bd7cdfcd0ffd596ffe044e06efa538
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision d84083bdbd06350e904ba709cdd0a760f6f62b75)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 2ce40d38e1bd7cdfcd0ffd596ffe044e06efa538)
@@ -354,15 +354,6 @@
}
///
- /// Looks up a localized string similar to Berekeningen konden niet worden gestart. {0}.
- ///
- public static string CalculateHydraulicBoundaryLocation_Start_calculation_failed_0_ {
- get {
- return ResourceManager.GetString("CalculateHydraulicBoundaryLocation_Start_calculation_failed_0_", resourceCulture);
- }
- }
-
- ///
/// Looks up a localized resource of type System.Drawing.Bitmap.
///
public static System.Drawing.Bitmap CalculateIcon {
Index: Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx
===================================================================
diff -u -rd84083bdbd06350e904ba709cdd0a760f6f62b75 -r2ce40d38e1bd7cdfcd0ffd596ffe044e06efa538
--- Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision d84083bdbd06350e904ba709cdd0a760f6f62b75)
+++ Riskeer/Common/src/Riskeer.Common.Forms/Properties/Resources.resx (.../Resources.resx) (revision 2ce40d38e1bd7cdfcd0ffd596ffe044e06efa538)
@@ -560,9 +560,6 @@
De coördinaten van de locatie van het voorlandprofiel in het Rijksdriehoeksstelsel.
-
- Berekeningen konden niet worden gestart. {0}
-
Eigenschappen van de voorlandgeometrie.
Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryDataTest.cs
===================================================================
diff -u -r954e74e2d422a0c74fd8da84a1a564e9e1541f9b -r2ce40d38e1bd7cdfcd0ffd596ffe044e06efa538
--- Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryDataTest.cs (.../HydraulicBoundaryDataTest.cs) (revision 954e74e2d422a0c74fd8da84a1a564e9e1541f9b)
+++ Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryDataTest.cs (.../HydraulicBoundaryDataTest.cs) (revision 2ce40d38e1bd7cdfcd0ffd596ffe044e06efa538)
@@ -36,7 +36,6 @@
// Assert
Assert.IsInstanceOf(hydraulicBoundaryData);
- Assert.IsNull(hydraulicBoundaryData.FilePath);
Assert.IsNull(hydraulicBoundaryData.Version);
Assert.IsNotNull(hydraulicBoundaryData.HydraulicLocationConfigurationDatabase);
CollectionAssert.IsEmpty(hydraulicBoundaryData.HydraulicBoundaryDatabases);
Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -r2ce40d38e1bd7cdfcd0ffd596ffe044e06efa538
--- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 2ce40d38e1bd7cdfcd0ffd596ffe044e06efa538)
@@ -23,10 +23,7 @@
using System.Collections.Generic;
using Core.Gui.Forms;
using Core.Gui.Forms.ProgressDialog;
-using log4net;
using Riskeer.Common.Data.AssessmentSection;
-using Riskeer.Common.Data.Hydraulics;
-using Riskeer.Common.IO.HydraRing;
using Riskeer.DuneErosion.Data;
using Riskeer.DuneErosion.Service;
using RiskeerCommonFormsResources = Riskeer.Common.Forms.Properties.Resources;
@@ -38,7 +35,6 @@
///
public class DuneLocationCalculationGuiService
{
- private static readonly ILog log = LogManager.GetLogger(typeof(DuneLocationCalculationGuiService));
private readonly IViewParent viewParent;
///
@@ -81,25 +77,8 @@
throw new ArgumentNullException(nameof(assessmentSection));
}
- string hrdFilePath = assessmentSection.HydraulicBoundaryData.FilePath;
- HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase = assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationDatabase;
-
- string validationProblem = HydraulicBoundaryDataHelper.ValidateFilesForCalculation(hrdFilePath,
- hydraulicLocationConfigurationDatabase.FilePath,
- hydraulicLocationConfigurationDatabase.UsePreprocessorClosure);
-
- if (!string.IsNullOrEmpty(validationProblem))
- {
- log.ErrorFormat(RiskeerCommonFormsResources.CalculateHydraulicBoundaryLocation_Start_calculation_failed_0_,
- validationProblem);
- return;
- }
-
- ActivityProgressDialogRunner.Run(viewParent,
- DuneLocationCalculationActivityFactory.CreateCalculationActivities(calculations,
- assessmentSection,
- targetProbability,
- calculationIdentifier));
+ ActivityProgressDialogRunner.Run(viewParent, DuneLocationCalculationActivityFactory.CreateCalculationActivities(
+ calculations, assessmentSection, targetProbability, calculationIdentifier));
}
}
}
\ No newline at end of file
Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -r528226fedca9e3d8338642cb20775ecc95e75eac -r2ce40d38e1bd7cdfcd0ffd596ffe044e06efa538
--- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs (.../DuneLocationCalculationGuiServiceTest.cs) (revision 528226fedca9e3d8338642cb20775ecc95e75eac)
+++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs (.../DuneLocationCalculationGuiServiceTest.cs) (revision 2ce40d38e1bd7cdfcd0ffd596ffe044e06efa538)
@@ -97,38 +97,6 @@
}
[Test]
- public void Calculate_HydraulicBoundaryDatabaseDoesNotExist_LogsError()
- {
- // Setup
- var hydraulicBoundaryData = new HydraulicBoundaryData
- {
- FilePath = "Does not exist"
- };
-
- var mocks = new MockRepository();
- var viewParent = mocks.Stub();
- var assessmentSection = mocks.Stub();
- assessmentSection.Stub(a => a.HydraulicBoundaryData)
- .Return(hydraulicBoundaryData);
- mocks.ReplayAll();
-
- var guiService = new DuneLocationCalculationGuiService(viewParent);
-
- // Call
- void Call() => guiService.Calculate(Enumerable.Empty(), assessmentSection, 0.01, "1/100");
-
- // Assert
- TestHelper.AssertLogMessages(Call, messages =>
- {
- string[] msgs = messages.ToArray();
- Assert.AreEqual(1, msgs.Length);
- StringAssert.StartsWith("Berekeningen konden niet worden gestart. ", msgs.First());
- });
-
- mocks.VerifyAll();
- }
-
- [Test]
public void Calculate_ValidPathEmptyCalculationList_NoLog()
{
// Setup