Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs =================================================================== diff -u -r20c1632d35c38bd0a3e7d274c5908759754ac8f4 -re8b8711d2a50bc82b5a3820171ada00bde2482bf --- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision 20c1632d35c38bd0a3e7d274c5908759754ac8f4) +++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.Service/GrassCoverErosionInwardsCalculationService.cs (.../GrassCoverErosionInwardsCalculationService.cs) (revision e8b8711d2a50bc82b5a3820171ada00bde2482bf) @@ -26,7 +26,6 @@ using System.Linq; using System.Security; using Core.Common.Base.IO; -using Core.Common.IO.Exceptions; using Core.Common.Utils; using log4net; using Ringtoets.Common.Data.AssessmentSection; @@ -71,7 +70,7 @@ { CalculationServiceHelper.LogValidationBeginTime(calculation.Name); - var messages = ValidateInput(calculation.InputParameters, assessmentSection); + string[] messages = ValidateInput(calculation.InputParameters, assessmentSection); CalculationServiceHelper.LogMessagesAsError(RingtoetsCommonServiceResources.Error_in_validation_0, messages); CalculationServiceHelper.LogValidationEndTime(calculation.Name); @@ -148,17 +147,17 @@ { throw new ArgumentNullException(nameof(generalInput)); } - var hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); - var calculateDikeHeight = calculation.InputParameters.DikeHeightCalculationType != DikeHeightCalculationType.NoCalculation; - var totalSteps = calculateDikeHeight ? 2 : 1; - var calculationName = calculation.Name; + string hlcdDirectory = Path.GetDirectoryName(hydraulicBoundaryDatabaseFilePath); + bool calculateDikeHeight = calculation.InputParameters.DikeHeightCalculationType != DikeHeightCalculationType.NoCalculation; + int totalSteps = calculateDikeHeight ? 2 : 1; + string calculationName = calculation.Name; NotifyProgress(Resources.GrassCoverErosionInwardsCalculationService_Calculate_Executing_overtopping_calculation, 1, totalSteps); CalculationServiceHelper.LogCalculationBeginTime(calculationName); overtoppingCalculator = HydraRingCalculatorFactory.Instance.CreateOvertoppingCalculator(hlcdDirectory); - var overtoppingCalculationInput = CreateOvertoppingInput(calculation, generalInput, hydraulicBoundaryDatabaseFilePath); + OvertoppingCalculationInput overtoppingCalculationInput = CreateOvertoppingInput(calculation, generalInput, hydraulicBoundaryDatabaseFilePath); DikeHeightAssessmentOutput dikeHeight = null; try @@ -176,12 +175,12 @@ dikeHeightCalculator = HydraRingCalculatorFactory.Instance.CreateDikeHeightCalculator(hlcdDirectory); - var norm = GetProbabilityToUse(assessmentSection.FailureMechanismContribution.Norm, - generalInput, failureMechanismContribution, - calculation.InputParameters.DikeHeightCalculationType); - var dikeHeightCalculationInput = CreateDikeHeightInput(calculation, norm, - generalInput, - hydraulicBoundaryDatabaseFilePath); + double norm = GetProbabilityToUse(assessmentSection.FailureMechanismContribution.Norm, + generalInput, failureMechanismContribution, + calculation.InputParameters.DikeHeightCalculationType); + DikeHeightCalculationInput dikeHeightCalculationInput = CreateDikeHeightInput(calculation, norm, + generalInput, + hydraulicBoundaryDatabaseFilePath); bool dikeHeightCalculated = CalculateDikeHeight(dikeHeightCalculationInput, calculationName); if (canceled) @@ -225,9 +224,9 @@ double targetReliability, double targetProbability) { - var dikeHeight = dikeHeightCalculator.DikeHeight; - var reliability = dikeHeightCalculator.ReliabilityIndex; - var probability = StatisticsConverter.ReliabilityToProbability(reliability); + double dikeHeight = dikeHeightCalculator.DikeHeight; + double reliability = dikeHeightCalculator.ReliabilityIndex; + double probability = StatisticsConverter.ReliabilityToProbability(reliability); CalculationConvergence converged = RingtoetsCommonDataCalculationService.GetCalculationConvergence(dikeHeightCalculator.Converged); @@ -275,7 +274,7 @@ { if (!canceled) { - var lastErrorContent = overtoppingCalculator.LastErrorFileContent; + string lastErrorContent = overtoppingCalculator.LastErrorFileContent; if (string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(Resources.GrassCoverErosionInwardsCalculationService_Calculate_Error_in_grass_cover_erosion_inwards_0_calculation_no_error_report, calculationName); @@ -291,7 +290,7 @@ } finally { - var lastErrorFileContent = overtoppingCalculator.LastErrorFileContent; + string lastErrorFileContent = overtoppingCalculator.LastErrorFileContent; bool errorOccurred = CalculationServiceHelper.HasErrorOccurred(canceled, exceptionThrown, lastErrorFileContent); if (errorOccurred) { @@ -327,7 +326,7 @@ { if (!canceled) { - var lastErrorContent = dikeHeightCalculator.LastErrorFileContent; + string lastErrorContent = dikeHeightCalculator.LastErrorFileContent; if (string.IsNullOrEmpty(lastErrorContent)) { log.ErrorFormat(Resources.GrassCoverErosionInwardsCalculationService_Calculate_Error_in_hbn_grass_cover_erosion_inwards_0_calculation_no_error_report, calculationName); @@ -342,7 +341,7 @@ } finally { - var lastErrorFileContent = dikeHeightCalculator.LastErrorFileContent; + string lastErrorFileContent = dikeHeightCalculator.LastErrorFileContent; if (CalculationServiceHelper.HasErrorOccurred(canceled, exceptionThrown, lastErrorFileContent)) { log.ErrorFormat(Resources.GrassCoverErosionInwardsCalculationService_Calculate_Error_in_hbn_grass_cover_erosion_inwards_0_calculation_click_details_for_last_error_report_1, calculationName, lastErrorFileContent); @@ -473,9 +472,9 @@ private static string[] ValidateInput(GrassCoverErosionInwardsInput inputParameters, IAssessmentSection assessmentSection) { - List validationResult = new List(); + var validationResult = new List(); - var validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath); + string validationProblem = HydraulicDatabaseHelper.ValidatePathForCalculation(assessmentSection.HydraulicBoundaryDatabase.FilePath); if (!string.IsNullOrEmpty(validationProblem)) { validationResult.Add(validationProblem); Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs =================================================================== diff -u -rba715436cd0186ee10a1edc13d547ee27bea4c89 -re8b8711d2a50bc82b5a3820171ada00bde2482bf --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision ba715436cd0186ee10a1edc13d547ee27bea4c89) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Integration.Test/GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionInwardsCalculationActivityIntegrationTest.cs) (revision e8b8711d2a50bc82b5a3820171ada00bde2482bf) @@ -82,7 +82,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith("Validatie mislukt: Fout bij het lezen van bestand", msgs[1]); @@ -118,7 +118,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(5, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -157,7 +157,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; + TestOvertoppingCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; calculator.EndInFailure = true; // Call @@ -166,7 +166,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(6, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -217,7 +217,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; calculator.DikeHeight = double.NaN; calculator.EndInFailure = true; @@ -227,7 +227,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -294,7 +294,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; + TestOvertoppingCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; calculator.EndInFailure = true; // Call @@ -366,7 +366,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; calculator.DikeHeight = 2; calculator.ReliabilityIndex = -1; @@ -376,7 +376,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -503,7 +503,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; + TestOvertoppingCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; calculator.EndInFailure = true; activity.Run(); @@ -595,7 +595,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; calculator.DikeHeight = double.NaN; calculator.EndInFailure = true; @@ -633,7 +633,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; + TestOvertoppingCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; @@ -645,7 +645,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(6, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -680,7 +680,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; + TestOvertoppingCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; calculator.EndInFailure = true; var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFile, assessmentSection.GrassCoverErosionInwards, assessmentSection); @@ -691,7 +691,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(6, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -726,7 +726,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; + TestOvertoppingCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; calculator.EndInFailure = false; calculator.LastErrorFileContent = "An error occurred"; @@ -738,7 +738,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(6, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -774,7 +774,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; @@ -786,7 +786,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -822,7 +822,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; calculator.EndInFailure = true; var activity = new GrassCoverErosionInwardsCalculationActivity(calculation, validFile, assessmentSection.GrassCoverErosionInwards, assessmentSection); @@ -833,7 +833,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -869,7 +869,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; calculator.EndInFailure = false; calculator.LastErrorFileContent = "An error occurred"; @@ -881,7 +881,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(7, msgs.Length); StringAssert.StartsWith(string.Format("Validatie van '{0}' gestart om: ", calculation.Name), msgs[0]); StringAssert.StartsWith(string.Format("Validatie van '{0}' beëindigd om: ", calculation.Name), msgs[1]); @@ -920,14 +920,14 @@ activity.Run(); // Assert - var testOvertoppingCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; + TestOvertoppingCalculator testOvertoppingCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; OvertoppingCalculationInput[] overtoppingCalculationInputs = testOvertoppingCalculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, overtoppingCalculationInputs.Length); OvertoppingCalculationInput actualInput = overtoppingCalculationInputs[0]; GeneralGrassCoverErosionInwardsInput generalInput = assessmentSection.GrassCoverErosionInwards.GeneralInput; - var input = calculation.InputParameters; + GrassCoverErosionInwardsInput input = calculation.InputParameters; var expectedInput = new OvertoppingCalculationInput(calculation.InputParameters.HydraulicBoundaryLocation.Id, calculation.InputParameters.Orientation, calculation.InputParameters.DikeGeometry.Select(roughnessPoint => new HydraRingRoughnessProfilePoint(roughnessPoint.Point.X, roughnessPoint.Point.Y, roughnessPoint.Roughness)), @@ -988,21 +988,21 @@ activity.Run(); // Assert - var dikeHeightCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + TestDikeHeightCalculator dikeHeightCalculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; DikeHeightCalculationInput[] dikeHeightCalculationInputs = dikeHeightCalculator.ReceivedInputs.ToArray(); Assert.AreEqual(1, dikeHeightCalculationInputs.Length); DikeHeightCalculationInput actualInput = dikeHeightCalculationInputs[0]; GeneralGrassCoverErosionInwardsInput generalInput = assessmentSection.GrassCoverErosionInwards.GeneralInput; - var input = calculation.InputParameters; + GrassCoverErosionInwardsInput input = calculation.InputParameters; - var norm = dikeHeightCalculationType == DikeHeightCalculationType.CalculateByAssessmentSectionNorm - ? assessmentSection.FailureMechanismContribution.Norm - : RingtoetsCommonDataCalculationService.ProfileSpecificRequiredProbability( - assessmentSection.FailureMechanismContribution.Norm, - assessmentSection.GrassCoverErosionInwards.Contribution, - generalInput.N); + double norm = dikeHeightCalculationType == DikeHeightCalculationType.CalculateByAssessmentSectionNorm + ? assessmentSection.FailureMechanismContribution.Norm + : RingtoetsCommonDataCalculationService.ProfileSpecificRequiredProbability( + assessmentSection.FailureMechanismContribution.Norm, + assessmentSection.GrassCoverErosionInwards.Contribution, + generalInput.N); var expectedInput = new DikeHeightCalculationInput(calculation.InputParameters.HydraulicBoundaryLocation.Id, norm, Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs =================================================================== diff -u -rba715436cd0186ee10a1edc13d547ee27bea4c89 -re8b8711d2a50bc82b5a3820171ada00bde2482bf --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision ba715436cd0186ee10a1edc13d547ee27bea4c89) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Service.Test/GrassCoverErosionInwardsCalculationServiceTest.cs (.../GrassCoverErosionInwardsCalculationServiceTest.cs) (revision e8b8711d2a50bc82b5a3820171ada00bde2482bf) @@ -59,7 +59,7 @@ const string name = ""; - GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation + var calculation = new GrassCoverErosionInwardsCalculation { Name = name, InputParameters = @@ -69,13 +69,13 @@ }; // Call - bool isValid = false; + var isValid = false; Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub); // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); StringAssert.StartsWith("Validatie mislukt: Er is geen hydraulische randvoorwaardenlocatie geselecteerd.", msgs[1]); @@ -92,7 +92,7 @@ // Setup var grassCoverErosionInwardsFailureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var invalidFilePath = Path.Combine(testDataPath, "notexisting.sqlite"); + string invalidFilePath = Path.Combine(testDataPath, "notexisting.sqlite"); var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(grassCoverErosionInwardsFailureMechanism, @@ -102,7 +102,7 @@ const string name = ""; - GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation + var calculation = new GrassCoverErosionInwardsCalculation { Name = name, InputParameters = @@ -113,13 +113,13 @@ }; // Call - bool isValid = false; + var isValid = false; Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub); // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); StringAssert.StartsWith("Validatie mislukt: Fout bij het lezen van bestand", msgs[1]); @@ -136,7 +136,7 @@ // Setup var grassCoverErosionInwardsFailureMechanism = new GrassCoverErosionInwardsFailureMechanism(); - var invalidFilePath = Path.Combine(testDataPath, "HRD nosettings.sqlite"); + string invalidFilePath = Path.Combine(testDataPath, "HRD nosettings.sqlite"); var mockRepository = new MockRepository(); IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(grassCoverErosionInwardsFailureMechanism, @@ -146,7 +146,7 @@ const string name = ""; - GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation + var calculation = new GrassCoverErosionInwardsCalculation { Name = name, InputParameters = @@ -157,13 +157,13 @@ }; // Call - bool isValid = false; + var isValid = false; Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub); // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); StringAssert.StartsWith("Validatie mislukt: Fout bij het lezen van bestand", msgs[1]); @@ -188,7 +188,7 @@ const string name = ""; - GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation + var calculation = new GrassCoverErosionInwardsCalculation { Name = name, InputParameters = @@ -199,13 +199,13 @@ }; // Call - bool isValid = false; + var isValid = false; Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub); // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); StringAssert.StartsWith("Validatie mislukt: Er is geen dijkprofiel geselecteerd.", msgs[1]); @@ -237,13 +237,13 @@ calculation.InputParameters.UseBreakWater = true; // Call - bool isValid = false; + var isValid = false; Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub); // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); Assert.AreEqual("Validatie mislukt: De waarde voor 'hoogte' van de dam moet een concreet getal zijn.", msgs[1]); @@ -268,7 +268,7 @@ const string name = ""; - GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation + var calculation = new GrassCoverErosionInwardsCalculation { Name = name, InputParameters = @@ -284,13 +284,13 @@ }; // Call - bool isValid = false; + var isValid = false; Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub); // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); Assert.AreEqual("Validatie mislukt: De waarde voor 'oriëntatie' moet een concreet getal zijn.", msgs[1]); @@ -318,7 +318,7 @@ const string name = ""; - GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation + var calculation = new GrassCoverErosionInwardsCalculation { Name = name, InputParameters = @@ -334,13 +334,13 @@ }; // Call - bool isValid = false; + var isValid = false; Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub); // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(3, msgs.Length); StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); Assert.AreEqual("Validatie mislukt: De waarde voor 'dijkhoogte' moet een concreet getal zijn.", msgs[1]); @@ -374,13 +374,13 @@ calculation.InputParameters.UseBreakWater = useBreakWater; // Call - bool isValid = false; + var isValid = false; Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub); // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); StringAssert.StartsWith($"Validatie van '{name}' beëindigd om: ", msgs[1]); @@ -404,7 +404,7 @@ const string name = ""; - GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation + var calculation = new GrassCoverErosionInwardsCalculation { Name = name, InputParameters = @@ -415,13 +415,13 @@ }; // Call - bool isValid = false; + var isValid = false; Action call = () => isValid = GrassCoverErosionInwardsCalculationService.Validate(calculation, assessmentSectionStub); // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(2, msgs.Length); StringAssert.StartsWith($"Validatie van '{name}' gestart om: ", msgs[0]); StringAssert.StartsWith($"Validatie van '{name}' beëindigd om: ", msgs[1]); @@ -438,7 +438,7 @@ GrassCoverErosionInwardsFailureMechanism failureMechanism = CreateGrassCoverErosionInwardsFailureMechanism(); var mockRepository = new MockRepository(); - IAssessmentSection assessmentSectionStub = mockRepository.Stub(); + var assessmentSectionStub = mockRepository.Stub(); mockRepository.ReplayAll(); // Call @@ -481,7 +481,7 @@ GrassCoverErosionInwardsFailureMechanism failureMechanism = CreateGrassCoverErosionInwardsFailureMechanism(); var mockRepository = new MockRepository(); - IAssessmentSection assessmentSectionStub = mockRepository.Stub(); + var assessmentSectionStub = mockRepository.Stub(); mockRepository.ReplayAll(); // Call @@ -513,7 +513,7 @@ validFile); mockRepository.ReplayAll(); - var dikeProfile = GetDikeProfile(); + DikeProfile dikeProfile = GetDikeProfile(); var calculation = new GrassCoverErosionInwardsCalculation { @@ -579,7 +579,7 @@ validFile); mockRepository.ReplayAll(); - var dikeProfile = GetDikeProfile(); + DikeProfile dikeProfile = GetDikeProfile(); var calculation = new GrassCoverErosionInwardsCalculation { @@ -591,7 +591,7 @@ } }; - bool expectedExceptionThrown = false; + var expectedExceptionThrown = false; // Call Action call = () => @@ -600,7 +600,7 @@ { using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; calculator.EndInFailure = true; new GrassCoverErosionInwardsCalculationService().Calculate(calculation, assessmentSectionStub, @@ -618,7 +618,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(5, msgs.Length); StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie", msgs[1]); @@ -646,7 +646,7 @@ const string name = ""; - GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation + var calculation = new GrassCoverErosionInwardsCalculation { Name = name, InputParameters = @@ -660,7 +660,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; + TestOvertoppingCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call @@ -694,7 +694,7 @@ const string name = ""; - GrassCoverErosionInwardsCalculation calculation = new GrassCoverErosionInwardsCalculation + var calculation = new GrassCoverErosionInwardsCalculation { Name = name, InputParameters = @@ -711,8 +711,8 @@ using (new HydraRingCalculatorFactoryConfig()) { var testFactory = (TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance; - var overToppingCalculator = testFactory.OvertoppingCalculator; - var dikeHeightCalculator = testFactory.DikeHeightCalculator; + TestOvertoppingCalculator overToppingCalculator = testFactory.OvertoppingCalculator; + TestDikeHeightCalculator dikeHeightCalculator = testFactory.DikeHeightCalculator; if (cancelBeforeDikeHeightCalculationStarts) { @@ -763,7 +763,7 @@ validFile); mockRepository.ReplayAll(); - var dikeProfile = GetDikeProfile(); + DikeProfile dikeProfile = GetDikeProfile(); var calculation = new GrassCoverErosionInwardsCalculation { @@ -777,7 +777,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; + TestOvertoppingCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; @@ -803,7 +803,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); StringAssert.StartsWith($"De berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", msgs[1]); @@ -830,7 +830,7 @@ validFile); mockRepository.ReplayAll(); - var dikeProfile = GetDikeProfile(); + DikeProfile dikeProfile = GetDikeProfile(); var calculation = new GrassCoverErosionInwardsCalculation { @@ -844,7 +844,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; + TestOvertoppingCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; calculator.EndInFailure = true; var exceptionThrown = false; @@ -869,7 +869,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); StringAssert.StartsWith($"De berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Er is geen foutrapport beschikbaar.", msgs[1]); @@ -896,7 +896,7 @@ validFile); mockRepository.ReplayAll(); - var dikeProfile = GetDikeProfile(); + DikeProfile dikeProfile = GetDikeProfile(); var calculation = new GrassCoverErosionInwardsCalculation { @@ -910,12 +910,12 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; + TestOvertoppingCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).OvertoppingCalculator; calculator.EndInFailure = false; calculator.LastErrorFileContent = "An error occurred"; var exceptionThrown = false; - var exceptionMessage = string.Empty; + string exceptionMessage = string.Empty; // Call Action call = () => @@ -938,7 +938,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(4, msgs.Length); StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); StringAssert.StartsWith($"De berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", msgs[1]); @@ -965,7 +965,7 @@ validFile); mockRepository.ReplayAll(); - var dikeProfile = GetDikeProfile(); + DikeProfile dikeProfile = GetDikeProfile(); var calculation = new GrassCoverErosionInwardsCalculation { @@ -979,7 +979,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; calculator.LastErrorFileContent = "An error occurred"; calculator.EndInFailure = true; var exceptionThrown = false; @@ -1004,7 +1004,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(5, msgs.Length); StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie", msgs[1]); @@ -1030,7 +1030,7 @@ validFile); mockRepository.ReplayAll(); - var dikeProfile = GetDikeProfile(); + DikeProfile dikeProfile = GetDikeProfile(); var calculation = new GrassCoverErosionInwardsCalculation { @@ -1044,7 +1044,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; calculator.EndInFailure = true; var exceptionThrown = false; @@ -1068,7 +1068,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); Assert.AreEqual(5, msgs.Length); StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie", msgs[1]); @@ -1095,7 +1095,7 @@ validFile); mockRepository.ReplayAll(); - var dikeProfile = GetDikeProfile(); + DikeProfile dikeProfile = GetDikeProfile(); var calculation = new GrassCoverErosionInwardsCalculation { @@ -1109,7 +1109,7 @@ using (new HydraRingCalculatorFactoryConfig()) { - var calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; + TestDikeHeightCalculator calculator = ((TestHydraRingCalculatorFactory) HydraRingCalculatorFactory.Instance).DikeHeightCalculator; calculator.EndInFailure = false; calculator.LastErrorFileContent = "An error occurred"; var exceptionThrown = false; @@ -1134,7 +1134,7 @@ // Assert TestHelper.AssertLogMessages(call, messages => { - var msgs = messages.ToArray(); + string[] msgs = messages.ToArray(); StringAssert.StartsWith($"Berekening van '{calculation.Name}' gestart om: ", msgs[0]); StringAssert.StartsWith("Overloop berekening is uitgevoerd op de tijdelijke locatie", msgs[1]); StringAssert.StartsWith($"De HBN berekening voor grasbekleding erosie kruin en binnentalud '{calculation.Name}' is niet gelukt. Bekijk het foutrapport door op details te klikken.", msgs[2]);