Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs =================================================================== diff -u -r2c07b418d2d99cf20655dc4110a7fb206d21a435 -r22b10fe3072e54bf8fab9b70b04447bf36d87b99 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs) (revision 2c07b418d2d99cf20655dc4110a7fb206d21a435) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs (.../GrassCoverErosionOutwardsWaveConditionsOutputPropertiesTest.cs) (revision 22b10fe3072e54bf8fab9b70b04447bf36d87b99) @@ -108,33 +108,40 @@ // Assert CollectionAssert.AllItemsAreInstancesOfType(properties.WaveRunUpOutput, typeof(WaveConditionsOutputProperties)); Assert.AreEqual(waveRunUpOutput.Length, properties.WaveRunUpOutput.Length); - WaveConditionsOutputProperties waveRunUpProperty = properties.WaveRunUpOutput[0]; Assert.AreSame(waveRunUpOutput[0], waveRunUpProperty.Data); CollectionAssert.AllItemsAreInstancesOfType(properties.WaveImpactOutput, typeof(WaveConditionsOutputProperties)); Assert.AreEqual(waveImpactOutput.Length, properties.WaveImpactOutput.Length); WaveConditionsOutputProperties waveImpactProperties = properties.WaveImpactOutput[0]; Assert.AreSame(waveImpactOutput[0], waveImpactProperties.Data); + + CollectionAssert.AllItemsAreInstancesOfType(properties.TailorMadeWaveImpactOutput, typeof(WaveConditionsOutputProperties)); + Assert.AreEqual(tailorMadeWaveImpactOutput.Length, properties.TailorMadeWaveImpactOutput.Length); + WaveConditionsOutputProperties tailorMadeWaveImpactProperties = properties.TailorMadeWaveImpactOutput[0]; + Assert.AreSame(tailorMadeWaveImpactOutput[0], tailorMadeWaveImpactProperties.Data); } [Test] - public void Constructor_CalculationTypeWaveRunUpAndWaveImpact_PropertiesHaveExpectedAttributesValues() + public void Constructor_CalculationTypeAll_PropertiesHaveExpectedAttributesValues() { // Setup GrassCoverErosionOutwardsWaveConditionsOutput output = GrassCoverErosionOutwardsWaveConditionsOutputTestFactory.Create(); - var input = new GrassCoverErosionOutwardsWaveConditionsInput(); + var input = new GrassCoverErosionOutwardsWaveConditionsInput + { + CalculationType = GrassCoverErosionOutwardsWaveConditionsCalculationType.All + }; // Precondition - Assert.AreEqual(GrassCoverErosionOutwardsWaveConditionsCalculationType.WaveRunUpAndWaveImpact, input.CalculationType); + Assert.AreEqual(GrassCoverErosionOutwardsWaveConditionsCalculationType.All, input.CalculationType); // Call var properties = new GrassCoverErosionOutwardsWaveConditionsOutputProperties(output, input); // Assert PropertyDescriptorCollection dynamicProperties = PropertiesTestHelper.GetAllVisiblePropertyDescriptors(properties); - Assert.AreEqual(2, dynamicProperties.Count); + Assert.AreEqual(3, dynamicProperties.Count); PropertyDescriptor waveRunUpProperty = dynamicProperties[waveRunUpPropertyIndex]; PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(waveRunUpProperty, @@ -149,6 +156,13 @@ "Hydraulische belastingen voor golfklap", "Berekende hydraulische belastingen voor golfklap.", true); + + PropertyDescriptor tailorMadeWaveImpactProperty = dynamicProperties[tailorMadeWaveImpactPropertyIndex]; + PropertiesTestHelper.AssertRequiredPropertyDescriptorProperties(tailorMadeWaveImpactProperty, + "Resultaat", + "Hydraulische belastingen voor golfklap toets op maat", + "Berekende hydraulische belastingen voor golfklap toets op maat.", + true); } [Test]