Index: Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs =================================================================== diff -u -ra5eb5c3f7ed90adc9875439ab6fd1eea6f74ab18 -r3bba243ccce3db2adfed6d4cdf6884c2d54b3fa7 --- Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs (.../HydraulicBoundaryLocationPropertiesTest.cs) (revision a5eb5c3f7ed90adc9875439ab6fd1eea6f74ab18) +++ Ringtoets/Integration/test/Ringtoets.Integration.Forms.Test/PropertyClasses/HydraulicBoundaryLocationPropertiesTest.cs (.../HydraulicBoundaryLocationPropertiesTest.cs) (revision 3bba243ccce3db2adfed6d4cdf6884c2d54b3fa7) @@ -26,7 +26,6 @@ using Core.Common.Base.Geometry; using Core.Common.Gui.Converters; using Core.Common.TestUtil; -using Core.Common.Util; using NUnit.Framework; using Rhino.Mocks; using Ringtoets.Common.Data.Hydraulics; @@ -47,12 +46,11 @@ private const int targetReliabilityPropertyIndex = 4; private const int calculatedProbabilityPropertyIndex = 5; private const int calculatedReliabilityPropertyIndex = 6; - private const int convergencePropertyIndex = 7; - private const int shouldCalculateIllustrationPointsIndex = 8; - private const int governingWindDirectionIndex = 9; - private const int alphaValuesIndex = 10; - private const int durationsIndex = 11; - private const int illustrationPointsIndex = 12; + private const int shouldCalculateIllustrationPointsIndex = 7; + private const int governingWindDirectionIndex = 8; + private const int alphaValuesIndex = 9; + private const int durationsIndex = 10; + private const int illustrationPointsIndex = 11; [Test] public void Constructor_HydraulicBoundaryLocationCalculationNull_ThrowsArgumentNullException() @@ -79,7 +77,7 @@ Assert.IsInstanceOf(classTypeConverter); PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(9, dynamicProperties.Count); + Assert.AreEqual(8, dynamicProperties.Count); const string generalCategory = "Algemeen"; const string resultCategory = "Resultaat"; @@ -134,13 +132,6 @@ "Betrouwbaarheidsindex van de berekende kans van voorkomen van het berekende resultaat.", true); - PropertyDescriptor convergenceProperty = dynamicProperties[convergencePropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(convergenceProperty, - resultCategory, - "Convergentie", - "Is convergentie bereikt in de toetspeil berekening?", - true); - PropertyDescriptor calculateIllustrationPointsProperty = dynamicProperties[shouldCalculateIllustrationPointsIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(calculateIllustrationPointsProperty, illustrationPointsCategory, @@ -152,7 +143,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 TestHydraulicBoundaryLocationProperties(hydraulicBoundaryLocationCalculation); @@ -162,7 +156,7 @@ Assert.IsInstanceOf(classTypeConverter); PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(13, dynamicProperties.Count); + Assert.AreEqual(12, dynamicProperties.Count); const string generalCategory = "Algemeen"; const string resultCategory = "Resultaat"; @@ -217,13 +211,6 @@ "Betrouwbaarheidsindex van de berekende kans van voorkomen van het berekende resultaat.", true); - PropertyDescriptor convergenceProperty = dynamicProperties[convergencePropertyIndex]; - PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(convergenceProperty, - resultCategory, - "Convergentie", - "Is convergentie bereikt in de toetspeil berekening?", - true); - PropertyDescriptor calculateIllustrationPointsProperty = dynamicProperties[shouldCalculateIllustrationPointsIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(calculateIllustrationPointsProperty, illustrationPointsCategory, @@ -325,9 +312,6 @@ Assert.AreEqual(calculatedProbability, properties.CalculatedProbability); Assert.AreEqual(calculatedReliability, properties.CalculatedReliability, properties.CalculatedReliability.GetAccuracy()); - string convergenceValue = new EnumDisplayWrapper(convergence).DisplayName; - Assert.AreEqual(convergenceValue, properties.Convergence); - if (withIllustrationPoints) { GeneralResult expectedGeneralResult = hydraulicBoundaryLocationOutput.GeneralResult;