Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r50000aa8bb8b4e50fb4be12ac4a48bfaa919b317 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision 50000aa8bb8b4e50fb4be12ac4a48bfaa919b317) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Integration.Test/GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationActivityIntegrationTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -251,15 +251,15 @@ activity.Run(); // Assert - WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = waveConditionsCosineCalculator.ReceivedInputs.ToArray(); - Assert.AreEqual(nrOfCalculators, testWaveConditionsInputs.Length); + WaveConditionsCosineCalculationInput[] WaveConditionsInputs = waveConditionsCosineCalculator.ReceivedInputs.ToArray(); + Assert.AreEqual(nrOfCalculators, WaveConditionsInputs.Length); WaveConditionsInput input = calculation.InputParameters; double targetProbability = assessmentSection.FailureMechanismContribution.LowerLimitNorm; var waterLevelIndex = 0; GeneralGrassCoverErosionOutwardsInput generalInput = failureMechanism.GeneralInput; - for (var i = 0; i < testWaveConditionsInputs.Length / 2; i++) + for (var i = 0; i < WaveConditionsInputs.Length / 2; i++) { var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, @@ -272,11 +272,11 @@ generalInput.GeneralWaveRunUpWaveConditionsInput.B, generalInput.GeneralWaveRunUpWaveConditionsInput.C); - HydraRingDataEqualityHelper.AreEqual(expectedInput, testWaveConditionsInputs[i]); + HydraRingDataEqualityHelper.AreEqual(expectedInput, WaveConditionsInputs[i]); } waterLevelIndex = 0; - for (int i = testWaveConditionsInputs.Length / 2; i < testWaveConditionsInputs.Length; i++) + for (int i = WaveConditionsInputs.Length / 2; i < WaveConditionsInputs.Length; i++) { var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, @@ -289,7 +289,7 @@ generalInput.GeneralWaveImpactWaveConditionsInput.B, generalInput.GeneralWaveImpactWaveConditionsInput.C); - HydraRingDataEqualityHelper.AreEqual(expectedInput, testWaveConditionsInputs[i]); + HydraRingDataEqualityHelper.AreEqual(expectedInput, WaveConditionsInputs[i]); } } Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Service.Test/GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationServiceTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -433,8 +433,8 @@ assessmentSection); // Assert - WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = waveConditionsCosineCalculator.ReceivedInputs.ToArray(); - int nrOfReceivedInputs = testWaveConditionsInputs.Length; + WaveConditionsCosineCalculationInput[] WaveConditionsInputs = waveConditionsCosineCalculator.ReceivedInputs.ToArray(); + int nrOfReceivedInputs = WaveConditionsInputs.Length; Assert.AreEqual(nrOfCalculators, nrOfReceivedInputs); var waterLevelIndex = 0; @@ -455,7 +455,7 @@ generalInput.GeneralWaveRunUpWaveConditionsInput.B, generalInput.GeneralWaveRunUpWaveConditionsInput.C); - HydraRingDataEqualityHelper.AreEqual(expectedInput, testWaveConditionsInputs[i]); + HydraRingDataEqualityHelper.AreEqual(expectedInput, WaveConditionsInputs[i]); } waterLevelIndex = 0; @@ -473,7 +473,7 @@ generalInput.GeneralWaveImpactWaveConditionsInput.B, generalInput.GeneralWaveImpactWaveConditionsInput.C); - HydraRingDataEqualityHelper.AreEqual(expectedInput, testWaveConditionsInputs[i]); + HydraRingDataEqualityHelper.AreEqual(expectedInput, WaveConditionsInputs[i]); } waterLevelIndex = 0; @@ -491,7 +491,7 @@ generalInput.GeneralTailorMadeWaveImpactWaveConditionsInput.B, generalInput.GeneralTailorMadeWaveImpactWaveConditionsInput.C); - HydraRingDataEqualityHelper.AreEqual(expectedInput, testWaveConditionsInputs[i]); + HydraRingDataEqualityHelper.AreEqual(expectedInput, WaveConditionsInputs[i]); } } Index: Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputExtensionsTest.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputExtensionsTest.cs (.../WaveConditionsInputExtensionsTest.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputExtensionsTest.cs (.../WaveConditionsInputExtensionsTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -23,7 +23,6 @@ using System.Collections.Generic; using Core.Common.Base.Data; using NUnit.Framework; -using Riskeer.Revetment.Data.TestUtil; namespace Riskeer.Revetment.Data.Test { @@ -50,7 +49,7 @@ double assessmentLevel) { // Setup - var waveConditionsInput = new TestWaveConditionsInput + var waveConditionsInput = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetments, UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetments, @@ -70,7 +69,7 @@ public void GetWaterLevels_WaveConditionsInputWithWithAllBoundariesAboveUpperBoundaryAssessmentLevel_ReturnsEmptyEnumerable() { // Setup - var waveConditionsInput = new TestWaveConditionsInput + var waveConditionsInput = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) 6, UpperBoundaryRevetment = (RoundedDouble) 6.10, @@ -90,7 +89,7 @@ public void GetWaterLevels_AssessmentLevelNaN_ReturnsEmptyEnumerable() { // Setup - var waveConditionsInput = new TestWaveConditionsInput + var waveConditionsInput = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) 1.0, UpperBoundaryRevetment = (RoundedDouble) 10.0, @@ -117,7 +116,7 @@ IEnumerable expectedWaterLevels) { // Setup - var waveConditionsInput = new TestWaveConditionsInput + var waveConditionsInput = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment, UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment, Index: Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs =================================================================== diff -u -r3ceac0408c340b2799fd8d43ee7228a5065617e1 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs (.../WaveConditionsInputHelperTest.cs) (revision 3ceac0408c340b2799fd8d43ee7228a5065617e1) +++ Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputHelperTest.cs (.../WaveConditionsInputHelperTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -30,7 +30,6 @@ using Riskeer.Common.Data.Contribution; using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; -using Riskeer.Revetment.Data.TestUtil; namespace Riskeer.Revetment.Data.Test { @@ -74,7 +73,7 @@ const NormType normType = (NormType) 99; // Call - void Call() => WaveConditionsInputHelper.SetWaterLevelType(new TestWaveConditionsInput(), normType); + void Call() => WaveConditionsInputHelper.SetWaterLevelType(new WaveConditionsInput(), normType); // Assert var expectedMessage = $"The value of argument 'normType' ({normType}) is invalid for Enum type '{nameof(NormType)}'."; @@ -90,7 +89,7 @@ WaveConditionsInputWaterLevelType expectedWaveConditionsInputWaterLevelType) { // Setup - var waveConditionsInput = new TestWaveConditionsInput(); + var waveConditionsInput = new WaveConditionsInput(); // Call WaveConditionsInputHelper.SetWaterLevelType(waveConditionsInput, normType); @@ -114,7 +113,7 @@ public void GetHydraulicBoundaryLocationCalculation_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - void Call() => WaveConditionsInputHelper.GetHydraulicBoundaryLocationCalculation(new TestWaveConditionsInput(), null); + void Call() => WaveConditionsInputHelper.GetHydraulicBoundaryLocationCalculation(new WaveConditionsInput(), null); // Assert var exception = Assert.Throws(Call); @@ -126,7 +125,7 @@ { // Setup const WaveConditionsInputWaterLevelType waterLevelType = (WaveConditionsInputWaterLevelType) 99; - var waveConditionsInput = new TestWaveConditionsInput + var waveConditionsInput = new WaveConditionsInput { WaterLevelType = waterLevelType }; @@ -155,7 +154,7 @@ hydraulicBoundaryLocation }, true); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = hydraulicBoundaryLocation, WaterLevelType = waterLevelType, @@ -184,7 +183,7 @@ public void GetTargetProbability_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - void Call() => WaveConditionsInputHelper.GetTargetProbability(new TestWaveConditionsInput(), null); + void Call() => WaveConditionsInputHelper.GetTargetProbability(new WaveConditionsInput(), null); // Assert var exception = Assert.Throws(Call); @@ -196,7 +195,7 @@ { // Setup const WaveConditionsInputWaterLevelType waterLevelType = (WaveConditionsInputWaterLevelType) 99; - var waveConditionsInput = new TestWaveConditionsInput + var waveConditionsInput = new WaveConditionsInput { WaterLevelType = waterLevelType }; @@ -219,7 +218,7 @@ // Setup var assessmentSection = new AssessmentSectionStub(); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { WaterLevelType = waterLevelType, CalculationsTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01) @@ -247,7 +246,7 @@ public void GetAssessmentLevel_AssessmentSectionNull_ThrowsArgumentNullException() { // Call - void Call() => WaveConditionsInputHelper.GetAssessmentLevel(new TestWaveConditionsInput(), null); + void Call() => WaveConditionsInputHelper.GetAssessmentLevel(new WaveConditionsInput(), null); // Assert var exception = Assert.Throws(Call); @@ -259,7 +258,7 @@ { // Setup const WaveConditionsInputWaterLevelType waterLevelType = (WaveConditionsInputWaterLevelType) 99; - var waveConditionsInput = new TestWaveConditionsInput + var waveConditionsInput = new WaveConditionsInput { WaterLevelType = waterLevelType }; @@ -288,7 +287,7 @@ new TestHydraulicBoundaryLocation() }, true); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { WaterLevelType = waterLevelType, CalculationsTargetProbability = assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First() @@ -316,7 +315,7 @@ hydraulicBoundaryLocation }, true); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = hydraulicBoundaryLocation, WaterLevelType = waterLevelType, Index: Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputTest.cs =================================================================== diff -u -redf435e8cf5d61cd56b086fdc8bdfd6eee141955 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision edf435e8cf5d61cd56b086fdc8bdfd6eee141955) +++ Riskeer/Revetment/test/Riskeer.Revetment.Data.Test/WaveConditionsInputTest.cs (.../WaveConditionsInputTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -43,7 +43,7 @@ public void Constructor_ExpectedValues() { // Call - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Assert Assert.IsInstanceOf(input); @@ -80,7 +80,7 @@ [Values(true, false)] bool withValidForeshore) { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); BreakWaterType originalBreakWaterType = input.BreakWater.Type; RoundedDouble originalBreakWaterHeight = input.BreakWater.Height; HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation; @@ -141,7 +141,7 @@ public void Foreshore_SetNullValue_InputSyncedToDefaults() { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); BreakWaterType originalBreakWaterType = input.BreakWater.Type; RoundedDouble originalBreakWaterHeight = input.BreakWater.Height; HydraulicBoundaryLocation originalHydraulicBoundaryLocation = input.HydraulicBoundaryLocation; @@ -190,7 +190,7 @@ public void IsForeshoreProfileInputSynchronized_ForeshoreProfileNotSet_ReturnFalse() { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Call bool isSynchronized = input.IsForeshoreProfileInputSynchronized; @@ -203,7 +203,7 @@ public void IsForeshoreProfileInputSynchronized_ForeshoreProfileAndInputInSync_ReturnTrue() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile() }; @@ -227,7 +227,7 @@ ForeshoreProfile modifiedProfile) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile() }; @@ -245,7 +245,7 @@ public void SynchronizeForeshoreProfileInput_ForeshoreProfileNotSet_ExpectedValues() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UseBreakWater = true, UseForeshore = true, @@ -279,7 +279,7 @@ Orientation = 123.0 }); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile() }; @@ -305,7 +305,7 @@ public void Orientation_ValidValue_NewValueSet(double orientation) { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Call input.Orientation = (RoundedDouble) orientation; @@ -326,7 +326,7 @@ public void Orientation_InvalidValue_ThrowsArgumentOutOfRangeException(double invalidValue) { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Call void Call() => input.Orientation = (RoundedDouble) invalidValue; @@ -340,7 +340,7 @@ public void LowerBoundaryRevetment_SetNewValue_ValueIsRounded() { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); int originalNumberOfDecimalPlaces = input.LowerBoundaryRevetment.NumberOfDecimalPlaces; @@ -363,7 +363,7 @@ double upperBoundaryRevetment) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment }; @@ -384,7 +384,7 @@ double upperBoundaryRevetment) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment }; @@ -403,7 +403,7 @@ public void LowerBoundaryRevetment_BoundarySmallerThanValid_SetValueToValidBoundary(double newValue) { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Call input.LowerBoundaryRevetment = (RoundedDouble) newValue; @@ -416,7 +416,7 @@ public void UpperBoundaryRevetment_SetNewValue_ValueIsRounded() { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); int originalNumberOfDecimalPlaces = input.UpperBoundaryRevetment.NumberOfDecimalPlaces; @@ -439,7 +439,7 @@ double upperBoundaryRevetment) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment }; @@ -460,7 +460,7 @@ double upperBoundaryRevetment) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment }; @@ -479,7 +479,7 @@ public void UpperBoundaryRevetment_BoundaryLargerThanValid_SetValueToValidBoundary(double newValue) { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Call input.UpperBoundaryRevetment = (RoundedDouble) newValue; @@ -492,7 +492,7 @@ public void LowerBoundaryWaterLevels_SetNewValue_ValueIsRounded() { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); int originalNumberOfDecimalPlaces = input.LowerBoundaryWaterLevels.NumberOfDecimalPlaces; @@ -515,7 +515,7 @@ double upperBoundaryWaterLevels) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UpperBoundaryWaterLevels = (RoundedDouble) upperBoundaryWaterLevels }; @@ -536,7 +536,7 @@ double upperBoundaryWaterLevels) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UpperBoundaryWaterLevels = (RoundedDouble) upperBoundaryWaterLevels }; @@ -555,7 +555,7 @@ public void LowerBoundaryWaterLevels_BoundarySmallerThanValid_SetValueToValidBoundary(double newValue) { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Call input.LowerBoundaryWaterLevels = (RoundedDouble) newValue; @@ -568,7 +568,7 @@ public void UpperBoundaryWaterLevels_SetNewValue_ValueIsRounded() { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); int originalNumberOfDecimalPlaces = input.UpperBoundaryWaterLevels.NumberOfDecimalPlaces; @@ -591,7 +591,7 @@ double upperBoundaryWaterLevels) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryWaterLevels = (RoundedDouble) lowerBoundaryWaterLevels }; @@ -612,7 +612,7 @@ double upperBoundaryWaterLevels) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryWaterLevels }; @@ -631,7 +631,7 @@ public void UpperBoundaryWaterLevels_BoundaryLargerThanValid_SetValueToValidBoundary(double newValue) { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Call input.UpperBoundaryWaterLevels = (RoundedDouble) newValue; @@ -644,7 +644,7 @@ public void Clone_AllPropertiesSet_ReturnNewInstanceWithCopiedValues() { // Setup - var original = new TestWaveConditionsInput(); + var original = new WaveConditionsInput(); WaveConditionsTestDataGenerator.SetRandomDataToWaveConditionsInput(original); @@ -659,7 +659,7 @@ public void Clone_NotAllPropertiesSet_ReturnNewInstanceWithCopiedValues() { // Setup - var original = new TestWaveConditionsInput(); + var original = new WaveConditionsInput(); WaveConditionsTestDataGenerator.SetRandomDataToWaveConditionsInput(original); @@ -676,7 +676,7 @@ private static void AssertForeshoreProfileInputProperties(ForeshoreProfile expectedForeshoreProfile, WaveConditionsInput input) { - var defaultInput = new TestWaveConditionsInput(); + var defaultInput = new WaveConditionsInput(); if (expectedForeshoreProfile == null) { Assert.AreEqual(defaultInput.UseBreakWater, input.UseBreakWater); Fisheye: Tag b9ce34760e692ecfe64825c71e22acaf149c9d0d refers to a dead (removed) revision in file `Riskeer/Revetment/test/Riskeer.Revetment.Data.TestUtil/TestWaveConditionsInput.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/Factories/WaveConditionsChartDataFactoryTest.cs =================================================================== diff -u -rda6d3525ea7ee7528cab7184c39205d3452440f7 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/Factories/WaveConditionsChartDataFactoryTest.cs (.../WaveConditionsChartDataFactoryTest.cs) (revision da6d3525ea7ee7528cab7184c39205d3452440f7) +++ Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/Factories/WaveConditionsChartDataFactoryTest.cs (.../WaveConditionsChartDataFactoryTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -24,7 +24,7 @@ using Core.Components.Chart.Styles; using NUnit.Framework; using Riskeer.Common.Data.TestUtil; -using Riskeer.Revetment.Data.TestUtil; +using Riskeer.Revetment.Data; using Riskeer.Revetment.Forms.Factories; namespace Riskeer.Revetment.Forms.Test.Factories @@ -158,7 +158,7 @@ { // Setup var chartData = new ChartLineData("test name"); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UseForeshore = true }; @@ -175,7 +175,7 @@ { // Setup var chartData = new ChartLineData("test name"); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile("profile name"), UseForeshore = false @@ -193,7 +193,7 @@ { // Setup var chartData = new ChartLineData("test name"); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile("profile name"), UseForeshore = true Index: Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs (.../WaveConditionsChartDataPointsFactoryTest.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/Factories/WaveConditionsChartDataPointsFactoryTest.cs (.../WaveConditionsChartDataPointsFactoryTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -26,7 +26,6 @@ using NUnit.Framework; using Riskeer.Common.Data.TestUtil; using Riskeer.Revetment.Data; -using Riskeer.Revetment.Data.TestUtil; using Riskeer.Revetment.Forms.Factories; namespace Riskeer.Revetment.Forms.Test.Factories @@ -48,7 +47,7 @@ public void CreateForeshoreGeometryPoints_ForeshoreProfileNull_ReturnsEmptyPointsCollection() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UseForeshore = true }; @@ -64,7 +63,7 @@ public void CreateForeshoreGeometryPoints_ForeshoreProfileSetUseForeshoreFalse_ReturnsEmptyPointsCollection() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile(new[] { @@ -90,7 +89,7 @@ new Point2D(1.1, 2.2), new Point2D(3.3, 4.4) }; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile(foreshoreGeometry), UseForeshore = true @@ -134,7 +133,7 @@ const double lowerBoundaryRevetment = 2; const double upperBoundaryRevetment = 8; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment, UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment @@ -158,7 +157,7 @@ const double lowerBoundaryRevetment = 2; const double upperBoundaryRevetment = 8; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment, UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment, @@ -194,7 +193,7 @@ const double lowerBoundaryRevetment = 2; const double upperBoundaryRevetment = 9; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment, UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment, @@ -249,7 +248,7 @@ const double lowerBoundaryRevetment = 2; const double upperBoundaryRevetment = 8; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment, UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment @@ -273,7 +272,7 @@ const double lowerBoundaryRevetment = 2; const double upperBoundaryRevetment = 8; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment, UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment, @@ -309,7 +308,7 @@ const double lowerBoundaryRevetment = 2; const double upperBoundaryRevetment = 8; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment, UpperBoundaryRevetment = (RoundedDouble) upperBoundaryRevetment, @@ -345,7 +344,7 @@ const double upperBoundaryRevetment = 8; const double lowerBoundaryWaterLevels = -3; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryWaterLevels = (RoundedDouble) lowerBoundaryWaterLevels, LowerBoundaryRevetment = (RoundedDouble) lowerBoundaryRevetment, @@ -383,7 +382,7 @@ public void CreateLowerBoundaryRevetmentGeometryPoints_LowerBoundaryRevetmentNaN_ReturnsEmptyPointsCollection() { // Call - IEnumerable points = WaveConditionsChartDataPointsFactory.CreateLowerBoundaryRevetmentGeometryPoints(new TestWaveConditionsInput()); + IEnumerable points = WaveConditionsChartDataPointsFactory.CreateLowerBoundaryRevetmentGeometryPoints(new WaveConditionsInput()); // Assert CollectionAssert.IsEmpty(points); @@ -393,7 +392,7 @@ public void CreateLowerBoundaryRevetmentGeometryPoints_NoForeshoreProfile_ReturnsLowerBoundaryRevetmentGeometryPointsCollection() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) 3 }; @@ -414,7 +413,7 @@ public void CreateLowerBoundaryRevetmentGeometryPoints_UseForeshoreProfileFalse_ReturnsLowerBoundaryRevetmentGeometryPointsCollection() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) 3, ForeshoreProfile = new TestForeshoreProfile(new[] @@ -446,7 +445,7 @@ IEnumerable foreshoreProfileGeometry) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) 3, ForeshoreProfile = new TestForeshoreProfile(foreshoreProfileGeometry) @@ -481,7 +480,7 @@ public void CreateUpperBoundaryRevetmentGeometryPoints_UpperBoundaryRevetmentNaN_ReturnsEmptyPointsCollection() { // Call - IEnumerable points = WaveConditionsChartDataPointsFactory.CreateUpperBoundaryRevetmentGeometryPoints(new TestWaveConditionsInput()); + IEnumerable points = WaveConditionsChartDataPointsFactory.CreateUpperBoundaryRevetmentGeometryPoints(new WaveConditionsInput()); // Assert CollectionAssert.IsEmpty(points); @@ -491,7 +490,7 @@ public void CreateUpperBoundaryRevetmentGeometryPoints_NoForeshoreProfile_ReturnsUpperBoundaryRevetmentGeometryPointsCollection() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UpperBoundaryRevetment = (RoundedDouble) 9 }; @@ -512,7 +511,7 @@ public void CreateUpperBoundaryRevetmentGeometryPoints_UseForeshoreProfileFalse_ReturnsUpperBoundaryRevetmentGeometryPointsCollection() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UpperBoundaryRevetment = (RoundedDouble) 9, ForeshoreProfile = new TestForeshoreProfile(new[] @@ -544,7 +543,7 @@ IEnumerable foreshoreProfileGeometry) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UpperBoundaryRevetment = (RoundedDouble) 8, ForeshoreProfile = new TestForeshoreProfile(foreshoreProfileGeometry) @@ -579,7 +578,7 @@ public void CreateLowerBoundaryWaterLevelsGeometryPoints_LowerBoundaryWaterLevelsNaN_ReturnsEmptyPointsCollection() { // Call - IEnumerable points = WaveConditionsChartDataPointsFactory.CreateLowerBoundaryWaterLevelsGeometryPoints(new TestWaveConditionsInput()); + IEnumerable points = WaveConditionsChartDataPointsFactory.CreateLowerBoundaryWaterLevelsGeometryPoints(new WaveConditionsInput()); // Assert CollectionAssert.IsEmpty(points); @@ -589,7 +588,7 @@ public void CreateLowerBoundaryWaterLevelsGeometryPoints_NoForeshoreProfile_ReturnsLowerBoundaryWaterLevelsGeometryPointsCollection() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryWaterLevels = (RoundedDouble) 3 }; @@ -610,7 +609,7 @@ public void CreateLowerBoundaryWaterLevelsGeometryPoints_UseForeshoreProfileFalse_ReturnsLowerBoundaryWaterLevelsGeometryPointsCollection() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryWaterLevels = (RoundedDouble) 3, ForeshoreProfile = new TestForeshoreProfile(new[] @@ -642,7 +641,7 @@ IEnumerable foreshoreProfileGeometry) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryWaterLevels = (RoundedDouble) 3, ForeshoreProfile = new TestForeshoreProfile(foreshoreProfileGeometry) @@ -677,7 +676,7 @@ public void CreateUpperBoundaryWaterLevelsGeometryPoints_UpperBoundaryWaterLevelsNaN_ReturnsEmptyPointsCollection() { // Call - IEnumerable points = WaveConditionsChartDataPointsFactory.CreateUpperBoundaryWaterLevelsGeometryPoints(new TestWaveConditionsInput()); + IEnumerable points = WaveConditionsChartDataPointsFactory.CreateUpperBoundaryWaterLevelsGeometryPoints(new WaveConditionsInput()); // Assert CollectionAssert.IsEmpty(points); @@ -687,7 +686,7 @@ public void CreateUpperBoundaryWaterLevelsGeometryPoints_NoForeshoreProfile_ReturnsUpperBoundaryWaterLevelsGeometryPointsCollection() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UpperBoundaryWaterLevels = (RoundedDouble) 9 }; @@ -708,7 +707,7 @@ public void CreateUpperBoundaryWaterLevelsGeometryPoints_UseForeshoreProfileFalse_ReturnsUpperBoundaryWaterLevelsGeometryPointsCollection() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UpperBoundaryWaterLevels = (RoundedDouble) 9, ForeshoreProfile = new TestForeshoreProfile(new[] @@ -740,7 +739,7 @@ IEnumerable foreshoreProfileGeometry) { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UpperBoundaryWaterLevels = (RoundedDouble) 9, ForeshoreProfile = new TestForeshoreProfile(foreshoreProfileGeometry) @@ -775,7 +774,7 @@ public void CreateAssessmentLevelGeometryPoints_AssessmentLevelNaN_ReturnsEmptyPointsCollection() { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Call IEnumerable points = WaveConditionsChartDataPointsFactory.CreateAssessmentLevelGeometryPoints(input, RoundedDouble.NaN); @@ -788,7 +787,7 @@ public void CreateAssessmentLevelGeometryPoints_NoForeshoreProfile_ReturnsAssessmentLevelGeometryPointsCollection() { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Call IEnumerable points = WaveConditionsChartDataPointsFactory.CreateAssessmentLevelGeometryPoints(input, GetValidAssessmentLevel()); @@ -806,7 +805,7 @@ public void CreateAssessmentLevelGeometryPoints_UseForeshoreProfileFalse_ReturnsAssessmentLevelGeometryPointsCollection() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile(new[] { @@ -838,7 +837,7 @@ { // Setup RoundedDouble assessmentLevel = GetValidAssessmentLevel(); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile(foreshoreProfileGeometry) }; @@ -872,7 +871,7 @@ public void CreateWaterLevelsGeometryPoints_NoWaterLevels_ReturnsEmptyLinesList() { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Call IEnumerable> lines = WaveConditionsChartDataPointsFactory.CreateWaterLevelsGeometryPoints(input, RoundedDouble.NaN); @@ -885,7 +884,7 @@ public void CreateWaterLevelsGeometryPoints_NoForeshoreProfile_ReturnsWaterLevelsGeometryPointsCollection() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) 5, UpperBoundaryRevetment = (RoundedDouble) 7, @@ -923,7 +922,7 @@ { // Setup RoundedDouble assessmentLevel = GetValidAssessmentLevel(); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile(foreshoreProfileGeometry), LowerBoundaryRevetment = (RoundedDouble) 5, @@ -977,13 +976,13 @@ private static IEnumerable GetInputWithoutRevetmentBoundaries(string testNameFormat) { - yield return new TestCaseData(new TestWaveConditionsInput()) + yield return new TestCaseData(new WaveConditionsInput()) .SetName(string.Format(testNameFormat, "NoRevetmentBoundaries")); - yield return new TestCaseData(new TestWaveConditionsInput + yield return new TestCaseData(new WaveConditionsInput { LowerBoundaryRevetment = (RoundedDouble) 2 }).SetName(string.Format(testNameFormat, "LowerBoundaryRevetmentSet")); - yield return new TestCaseData(new TestWaveConditionsInput + yield return new TestCaseData(new WaveConditionsInput { UpperBoundaryRevetment = (RoundedDouble) 7 }).SetName(string.Format(testNameFormat, "UpperBoundaryRevetmentSet")); Index: Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs (.../WaveConditionsInputContextTest.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PresentationObjects/WaveConditionsInputContextTest.cs (.../WaveConditionsInputContextTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -28,6 +28,7 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.TestUtil; +using Riskeer.Revetment.Data; using Riskeer.Revetment.Data.TestUtil; using Riskeer.Revetment.Forms.PresentationObjects; @@ -40,14 +41,14 @@ public void Constructor_CalculationNull_ThrowArgumentNullException() { // Setup - var waveConditionsInput = new TestWaveConditionsInput(); + var waveConditionsInput = new WaveConditionsInput(); var mocks = new MockRepository(); var assessmentSection = mocks.StrictMock(); mocks.ReplayAll(); // Call - TestDelegate call = () => new TestWaveConditionsInputContext(waveConditionsInput, + TestDelegate call = () => new WaveConditionsInputContext(waveConditionsInput, null, assessmentSection); @@ -61,11 +62,11 @@ public void Constructor_AssessmentSectionNull_ThrowArgumentNullException() { // Setup - var waveConditionsInput = new TestWaveConditionsInput(); - var calculation = new TestWaveConditionsCalculation(waveConditionsInput); + var waveConditionsInput = new WaveConditionsInput(); + var calculation = new TestWaveConditionsCalculation(waveConditionsInput); // Call - TestDelegate call = () => new TestWaveConditionsInputContext(waveConditionsInput, + TestDelegate call = () => new WaveConditionsInputContext(waveConditionsInput, calculation, null); @@ -78,27 +79,27 @@ public void Constructor_ValidInput_ExpectedValues() { // Setup - var waveConditionsInput = new TestWaveConditionsInput(); - var calculation = new TestWaveConditionsCalculation(waveConditionsInput); + var waveConditionsInput = new WaveConditionsInput(); + var calculation = new TestWaveConditionsCalculation(waveConditionsInput); var assessmentSection = new AssessmentSectionStub(); // Call - var context = new TestWaveConditionsInputContext(waveConditionsInput, + var context = new WaveConditionsInputContext(waveConditionsInput, calculation, assessmentSection); // Assert - Assert.IsInstanceOf>(context); + Assert.IsInstanceOf>(context); Assert.AreSame(waveConditionsInput, context.WrappedData); Assert.AreSame(calculation, context.Calculation); Assert.AreSame(assessmentSection, context.AssessmentSection); Assert.AreSame(assessmentSection.HydraulicBoundaryDatabase.Locations, context.HydraulicBoundaryLocations); } - private class TestWaveConditionsInputContext : WaveConditionsInputContext + private class WaveConditionsInputContext : WaveConditionsInputContext { - public TestWaveConditionsInputContext(TestWaveConditionsInput wrappedData, - ICalculation calculation, + public WaveConditionsInputContext(WaveConditionsInput wrappedData, + ICalculation calculation, IAssessmentSection assessmentSection) : base(wrappedData, calculation, assessmentSection) {} Index: Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs =================================================================== diff -u -rf10cf45c86b712053fcd5cc16db231a726c9397e -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision f10cf45c86b712053fcd5cc16db231a726c9397e) +++ Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputContextPropertiesTest.cs (.../WaveConditionsInputContextPropertiesTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -81,7 +81,7 @@ mocks.ReplayAll(); // Call - TestDelegate test = () => new TestWaveConditionsInputContextProperties(null, + TestDelegate test = () => new WaveConditionsInputContextProperties(null, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -101,13 +101,13 @@ var assessmentSection = new AssessmentSectionStub(); - var context = new TestWaveConditionsInputContext( - new TestWaveConditionsInput(), + var context = new WaveConditionsInputContext( + new WaveConditionsInput(), Enumerable.Empty(), assessmentSection); // Call - TestDelegate test = () => new TestWaveConditionsInputContextProperties(context, null, handler); + TestDelegate test = () => new WaveConditionsInputContextProperties(context, null, handler); // Assert var exception = Assert.Throws(test); @@ -119,13 +119,13 @@ public void Constructor_PropertyChangeHandlerNull_ThrowsArgumentNullException() { // Setup - var context = new TestWaveConditionsInputContext( - new TestWaveConditionsInput(), + var context = new WaveConditionsInputContext( + new WaveConditionsInput(), Enumerable.Empty(), new AssessmentSectionStub()); // Call - TestDelegate test = () => new TestWaveConditionsInputContextProperties(context, + TestDelegate test = () => new WaveConditionsInputContextProperties(context, AssessmentSectionTestHelper.GetTestAssessmentLevel, null); @@ -171,7 +171,7 @@ var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); HydraulicBoundaryLocationCalculationsForTargetProbability calculationsForTargetProbability = assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First(); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = foreshoreProfile, HydraulicBoundaryLocation = hydraulicBoundaryLocation, @@ -183,13 +183,13 @@ WaterLevelType = WaveConditionsInputWaterLevelType.UserDefinedTargetProbability, CalculationsTargetProbability = calculationsForTargetProbability }; - var inputContext = new TestWaveConditionsInputContext(input, Array.Empty(), assessmentSection); + var inputContext = new WaveConditionsInputContext(input, Array.Empty(), assessmentSection); // Call - var properties = new TestWaveConditionsInputContextProperties(inputContext, () => assessmentLevel, handler); + var properties = new WaveConditionsInputContextProperties(inputContext, () => assessmentLevel, handler); // Assert - Assert.IsInstanceOf>(properties); + Assert.IsInstanceOf>(properties); Assert.IsInstanceOf(properties); Assert.IsInstanceOf(properties); Assert.IsInstanceOf(properties); @@ -236,21 +236,21 @@ var assessmentSection = new AssessmentSectionStub(); - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); var foreshoreProfile = new TestForeshoreProfile(); if (withForeshoreProfile) { input.ForeshoreProfile = foreshoreProfile; } - var inputContext = new TestWaveConditionsInputContext(input, new[] + var inputContext = new WaveConditionsInputContext(input, new[] { foreshoreProfile }, assessmentSection); // Call - var properties = new TestWaveConditionsInputContextProperties(inputContext, + var properties = new WaveConditionsInputContextProperties(inputContext, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -389,18 +389,18 @@ var upperBoundaryWaterLevels = (RoundedDouble) 5.88; const WaveConditionsInputStepSize stepSize = WaveConditionsInputStepSize.Half; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { UpperBoundaryRevetment = upperBoundaryRevetment, LowerBoundaryRevetment = lowerBoundaryRevetment, UpperBoundaryWaterLevels = upperBoundaryWaterLevels, LowerBoundaryWaterLevels = lowerBoundaryWaterLevels, StepSize = stepSize }; - var inputContext = new TestWaveConditionsInputContext(input, Array.Empty(), assessmentSection); + var inputContext = new WaveConditionsInputContext(input, Array.Empty(), assessmentSection); // Call - var properties = new TestWaveConditionsInputContextProperties(inputContext, () => assessmentLevel, handler); + var properties = new WaveConditionsInputContextProperties(inputContext, () => assessmentLevel, handler); // Assert Assert.IsNotEmpty(properties.WaterLevels); @@ -435,16 +435,16 @@ observable.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); - var input = new TestWaveConditionsInput(); - var calculation = new TestWaveConditionsCalculation(input); - var context = new TestWaveConditionsInputContext(input, calculation, assessmentSection, Array.Empty()); + var input = new WaveConditionsInput(); + var calculation = new TestWaveConditionsCalculation(input); + var context = new WaveConditionsInputContext(input, calculation, assessmentSection, Array.Empty()); var customHandler = new SetPropertyValueAfterConfirmationParameterTester(new[] { observable }); - var properties = new TestWaveConditionsInputContextProperties(context, AssessmentSectionTestHelper.GetTestAssessmentLevel, customHandler); + var properties = new WaveConditionsInputContextProperties(context, AssessmentSectionTestHelper.GetTestAssessmentLevel, customHandler); var newSelectableTargetProbability = new SelectableTargetProbability(Enumerable.Empty(), waterLevelType, 0.01); @@ -474,16 +474,16 @@ observable.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); - var input = new TestWaveConditionsInput(); - var calculation = new TestWaveConditionsCalculation(input); - var context = new TestWaveConditionsInputContext(input, calculation, assessmentSection, Array.Empty()); + var input = new WaveConditionsInput(); + var calculation = new TestWaveConditionsCalculation(input); + var context = new WaveConditionsInputContext(input, calculation, assessmentSection, Array.Empty()); var customHandler = new SetPropertyValueAfterConfirmationParameterTester(new[] { observable }); - var properties = new TestWaveConditionsInputContextProperties(context, AssessmentSectionTestHelper.GetTestAssessmentLevel, customHandler); + var properties = new WaveConditionsInputContextProperties(context, AssessmentSectionTestHelper.GetTestAssessmentLevel, customHandler); const WaveConditionsInputWaterLevelType waterLevelType = WaveConditionsInputWaterLevelType.UserDefinedTargetProbability; var selectableTargetProbability = new SelectableTargetProbability(calculationsForTargetProbability.HydraulicBoundaryLocationCalculations, @@ -581,10 +581,10 @@ var assessmentSection = new AssessmentSectionStub(); - var input = new TestWaveConditionsInput(); - var inputContext = new TestWaveConditionsInputContext(input, Array.Empty(), assessmentSection); + var input = new WaveConditionsInput(); + var inputContext = new WaveConditionsInputContext(input, Array.Empty(), assessmentSection); - var properties = new TestWaveConditionsInputContextProperties(inputContext, + var properties = new WaveConditionsInputContextProperties(inputContext, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -612,13 +612,13 @@ hydraulicBoundaryLocation }); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile(new Point2D(200620.173572981, 503401.652985217)) }; - var inputContext = new TestWaveConditionsInputContext(input, Array.Empty(), assessmentSection); + var inputContext = new WaveConditionsInputContext(input, Array.Empty(), assessmentSection); - var properties = new TestWaveConditionsInputContextProperties(inputContext, + var properties = new WaveConditionsInputContextProperties(inputContext, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -649,7 +649,7 @@ mocks.ReplayAll(); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = hydraulicBoundaryLocation, ForeshoreProfile = new TestForeshoreProfile(new Point2D(200620.173572981, 503401.652985217)) @@ -661,8 +661,8 @@ hydraulicBoundaryLocation }); - var inputContext = new TestWaveConditionsInputContext(input, Array.Empty(), assessmentSection); - var properties = new TestWaveConditionsInputContextProperties(inputContext, + var inputContext = new WaveConditionsInputContext(input, Array.Empty(), assessmentSection); + var properties = new WaveConditionsInputContextProperties(inputContext, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -692,7 +692,7 @@ var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 200643.312, 503347.25); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = hydraulicBoundaryLocation, ForeshoreProfile = new TestForeshoreProfile(new Point2D(200620.173572981, 503401.652985217)) @@ -704,9 +704,9 @@ hydraulicBoundaryLocation }); - var inputContext = new TestWaveConditionsInputContext(input, Array.Empty(), assessmentSection); + var inputContext = new WaveConditionsInputContext(input, Array.Empty(), assessmentSection); - var properties = new TestWaveConditionsInputContextProperties(inputContext, + var properties = new WaveConditionsInputContextProperties(inputContext, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -741,10 +741,10 @@ var assessmentSection = new AssessmentSectionStub(); assessmentSection.SetHydraulicBoundaryLocationCalculations(locations); - var input = new TestWaveConditionsInput(); - var inputContext = new TestWaveConditionsInputContext(input, Array.Empty(), assessmentSection); + var input = new WaveConditionsInput(); + var inputContext = new WaveConditionsInputContext(input, Array.Empty(), assessmentSection); - var properties = new TestWaveConditionsInputContextProperties(inputContext, + var properties = new WaveConditionsInputContextProperties(inputContext, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -777,17 +777,17 @@ new HydraulicBoundaryLocation(2, "B", 0, 200) }; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile() }; var assessmentSection = new AssessmentSectionStub(); assessmentSection.SetHydraulicBoundaryLocationCalculations(locations); - var inputContext = new TestWaveConditionsInputContext(input, Array.Empty(), assessmentSection); + var inputContext = new WaveConditionsInputContext(input, Array.Empty(), assessmentSection); - var properties = new TestWaveConditionsInputContextProperties(inputContext, + var properties = new WaveConditionsInputContextProperties(inputContext, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -820,17 +820,17 @@ var assessmentSection = new AssessmentSectionStub(); assessmentSection.SetHydraulicBoundaryLocationCalculations(locations); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile() }; - var calculation = new TestWaveConditionsCalculation(input); - var inputContext = new TestWaveConditionsInputContext(input, calculation, assessmentSection, Array.Empty()); + var calculation = new TestWaveConditionsCalculation(input); + var inputContext = new WaveConditionsInputContext(input, calculation, assessmentSection, Array.Empty()); var otherProfile = new TestForeshoreProfile(new Point2D(0, 190)); var customHandler = new SetPropertyValueAfterConfirmationParameterTester(Enumerable.Empty()); - var properties = new TestWaveConditionsInputContextProperties(inputContext, + var properties = new WaveConditionsInputContextProperties(inputContext, AssessmentSectionTestHelper.GetTestAssessmentLevel, customHandler); @@ -869,10 +869,10 @@ new TestForeshoreProfile() }; - var input = new TestWaveConditionsInput(); - var inputContext = new TestWaveConditionsInputContext(input, foreshoreProfiles, assessmentSection); + var input = new WaveConditionsInput(); + var inputContext = new WaveConditionsInputContext(input, foreshoreProfiles, assessmentSection); - var properties = new TestWaveConditionsInputContextProperties(inputContext, + var properties = new WaveConditionsInputContextProperties(inputContext, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -894,10 +894,10 @@ var assessmentSection = new AssessmentSectionStub(); - var input = new TestWaveConditionsInput(); - var inputContext = new TestWaveConditionsInputContext(input, Array.Empty(), assessmentSection); + var input = new WaveConditionsInput(); + var inputContext = new WaveConditionsInputContext(input, Array.Empty(), assessmentSection); - var properties = new TestWaveConditionsInputContextProperties(inputContext, + var properties = new WaveConditionsInputContextProperties(inputContext, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -923,7 +923,7 @@ var assessmentSection = new AssessmentSectionStub(); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { WaterLevelType = waterLevelType }; @@ -933,9 +933,9 @@ input.CalculationsTargetProbability = assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.First(); } - var inputContext = new TestWaveConditionsInputContext(input, Array.Empty(), assessmentSection); + var inputContext = new WaveConditionsInputContext(input, Array.Empty(), assessmentSection); - var properties = new TestWaveConditionsInputContextProperties(inputContext, + var properties = new WaveConditionsInputContextProperties(inputContext, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -959,10 +959,10 @@ var assessmentSection = new AssessmentSectionStub(); - var input = new TestWaveConditionsInput(); - var inputContext = new TestWaveConditionsInputContext(input, Array.Empty(), assessmentSection); + var input = new WaveConditionsInput(); + var inputContext = new WaveConditionsInputContext(input, Array.Empty(), assessmentSection); - var properties = new TestWaveConditionsInputContextProperties(inputContext, + var properties = new WaveConditionsInputContextProperties(inputContext, AssessmentSectionTestHelper.GetTestAssessmentLevel, handler); @@ -988,7 +988,7 @@ mocks.VerifyAll(); } - private static void SetPropertyAndVerifyNotificationsAndOutputForCalculation(Action setProperty) + private static void SetPropertyAndVerifyNotificationsAndOutputForCalculation(Action setProperty) { // Setup var mocks = new MockRepository(); @@ -997,13 +997,13 @@ observable.Expect(o => o.NotifyObservers()); mocks.ReplayAll(); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile() }; - var calculation = new TestWaveConditionsCalculation(input); + var calculation = new TestWaveConditionsCalculation(input); - var context = new TestWaveConditionsInputContext(input, + var context = new WaveConditionsInputContext(input, calculation, assessmentSection, Array.Empty()); @@ -1013,7 +1013,7 @@ observable }); - var properties = new TestWaveConditionsInputContextProperties(context, + var properties = new WaveConditionsInputContextProperties(context, AssessmentSectionTestHelper.GetTestAssessmentLevel, customHandler); @@ -1047,9 +1047,9 @@ section => section.WaterLevelCalculationsForUserDefinedTargetProbabilities.First().TargetProbability)); } - private class TestWaveConditionsInputContextProperties : WaveConditionsInputContextProperties + private class WaveConditionsInputContextProperties : WaveConditionsInputContextProperties { - public TestWaveConditionsInputContextProperties(TestWaveConditionsInputContext context, + public WaveConditionsInputContextProperties(WaveConditionsInputContext context, Func getAssessmentLevelFunc, IObservablePropertyChangeHandler handler) : base(context, getAssessmentLevelFunc, handler) {} Index: Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs =================================================================== diff -u -r108161cd4d645bfa85a61f2c083e27b4c28a9a7c -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs (.../WaveConditionsInputForeshoreProfilePropertiesTest.cs) (revision 108161cd4d645bfa85a61f2c083e27b4c28a9a7c) +++ Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/PropertyClasses/WaveConditionsInputForeshoreProfilePropertiesTest.cs (.../WaveConditionsInputForeshoreProfilePropertiesTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -29,7 +29,6 @@ using Rhino.Mocks; using Riskeer.Common.Data.TestUtil; using Riskeer.Revetment.Data; -using Riskeer.Revetment.Data.TestUtil; using Riskeer.Revetment.Forms.PropertyClasses; namespace Riskeer.Revetment.Forms.Test.PropertyClasses @@ -56,7 +55,7 @@ public void Data_SetNewInputContextInstance_ReturnCorrectPropertyValues() { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); var properties = new WaveConditionsInputForeshoreProfileProperties(); // Call @@ -71,7 +70,7 @@ public void Data_SetInputContextInstanceWithData_ReturnCorrectPropertyValues() { // Setup - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { ForeshoreProfile = new TestForeshoreProfile(new[] { @@ -104,7 +103,7 @@ observer.Expect(o => o.UpdateObserver()).Repeat.Times(numberOfChangedProperties); mockRepository.ReplayAll(); - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); var properties = new WaveConditionsInputForeshoreProfileProperties { Data = input @@ -127,7 +126,7 @@ public void PropertyAttributes_WithOrWithoutForeshoreProfileAndPoints_ReturnExpectedValues(bool withForeshoreProfile, int numberOfProfilePoints, bool expectedCoordinatesPropertyReadOnly) { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); if (withForeshoreProfile) { Index: Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs =================================================================== diff -u -rda6d3525ea7ee7528cab7184c39205d3452440f7 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision da6d3525ea7ee7528cab7184c39205d3452440f7) +++ Riskeer/Revetment/test/Riskeer.Revetment.Forms.Test/Views/WaveConditionsInputViewTest.cs (.../WaveConditionsInputViewTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -75,7 +75,7 @@ // Call TestDelegate test = () => new WaveConditionsInputView(CreateTestCalculation(), null, - new TestWaveConditionsInputViewStyle()); + new WaveConditionsInputViewStyle()); // Assert var exception = Assert.Throws(test); @@ -88,7 +88,7 @@ // Call TestDelegate test = () => new WaveConditionsInputView(null, GetHydraulicBoundaryLocationCalculation, - new TestWaveConditionsInputViewStyle()); + new WaveConditionsInputViewStyle()); // Assert var exception = Assert.Throws(test); @@ -99,10 +99,10 @@ public void Constructor_ExpectedValues() { // Call - TestWaveConditionsCalculation calculation = CreateTestCalculation(); + TestWaveConditionsCalculation calculation = CreateTestCalculation(); using (var view = new WaveConditionsInputView(calculation, GetHydraulicBoundaryLocationCalculation, - new TestWaveConditionsInputViewStyle())) + new WaveConditionsInputViewStyle())) { // Assert Assert.IsInstanceOf(view); @@ -119,7 +119,7 @@ // Setup const string calculationName = "Calculation name"; var assessmentLevel = (RoundedDouble) 6; - var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) + var calculation = new TestWaveConditionsCalculation(new WaveConditionsInput()) { Name = calculationName, InputParameters = @@ -140,7 +140,7 @@ // Call using (var view = new WaveConditionsInputView(calculation, () => GetHydraulicBoundaryLocationCalculation(assessmentLevel), - new TestWaveConditionsInputViewStyle())) + new WaveConditionsInputViewStyle())) { // Assert IChartControl chartControl = view.Chart; @@ -192,14 +192,14 @@ const string initialName = "Initial name"; const string updatedName = "Updated name"; - var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) + var calculation = new TestWaveConditionsCalculation(new WaveConditionsInput()) { Name = initialName }; using (var view = new WaveConditionsInputView(calculation, GetHydraulicBoundaryLocationCalculation, - new TestWaveConditionsInputViewStyle())) + new WaveConditionsInputViewStyle())) { // Precondition Assert.AreEqual(initialName, view.Chart.ChartTitle); @@ -224,7 +224,7 @@ mocks.ReplayAll(); var assessmentLevel = (RoundedDouble) 6; - var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) + var calculation = new TestWaveConditionsCalculation(new WaveConditionsInput()) { InputParameters = { @@ -243,7 +243,7 @@ using (var view = new WaveConditionsInputView(calculation, () => GetHydraulicBoundaryLocationCalculation(assessmentLevel), - new TestWaveConditionsInputViewStyle())) + new WaveConditionsInputViewStyle())) { var foreshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex); var lowerBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex); @@ -328,7 +328,7 @@ new Point2D(1.0, 1.0), new Point2D(2.0, 2.0) }); - var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) + var calculation = new TestWaveConditionsCalculation(new WaveConditionsInput()) { InputParameters = { @@ -345,7 +345,7 @@ using (var view = new WaveConditionsInputView(calculation, () => hydraulicBoundaryLocationCalculation, - new TestWaveConditionsInputViewStyle())) + new WaveConditionsInputViewStyle())) { var foreshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex); var lowerBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex); @@ -411,7 +411,7 @@ new Point2D(1.0, 1.0), new Point2D(2.0, 2.0) }); - var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) + var calculation = new TestWaveConditionsCalculation(new WaveConditionsInput()) { InputParameters = { @@ -427,7 +427,7 @@ using (var view = new WaveConditionsInputView(calculation, () => hydraulicBoundaryLocationCalculation, - new TestWaveConditionsInputViewStyle())) + new WaveConditionsInputViewStyle())) { var foreshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex); var lowerBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex); @@ -490,7 +490,7 @@ new Point2D(1.0, 1.0), new Point2D(2.0, 2.0) }); - var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) + var calculation = new TestWaveConditionsCalculation(new WaveConditionsInput()) { InputParameters = { @@ -506,7 +506,7 @@ var assessmentLevel = (RoundedDouble) 6; using (var view = new WaveConditionsInputView(calculation, () => GetHydraulicBoundaryLocationCalculation(assessmentLevel), - new TestWaveConditionsInputViewStyle())) + new WaveConditionsInputViewStyle())) { var foreshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex); var lowerBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex); @@ -572,7 +572,7 @@ new Point2D(1.0, 1.0), new Point2D(2.0, 2.0) }); - var calculation = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) + var calculation = new TestWaveConditionsCalculation(new WaveConditionsInput()) { InputParameters = { @@ -590,7 +590,7 @@ using (var view = new WaveConditionsInputView(calculation, () => hydraulicBoundaryLocationCalculation, - new TestWaveConditionsInputViewStyle())) + new WaveConditionsInputViewStyle())) { var foreshoreChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(foreShoreChartDataIndex); var lowerBoundaryRevetmentChartData = (ChartLineData) view.Chart.Data.Collection.ElementAt(lowerBoundaryRevetmentChartDataIndex); @@ -661,9 +661,9 @@ }; } - private static TestWaveConditionsCalculation CreateTestCalculation() + private static TestWaveConditionsCalculation CreateTestCalculation() { - return new TestWaveConditionsCalculation(new TestWaveConditionsInput()); + return new TestWaveConditionsCalculation(new WaveConditionsInput()); } private static void AssertForeshoreChartData(ForeshoreProfile foreshoreProfile, ChartData chartData) Index: Riskeer/Revetment/test/Riskeer.Revetment.Forms.TestUtil/TestWaveConditionsInputContext.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Forms.TestUtil/TestWaveConditionsInputContext.cs (.../TestWaveConditionsInputContext.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/test/Riskeer.Revetment.Forms.TestUtil/TestWaveConditionsInputContext.cs (.../TestWaveConditionsInputContext.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -24,6 +24,7 @@ using Riskeer.Common.Data.Calculation; using Riskeer.Common.Data.DikeProfiles; using Riskeer.Common.Data.TestUtil; +using Riskeer.Revetment.Data; using Riskeer.Revetment.Data.TestUtil; using Riskeer.Revetment.Forms.PresentationObjects; @@ -33,40 +34,40 @@ /// Simple implementation which can be used /// for test purposes. /// - public class TestWaveConditionsInputContext : WaveConditionsInputContext + public class WaveConditionsInputContext : WaveConditionsInputContext { /// - /// Creates a new . + /// Creates a new . /// /// The wrapped wave conditions input. - public TestWaveConditionsInputContext(TestWaveConditionsInput wrappedData) + public WaveConditionsInputContext(WaveConditionsInput wrappedData) : this(wrappedData, new ForeshoreProfile[0], new AssessmentSectionStub()) {} /// - /// Creates a new . + /// Creates a new . /// /// The wrapped wave conditions input. /// The foreshore profiles. /// The assessment section. - public TestWaveConditionsInputContext(TestWaveConditionsInput wrappedData, + public WaveConditionsInputContext(WaveConditionsInput wrappedData, IEnumerable foreshoreProfiles, IAssessmentSection assessmentSection) : this(wrappedData, - new TestWaveConditionsCalculation(wrappedData), + new TestWaveConditionsCalculation(wrappedData), assessmentSection, foreshoreProfiles) {} /// - /// Creates a new . + /// Creates a new . /// /// The wrapped wave conditions input. /// The calculation. /// The assessment section. /// The foreshore profiles. - public TestWaveConditionsInputContext(TestWaveConditionsInput wrappedData, - ICalculation calculation, + public WaveConditionsInputContext(WaveConditionsInput wrappedData, + ICalculation calculation, IAssessmentSection assessmentSection, IEnumerable foreshoreProfiles) : base(wrappedData, calculation, assessmentSection) Index: Riskeer/Revetment/test/Riskeer.Revetment.Forms.TestUtil/TestWaveConditionsInputViewStyle.cs =================================================================== diff -u -r7491928192a7ecf23958f85fbd4669ec17085c95 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Forms.TestUtil/TestWaveConditionsInputViewStyle.cs (.../TestWaveConditionsInputViewStyle.cs) (revision 7491928192a7ecf23958f85fbd4669ec17085c95) +++ Riskeer/Revetment/test/Riskeer.Revetment.Forms.TestUtil/TestWaveConditionsInputViewStyle.cs (.../TestWaveConditionsInputViewStyle.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -28,7 +28,7 @@ /// Class that defines the style that is used in the /// which can be used for test purposes. /// - public class TestWaveConditionsInputViewStyle : IWaveConditionsInputViewStyle + public class WaveConditionsInputViewStyle : IWaveConditionsInputViewStyle { public Color RevetmentLineColor { Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationExporterTest.cs =================================================================== diff -u -r6162d7dffc2e385a00186585cd9b59d501e30a23 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationExporterTest.cs (.../WaveConditionsCalculationConfigurationExporterTest.cs) (revision 6162d7dffc2e385a00186585cd9b59d501e30a23) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationExporterTest.cs (.../WaveConditionsCalculationConfigurationExporterTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -59,7 +59,7 @@ public void Export_VariousTargetProbabilities_ReturnTrueAndWritesFile() { // Setup - var calculation1 = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) + var calculation1 = new TestWaveConditionsCalculation(new WaveConditionsInput()) { Name = "Calculation 1 (lower limit)", InputParameters = @@ -68,7 +68,7 @@ } }; - var calculation2 = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) + var calculation2 = new TestWaveConditionsCalculation(new WaveConditionsInput()) { Name = "Calculation 2 (signaling)", InputParameters = @@ -77,7 +77,7 @@ } }; - var calculation3 = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) + var calculation3 = new TestWaveConditionsCalculation(new WaveConditionsInput()) { Name = "Calculation 3 (user defined)", InputParameters = @@ -87,7 +87,7 @@ } }; - var calculation4 = new TestWaveConditionsCalculation(new TestWaveConditionsInput()) + var calculation4 = new TestWaveConditionsCalculation(new WaveConditionsInput()) { Name = "Calculation 4 (none)", InputParameters = @@ -130,7 +130,7 @@ protected override ICalculation CreateCalculation() { - return new TestWaveConditionsCalculation(new TestWaveConditionsInput()); + return new TestWaveConditionsCalculation(new WaveConditionsInput()); } protected override WaveConditionsCalculationConfigurationExporter, WaveConditionsCalculationConfiguration, ICalculation> CallConfigurationFilePathConstructor( Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs =================================================================== diff -u -rcc7d01e84fd44fff418ea8b749ecbcd8e2855957 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision cc7d01e84fd44fff418ea8b749ecbcd8e2855957) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/Configurations/WaveConditionsCalculationConfigurationImporterTest.cs (.../WaveConditionsCalculationConfigurationImporterTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -576,9 +576,9 @@ } } - private class TestTargetTestWaveConditionsCalculation : TestWaveConditionsCalculation + private class TestTargetTestWaveConditionsCalculation : TestWaveConditionsCalculation { - public TestTargetTestWaveConditionsCalculation() : base(new TestWaveConditionsInput()) {} + public TestTargetTestWaveConditionsCalculation() : base(new WaveConditionsInput()) {} } private class TestWaveConditionsCalculationConfigurationReader : WaveConditionsCalculationConfigurationReader Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsTest.cs =================================================================== diff -u -r390c32569c89b5054c9b99ef3e46c1c0e963b81d -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsTest.cs (.../ExportableWaveConditionsTest.cs) (revision 390c32569c89b5054c9b99ef3e46c1c0e963b81d) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/ExportableWaveConditionsTest.cs (.../ExportableWaveConditionsTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -93,7 +93,7 @@ public void Constructor_WaveConditionsInputHydraulicBoundaryLocationNull_ThrowsArgumentException() { // Call - void Call() => new ExportableWaveConditions("aName", new TestWaveConditionsInput(), waveConditionsOutput, CoverType.StoneCoverColumns, "1/100"); + void Call() => new ExportableWaveConditions("aName", new WaveConditionsInput(), waveConditionsOutput, CoverType.StoneCoverColumns, "1/100"); // Assert var exception = Assert.Throws(Call); @@ -184,7 +184,7 @@ private static WaveConditionsInput CreateValidWaveConditionsInput() { - return new TestWaveConditionsInput + return new WaveConditionsInput { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "hblName", 1.0, 8.0) }; Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/WaveConditionsExporterBaseTest.cs =================================================================== diff -u -rc9a87f101cdd37370a07bd6d0727ce9773313332 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision c9a87f101cdd37370a07bd6d0727ce9773313332) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -28,7 +28,6 @@ using NUnit.Framework; using Riskeer.Common.Data.Hydraulics; using Riskeer.Revetment.Data; -using Riskeer.Revetment.Data.TestUtil; using Riskeer.Revetment.IO.WaveConditions; namespace Riskeer.Revetment.IO.Test.WaveConditions @@ -119,7 +118,7 @@ // Setup ExportableWaveConditions[] exportableWaveConditions = { - new ExportableWaveConditions("blocksName", new TestWaveConditionsInput + new ExportableWaveConditions("blocksName", new WaveConditionsInput { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0), LowerBoundaryRevetment = (RoundedDouble) 5.68, @@ -128,7 +127,7 @@ LowerBoundaryWaterLevels = (RoundedDouble) 2.689, UpperBoundaryWaterLevels = (RoundedDouble) 77.8249863247 }, CreateWaveConditionsOutputForExport(1.11111, 2.22222, 3.33333, 4.4, 5.5555555), CoverType.StoneCoverBlocks, "1/100"), - new ExportableWaveConditions("columnsName", new TestWaveConditionsInput + new ExportableWaveConditions("columnsName", new WaveConditionsInput { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456), LowerBoundaryRevetment = (RoundedDouble) 1.384, Index: Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/WaveConditionsWriterTest.cs =================================================================== diff -u -rc9a87f101cdd37370a07bd6d0727ce9773313332 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision c9a87f101cdd37370a07bd6d0727ce9773313332) +++ Riskeer/Revetment/test/Riskeer.Revetment.IO.Test/WaveConditions/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -29,7 +29,6 @@ using NUnit.Framework; using Riskeer.Common.Data.Hydraulics; using Riskeer.Revetment.Data; -using Riskeer.Revetment.Data.TestUtil; using Riskeer.Revetment.IO.WaveConditions; namespace Riskeer.Revetment.IO.Test.WaveConditions @@ -142,7 +141,7 @@ // Setup ExportableWaveConditions[] exportableWaveConditions = { - new ExportableWaveConditions("blocksName", new TestWaveConditionsInput + new ExportableWaveConditions("blocksName", new WaveConditionsInput { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0), LowerBoundaryRevetment = (RoundedDouble) 5.68, @@ -152,7 +151,7 @@ UpperBoundaryWaterLevels = (RoundedDouble) 77.8249863247, UseBreakWater = true }, CreateWaveConditionsOutputForExport(1.11111, 2.22222, 3.33333, 4.4, 5.5555555), CoverType.StoneCoverBlocks, "1/100"), - new ExportableWaveConditions("columnsName", new TestWaveConditionsInput + new ExportableWaveConditions("columnsName", new WaveConditionsInput { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456), LowerBoundaryRevetment = (RoundedDouble) 1.384, Index: Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -ra236a8a791de15d185a94dc6cbfe496ced981d8d -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision a236a8a791de15d185a94dc6cbfe496ced981d8d) +++ Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -66,7 +66,7 @@ public void Validate_HydraulicBoundaryDatabaseNull_ThrowArgumentNullException() { // Setup - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Call void Call() => WaveConditionsCalculationServiceBase.Validate(input, GetValidAssessmentLevel(), null); @@ -84,7 +84,7 @@ string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite"); // Call - void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(new TestWaveConditionsInput(), + void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(new WaveConditionsInput(), GetValidAssessmentLevel(), new HydraulicBoundaryDatabase { @@ -130,7 +130,7 @@ HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); // Call - void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(new TestWaveConditionsInput(), + void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(new WaveConditionsInput(), GetValidAssessmentLevel(), hydraulicBoundaryDatabase); @@ -155,7 +155,7 @@ string dbFilePath = Path.Combine(testDataPath, "HRD nosettings.sqlite"); // Call - void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(new TestWaveConditionsInput(), + void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(new WaveConditionsInput(), GetValidAssessmentLevel(), new HydraulicBoundaryDatabase { @@ -188,7 +188,7 @@ var isValid = false; // Call - void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(new TestWaveConditionsInput(), + void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(new WaveConditionsInput(), GetValidAssessmentLevel(), new HydraulicBoundaryDatabase()); @@ -211,7 +211,7 @@ // Setup var isValid = false; - var input = new TestWaveConditionsInput(); + var input = new WaveConditionsInput(); // Call void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(input, GetValidAssessmentLevel(), @@ -236,7 +236,7 @@ // Setup var isValid = false; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, string.Empty, 0, 0) }; @@ -268,7 +268,7 @@ // Setup var isValid = false; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(), Orientation = (RoundedDouble) 0, @@ -472,7 +472,7 @@ var b = (RoundedDouble) 0.8; var c = (RoundedDouble) 0.4; const double targetProbability = 0.2; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(), ForeshoreProfile = new TestForeshoreProfile(true), @@ -531,7 +531,7 @@ var b = (RoundedDouble) 0.8; var c = (RoundedDouble) 0.4; const double targetProbability = 0.2; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(), ForeshoreProfile = new TestForeshoreProfile(true), @@ -594,7 +594,7 @@ var b = (RoundedDouble) 0.8; var c = (RoundedDouble) 0.4; const double targetProbability = 0.2; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(), ForeshoreProfile = new TestForeshoreProfile(true), @@ -657,7 +657,7 @@ var waterLevelUpperBoundaryRevetment = new RoundedDouble(2, 4.00); var waterLevelLowerBoundaryRevetment = new RoundedDouble(2, 3.00); - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(), ForeshoreProfile = new TestForeshoreProfile(), @@ -771,7 +771,7 @@ var b = (RoundedDouble) 0.8; var c = (RoundedDouble) 0.4; const double targetProbability = 0.2; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(), ForeshoreProfile = new TestForeshoreProfile(), @@ -828,7 +828,7 @@ var b = (RoundedDouble) 0.8; var c = (RoundedDouble) 0.4; const double targetProbability = 0.2; - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(), ForeshoreProfile = new TestForeshoreProfile(), @@ -866,7 +866,7 @@ private static WaveConditionsInput GetDefaultValidationInput() { - var input = new TestWaveConditionsInput + var input = new WaveConditionsInput { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(), ForeshoreProfile = new TestForeshoreProfile(true), Index: Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsDataSynchronizationServiceTest.cs =================================================================== diff -u -rc184b065b5909ce4a9bc542ba203075b8778eb56 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsDataSynchronizationServiceTest.cs (.../WaveConditionsDataSynchronizationServiceTest.cs) (revision c184b065b5909ce4a9bc542ba203075b8778eb56) +++ Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsDataSynchronizationServiceTest.cs (.../WaveConditionsDataSynchronizationServiceTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -74,19 +74,19 @@ public void ClearAllWaveConditionsCalculationOutputWithNormType_WithAllData_ClearsOutputAndReturnsAffectedObjects(NormType normType) { // Setup - var calculation1 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation1 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.Signaling }, true); - var calculation2 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation2 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit }, true); - var calculation3 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation3 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.None }, true); - var calculation4 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation4 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.UserDefinedTargetProbability }, true); @@ -151,27 +151,27 @@ var calculationsForTargetProbabilityToClear = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); var otherCalculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01); - var calculation1 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation1 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.Signaling, CalculationsTargetProbability = calculationsForTargetProbabilityToClear }, true); - var calculation2 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation2 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit, CalculationsTargetProbability = calculationsForTargetProbabilityToClear }, true); - var calculation3 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation3 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.None, CalculationsTargetProbability = calculationsForTargetProbabilityToClear }, true); - var calculation4 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation4 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.UserDefinedTargetProbability, CalculationsTargetProbability = calculationsForTargetProbabilityToClear }, true); - var calculation5 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation5 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.UserDefinedTargetProbability, CalculationsTargetProbability = otherCalculationsForTargetProbability @@ -236,24 +236,24 @@ var calculationsForTargetProbabilityToClear = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); var otherCalculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01); - var calculation1 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation1 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.Signaling }, true); - var calculation2 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation2 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.LowerLimit }, true); - var calculation3 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation3 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.None }, true); - var calculation4 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation4 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.UserDefinedTargetProbability, CalculationsTargetProbability = calculationsForTargetProbabilityToClear }, true); - var calculation5 = new TestWaveConditionsCalculation(new TestWaveConditionsInput + var calculation5 = new TestWaveConditionsCalculation(new WaveConditionsInput { WaterLevelType = WaveConditionsInputWaterLevelType.UserDefinedTargetProbability, CalculationsTargetProbability = otherCalculationsForTargetProbability Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r3296c47ff95264562788d60157fc7137acdf73df -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 3296c47ff95264562788d60157fc7137acdf73df) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -228,16 +228,16 @@ activity.Run(); // Assert - WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = calculator.ReceivedInputs.ToArray(); - Assert.AreEqual(nrOfCalculators, testWaveConditionsInputs.Length); + WaveConditionsCosineCalculationInput[] WaveConditionsInputs = calculator.ReceivedInputs.ToArray(); + Assert.AreEqual(nrOfCalculators, WaveConditionsInputs.Length); GeneralStabilityStoneCoverWaveConditionsInput generalInput = stabilityStoneCoverFailureMechanism.GeneralInput; WaveConditionsInput input = calculation.InputParameters; double targetProbability = assessmentSection.FailureMechanismContribution.LowerLimitNorm; var waterLevelIndex = 0; - for (var i = 0; i < testWaveConditionsInputs.Length / 2; i++) + for (var i = 0; i < WaveConditionsInputs.Length / 2; i++) { var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, @@ -250,11 +250,11 @@ generalInput.GeneralBlocksWaveConditionsInput.B, generalInput.GeneralBlocksWaveConditionsInput.C); - HydraRingDataEqualityHelper.AreEqual(expectedInput, testWaveConditionsInputs[i]); + HydraRingDataEqualityHelper.AreEqual(expectedInput, WaveConditionsInputs[i]); } waterLevelIndex = 0; - for (int i = testWaveConditionsInputs.Length / 2; i < testWaveConditionsInputs.Length; i++) + for (int i = WaveConditionsInputs.Length / 2; i < WaveConditionsInputs.Length; i++) { var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, @@ -267,7 +267,7 @@ generalInput.GeneralColumnsWaveConditionsInput.B, generalInput.GeneralColumnsWaveConditionsInput.C); - HydraRingDataEqualityHelper.AreEqual(expectedInput, testWaveConditionsInputs[i]); + HydraRingDataEqualityHelper.AreEqual(expectedInput, WaveConditionsInputs[i]); } } Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r7359c7f8081ff1deb0e17dd50b856e156c85ac1c -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision 7359c7f8081ff1deb0e17dd50b856e156c85ac1c) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Service.Test/StabilityStoneCoverWaveConditionsCalculationServiceTest.cs (.../StabilityStoneCoverWaveConditionsCalculationServiceTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -401,8 +401,8 @@ stabilityStoneCoverFailureMechanism.GeneralInput); // Assert - WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = calculator.ReceivedInputs.ToArray(); - Assert.AreEqual(6, testWaveConditionsInputs.Length); + WaveConditionsCosineCalculationInput[] WaveConditionsInputs = calculator.ReceivedInputs.ToArray(); + Assert.AreEqual(6, WaveConditionsInputs.Length); GeneralStabilityStoneCoverWaveConditionsInput generalInput = stabilityStoneCoverFailureMechanism.GeneralInput; @@ -411,7 +411,7 @@ double expectedTargetProbability = assessmentSection.FailureMechanismContribution.LowerLimitNorm; var waterLevelIndex = 0; - for (var i = 0; i < testWaveConditionsInputs.Length / 2; i++) + for (var i = 0; i < WaveConditionsInputs.Length / 2; i++) { var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, @@ -424,11 +424,11 @@ generalInput.GeneralBlocksWaveConditionsInput.B, generalInput.GeneralBlocksWaveConditionsInput.C); - HydraRingDataEqualityHelper.AreEqual(expectedInput, testWaveConditionsInputs[i]); + HydraRingDataEqualityHelper.AreEqual(expectedInput, WaveConditionsInputs[i]); } waterLevelIndex = 0; - for (int i = testWaveConditionsInputs.Length / 2; i < testWaveConditionsInputs.Length; i++) + for (int i = WaveConditionsInputs.Length / 2; i < WaveConditionsInputs.Length; i++) { var expectedInput = new WaveConditionsCosineCalculationInput(1, input.Orientation, @@ -441,7 +441,7 @@ generalInput.GeneralColumnsWaveConditionsInput.B, generalInput.GeneralColumnsWaveConditionsInput.C); - HydraRingDataEqualityHelper.AreEqual(expectedInput, testWaveConditionsInputs[i]); + HydraRingDataEqualityHelper.AreEqual(expectedInput, WaveConditionsInputs[i]); } } Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r0d0bb2f9dd4bcc2c2681f96e54b47980225cfcd4 -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 0d0bb2f9dd4bcc2c2681f96e54b47980225cfcd4) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -230,11 +230,11 @@ activity.Run(); // Assert - WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = calculator.ReceivedInputs.ToArray(); - Assert.AreEqual(nrOfCalculators, testWaveConditionsInputs.Length); + WaveConditionsCosineCalculationInput[] WaveConditionsInputs = calculator.ReceivedInputs.ToArray(); + Assert.AreEqual(nrOfCalculators, WaveConditionsInputs.Length); var waterLevelIndex = 0; - foreach (WaveConditionsCosineCalculationInput actualInput in testWaveConditionsInputs) + foreach (WaveConditionsCosineCalculationInput actualInput in WaveConditionsInputs) { GeneralWaveConditionsInput generalInput = waveImpactAsphaltCoverFailureMechanism.GeneralInput; Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs =================================================================== diff -u -r81e620711edcf9e09169b0c5c9d199a345653e0d -rb9ce34760e692ecfe64825c71e22acaf149c9d0d --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision 81e620711edcf9e09169b0c5c9d199a345653e0d) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Service.Test/WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationServiceTest.cs) (revision b9ce34760e692ecfe64825c71e22acaf149c9d0d) @@ -274,11 +274,11 @@ waveImpactAsphaltCoverFailureMechanism.GeneralInput); // Assert - WaveConditionsCosineCalculationInput[] testWaveConditionsInputs = calculator.ReceivedInputs.ToArray(); - Assert.AreEqual(3, testWaveConditionsInputs.Length); + WaveConditionsCosineCalculationInput[] WaveConditionsInputs = calculator.ReceivedInputs.ToArray(); + Assert.AreEqual(3, WaveConditionsInputs.Length); var waterLevelIndex = 0; - foreach (WaveConditionsCosineCalculationInput actualInput in testWaveConditionsInputs) + foreach (WaveConditionsCosineCalculationInput actualInput in WaveConditionsInputs) { GeneralWaveConditionsInput generalInput = waveImpactAsphaltCoverFailureMechanism.GeneralInput;