Index: Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs =================================================================== diff -u -r1a77d259209a62203b61ca212b55318ffab3a49f -rb6fe68d83fa65c6f8c40f39bdc9d034252c80305 --- Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision 1a77d259209a62203b61ca212b55318ffab3a49f) +++ Riskeer/GrassCoverErosionOutwards/src/Riskeer.GrassCoverErosionOutwards.Service/GrassCoverErosionOutwardsWaveConditionsCalculationService.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationService.cs) (revision b6fe68d83fa65c6f8c40f39bdc9d034252c80305) @@ -138,7 +138,7 @@ } IEnumerable waveImpactWithWaveDirectionOutput = null; - if (ShouldCalculateTailorMadeWaveImpact(calculationType)) + if (ShouldCalculateWaveImpactWithWaveDirection(calculationType)) { CurrentCalculationType = Resources.GrassCoverErosionOutwardsWaveConditions_WaveImpactWithWaveDirection_DisplayName; waveImpactWithWaveDirectionOutput = CalculateWaveImpactWithWaveDirection(calculation, failureMechanism, hydraulicBoundaryDatabase, assessmentLevel, targetProbability); @@ -177,7 +177,7 @@ TotalWaterLevelCalculations = waterLevelCount; } - private static bool ShouldCalculateTailorMadeWaveImpact(GrassCoverErosionOutwardsWaveConditionsCalculationType calculationType) + private static bool ShouldCalculateWaveImpactWithWaveDirection(GrassCoverErosionOutwardsWaveConditionsCalculationType calculationType) { return calculationType == GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveImpactWithWaveDirection || calculationType == GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs =================================================================== diff -u -ra79c1bc928ca6d7dd1765f39421b062eee1461ad -rb6fe68d83fa65c6f8c40f39bdc9d034252c80305 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs) (revision a79c1bc928ca6d7dd1765f39421b062eee1461ad) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs) (revision b6fe68d83fa65c6f8c40f39bdc9d034252c80305) @@ -203,7 +203,7 @@ [TestCase(GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection, true, false, true)] [TestCase(GrassCoverErosionOutwardsWaveConditionsCalculationType.All, true, true, true)] public void DynamicVisibleValidationMethod_DependingOnRelevancy_ReturnExpectedVisibility( - GrassCoverErosionOutwardsWaveConditionsCalculationType calculationType, bool waveRunUpVisible, bool waveImpactVisible, bool tailorMadeWaveImpactVisible) + GrassCoverErosionOutwardsWaveConditionsCalculationType calculationType, bool waveRunUpVisible, bool waveImpactVisible, bool waveImpactWithWaveDirectionVisible) { // Setup GrassCoverErosionOutwardsWaveConditionsOutput output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create(); @@ -217,7 +217,7 @@ // Call & Assert Assert.AreEqual(waveRunUpVisible, properties.DynamicVisibleValidationMethod(nameof(properties.WaveRunUpOutput))); Assert.AreEqual(waveImpactVisible, properties.DynamicVisibleValidationMethod(nameof(properties.WaveImpactOutput))); - Assert.AreEqual(tailorMadeWaveImpactVisible, properties.DynamicVisibleValidationMethod(nameof(properties.WaveImpactWithWaveDirectionOutput))); + Assert.AreEqual(waveImpactWithWaveDirectionVisible, properties.DynamicVisibleValidationMethod(nameof(properties.WaveImpactWithWaveDirectionOutput))); Assert.IsFalse(properties.DynamicVisibleValidationMethod(null)); } } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs =================================================================== diff -u -r8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4 -rb6fe68d83fa65c6f8c40f39bdc9d034252c80305 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision 8a8f029efdba1dc3b42a673cbecd1aba94f7e4b4) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.IO.Test/Exporters/GrassCoverErosionOutwardsWaveConditionsExporterTest.cs (.../GrassCoverErosionOutwardsWaveConditionsExporterTest.cs) (revision b6fe68d83fa65c6f8c40f39bdc9d034252c80305) @@ -461,7 +461,7 @@ string expectedText = $"Naam berekening; Naam HB locatie; X HB locatie (RD) [m]; Y HB locatie (RD) [m]; Naam voorlandprofiel; Dam gebruikt; Voorlandgeometrie gebruikt; Type bekleding; Doelkans [1/jaar]; Waterstand [m+NAP]; Golfhoogte (Hs) [m]; Golfperiode (Tp) [s]; Golfrichting t.o.v. dijknormaal [°]; Golfrichting t.o.v. Noord [°]{Environment.NewLine}" + $"aCalculation; aLocation; 44.000; 123.456; foreshoreA; nee; nee; Gras (golfoploop); 1/100; 1.10; 2.20; 3.30; 4.40; 5.50{Environment.NewLine}" + $"aCalculation; aLocation; 44.000; 123.456; foreshoreA; nee; nee; Gras (golfklap); 1/100; 1.10; 2.20; 3.30; 4.40; 5.50{Environment.NewLine}" + - $"aCalculation; aLocation; 44.000; 123.456; foreshoreA; nee; nee; Gras (golfklap voor toets op maat); 1/100; 1.10; 2.20; 3.30; 4.40; 5.50{Environment.NewLine}"; + $"aCalculation; aLocation; 44.000; 123.456; foreshoreA; nee; nee; Gras (golfklap met golfrichting); 1/100; 1.10; 2.20; 3.30; 4.40; 5.50{Environment.NewLine}"; Assert.AreEqual(expectedText, fileContent); } } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r1a77d259209a62203b61ca212b55318ffab3a49f -rb6fe68d83fa65c6f8c40f39bdc9d034252c80305 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 1a77d259209a62203b61ca212b55318ffab3a49f) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision b6fe68d83fa65c6f8c40f39bdc9d034252c80305) @@ -551,7 +551,7 @@ [TestCase(GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndWaveImpactWithWaveDirection, false, true, false)] [TestCase(GrassCoverErosionOutwardsWaveConditionsCalculationType.All, false, false, false)] public void Calculate_WithValidInput_SetsOutput( - GrassCoverErosionOutwardsWaveConditionsCalculationType calculationType, bool waveRunUpNull, bool waveImpactNull, bool tailorMadeWaveImpactNull) + GrassCoverErosionOutwardsWaveConditionsCalculationType calculationType, bool waveRunUpNull, bool waveImpactNull, bool waveImpactWithWaveDirectionNull) { // Setup AssessmentSectionStub assessmentSection = CreateAssessmentSection(); @@ -585,7 +585,7 @@ Assert.IsNotNull(calculationOutput); Assert.AreEqual(waveRunUpNull, calculationOutput.WaveRunUpOutput == null); Assert.AreEqual(waveImpactNull, calculationOutput.WaveImpactOutput == null); - Assert.AreEqual(tailorMadeWaveImpactNull, calculationOutput.WaveImpactWithWaveDirectionOutput == null); + Assert.AreEqual(waveImpactWithWaveDirectionNull, calculationOutput.WaveImpactWithWaveDirectionOutput == null); if (!waveRunUpNull) { @@ -597,7 +597,7 @@ Assert.AreEqual(3, calculationOutput.WaveImpactOutput.Count()); } - if (!tailorMadeWaveImpactNull) + if (!waveImpactWithWaveDirectionNull) { Assert.AreEqual(3, calculationOutput.WaveImpactWithWaveDirectionOutput.Count()); }