Index: Ringtoets.sln
===================================================================
diff -u -r9779d1ab6b555c557e8fd18f4430ad207bd003da -ra1d8b4b58632ae45df9bde7fe7eaa69f3864507a
--- Ringtoets.sln (.../Ringtoets.sln) (revision 9779d1ab6b555c557e8fd18f4430ad207bd003da)
+++ Ringtoets.sln (.../Ringtoets.sln) (revision a1d8b4b58632ae45df9bde7fe7eaa69f3864507a)
@@ -1649,6 +1649,11 @@
{C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
EndProjectSection
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Ringtoets.GrassCoverErosionInwards.Service.TestUtil", "Ringtoets\GrassCoverErosionInwards\test\Ringtoets.GrassCoverErosionInwards.Service.TestUtil\Ringtoets.GrassCoverErosionInwards.Service.TestUtil.csproj", "{61506E11-2D00-44FE-AB74-44D5766DF457}"
+ ProjectSection(ProjectDependencies) = postProject
+ {C90B77DA-E421-43CC-B82E-529651BC21AC} = {C90B77DA-E421-43CC-B82E-529651BC21AC}
+ EndProjectSection
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
CreateInstaller|x86 = CreateInstaller|x86
@@ -4147,6 +4152,14 @@
{52093DA6-D545-476A-ADFD-12F56625E36B}.Release|x86.Build.0 = Release|x86
{52093DA6-D545-476A-ADFD-12F56625E36B}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
{52093DA6-D545-476A-ADFD-12F56625E36B}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
+ {61506E11-2D00-44FE-AB74-44D5766DF457}.CreateInstaller|x86.ActiveCfg = Release|x86
+ {61506E11-2D00-44FE-AB74-44D5766DF457}.CreateInstallerWithDemoProject|x86.ActiveCfg = Release|x86
+ {61506E11-2D00-44FE-AB74-44D5766DF457}.Debug|x86.ActiveCfg = Debug|x86
+ {61506E11-2D00-44FE-AB74-44D5766DF457}.Debug|x86.Build.0 = Debug|x86
+ {61506E11-2D00-44FE-AB74-44D5766DF457}.Release|x86.ActiveCfg = Release|x86
+ {61506E11-2D00-44FE-AB74-44D5766DF457}.Release|x86.Build.0 = Release|x86
+ {61506E11-2D00-44FE-AB74-44D5766DF457}.ReleaseForCodeCoverage|x86.ActiveCfg = ReleaseForCodeCoverage|x86
+ {61506E11-2D00-44FE-AB74-44D5766DF457}.ReleaseForCodeCoverage|x86.Build.0 = ReleaseForCodeCoverage|x86
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -4503,6 +4516,7 @@
{77F983B7-EEAA-4348-8799-CDF79248BCC9} = {A39CC244-FBB2-4221-82B9-92CC837EF1DC}
{1FD22BC2-B3D5-49D5-9E9B-694BE547DB6D} = {D9DC93FF-DCF3-44A4-9193-9911966CDFF4}
{52093DA6-D545-476A-ADFD-12F56625E36B} = {B5F4F5A5-FD36-405D-ABA1-56C270207C8F}
+ {61506E11-2D00-44FE-AB74-44D5766DF457} = {1C1E8754-CF61-4858-9CEE-3E5DE344474F}
EndGlobalSection
GlobalSection(TextTemplating) = postSolution
TextTemplating = 1
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs
===================================================================
diff -u -r6bc7d332c95f37bc4192dbd574d2ff6ce28ad6c0 -ra1d8b4b58632ae45df9bde7fe7eaa69f3864507a
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision 6bc7d332c95f37bc4192dbd574d2ff6ce28ad6c0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision a1d8b4b58632ae45df9bde7fe7eaa69f3864507a)
@@ -38,6 +38,7 @@
using Ringtoets.Common.Service.TestUtil;
using Ringtoets.GrassCoverErosionInwards.Data;
using Ringtoets.GrassCoverErosionInwards.Service;
+using Ringtoets.GrassCoverErosionInwards.Service.TestUtil;
using Ringtoets.HydraRing.Calculation.Calculator.Factory;
using Ringtoets.HydraRing.Calculation.Data;
using Ringtoets.HydraRing.Calculation.Data.Input.Hydraulics;
@@ -51,9 +52,6 @@
[TestFixture]
public class GrassCoverErosionInwardsCalculationActivityIntegrationTest
{
- private const string overtoppingCalculationDescription = "overloop en overslag";
- private const string overtoppingRateCalculationDescription = "overslagdebiet";
- private const string hbnCalculationDescription = "HBN";
private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation");
private static readonly string validFile = Path.Combine(testDataPath, "HRD dutch coast south.sqlite");
@@ -215,22 +213,6 @@
});
}
- private static void AssertCalculationFinishedMessage(string calculationDescription, string calculatorOutputDirectory, string actual)
- {
- Assert.AreEqual($"De {calculationDescription} berekening is uitgevoerd op de tijdelijke locatie '{calculatorOutputDirectory}'. " +
- "Gedetailleerde invoer en uitvoer kan in de bestanden op deze locatie worden gevonden.",
- actual);
- }
-
- private static void AssertCalculationFailedMessage(string calculationDescription, string calculationName, string detailedReport, string actual)
- {
- Assert.AreEqual($"De {calculationDescription} berekening voor grasbekleding erosie kruin en binnentalud '{calculationName}' is niet gelukt. " +
- (detailedReport != null
- ? $"Bekijk het foutrapport door op details te klikken.\r\n{detailedReport}"
- : "Er is geen foutrapport beschikbaar."),
- actual);
- }
-
#region Overtopping calculations
[Test]
@@ -353,7 +335,7 @@
CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]);
Assert.AreEqual($"De overloop en overslag berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. {detailedReport}", msgs[3]);
- AssertCalculationFinishedMessage(overtoppingCalculationDescription, calculator.OutputDirectory, msgs[4]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, calculator.OutputDirectory, msgs[4]);
CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[5]);
});
Assert.AreEqual(ActivityState.Failed, activity.State);
@@ -400,7 +382,7 @@
CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]);
- AssertCalculationFinishedMessage(overtoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[4]);
});
Assert.AreEqual(ActivityState.Executed, activity.State);
@@ -642,9 +624,9 @@
CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]);
- AssertCalculationFinishedMessage(overtoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
- AssertCalculationFailedMessage(hbnCalculationDescription, calculation.Name, dikeHeightCalculator.LastErrorFileContent, msgs[4]);
- AssertCalculationFinishedMessage(hbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[5]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, calculation.Name, dikeHeightCalculator.LastErrorFileContent, msgs[4]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[5]);
CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]);
});
Assert.AreEqual(ActivityState.Executed, activity.State);
@@ -700,9 +682,9 @@
CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]);
- AssertCalculationFinishedMessage(overtoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
- AssertCalculationFailedMessage(hbnCalculationDescription, calculation.Name, dikeHeightCalculator.LastErrorFileContent, msgs[4]);
- AssertCalculationFinishedMessage(hbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[5]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, calculation.Name, dikeHeightCalculator.LastErrorFileContent, msgs[4]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[5]);
CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]);
});
Assert.AreEqual(ActivityState.Executed, activity.State);
@@ -759,9 +741,9 @@
CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]);
- AssertCalculationFinishedMessage(overtoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
- AssertCalculationFailedMessage(hbnCalculationDescription, calculation.Name, dikeHeightCalculator.LastErrorFileContent, msgs[4]);
- AssertCalculationFinishedMessage(hbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[5]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, calculation.Name, dikeHeightCalculator.LastErrorFileContent, msgs[4]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[5]);
CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]);
});
Assert.AreEqual(ActivityState.Executed, activity.State);
@@ -824,8 +806,8 @@
CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]);
- AssertCalculationFinishedMessage(overtoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
- AssertCalculationFinishedMessage(hbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[4]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.HbnCalculationDescription, dikeHeightCalculator.OutputDirectory, msgs[4]);
Assert.AreEqual($"De HBN berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet geconvergeerd.", msgs[5]);
CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]);
});
@@ -1073,9 +1055,9 @@
CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]);
- AssertCalculationFinishedMessage(overtoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
- AssertCalculationFailedMessage(overtoppingRateCalculationDescription, calculation.Name, overtoppingRateCalculator.LastErrorFileContent, msgs[4]);
- AssertCalculationFinishedMessage(overtoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[5]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, calculation.Name, overtoppingRateCalculator.LastErrorFileContent, msgs[4]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[5]);
CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]);
});
Assert.AreEqual(ActivityState.Executed, activity.State);
@@ -1131,9 +1113,9 @@
CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]);
- AssertCalculationFinishedMessage(overtoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
- AssertCalculationFailedMessage(overtoppingRateCalculationDescription, calculation.Name, overtoppingRateCalculator.LastErrorFileContent, msgs[4]);
- AssertCalculationFinishedMessage(overtoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[5]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, calculation.Name, overtoppingRateCalculator.LastErrorFileContent, msgs[4]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[5]);
CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]);
});
Assert.AreEqual(ActivityState.Executed, activity.State);
@@ -1190,9 +1172,9 @@
CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]);
- AssertCalculationFinishedMessage(overtoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
- AssertCalculationFailedMessage(overtoppingRateCalculationDescription, calculation.Name, overtoppingRateCalculator.LastErrorFileContent, msgs[4]);
- AssertCalculationFinishedMessage(overtoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[5]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFailedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, calculation.Name, overtoppingRateCalculator.LastErrorFileContent, msgs[4]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[5]);
CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]);
});
Assert.AreEqual(ActivityState.Executed, activity.State);
@@ -1255,8 +1237,8 @@
CalculationServiceTestHelper.AssertValidationStartMessage(calculation.Name, msgs[0]);
CalculationServiceTestHelper.AssertValidationEndMessage(calculation.Name, msgs[1]);
CalculationServiceTestHelper.AssertCalculationStartMessage(calculation.Name, msgs[2]);
- AssertCalculationFinishedMessage(overtoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
- AssertCalculationFinishedMessage(overtoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[4]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingCalculationDescription, overtoppingCalculator.OutputDirectory, msgs[3]);
+ GrassCoverErosionInwardsCalculationServiceTestHelper.AssertCalculationFinishedMessage(GrassCoverErosionInwardsCalculationServiceTestHelper.OvertoppingRateCalculationDescription, overtoppingRateCalculator.OutputDirectory, msgs[4]);
Assert.AreEqual($"De overslagdebiet berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet geconvergeerd.", msgs[5]);
CalculationServiceTestHelper.AssertCalculationEndMessage(calculation.Name, msgs[6]);
});
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/Ringtoets.GrassCoverErosionInwards.Integration.Test.csproj
===================================================================
diff -u -r9779d1ab6b555c557e8fd18f4430ad207bd003da -ra1d8b4b58632ae45df9bde7fe7eaa69f3864507a
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/Ringtoets.GrassCoverErosionInwards.Integration.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Integration.Test.csproj) (revision 9779d1ab6b555c557e8fd18f4430ad207bd003da)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/Ringtoets.GrassCoverErosionInwards.Integration.Test.csproj (.../Ringtoets.GrassCoverErosionInwards.Integration.Test.csproj) (revision a1d8b4b58632ae45df9bde7fe7eaa69f3864507a)
@@ -145,6 +145,10 @@
{5D158D8E-A5EB-489C-A885-87E13BC0D3B3}
Ringtoets.GrassCoverErosionInwards.Service
+
+ {61506E11-2D00-44FE-AB74-44D5766DF457}
+ Ringtoets.GrassCoverErosionInwards.Service.TestUtil
+
+
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.TestUtil/packages.config
===================================================================
diff -u
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.TestUtil/packages.config (revision 0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.TestUtil/packages.config (revision a1d8b4b58632ae45df9bde7fe7eaa69f3864507a)
@@ -0,0 +1,26 @@
+
+
+
+
+
\ No newline at end of file