Index: Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs =================================================================== diff -u -ra9dc04dde69e1d7b8ebc2207dc45644d3c06a4bc -r6a8b1b5c3f3d8ff1115e39401bbe7aff42a1a5f7 --- Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision a9dc04dde69e1d7b8ebc2207dc45644d3c06a4bc) +++ Riskeer/Common/test/Riskeer.Common.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 6a8b1b5c3f3d8ff1115e39401bbe7aff42a1a5f7) @@ -72,16 +72,16 @@ { // Setup const string locationName = "locationName"; - const string categoryBoundaryName = "A"; + const string calculationIdentifier = "1/200"; // Call - TestDelegate call = () => new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)), - null, - 1, - categoryBoundaryName); + void Call() => new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)), + null, + validNorm, + calculationIdentifier); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("calculationSettings", exception.ParamName); } @@ -90,17 +90,17 @@ { // Setup const string locationName = "locationName"; - const string categoryBoundaryName = "A"; + const string calculationIdentifier = "1/200"; // Call var activity = new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)), CreateCalculationSettings(), - 1, - categoryBoundaryName); + validNorm, + calculationIdentifier); // Assert Assert.IsInstanceOf(activity); - Assert.AreEqual(GetActivityDescription(locationName, categoryBoundaryName), activity.Description); + Assert.AreEqual(GetActivityDescription(locationName, calculationIdentifier), activity.Description); Assert.IsNull(activity.ProgressText); Assert.AreEqual(ActivityState.None, activity.State); } @@ -111,7 +111,7 @@ // Setup string invalidFilePath = Path.Combine(testDataPath, "notexisting.sqlite"); const string locationName = "locationName"; - const string categoryBoundaryName = "A"; + const string calculationIdentifier = "1/200"; var settings = new HydraulicBoundaryCalculationSettings(invalidFilePath, validHlcdFilePath, @@ -120,17 +120,17 @@ var activity = new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)), settings, validNorm, - categoryBoundaryName); + calculationIdentifier); // Call - Action call = () => activity.Run(); + void Call() => activity.Run(); // Assert - TestHelper.AssertLogMessages(call, messages => + TestHelper.AssertLogMessages(Call, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); - Assert.AreEqual($"{GetActivityDescription(locationName, categoryBoundaryName)} is gestart.", msgs[0]); + Assert.AreEqual($"{GetActivityDescription(locationName, calculationIdentifier)} is gestart.", msgs[0]); CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]); StringAssert.StartsWith("Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. Fout bij het lezen van bestand", msgs[2]); CalculationServiceTestHelper.AssertValidationEndMessage(msgs[3]); @@ -144,7 +144,7 @@ // Setup const string invalidPreprocessorDirectory = "NonExistingPreprocessorDirectory"; const string locationName = "locationName"; - const string categoryBoundaryName = "A"; + const string calculationIdentifier = "1/200"; var settings = new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath, validHlcdFilePath, @@ -153,17 +153,17 @@ var activity = new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)), settings, validNorm, - categoryBoundaryName); + calculationIdentifier); // Call - Action call = () => activity.Run(); + void Call() => activity.Run(); // Assert - TestHelper.AssertLogMessages(call, messages => + TestHelper.AssertLogMessages(Call, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); - Assert.AreEqual($"{GetActivityDescription(locationName, categoryBoundaryName)} is gestart.", msgs[0]); + Assert.AreEqual($"{GetActivityDescription(locationName, calculationIdentifier)} is gestart.", msgs[0]); CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]); Assert.AreEqual("De bestandsmap waar de preprocessor bestanden opslaat is ongeldig. De bestandsmap bestaat niet.", msgs[2]); CalculationServiceTestHelper.AssertValidationEndMessage(msgs[3]); @@ -176,22 +176,22 @@ { // Setup const string locationName = "locationName"; - const string categoryBoundaryName = "A"; + const string calculationIdentifier = "1/1"; var activity = new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation(locationName)), CreateCalculationSettings(), 1.0, - categoryBoundaryName); + calculationIdentifier); // Call - Action call = () => activity.Run(); + void Call() => activity.Run(); // Assert - TestHelper.AssertLogMessages(call, messages => + TestHelper.AssertLogMessages(Call, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); - Assert.AreEqual($"{GetActivityDescription(locationName, categoryBoundaryName)} is gestart.", msgs[0]); + Assert.AreEqual($"{GetActivityDescription(locationName, calculationIdentifier)} is gestart.", msgs[0]); CalculationServiceTestHelper.AssertValidationStartMessage(msgs[1]); Assert.AreEqual("Doelkans is te groot om een berekening uit te kunnen voeren.", msgs[2]); CalculationServiceTestHelper.AssertValidationEndMessage(msgs[3]); @@ -206,7 +206,7 @@ { // Setup const string locationName = "locationName"; - const string categoryBoundaryName = "A"; + const string calculationIdentifier = "1/30"; const double norm = 1.0 / 30; var calculator = new TestDesignWaterLevelCalculator @@ -236,7 +236,7 @@ var activity = new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation), calculationSettings, norm, - categoryBoundaryName); + calculationIdentifier); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { @@ -258,7 +258,7 @@ { // Setup const string locationName = "locationName"; - const string categoryBoundaryName = "A"; + const string calculationIdentifier = "1/30"; const double norm = 1.0 / 30; var calculator = new TestDesignWaterLevelCalculator @@ -280,19 +280,19 @@ var activity = new DesignWaterLevelCalculationActivity(new HydraulicBoundaryLocationCalculation(hydraulicBoundaryLocation), calculationSettings, norm, - categoryBoundaryName); + calculationIdentifier); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call - Action call = () => activity.Run(); + void Call() => activity.Run(); // Assert - TestHelper.AssertLogMessages(call, m => + TestHelper.AssertLogMessages(Call, m => { string[] messages = m.ToArray(); Assert.AreEqual(6, messages.Length); - Assert.AreEqual($"{GetActivityDescription(locationName, categoryBoundaryName)} is gestart.", messages[0]); + Assert.AreEqual($"{GetActivityDescription(locationName, calculationIdentifier)} is gestart.", messages[0]); CalculationServiceTestHelper.AssertValidationStartMessage(messages[1]); CalculationServiceTestHelper.AssertValidationEndMessage(messages[2]); CalculationServiceTestHelper.AssertCalculationStartMessage(messages[3]); @@ -334,7 +334,7 @@ var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocationCalculation, CreateCalculationSettings(), norm, - "A"); + "1/30"); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { @@ -359,7 +359,7 @@ { // Setup const string locationName = "locationName"; - const string categoryBoundaryName = "A"; + const string calculationIdentifier = "1/200"; var calculator = new TestDesignWaterLevelCalculator { @@ -387,26 +387,26 @@ var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocationCalculation, CreateCalculationSettings(), validNorm, - categoryBoundaryName); + calculationIdentifier); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call - Action call = () => activity.Run(); + void Call() => activity.Run(); // Assert - TestHelper.AssertLogMessages(call, m => + TestHelper.AssertLogMessages(Call, m => { string[] messages = m.ToArray(); Assert.AreEqual(7, messages.Length); - Assert.AreEqual($"{GetActivityDescription(locationName, categoryBoundaryName)} is gestart.", messages[0]); + Assert.AreEqual($"{GetActivityDescription(locationName, calculationIdentifier)} is gestart.", messages[0]); CalculationServiceTestHelper.AssertValidationStartMessage(messages[1]); CalculationServiceTestHelper.AssertValidationEndMessage(messages[2]); CalculationServiceTestHelper.AssertCalculationStartMessage(messages[3]); string expectedFailureMessage = string.IsNullOrEmpty(lastErrorFileContent) - ? $"Er is een fout opgetreden tijdens de waterstand berekening voor locatie '{locationName}' (Categoriegrens {categoryBoundaryName}). Er is geen foutrapport beschikbaar." - : $"Er is een fout opgetreden tijdens de waterstand berekening voor locatie '{locationName}' (Categoriegrens {categoryBoundaryName}). Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{lastErrorFileContent}"; + ? $"Er is een fout opgetreden tijdens de waterstand berekening voor locatie '{locationName}' ({calculationIdentifier}). Er is geen foutrapport beschikbaar." + : $"Er is een fout opgetreden tijdens de waterstand berekening voor locatie '{locationName}' ({calculationIdentifier}). Bekijk het foutrapport door op details te klikken.{Environment.NewLine}{lastErrorFileContent}"; Assert.AreEqual(expectedFailureMessage, messages[4]); StringAssert.StartsWith("Waterstand berekening is uitgevoerd op de tijdelijke locatie", messages[5]); @@ -426,7 +426,7 @@ { // Setup const string locationName = "locationName"; - const string categoryBoundaryName = "A"; + const string calculationIdentifier = "1/300"; var calculator = new TestDesignWaterLevelCalculator { @@ -454,19 +454,19 @@ var activity = new DesignWaterLevelCalculationActivity(hydraulicBoundaryLocationCalculation, CreateCalculationSettings(), norm, - categoryBoundaryName); + calculationIdentifier); using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call - Action call = () => activity.Run(); + void Call() => activity.Run(); // Assert - TestHelper.AssertLogMessages(call, messages => + TestHelper.AssertLogMessages(Call, messages => { string[] msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); - Assert.AreEqual($"Waterstand berekening voor locatie 'locationName' (Categoriegrens {categoryBoundaryName}) is niet geconvergeerd.", msgs[4]); + Assert.AreEqual($"Waterstand berekening voor locatie 'locationName' ({calculationIdentifier}) is niet geconvergeerd.", msgs[4]); }); Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocationCalculation.Output.CalculationConvergence); } @@ -482,7 +482,7 @@ public void Finish_ActivityWithSpecificState_NotifyHydraulicBoundaryLocationCalculation(ActivityState state) { // Setup - const string categoryBoundaryName = "A"; + const string calculationIdentifier = "1/200"; var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()); @@ -494,8 +494,8 @@ var activity = new TestDesignWaterLevelCalculationActivity(hydraulicBoundaryLocationCalculation, CreateCalculationSettings(), - 1.0, - categoryBoundaryName, + validNorm, + calculationIdentifier, state); // Call @@ -505,9 +505,9 @@ mockRepository.VerifyAll(); } - private static string GetActivityDescription(string locationName, string categoryBoundaryName) + private static string GetActivityDescription(string locationName, string calculationIdentifier) { - return $"Waterstand berekenen voor locatie '{locationName}' (Categoriegrens {categoryBoundaryName})"; + return $"Waterstand berekenen voor locatie '{locationName}' ({calculationIdentifier})"; } private static HydraulicBoundaryCalculationSettings CreateCalculationSettings()