Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs
===================================================================
diff -u -rf0a2ec89952a42ebdedbea6efac5fe7196f3b46a -r886f53016571b5d7a65318c6e29d6da9385bbade
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision f0a2ec89952a42ebdedbea6efac5fe7196f3b46a)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 886f53016571b5d7a65318c6e29d6da9385bbade)
@@ -33,7 +33,7 @@
namespace Ringtoets.DuneErosion.Forms.GuiServices
{
///
- /// This class is responsible for calculating the .
+ /// This class is responsible for performing dune location calculations.
///
public class DuneLocationCalculationGuiService
{
@@ -56,14 +56,13 @@
}
///
- /// Performs the calculation for all .
+ /// Performs all .
///
- /// The collection of to perform
- /// the calculation for.
+ /// The collection of to perform.
/// The hydraulic boundary database file
- /// that should be used for performing the calculation.
+ /// that should be used for performing the calculations.
/// The preprocessor directory.
- /// The norm to use during the calculation.
+ /// The norm to use during the calculations.
/// Preprocessing is disabled when
/// equals .
/// Thrown when is null.
Index: Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneLocationCalculationService.cs
===================================================================
diff -u -r3138d37a28dbf3a67ca33262e9ee404f082857c1 -r886f53016571b5d7a65318c6e29d6da9385bbade
--- Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneLocationCalculationService.cs (.../DuneLocationCalculationService.cs) (revision 3138d37a28dbf3a67ca33262e9ee404f082857c1)
+++ Ringtoets/DuneErosion/src/Ringtoets.DuneErosion.Service/DuneLocationCalculationService.cs (.../DuneLocationCalculationService.cs) (revision 886f53016571b5d7a65318c6e29d6da9385bbade)
@@ -90,7 +90,7 @@
}
///
- /// Performs a dune location calculation based on the supplied
+ /// Performs the provided
/// and sets its output if the calculation is successful.
/// Error and status information is logged during the execution of the operation.
///
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs
===================================================================
diff -u -rf0d6c65c6d7251bdc0c2cde6128d5777cff9ed49 -r886f53016571b5d7a65318c6e29d6da9385bbade
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs (.../DuneLocationCalculationGuiServiceTest.cs) (revision f0d6c65c6d7251bdc0c2cde6128d5777cff9ed49)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs (.../DuneLocationCalculationGuiServiceTest.cs) (revision 886f53016571b5d7a65318c6e29d6da9385bbade)
@@ -83,7 +83,7 @@
}
[Test]
- public void Calculate_ValidData_ScheduleAllLocations()
+ public void Calculate_ValidData_ScheduleAllCalculations()
{
// Setup
var duneLocationCalculations = new[]
@@ -185,10 +185,10 @@
}
[Test]
- public void Calculate_ValidPathOneLocationInTheList_LogsMessages()
+ public void Calculate_ValidPathOneCalculationInTheList_LogsMessages()
{
// Setup
- const string hydraulicLocationName = "name";
+ const string duneLocationName = "name";
var viewParent = mockRepository.Stub();
@@ -203,7 +203,7 @@
// Call
Action call = () => guiService.Calculate(new []
{
- new DuneLocationCalculation(new TestDuneLocation(hydraulicLocationName))
+ new DuneLocationCalculation(new TestDuneLocation(duneLocationName))
},
validFilePath,
validPreprocessorDirectory,
@@ -215,12 +215,12 @@
string[] msgs = messages.ToArray();
Assert.AreEqual(8, msgs.Length);
- string calculationName = $"Hydraulische belasting berekenen voor locatie '{hydraulicLocationName}'";
- Assert.AreEqual($"Hydraulische randvoorwaarden berekenen voor locatie '{hydraulicLocationName}' is gestart.", msgs[0]);
+ string calculationName = $"Hydraulische belasting berekenen voor locatie '{duneLocationName}'";
+ Assert.AreEqual($"Hydraulische randvoorwaarden berekenen voor locatie '{duneLocationName}' is gestart.", msgs[0]);
CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]);
CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
CalculationServiceTestHelper.AssertCalculationStartMessage(msgs[3]);
- Assert.AreEqual($"Hydraulische randvoorwaarden berekening voor locatie '{hydraulicLocationName}' is niet geconvergeerd.", msgs[4]);
+ Assert.AreEqual($"Hydraulische randvoorwaarden berekening voor locatie '{duneLocationName}' is niet geconvergeerd.", msgs[4]);
StringAssert.StartsWith("Hydraulische randvoorwaarden berekening is uitgevoerd op de tijdelijke locatie", msgs[5]);
CalculationServiceTestHelper.AssertCalculationEndMessage(msgs[6]);
StringAssert.AreNotEqualIgnoringCase($"Uitvoeren van '{calculationName}' is gelukt.", msgs[7]);
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityTest.cs
===================================================================
diff -u -rf0a2ec89952a42ebdedbea6efac5fe7196f3b46a -r886f53016571b5d7a65318c6e29d6da9385bbade
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityTest.cs (.../DuneLocationCalculationActivityTest.cs) (revision f0a2ec89952a42ebdedbea6efac5fe7196f3b46a)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationActivityTest.cs (.../DuneLocationCalculationActivityTest.cs) (revision 886f53016571b5d7a65318c6e29d6da9385bbade)
@@ -150,7 +150,7 @@
}
[Test]
- public void Run_ValidHydraulicBoundaryDatabaseAndDuneLocation_PerformValidationValidParameters()
+ public void Run_ValidHydraulicBoundaryDatabaseAndDuneLocationCalculation_PerformValidationValidParameters()
{
// Setup
const double norm = 1.0 / 30;
Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationServiceTest.cs
===================================================================
diff -u -r7d7a01ed91dd10bc4795528179b5f35e5f59f1bd -r886f53016571b5d7a65318c6e29d6da9385bbade
--- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationServiceTest.cs (.../DuneLocationCalculationServiceTest.cs) (revision 7d7a01ed91dd10bc4795528179b5f35e5f59f1bd)
+++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Service.Test/DuneLocationCalculationServiceTest.cs (.../DuneLocationCalculationServiceTest.cs) (revision 886f53016571b5d7a65318c6e29d6da9385bbade)
@@ -269,11 +269,6 @@
.Return(calculator);
mockRepository.ReplayAll();
- var failureMechanism = new DuneErosionFailureMechanism
- {
- Contribution = 10
- };
-
var duneLocation = new TestDuneLocation("Name");
var duneLocationCalculation = new DuneLocationCalculation(duneLocation);