Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationPropertiesTest.cs =================================================================== diff -u -r3c84f0e17aa468000838418a03bd54aa946ab35f -r3bba243ccce3db2adfed6d4cdf6884c2d54b3fa7 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationPropertiesTest.cs (.../WaveHeightLocationPropertiesTest.cs) (revision 3c84f0e17aa468000838418a03bd54aa946ab35f) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/WaveHeightLocationPropertiesTest.cs (.../WaveHeightLocationPropertiesTest.cs) (revision 3bba243ccce3db2adfed6d4cdf6884c2d54b3fa7) @@ -23,6 +23,7 @@ using System.ComponentModel; using Core.Common.Gui.Converters; using Core.Common.TestUtil; +using Core.Common.Util; using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; @@ -143,7 +144,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(convergenceProperty, resultCategory, "Convergentie", - "Is convergentie bereikt in de toetspeil berekening?", + "Is convergentie bereikt in de golfhoogte berekening?", true); PropertyDescriptor calculateIllustrationPointsProperty = dynamicProperties[shouldCalculateIllustrationPointsIndex]; @@ -157,7 +158,10 @@ public void Constructor_WithGeneralIllustrationPointsResult_PropertiesHaveExpectedAttributesValues() { // Setup - var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()); + var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) + { + Output = new TestHydraulicBoundaryLocationOutput(new TestGeneralResultSubMechanismIllustrationPoint()) + }; // Call var properties = new WaveHeightLocationProperties(hydraulicBoundaryLocationCalculation); @@ -233,7 +237,7 @@ PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(convergenceProperty, resultCategory, "Convergentie", - "Is convergentie bereikt in de toetspeil berekening?", + "Is convergentie bereikt in de golfhoogte berekening?", true); PropertyDescriptor calculateIllustrationPointsProperty = dynamicProperties[shouldCalculateIllustrationPointsIndex]; @@ -280,13 +284,14 @@ // Setup var random = new Random(); double waveHeight = random.NextDouble(); + var convergence = random.NextEnumValue(); var hydraulicBoundaryLocationOutput = new HydraulicBoundaryLocationOutput(waveHeight, random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(), - random.NextEnumValue(), + convergence, new TestGeneralResultSubMechanismIllustrationPoint()); var hydraulicBoundaryLocationCalculation = new HydraulicBoundaryLocationCalculation(new TestHydraulicBoundaryLocation()) @@ -299,6 +304,9 @@ // Assert Assert.AreEqual(hydraulicBoundaryLocationCalculation.Output.Result, properties.WaveHeight, hydraulicBoundaryLocationCalculation.Output.Result.GetAccuracy()); + + string convergenceValue = new EnumDisplayWrapper(convergence).DisplayName; + Assert.AreEqual(convergenceValue, properties.Convergence); } } } \ No newline at end of file