Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationCreateExtensionsTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -221,7 +221,7 @@ { Output = new GrassCoverErosionOutwardsWaveConditionsOutput(new[] { - new TestWaveConditionsOutput(1, 2, 3, 4) + new TestWaveConditionsOutput() }) }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs (.../StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs (.../StabilityStoneCoverWaveConditionsCalculationCreateExtensionsTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -220,10 +220,10 @@ { Output = new StabilityStoneCoverWaveConditionsOutput(new[] { - new TestWaveConditionsOutput(1, 2, 3, 4) + new TestWaveConditionsOutput() }, new[] { - new TestWaveConditionsOutput(1, 2, 3, 4) + new TestWaveConditionsOutput() }) }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationCreateExtensionsTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -219,20 +219,18 @@ { Output = new WaveImpactAsphaltCoverWaveConditionsOutput(new[] { - new TestWaveConditionsOutput(1, 2, 3, 4), - new TestWaveConditionsOutput(double.NaN, double.NaN, double.NaN, double.NaN) + new TestWaveConditionsOutput() }) }; // Call WaveImpactAsphaltCoverWaveConditionsCalculationEntity entity = calculation.Create(registry, 0); // Assert - Assert.AreEqual(2, entity.WaveImpactAsphaltCoverWaveConditionsOutputEntities.Count); + Assert.AreEqual(1, entity.WaveImpactAsphaltCoverWaveConditionsOutputEntities.Count); Assert.AreEqual(new[] { - 0, - 1 + 0 }, entity.WaveImpactAsphaltCoverWaveConditionsOutputEntities.Select(oe => oe.Order)); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsOutputTest.cs =================================================================== diff -u -r215e7512a8046a8f6ba71276c85d5880328d5ba1 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsOutputTest.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputTest.cs) (revision 215e7512a8046a8f6ba71276c85d5880328d5ba1) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Data.Test/GrassCoverErosionOutwardsWaveConditionsOutputTest.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -45,8 +45,7 @@ // Setup var outputItems = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), - new TestWaveConditionsOutput(8, 2, 6, 1) + new TestWaveConditionsOutput() }; // Call Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs =================================================================== diff -u -r215e7512a8046a8f6ba71276c85d5880328d5ba1 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs) (revision 215e7512a8046a8f6ba71276c85d5880328d5ba1) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextExportInfoTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -113,8 +113,7 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); var output = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), - new TestWaveConditionsOutput(8, 2, 6, 1) + new TestWaveConditionsOutput() }; var context = new GrassCoverErosionOutwardsWaveConditionsCalculationContext( Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r215e7512a8046a8f6ba71276c85d5880328d5ba1 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision 215e7512a8046a8f6ba71276c85d5880328d5ba1) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/ExportInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -121,8 +121,7 @@ { var output = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), - new TestWaveConditionsOutput(8, 2, 6, 1) + new TestWaveConditionsOutput() }; calculation.Output = new GrassCoverErosionOutwardsWaveConditionsOutput(output); @@ -162,8 +161,7 @@ { var output = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), - new TestWaveConditionsOutput(8, 2, 6, 1) + new TestWaveConditionsOutput() }; grassCoverErosionOutwardsWaveConditionsOutput = new GrassCoverErosionOutwardsWaveConditionsOutput(output); } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs =================================================================== diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyInfos/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -23,7 +23,9 @@ using System.ComponentModel; using Core.Common.Gui.Converters; using Core.Common.Gui.PropertyBag; +using Core.Common.Utils; using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Helpers; using Ringtoets.GrassCoverErosionOutwards.Data; @@ -81,7 +83,9 @@ Assert.AreEqual(ProbabilityFormattingHelper.Format(firstOutput.CalculatedProbability), firstOutputProperties.CalculatedProbability); Assert.AreEqual(firstOutput.TargetReliability, firstOutputProperties.TargetReliability, firstOutputProperties.TargetReliability.GetAccuracy()); - Assert.AreEqual(string.Empty, firstOutputProperties.Convergence); + + string convergenceValue = new EnumDisplayWrapper(firstOutput.CalculationConvergence).DisplayName; + Assert.AreEqual(convergenceValue, firstOutputProperties.Convergence); } [Test] Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs =================================================================== diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextExportInfoTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -113,14 +113,12 @@ var failureMechanism = new StabilityStoneCoverFailureMechanism(); var columnsOutput = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), - new TestWaveConditionsOutput(8, 2, 6, 1) + new TestWaveConditionsOutput() }; var blocksOutput = new[] { - new TestWaveConditionsOutput(6, 2, 9, 4), - new TestWaveConditionsOutput(4, 1, 7, 3) + new TestWaveConditionsOutput() }; var context = new StabilityStoneCoverWaveConditionsCalculationContext( Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ExportInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -141,14 +141,12 @@ var calculationGroup = new CalculationGroup(); var columnsOutput = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), - new TestWaveConditionsOutput(8, 2, 6, 1) + new TestWaveConditionsOutput() }; var blocksOutput = new[] { - new TestWaveConditionsOutput(6, 2, 9, 4), - new TestWaveConditionsOutput(4, 1, 7, 3) + new TestWaveConditionsOutput() }; calculationGroup.Children.Add(new StabilityStoneCoverWaveConditionsCalculation { @@ -187,14 +185,12 @@ { var columnsOutput = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), - new TestWaveConditionsOutput(8, 2, 6, 1) + new TestWaveConditionsOutput() }; var blocksOutput = new[] { - new TestWaveConditionsOutput(6, 2, 9, 4), - new TestWaveConditionsOutput(4, 1, 7, 3) + new TestWaveConditionsOutput() }; stabilityStoneCoverWaveConditionsOutput = new StabilityStoneCoverWaveConditionsOutput(columnsOutput, blocksOutput); Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs =================================================================== diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextExportInfoTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -113,8 +113,7 @@ var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var output = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), - new TestWaveConditionsOutput(8, 2, 6, 1) + new TestWaveConditionsOutput() }; var context = new WaveImpactAsphaltCoverWaveConditionsCalculationContext( Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs =================================================================== diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/ExportInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextExportInfoTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -141,8 +141,7 @@ var calculationGroup = new CalculationGroup(); var output = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), - new TestWaveConditionsOutput(8, 2, 6, 1) + new TestWaveConditionsOutput() }; calculationGroup.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation @@ -182,8 +181,7 @@ { var output = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), - new TestWaveConditionsOutput(8, 2, 6, 1) + new TestWaveConditionsOutput() }; waveImpactAsphaltCoverWaveConditionsOutput = new WaveImpactAsphaltCoverWaveConditionsOutput(output); } Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/TestWaveConditionsOutputTest.cs =================================================================== diff -u -rb684c1722477f735090c948e93cd052bdc52a6b6 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/TestWaveConditionsOutputTest.cs (.../TestWaveConditionsOutputTest.cs) (revision b684c1722477f735090c948e93cd052bdc52a6b6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil.Test/TestWaveConditionsOutputTest.cs (.../TestWaveConditionsOutputTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -47,38 +47,7 @@ Assert.AreEqual(1.282, output.TargetReliability, output.TargetReliability.GetAccuracy()); Assert.AreEqual(0.4, output.CalculatedProbability); Assert.AreEqual(0.253, output.CalculatedReliability, output.TargetReliability.GetAccuracy()); - Assert.AreEqual(CalculationConvergence.NotCalculated, output.CalculationConvergence); + Assert.AreEqual(CalculationConvergence.CalculatedConverged, output.CalculationConvergence); } - - [Test] - [TestCase(CalculationConvergence.NotCalculated)] - [TestCase(CalculationConvergence.CalculatedConverged)] - [TestCase(CalculationConvergence.CalculatedNotConverged)] - public void Constructor_WithParameters_ReturnsWithExpectedValues(CalculationConvergence convergence) - { - // Setup - var random = new Random(21); - double waterLevel = random.NextDouble(); - double waveHeight = random.NextDouble(); - double wavePeakPeriod = random.NextDouble(); - double waveAngle = random.NextDouble(); - double waveDirection = random.NextDouble(); - - // Call - WaveConditionsOutput output = new TestWaveConditionsOutput(waterLevel, waveHeight, wavePeakPeriod, waveAngle, waveDirection, convergence); - - // Assert - Assert.AreEqual(waterLevel, output.WaterLevel, output.WaterLevel.GetAccuracy()); - Assert.AreEqual(waveHeight, output.WaveHeight, output.WaveHeight.GetAccuracy()); - Assert.AreEqual(wavePeakPeriod, output.WavePeakPeriod, output.WavePeakPeriod.GetAccuracy()); - Assert.AreEqual(waveAngle, output.WaveAngle, output.WaveAngle.GetAccuracy()); - Assert.AreEqual(waveDirection, output.WaveDirection, output.WaveDirection.GetAccuracy()); - - Assert.AreEqual(0.1, output.TargetProbability); - Assert.AreEqual(1.282, output.TargetReliability, output.TargetReliability.GetAccuracy()); - Assert.AreEqual(0.4, output.CalculatedProbability); - Assert.AreEqual(0.253, output.CalculatedReliability, output.TargetReliability.GetAccuracy()); - Assert.AreEqual(convergence, output.CalculationConvergence); - } } } \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsOutput.cs =================================================================== diff -u -rb684c1722477f735090c948e93cd052bdc52a6b6 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsOutput.cs (.../TestWaveConditionsOutput.cs) (revision b684c1722477f735090c948e93cd052bdc52a6b6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.TestUtil/TestWaveConditionsOutput.cs (.../TestWaveConditionsOutput.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -32,20 +32,7 @@ /// /// Instantiates a with default values. /// - public TestWaveConditionsOutput() : this(1.1, 2.2, 3.3, 4.4) {} - - /// - /// Instantiates a with a specified values. - /// - /// The wave angle. - /// The wave direction. - /// The status of the calculation. - /// The water level which was calculated for. - /// The calculated wave height. - /// The calculated wave peak period. - public TestWaveConditionsOutput(double waterLevel, double waveHeight, double wavePeakPeriod, double waveAngle, - double waveDirection = 5.5, - CalculationConvergence convergence = CalculationConvergence.NotCalculated) : - base(waterLevel, waveHeight, wavePeakPeriod, waveAngle, waveDirection, 0.1, 1.282, 0.4, 0.253, convergence) {} + public TestWaveConditionsOutput() : + base(1.1, 2.2, 3.3, 4.4, 5.5, 0.1, 1.282, 0.4, 0.253, CalculationConvergence.CalculatedConverged) {} } } \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsFactoryTest.cs =================================================================== diff -u -rb684c1722477f735090c948e93cd052bdc52a6b6 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision b684c1722477f735090c948e93cd052bdc52a6b6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsFactoryTest.cs (.../ExportableWaveConditionsFactoryTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -34,9 +34,10 @@ [TestFixture] public class ExportableWaveConditionsFactoryTest { + private static readonly TestWaveConditionsOutput waveConditionsOutput = new TestWaveConditionsOutput(); private readonly WaveConditionsOutput[] waveConditionsOutputCollection = { - new TestWaveConditionsOutput(0.0, 1.1, 2.2, 3.3) + waveConditionsOutput }; private readonly WaveConditionsInput emptyWaveConditionsInput = new WaveConditionsInput(); @@ -148,11 +149,11 @@ Assert.AreEqual(2, exportableWaveConditions.WaveHeight.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WavePeriod.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WaveAngle.NumberOfDecimalPlaces); - Assert.AreEqual(0.0, exportableWaveConditions.WaterLevel.Value); - Assert.AreEqual(1.1, exportableWaveConditions.WaveHeight.Value); - Assert.AreEqual(2.2, exportableWaveConditions.WavePeriod.Value); - Assert.AreEqual(3.3, exportableWaveConditions.WaveAngle.Value); - Assert.AreEqual(5.5, exportableWaveConditions.WaveDirection.Value); + Assert.AreEqual(waveConditionsOutput.WaterLevel, exportableWaveConditions.WaterLevel); + Assert.AreEqual(waveConditionsOutput.WaveHeight, exportableWaveConditions.WaveHeight); + Assert.AreEqual(waveConditionsOutput.WavePeakPeriod, exportableWaveConditions.WavePeriod); + Assert.AreEqual(waveConditionsOutput.WaveAngle, exportableWaveConditions.WaveAngle); + Assert.AreEqual(waveConditionsOutput.WaveDirection, exportableWaveConditions.WaveDirection); } [Test] @@ -244,11 +245,11 @@ Assert.AreEqual(2, exportableWaveConditions.WaveHeight.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WavePeriod.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WaveAngle.NumberOfDecimalPlaces); - Assert.AreEqual(0.0, exportableWaveConditions.WaterLevel.Value); - Assert.AreEqual(1.1, exportableWaveConditions.WaveHeight.Value); - Assert.AreEqual(2.2, exportableWaveConditions.WavePeriod.Value); - Assert.AreEqual(3.3, exportableWaveConditions.WaveAngle.Value); - Assert.AreEqual(5.5, exportableWaveConditions.WaveDirection.Value); + Assert.AreEqual(waveConditionsOutput.WaterLevel, exportableWaveConditions.WaterLevel); + Assert.AreEqual(waveConditionsOutput.WaveHeight, exportableWaveConditions.WaveHeight); + Assert.AreEqual(waveConditionsOutput.WavePeakPeriod, exportableWaveConditions.WavePeriod); + Assert.AreEqual(waveConditionsOutput.WaveAngle, exportableWaveConditions.WaveAngle); + Assert.AreEqual(waveConditionsOutput.WaveDirection, exportableWaveConditions.WaveDirection); } } } \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs =================================================================== diff -u -rb533cf59bc54e746ab1f89186a544fd23a62fed5 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs (.../ExportableWaveConditionsTest.cs) (revision b533cf59bc54e746ab1f89186a544fd23a62fed5) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/ExportableWaveConditionsTest.cs (.../ExportableWaveConditionsTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -39,7 +39,7 @@ UseForeshore = true }; - private readonly WaveConditionsOutput waveConditionsOutput = new TestWaveConditionsOutput(0.0, 1.1, 2.2, 3.3); + private readonly WaveConditionsOutput waveConditionsOutput = new TestWaveConditionsOutput(); [Test] public void Constructor_NameNull_ThrowsArgumentNullException() @@ -112,11 +112,11 @@ Assert.AreEqual(2, exportableWaveConditions.WaveHeight.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WavePeriod.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WaveAngle.NumberOfDecimalPlaces); - Assert.AreEqual(0.0, exportableWaveConditions.WaterLevel.Value); - Assert.AreEqual(1.1, exportableWaveConditions.WaveHeight.Value); - Assert.AreEqual(2.2, exportableWaveConditions.WavePeriod.Value); - Assert.AreEqual(3.3, exportableWaveConditions.WaveAngle.Value); - Assert.AreEqual(5.5, exportableWaveConditions.WaveDirection.Value); + Assert.AreEqual(waveConditionsOutput.WaterLevel, exportableWaveConditions.WaterLevel); + Assert.AreEqual(waveConditionsOutput.WaveHeight, exportableWaveConditions.WaveHeight); + Assert.AreEqual(waveConditionsOutput.WavePeakPeriod, exportableWaveConditions.WavePeriod); + Assert.AreEqual(waveConditionsOutput.WaveAngle, exportableWaveConditions.WaveAngle); + Assert.AreEqual(waveConditionsOutput.WaveDirection, exportableWaveConditions.WaveDirection); } [Test] @@ -142,11 +142,11 @@ Assert.AreEqual(2, exportableWaveConditions.WaveHeight.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WavePeriod.NumberOfDecimalPlaces); Assert.AreEqual(2, exportableWaveConditions.WaveAngle.NumberOfDecimalPlaces); - Assert.AreEqual(0.0, exportableWaveConditions.WaterLevel.Value); - Assert.AreEqual(1.1, exportableWaveConditions.WaveHeight.Value); - Assert.AreEqual(2.2, exportableWaveConditions.WavePeriod.Value); - Assert.AreEqual(3.3, exportableWaveConditions.WaveAngle.Value); - Assert.AreEqual(5.5, exportableWaveConditions.WaveDirection.Value); + Assert.AreEqual(waveConditionsOutput.WaterLevel, exportableWaveConditions.WaterLevel); + Assert.AreEqual(waveConditionsOutput.WaveHeight, exportableWaveConditions.WaveHeight); + Assert.AreEqual(waveConditionsOutput.WavePeakPeriod, exportableWaveConditions.WavePeriod); + Assert.AreEqual(waveConditionsOutput.WaveAngle, exportableWaveConditions.WaveAngle); + Assert.AreEqual(waveConditionsOutput.WaveDirection, exportableWaveConditions.WaveDirection); } } } \ No newline at end of file Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs =================================================================== diff -u -rb684c1722477f735090c948e93cd052bdc52a6b6 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision b684c1722477f735090c948e93cd052bdc52a6b6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsExporterBaseTest.cs (.../WaveConditionsExporterBaseTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -131,7 +131,7 @@ StepSize = WaveConditionsInputStepSize.One, LowerBoundaryWaterLevels = (RoundedDouble) 2.689, UpperBoundaryWaterLevels = (RoundedDouble) 77.8249863247 - }, new TestWaveConditionsOutput(1.11111, 2.22222, 3.33333, 4.44444, 5.5555), CoverType.StoneCoverBlocks), + }, new TestWaveConditionsOutput(), CoverType.StoneCoverBlocks), new ExportableWaveConditions("columnsName", new WaveConditionsInput() { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456) @@ -143,7 +143,7 @@ StepSize = WaveConditionsInputStepSize.Half, LowerBoundaryWaterLevels = (RoundedDouble) 1.98699, UpperBoundaryWaterLevels = (RoundedDouble) 84.26548 - }, new TestWaveConditionsOutput(3.33333, 1.11111, 4.44444, 2.22222, 6.66666), CoverType.StoneCoverColumns) + }, new TestWaveConditionsOutput(), CoverType.StoneCoverColumns) }; string directoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Revetment.IO, @@ -160,8 +160,8 @@ Assert.IsTrue(File.Exists(filePath)); string fileContent = File.ReadAllText(filePath); Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam aanwezig, Voorlandgeometrie aanwezig, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n" + - "blocksName, , 0.000, 0.000, , nee, nee, Steen (blokken), 1.11, 2.22, 3.33, 4.44, 5.56\r\n" + - "columnsName, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 3.33, 1.11, 4.44, 2.22, 6.67\r\n", + "blocksName, , 0.000, 0.000, , nee, nee, Steen (blokken), 1.10, 2.20, 3.30, 4.40, 5.50\r\n" + + "columnsName, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 1.10, 2.20, 3.30, 4.40, 5.50\r\n", fileContent); } finally Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs =================================================================== diff -u -rb684c1722477f735090c948e93cd052bdc52a6b6 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision b684c1722477f735090c948e93cd052bdc52a6b6) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/WaveConditionsWriterTest.cs (.../WaveConditionsWriterTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -135,7 +135,7 @@ LowerBoundaryWaterLevels = (RoundedDouble) 2.689, UpperBoundaryWaterLevels = (RoundedDouble) 77.8249863247, UseBreakWater = true - }, new TestWaveConditionsOutput(1.11111, 2.22222, 3.33333, 4.44444, 5.5555555), CoverType.StoneCoverBlocks), + }, new TestWaveConditionsOutput(), CoverType.StoneCoverBlocks), new ExportableWaveConditions("columnsName", new WaveConditionsInput { HydraulicBoundaryLocation = new HydraulicBoundaryLocation(8, "aLocation", 44, 123.456) @@ -147,7 +147,7 @@ StepSize = WaveConditionsInputStepSize.One, LowerBoundaryWaterLevels = (RoundedDouble) 1.98699, UpperBoundaryWaterLevels = (RoundedDouble) 84.26548 - }, new TestWaveConditionsOutput(3.33333, 1.11111, 4.44444, 2.22222, 6.66666), CoverType.StoneCoverColumns) + }, new TestWaveConditionsOutput(), CoverType.StoneCoverColumns) }; string directoryPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Revetment.IO, @@ -164,8 +164,8 @@ Assert.IsTrue(File.Exists(filePath)); string fileContent = File.ReadAllText(filePath); Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam aanwezig, Voorlandgeometrie aanwezig, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n" + - "blocksName, , 0.000, 0.000, , ja, nee, Steen (blokken), 1.11, 2.22, 3.33, 4.44, 5.56\r\n" + - "columnsName, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 3.33, 1.11, 4.44, 2.22, 6.67\r\n", + "blocksName, , 0.000, 0.000, , ja, nee, Steen (blokken), 1.10, 2.20, 3.30, 4.40, 5.50\r\n" + + "columnsName, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 1.10, 2.20, 3.30, 4.40, 5.50\r\n", fileContent); } finally Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsOutputTest.cs =================================================================== diff -u -r215e7512a8046a8f6ba71276c85d5880328d5ba1 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsOutputTest.cs (.../StabilityStoneCoverWaveConditionsOutputTest.cs) (revision 215e7512a8046a8f6ba71276c85d5880328d5ba1) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Data.Test/StabilityStoneCoverWaveConditionsOutputTest.cs (.../StabilityStoneCoverWaveConditionsOutputTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -58,14 +58,12 @@ // Setup var columnsOutput = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), - new TestWaveConditionsOutput(8, 2, 6, 1) + new TestWaveConditionsOutput() }; var blocksOutput = new[] { - new TestWaveConditionsOutput(6, 2, 9, 4), - new TestWaveConditionsOutput(4, 1, 7, 3) + new TestWaveConditionsOutput() }; // Call Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsOutputPropertiesTest.cs =================================================================== diff -u -r2b711a78eafd364bd30d015ee235115ddb1cb8ff -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsOutputPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsOutputPropertiesTest.cs) (revision 2b711a78eafd364bd30d015ee235115ddb1cb8ff) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Forms.Test/PropertyClasses/StabilityStoneCoverWaveConditionsOutputPropertiesTest.cs (.../StabilityStoneCoverWaveConditionsOutputPropertiesTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -23,7 +23,9 @@ using System.ComponentModel; using Core.Common.Gui.Converters; using Core.Common.Gui.PropertyBag; +using Core.Common.Utils; using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Revetment.Forms.PropertyClasses; @@ -56,12 +58,12 @@ // Setup var blocksOutput = new[] { - new TestWaveConditionsOutput(6, 2, 9, 4) + new TestWaveConditionsOutput() }; var columnsOutput = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5) + new TestWaveConditionsOutput() }; var stabilityStoneCoverWaveConditionsOutput = new StabilityStoneCoverWaveConditionsOutput(columnsOutput, blocksOutput); @@ -91,8 +93,10 @@ firstBlocksProperties.CalculatedProbability); Assert.AreEqual(firstBlocksOutput.TargetReliability, firstBlocksProperties.TargetReliability, firstBlocksProperties.TargetReliability.GetAccuracy()); - Assert.AreEqual(string.Empty, firstBlocksProperties.Convergence); + string convergenceValue = new EnumDisplayWrapper(firstBlocksOutput.CalculationConvergence).DisplayName; + Assert.AreEqual(convergenceValue, firstBlocksProperties.Convergence); + CollectionAssert.AllItemsAreInstancesOfType(properties.Columns, typeof(WaveConditionsOutputProperties)); Assert.AreEqual(columnsOutput.Length, properties.Columns.Length); @@ -111,7 +115,9 @@ firstColumnsProperties.CalculatedProbability); Assert.AreEqual(firstColumnsOutput.TargetReliability, firstColumnsProperties.TargetReliability, firstColumnsProperties.TargetReliability.GetAccuracy()); - Assert.AreEqual(string.Empty, firstBlocksProperties.Convergence); + + convergenceValue = new EnumDisplayWrapper(firstColumnsOutput.CalculationConvergence).DisplayName; + Assert.AreEqual(convergenceValue, firstColumnsProperties.Convergence); } [Test] @@ -120,12 +126,12 @@ // Setup var blocksOutput = new[] { - new TestWaveConditionsOutput(6, 2, 9, 4), + new TestWaveConditionsOutput(), }; var columnsOutput = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), + new TestWaveConditionsOutput(), }; var stabilityStoneCoverWaveConditionsOutput = new StabilityStoneCoverWaveConditionsOutput(columnsOutput, blocksOutput); Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/StabilityStoneCoverWaveConditionsExporterTest.cs =================================================================== diff -u -rb684c1722477f735090c948e93cd052bdc52a6b6 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/StabilityStoneCoverWaveConditionsExporterTest.cs (.../StabilityStoneCoverWaveConditionsExporterTest.cs) (revision b684c1722477f735090c948e93cd052bdc52a6b6) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.IO.Test/StabilityStoneCoverWaveConditionsExporterTest.cs (.../StabilityStoneCoverWaveConditionsExporterTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -157,10 +157,10 @@ }, Output = new StabilityStoneCoverWaveConditionsOutput(new[] { - new TestWaveConditionsOutput(1.11111, 2.22222, 3.33333, 4.44444, 5.5555) + new TestWaveConditionsOutput() }, new[] { - new TestWaveConditionsOutput(3.33333, 1.11111, 4.44444, 2.22222, 6.6666) + new TestWaveConditionsOutput() }) } }; @@ -177,8 +177,8 @@ Assert.IsTrue(File.Exists(filePath)); string fileContent = File.ReadAllText(filePath); Assert.AreEqual("Naam berekening, Naam HR locatie, X HR locatie (RD) [m], Y HR locatie (RD) [m], Naam voorlandprofiel, Dam aanwezig, Voorlandgeometrie aanwezig, Type bekleding, Waterstand [m+NAP], Golfhoogte (Hs) [m], Golfperiode (Tp) [s], Golfrichting t.o.v. dijknormaal [°], Golfrichting t.o.v. Noord [°]\r\n" + - "aCalculation, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 1.11, 2.22, 3.33, 4.44, 5.56\r\n" + - "aCalculation, aLocation, 44.000, 123.456, , nee, nee, Steen (blokken), 3.33, 1.11, 4.44, 2.22, 6.67\r\n", + "aCalculation, aLocation, 44.000, 123.456, , nee, nee, Steen (zuilen), 1.10, 2.20, 3.30, 4.40, 5.50\r\n" + + "aCalculation, aLocation, 44.000, 123.456, , nee, nee, Steen (blokken), 1.10, 2.20, 3.30, 4.40, 5.50\r\n", fileContent); } finally Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverDataSynchronizationServiceTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverDataSynchronizationServiceTest.cs (.../StabilityStoneCoverDataSynchronizationServiceTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Service.Test/StabilityStoneCoverDataSynchronizationServiceTest.cs (.../StabilityStoneCoverDataSynchronizationServiceTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -54,10 +54,10 @@ { Output = new StabilityStoneCoverWaveConditionsOutput(new[] { - new TestWaveConditionsOutput(12.0, 4.3, 0.4, 49) + new TestWaveConditionsOutput() }, new[] { - new TestWaveConditionsOutput(6.0, 3.7, 4.3, 29) + new TestWaveConditionsOutput() }) }; Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsOutputTest.cs =================================================================== diff -u -r215e7512a8046a8f6ba71276c85d5880328d5ba1 -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsOutputTest.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputTest.cs) (revision 215e7512a8046a8f6ba71276c85d5880328d5ba1) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Data.Test/WaveImpactAsphaltCoverWaveConditionsOutputTest.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -45,8 +45,7 @@ // Setup var outputItems = new[] { - new TestWaveConditionsOutput(1, 0, 3, 5), - new TestWaveConditionsOutput(8, 2, 6, 1) + new TestWaveConditionsOutput() }; // Call Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsOutputPropertiesTest.cs =================================================================== diff -u -r714ecb29352663cc4b18f7d00d09ed73b863c53f -rf2e108cd25b68267d9484249eac3c6ea0db6a7b6 --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsOutputPropertiesTest.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputPropertiesTest.cs) (revision 714ecb29352663cc4b18f7d00d09ed73b863c53f) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Forms.Test/PropertyClasses/WaveImpactAsphaltCoverWaveConditionsOutputPropertiesTest.cs (.../WaveImpactAsphaltCoverWaveConditionsOutputPropertiesTest.cs) (revision f2e108cd25b68267d9484249eac3c6ea0db6a7b6) @@ -23,7 +23,9 @@ using System.ComponentModel; using Core.Common.Gui.Converters; using Core.Common.Gui.PropertyBag; +using Core.Common.Utils; using NUnit.Framework; +using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.Forms.Helpers; using Ringtoets.Revetment.Data; @@ -84,7 +86,9 @@ firstOutputProperties.TargetProbability); Assert.AreEqual(expectedOutputProperty.TargetReliability, firstOutputProperties.TargetReliability, firstOutputProperties.TargetReliability.GetAccuracy()); - Assert.AreEqual(string.Empty, firstOutputProperties.Convergence); + + string convergenceValue = new EnumDisplayWrapper(expectedOutputProperty.CalculationConvergence).DisplayName; + Assert.AreEqual(convergenceValue, firstOutputProperties.Convergence); } [Test]