Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -rd19a8549965b16b63086270a6e4eb0f8800af766 -r619c8da05c7b74130ee6a652dfec3918d91b44f9 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision d19a8549965b16b63086270a6e4eb0f8800af766) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 619c8da05c7b74130ee6a652dfec3918d91b44f9) @@ -240,9 +240,9 @@ CreateInstance = context => new CalculationGroupContextProperties(context) }; yield return new PropertyInfo, CalculationContextProperties>(); - yield return new PropertyInfo + yield return new PropertyInfo { - CreateInstance = context => new DesignWaterLevelCalculationsProperties(context.WrappedData) + CreateInstance = context => new WaterLevelCalculationsForNormTargetProbabilityProperties(context.WrappedData, context.GetNormFunc()) }; yield return new PropertyInfo { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/WaterLevelCalculationsForNormTargetProbabilityContextPropertyInfoTest.cs =================================================================== diff -u -r78c515b5cf1df7b89dafcd0f5279e9c4e19edb34 -r619c8da05c7b74130ee6a652dfec3918d91b44f9 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/WaterLevelCalculationsForNormTargetProbabilityContextPropertyInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextPropertyInfoTest.cs) (revision 78c515b5cf1df7b89dafcd0f5279e9c4e19edb34) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/PropertyInfos/WaterLevelCalculationsForNormTargetProbabilityContextPropertyInfoTest.cs (.../WaterLevelCalculationsForNormTargetProbabilityContextPropertyInfoTest.cs) (revision 619c8da05c7b74130ee6a652dfec3918d91b44f9) @@ -45,7 +45,7 @@ PropertyInfo info = GetInfo(plugin); // Assert - Assert.AreEqual(typeof(DesignWaterLevelCalculationsProperties), info.PropertyObjectType); + Assert.AreEqual(typeof(WaterLevelCalculationsForNormTargetProbabilityProperties), info.PropertyObjectType); } } @@ -59,9 +59,11 @@ var hydraulicBoundaryLocationCalculations = new ObservableList(); + double GetNormFunc() => 0.01; + var context = new WaterLevelCalculationsForNormTargetProbabilityContext(hydraulicBoundaryLocationCalculations, assessmentSection, - () => 0.01); + GetNormFunc); using (var plugin = new RiskeerPlugin()) { @@ -71,8 +73,9 @@ IObjectProperties objectProperties = info.CreateInstance(context); // Assert - Assert.IsInstanceOf(objectProperties); + Assert.IsInstanceOf(objectProperties); Assert.AreSame(hydraulicBoundaryLocationCalculations, objectProperties.Data); + Assert.AreEqual(GetNormFunc(), ((WaterLevelCalculationsForNormTargetProbabilityProperties) objectProperties).TargetProbability); } mockRepository.VerifyAll(); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs =================================================================== diff -u -rd19a8549965b16b63086270a6e4eb0f8800af766 -r619c8da05c7b74130ee6a652dfec3918d91b44f9 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision d19a8549965b16b63086270a6e4eb0f8800af766) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 619c8da05c7b74130ee6a652dfec3918d91b44f9) @@ -282,7 +282,7 @@ PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(WaterLevelCalculationsForNormTargetProbabilityContext), - typeof(DesignWaterLevelCalculationsProperties)); + typeof(WaterLevelCalculationsForNormTargetProbabilityProperties)); PluginTestHelper.AssertPropertyInfoDefined( propertyInfos,