Index: Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs =================================================================== diff -u -rf0b908fddec69d796920753fa84fb8c0bac575ac -r1e096895772e9946fe12cd79003d895e094b5d4b --- Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision f0b908fddec69d796920753fa84fb8c0bac575ac) +++ Demo/Ringtoets/src/Demo.Ringtoets/Commands/AddNewDemoAssessmentSectionCommand.cs (.../AddNewDemoAssessmentSectionCommand.cs) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -91,7 +91,8 @@ hydraulicBoundaryDatabaseImporter.Import(demoAssessmentSection, filePath); } - SetHydraulicBoundaryLocationValues(demoAssessmentSection.HydraulicBoundaryDatabase.Locations); + SetHydraulicBoundaryLocationDesignWaterLevelValues(demoAssessmentSection.HydraulicBoundaryDatabase.Locations); + SetHydraulicBoundaryLocationWaveHeightValues(demoAssessmentSection.HydraulicBoundaryDatabase.Locations); } private void InitializeDemoFailureMechanismSections(AssessmentSection demoAssessmentSection) @@ -183,7 +184,7 @@ calculation.InputParameters.NotifyObservers(); } - private void SetHydraulicBoundaryLocationValues(ICollection locations) + private void SetHydraulicBoundaryLocationDesignWaterLevelValues(ICollection locations) { locations.ElementAt(0).DesignWaterLevel = 5.78; locations.ElementAt(1).DesignWaterLevel = 5.77; @@ -204,5 +205,27 @@ locations.ElementAt(16).DesignWaterLevel = 5.86; locations.ElementAt(17).DesignWaterLevel = 6.0; } + + private void SetHydraulicBoundaryLocationWaveHeightValues(ICollection locations) + { + locations.ElementAt(0).WaveHeight = 4.13374; + locations.ElementAt(1).WaveHeight = 4.19044; + locations.ElementAt(2).WaveHeight = 4.01717; + locations.ElementAt(3).WaveHeight = 3.87408; + locations.ElementAt(4).WaveHeight = 3.73281; + locations.ElementAt(5).WaveHeight = 2.65268; + locations.ElementAt(6).WaveHeight = 3.04333; + locations.ElementAt(7).WaveHeight = 3.19952; + locations.ElementAt(8).WaveHeight = 3.3554; + locations.ElementAt(9).WaveHeight = 3.52929; + locations.ElementAt(10).WaveHeight = 3.62194; + locations.ElementAt(11).WaveHeight = 3.6851; + locations.ElementAt(12).WaveHeight = 3.72909; + locations.ElementAt(13).WaveHeight = 3.74794; + locations.ElementAt(14).WaveHeight = 3.29686; + locations.ElementAt(15).WaveHeight = 9.57558; + locations.ElementAt(16).WaveHeight = 8.01959; + locations.ElementAt(17).WaveHeight = 4.11447; + } } } \ No newline at end of file Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs =================================================================== diff -u -rf0b908fddec69d796920753fa84fb8c0bac575ac -r1e096895772e9946fe12cd79003d895e094b5d4b --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision f0b908fddec69d796920753fa84fb8c0bac575ac) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Commands/AddNewDemoAssessmentSectionCommandTest.cs (.../AddNewDemoAssessmentSectionCommandTest.cs) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -75,7 +75,8 @@ Assert.IsTrue(File.Exists(Path.Combine(Path.GetDirectoryName(demoAssessmentSection.HydraulicBoundaryDatabase.FilePath), "HLCD.sqlite"))); var hydraulicBoundaryLocations = demoAssessmentSection.HydraulicBoundaryDatabase.Locations.ToArray(); Assert.AreEqual(18, hydraulicBoundaryLocations.Length); - AssertValuesOnHydraulicBoundaryLocations(hydraulicBoundaryLocations); + AssertDesignWaterLevelValuesOnHydraulicBoundaryLocations(hydraulicBoundaryLocations); + AssertWaveHeightValuesOnHydraulicBoundaryLocations(hydraulicBoundaryLocations); Assert.AreEqual(2380, demoAssessmentSection.ReferenceLine.Points.Count()); @@ -128,7 +129,7 @@ }, sectionResultWithCalculation.GetCalculationScenarios(calculations)); } - private void AssertValuesOnHydraulicBoundaryLocations(HydraulicBoundaryLocation[] hydraulicBoundaryLocations) + private void AssertDesignWaterLevelValuesOnHydraulicBoundaryLocations(HydraulicBoundaryLocation[] hydraulicBoundaryLocations) { Assert.AreEqual(5.78, hydraulicBoundaryLocations[0].DesignWaterLevel); Assert.AreEqual(5.77, hydraulicBoundaryLocations[1].DesignWaterLevel); @@ -150,6 +151,28 @@ Assert.AreEqual(6.0, hydraulicBoundaryLocations[17].DesignWaterLevel); } + private void AssertWaveHeightValuesOnHydraulicBoundaryLocations(HydraulicBoundaryLocation[] hydraulicBoundaryLocations) + { + Assert.AreEqual(4.13374, hydraulicBoundaryLocations[0].WaveHeight); + Assert.AreEqual(4.19044, hydraulicBoundaryLocations[1].WaveHeight); + Assert.AreEqual(4.01717, hydraulicBoundaryLocations[2].WaveHeight); + Assert.AreEqual(3.87408, hydraulicBoundaryLocations[3].WaveHeight); + Assert.AreEqual(3.73281, hydraulicBoundaryLocations[4].WaveHeight); + Assert.AreEqual(2.65268, hydraulicBoundaryLocations[5].WaveHeight); + Assert.AreEqual(3.04333, hydraulicBoundaryLocations[6].WaveHeight); + Assert.AreEqual(3.19952, hydraulicBoundaryLocations[7].WaveHeight); + Assert.AreEqual(3.3554, hydraulicBoundaryLocations[8].WaveHeight); + Assert.AreEqual(3.52929, hydraulicBoundaryLocations[9].WaveHeight); + Assert.AreEqual(3.62194, hydraulicBoundaryLocations[10].WaveHeight); + Assert.AreEqual(3.6851, hydraulicBoundaryLocations[11].WaveHeight); + Assert.AreEqual(3.72909, hydraulicBoundaryLocations[12].WaveHeight); + Assert.AreEqual(3.74794, hydraulicBoundaryLocations[13].WaveHeight); + Assert.AreEqual(3.29686, hydraulicBoundaryLocations[14].WaveHeight); + Assert.AreEqual(9.57558, hydraulicBoundaryLocations[15].WaveHeight); + Assert.AreEqual(8.01959, hydraulicBoundaryLocations[16].WaveHeight); + Assert.AreEqual(4.11447, hydraulicBoundaryLocations[17].WaveHeight); + } + private void AssertCharacteristicPointsOnSurfaceLines(RingtoetsPipingSurfaceLine[] surfaceLines) { var surfaceLine1 = surfaceLines.FirstOrDefault(s => s.Name == "PK001_0001"); Index: Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightContext.cs =================================================================== diff -u -rb32ec68f52968bc821b67cd973544bc2d0e7d568 -r1e096895772e9946fe12cd79003d895e094b5d4b --- Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightContext.cs (.../WaveHeightContext.cs) (revision b32ec68f52968bc821b67cd973544bc2d0e7d568) +++ Ringtoets/Integration/src/Ringtoets.Integration.Forms/PresentationObjects/WaveHeightContext.cs (.../WaveHeightContext.cs) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -31,7 +31,7 @@ public class WaveHeightContext : ObservableWrappedObjectContextBase { /// - /// Creates a new instance of . + /// Creates a new instance of . /// /// The which the belongs to. /// Thrown when is null. Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r5cf6fd5b4bd57890b104182c35fff4180b9d7aba -r1e096895772e9946fe12cd79003d895e094b5d4b --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 5cf6fd5b4bd57890b104182c35fff4180b9d7aba) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -451,8 +451,8 @@ yield return new TreeNodeInfo { - Text = designWaterLevel => RingtoetsFormsResources.WaveHeightContext_DisplayName, - Image = designWaterLevel => RingtoetsCommonFormsResources.GenericInputOutputIcon, + Text = waveHeight => RingtoetsFormsResources.WaveHeightContext_DisplayName, + Image = waveHeight => RingtoetsCommonFormsResources.GenericInputOutputIcon, CanRename = (context, o) => false, ForeColor = context => context.WrappedData.HydraulicBoundaryDatabase == null ? Color.FromKnownColor(KnownColor.GrayText) : Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -r499c3c7ddd3e75bc5b908d53e45401d42b66c3a6 -r1e096895772e9946fe12cd79003d895e094b5d4b --- Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 499c3c7ddd3e75bc5b908d53e45401d42b66c3a6) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -52,7 +52,8 @@ /// False if contains validation errors; True otherwise. internal static bool Validate(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, HydraulicBoundaryLocation hydraulicBoundaryLocation) { - CalculationServiceHelper.LogValidationBeginTime(hydraulicBoundaryLocation.Name); + var calculationName = string.Format(Resources.DesignWaterLevelCalculationService_Name_Assessment_level_for_location_0_, hydraulicBoundaryLocation.Name); + CalculationServiceHelper.LogValidationBeginTime(calculationName); var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabase.FilePath); var hasErrors = string.IsNullOrEmpty(validationProblem); @@ -63,7 +64,7 @@ validationProblem); } - CalculationServiceHelper.LogValidationEndTime(hydraulicBoundaryLocation.Name); + CalculationServiceHelper.LogValidationEndTime(calculationName); return hasErrors; } @@ -83,9 +84,10 @@ var hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabase.FilePath); var input = CreateInput(assessmentSection, hydraulicBoundaryLocation); var targetProbabilityCalculationParser = new TargetProbabilityCalculationParser(); + var calculationName = string.Format(Resources.DesignWaterLevelCalculationService_Name_Assessment_level_for_location_0_, hydraulicBoundaryLocation.Name); CalculationServiceHelper.PerformCalculation( - hydraulicBoundaryLocation.Name, + calculationName, () => { HydraRingCalculationService.PerformCalculation( Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Properties/Resources.Designer.cs =================================================================== diff -u -r5cf6fd5b4bd57890b104182c35fff4180b9d7aba -r1e096895772e9946fe12cd79003d895e094b5d4b --- Ringtoets/Integration/src/Ringtoets.Integration.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 5cf6fd5b4bd57890b104182c35fff4180b9d7aba) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Properties/Resources.Designer.cs (.../Resources.Designer.cs) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -71,6 +71,15 @@ } /// + /// Looks up a localized string similar to Toetspeil voor locatie {0}. + /// + internal static string DesignWaterLevelCalculationService_Name_Assessment_level_for_location_0_ { + get { + return ResourceManager.GetString("DesignWaterLevelCalculationService_Name_Assessment_level_for_location_0_", resourceCulture); + } + } + + /// /// Looks up a localized string similar to Toetspeil berekenen voor locatie '{0}'. /// internal static string DesignWaterLevelCalculationService_Name_Calculate_assessment_level_for_location_0_ { @@ -92,10 +101,19 @@ /// /// Looks up a localized string similar to Golfhoogte berekenen voor locatie '{0}'. /// - internal static string WaveHeightCalculationService_Name_Calculate_assessment_level_for_location_0_ { + internal static string WaveHeightCalculationService_Name_Calculate_wave_height_for_location_0_ { get { - return ResourceManager.GetString("WaveHeightCalculationService_Name_Calculate_assessment_level_for_location_0_", resourceCulture); + return ResourceManager.GetString("WaveHeightCalculationService_Name_Calculate_wave_height_for_location_0_", resourceCulture); } } + + /// + /// Looks up a localized string similar to Golfhoogte voor locatie {0}. + /// + internal static string WaveHeightCalculationService_Name_Wave_height_for_location_0_ { + get { + return ResourceManager.GetString("WaveHeightCalculationService_Name_Wave_height_for_location_0_", resourceCulture); + } + } } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/Properties/Resources.resx =================================================================== diff -u -r5cf6fd5b4bd57890b104182c35fff4180b9d7aba -r1e096895772e9946fe12cd79003d895e094b5d4b --- Ringtoets/Integration/src/Ringtoets.Integration.Service/Properties/Resources.resx (.../Resources.resx) (revision 5cf6fd5b4bd57890b104182c35fff4180b9d7aba) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/Properties/Resources.resx (.../Resources.resx) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -120,13 +120,19 @@ Er is een fout opgetreden tijdens de toetspeil berekening '{0}': inspecteer het logbestand. + + Toetspeil voor locatie {0} + Toetspeil berekenen voor locatie '{0}' Er is een fout opgetreden tijdens de golfhoogte berekening '{0}': inspecteer het logbestand. - + Golfhoogte berekenen voor locatie '{0}' + + Golfhoogte voor locatie {0} + \ No newline at end of file Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationActivity.cs =================================================================== diff -u -r5cf6fd5b4bd57890b104182c35fff4180b9d7aba -r1e096895772e9946fe12cd79003d895e094b5d4b --- Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationActivity.cs (.../WaveHeightCalculationActivity.cs) (revision 5cf6fd5b4bd57890b104182c35fff4180b9d7aba) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationActivity.cs (.../WaveHeightCalculationActivity.cs) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -63,7 +63,7 @@ { get { - return string.Format(Resources.WaveHeightCalculationService_Name_Calculate_assessment_level_for_location_0_, + return string.Format(Resources.WaveHeightCalculationService_Name_Calculate_wave_height_for_location_0_, hydraulicBoundaryLocation.Name); } } Index: Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs =================================================================== diff -u -r7eb4647c7751883ebba18fcc71c72825636906b0 -r1e096895772e9946fe12cd79003d895e094b5d4b --- Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 7eb4647c7751883ebba18fcc71c72825636906b0) +++ Ringtoets/Integration/src/Ringtoets.Integration.Service/WaveHeightCalculationService.cs (.../WaveHeightCalculationService.cs) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -52,7 +52,8 @@ /// False if contains validation errors; True otherwise. internal static bool Validate(HydraulicBoundaryDatabase hydraulicBoundaryDatabase, HydraulicBoundaryLocation hydraulicBoundaryLocation) { - CalculationServiceHelper.LogValidationBeginTime(hydraulicBoundaryLocation.Name); + var calculationName = string.Format(Resources.WaveHeightCalculationService_Name_Wave_height_for_location_0_,hydraulicBoundaryLocation.Name); + CalculationServiceHelper.LogValidationBeginTime(calculationName); var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(hydraulicBoundaryDatabase.FilePath); var hasErrors = string.IsNullOrEmpty(validationProblem); @@ -63,7 +64,7 @@ validationProblem); } - CalculationServiceHelper.LogValidationEndTime(hydraulicBoundaryLocation.Name); + CalculationServiceHelper.LogValidationEndTime(calculationName); return hasErrors; } @@ -74,9 +75,10 @@ var hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabase.FilePath); var input = CreateInput(assessmentSection, hydraulicBoundaryLocation); var targetProbabilityCalculationParser = new TargetProbabilityCalculationParser(); + var calculationName = string.Format(Resources.WaveHeightCalculationService_Name_Wave_height_for_location_0_, hydraulicBoundaryLocation.Name); CalculationServiceHelper.PerformCalculation( - hydraulicBoundaryLocation.Name, + calculationName, () => { HydraRingCalculationService.PerformCalculation( Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationActivityTest.cs =================================================================== diff -u -rf66924df04bacf683c049beacc717970ea807580 -r1e096895772e9946fe12cd79003d895e094b5d4b --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision f66924df04bacf683c049beacc717970ea807580) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -117,9 +117,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); + var calculationName = string.Format("Toetspeil voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]); StringAssert.StartsWith("Herstellen van de verbinding met de hydraulische randvoorwaardendatabase is mislukt. Fout bij het lezen van bestand", msgs[1]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[2]); }); Assert.AreEqual(ActivityState.Failed, activity.State); } @@ -143,10 +144,11 @@ { var msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[2]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[3]); + var calculationName = string.Format("Toetspeil voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[2]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[3]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -170,11 +172,12 @@ { var msgs = messages.ToArray(); Assert.AreEqual(5, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[2]); + var calculationName = string.Format("Toetspeil voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[2]); StringAssert.StartsWith(string.Format("Er is een fout opgetreden tijdens de toetspeil berekening '{0}': inspecteer het logbestand.", hydraulicBoundaryLocation.Name), msgs[3]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[4]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[4]); }); Assert.AreEqual(ActivityState.Failed, activity.State); Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel); Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationServiceTest.cs =================================================================== diff -u -rf66924df04bacf683c049beacc717970ea807580 -r1e096895772e9946fe12cd79003d895e094b5d4b --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision f66924df04bacf683c049beacc717970ea807580) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -55,8 +55,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[1]); + var calculationName = string.Format("Toetspeil voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[1]); }); Assert.IsTrue(valid); } @@ -81,9 +82,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); + var calculationName = string.Format("Toetspeil voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]); StringAssert.StartsWith("Herstellen van de verbinding met de hydraulische randvoorwaardendatabase is mislukt. Fout bij het lezen van bestand", msgs[1]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[2]); }); Assert.IsFalse(valid); } @@ -110,8 +112,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[1]); + var calculationName = string.Format("Toetspeil voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[1]); }); Assert.IsNotNull(output); } @@ -138,9 +141,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); + var calculationName = string.Format("Toetspeil voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]); StringAssert.StartsWith(string.Format("Er is een fout opgetreden tijdens de toetspeil berekening '{0}': inspecteer het logbestand.", hydraulicBoundaryLocation.Name), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[2]); }); Assert.IsNull(output); } Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationActivityTest.cs =================================================================== diff -u -r5cf6fd5b4bd57890b104182c35fff4180b9d7aba -r1e096895772e9946fe12cd79003d895e094b5d4b --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 5cf6fd5b4bd57890b104182c35fff4180b9d7aba) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationActivityTest.cs (.../WaveHeightCalculationActivityTest.cs) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -116,9 +116,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); + var calculationName = string.Format("Golfhoogte voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]); StringAssert.StartsWith("Herstellen van de verbinding met de hydraulische randvoorwaardendatabase is mislukt. Fout bij het lezen van bestand", msgs[1]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[2]); }); Assert.AreEqual(ActivityState.Failed, activity.State); } @@ -142,10 +143,11 @@ { var msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[2]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[3]); + var calculationName = string.Format("Golfhoogte voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[2]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ",calculationName), msgs[3]); }); Assert.AreEqual(ActivityState.Executed, activity.State); } @@ -169,11 +171,12 @@ { var msgs = messages.ToArray(); Assert.AreEqual(5, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[2]); + var calculationName = string.Format("Golfhoogte voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[1]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[2]); StringAssert.StartsWith(string.Format("Er is een fout opgetreden tijdens de golfhoogte berekening '{0}': inspecteer het logbestand.", hydraulicBoundaryLocation.Name), msgs[3]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[4]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[4]); }); Assert.AreEqual(ActivityState.Failed, activity.State); Assert.IsNaN(hydraulicBoundaryLocation.WaveHeight); Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -r7eb4647c7751883ebba18fcc71c72825636906b0 -r1e096895772e9946fe12cd79003d895e094b5d4b --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 7eb4647c7751883ebba18fcc71c72825636906b0) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 1e096895772e9946fe12cd79003d895e094b5d4b) @@ -54,8 +54,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[1]); + var calculationName = string.Format("Golfhoogte voor locatie {0}",hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[1]); }); Assert.IsTrue(valid); } @@ -80,9 +81,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); + var calculationName = string.Format("Golfhoogte voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculationName), msgs[0]); StringAssert.StartsWith("Herstellen van de verbinding met de hydraulische randvoorwaardendatabase is mislukt. Fout bij het lezen van bestand", msgs[1]); - StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculationName), msgs[2]); }); Assert.IsFalse(valid); } @@ -109,8 +111,9 @@ { var msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[1]); + var calculationName = string.Format("Golfhoogte voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[1]); }); Assert.IsNotNull(output); } @@ -137,9 +140,10 @@ { var msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); - StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", hydraulicBoundaryLocation.Name), msgs[0]); + var calculationName = string.Format("Golfhoogte voor locatie {0}", hydraulicBoundaryLocation.Name); + StringAssert.StartsWith(string.Format("Berekening van '{0}' gestart om: ", calculationName), msgs[0]); StringAssert.StartsWith(string.Format("Er is een fout opgetreden tijdens de golfhoogte berekening '{0}': inspecteer het logbestand.", hydraulicBoundaryLocation.Name), msgs[1]); - StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", hydraulicBoundaryLocation.Name), msgs[2]); + StringAssert.StartsWith(string.Format("Berekening van '{0}' beëindigd om: ", calculationName), msgs[2]); }); Assert.IsNull(output); }