Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r87bd836d55d336e37e3d80f9a1521feb83ddc475 -r3296c47ff95264562788d60157fc7137acdf73df --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 87bd836d55d336e37e3d80f9a1521feb83ddc475) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 3296c47ff95264562788d60157fc7137acdf73df) @@ -235,8 +235,8 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { - var progessTexts = new List(); - activity.ProgressChanged += (sender, args) => progessTexts.Add(activity.ProgressText); + var progressTexts = new List(); + activity.ProgressChanged += (sender, args) => progressTexts.Add(activity.ProgressText); // Call activity.Run(); @@ -248,7 +248,7 @@ { string calculationType = i < waterLevels.Length ? "golfoploop" : "golfklap"; string text = $"Stap {i + 1} van {totalSteps} | Waterstand '{waterLevels[i % waterLevels.Length]}' [m+NAP] voor {calculationType} berekenen."; - Assert.AreEqual(text, progessTexts[i]); + Assert.AreEqual(text, progressTexts[i]); } } Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -rd37658e3c0ec3c807bfd5fcef67159781441a25f -r3296c47ff95264562788d60157fc7137acdf73df --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision d37658e3c0ec3c807bfd5fcef67159781441a25f) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 3296c47ff95264562788d60157fc7137acdf73df) @@ -148,45 +148,6 @@ } [Test] - public void Run_InvalidNorm_DoesNotPerformCalculationAndLogsError() - { - // Setup - IAssessmentSection assessmentSection = CreateAssessmentSectionWithHydraulicBoundaryOutput(); - StabilityStoneCoverWaveConditionsCalculation calculation = CreateValidCalculation(assessmentSection.HydraulicBoundaryDatabase.Locations.First()); - - assessmentSection.FailureMechanismContribution.LowerLimitNorm = 0.1; - - CalculatableActivity activity = StabilityStoneCoverWaveConditionsCalculationActivityFactory.CreateCalculationActivity( - calculation, - new StabilityStoneCoverFailureMechanism(), - assessmentSection); - - var mockRepository = new MockRepository(); - var calculatorFactory = mockRepository.StrictMock(); - mockRepository.ReplayAll(); - - using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) - { - // Call - void Call() => activity.Run(); - - // Assert - TestHelper.AssertLogMessages(Call, messages => - { - string[] msgs = messages.ToArray(); - Assert.AreEqual(4, msgs.Length); - Assert.AreEqual($"Golfcondities berekenen voor '{calculation.Name}' 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]); - }); - Assert.AreEqual(ActivityState.Failed, activity.State); - } - - mockRepository.VerifyAll(); - } - - [Test] public void Run_Always_SetProgressTexts() { // Setup @@ -211,8 +172,8 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { - var progessTexts = new List(); - activity.ProgressChanged += (sender, args) => progessTexts.Add(activity.ProgressText); + var progressTexts = new List(); + activity.ProgressChanged += (sender, args) => progressTexts.Add(activity.ProgressText); // Call activity.Run(); @@ -223,7 +184,7 @@ { string revetment = i < waterLevels.Length ? "blokken" : "zuilen"; var text = $"Stap {i + 1} van {totalSteps} | Waterstand '{waterLevels[i % waterLevels.Length]}' [m+NAP] voor {revetment} berekenen."; - Assert.AreEqual(text, progessTexts[i]); + Assert.AreEqual(text, progressTexts[i]); } } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -rea8a17f920fc62e1164b07230be5d2f256dc4ffe -r3296c47ff95264562788d60157fc7137acdf73df --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision ea8a17f920fc62e1164b07230be5d2f256dc4ffe) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 3296c47ff95264562788d60157fc7137acdf73df) @@ -211,8 +211,8 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { - var progessTexts = new List(); - activity.ProgressChanged += (sender, args) => progessTexts.Add(activity.ProgressText); + var progressTexts = new List(); + activity.ProgressChanged += (sender, args) => progressTexts.Add(activity.ProgressText); // Call activity.Run(); @@ -221,7 +221,7 @@ for (var i = 0; i < waterLevels.Length; i++) { var text = $"Stap {i + 1} van {waterLevels.Length} | Waterstand '{waterLevels[i]}' [m+NAP] voor asfalt berekenen."; - Assert.AreEqual(text, progessTexts[i]); + Assert.AreEqual(text, progressTexts[i]); } }