Index: Core/Common/src/Core.Common.Gui/Plugin/PropertyInfo.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Core/Common/src/Core.Common.Gui/Plugin/PropertyInfo.cs (.../PropertyInfo.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Core/Common/src/Core.Common.Gui/Plugin/PropertyInfo.cs (.../PropertyInfo.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -55,20 +55,6 @@ /// var propertyInfo = new PropertyInfo < Folder, ModelImplementationFolderProperties > { CreateInstance = o => new ModelImplementationFolderProperties(o) }; /// public Func CreateInstance { get; set; } - - /// - /// Gets or sets the optional function that allows for post-creation logic to be - /// executed on the newly created object properties. Function arguments: - /// - /// The created property instance. - /// The data corresponding to this property info. - /// - /// - /// - /// As an example, you could implement this as follows: - /// var propertyInfo = new PropertyInfo < ModelImplementation, ModelImplementationProperties > { AfterCreate = (op, od) => op.AdditionalBooleanProperty = od.PostCreationBooleanValue }; - /// - public Action AfterCreate { get; set; } } /// @@ -118,20 +104,6 @@ public Func CreateInstance { get; set; } /// - /// Gets or sets the optional function that allows for post-creation logic to be - /// executed on the newly created object properties. Function arguments: - /// - /// The created view instance. - /// The data corresponding to this view info. - /// - /// - /// - /// As an example, you could implement this as follows: - /// var propertyInfo = new PropertyInfo < ModelImplementation, ModelImplementationProperties > { AfterCreate = (op, od) => op.AdditionalBooleanProperty = od.PostCreationBooleanValue }; - /// - public Action AfterCreate { get; set; } - - /// /// Performs an implicit conversion from to . /// /// The property information to convert. @@ -142,10 +114,7 @@ { DataType = typeof(TObject), PropertyObjectType = typeof(TProperty), - CreateInstance = o => propertyInfo.CreateInstance((TObject) o), - AfterCreate = propertyInfo.AfterCreate != null - ? (p, o) => propertyInfo.AfterCreate((TProperty) p, (TObject) o) - : (Action) null + CreateInstance = o => propertyInfo.CreateInstance((TObject) o) }; } } Index: Core/Common/src/Core.Common.Gui/Plugin/PropertyInfoExtensions.cs =================================================================== diff -u -r9383ddebb862ad6d2e18939d544c3710745a7e3f -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Core/Common/src/Core.Common.Gui/Plugin/PropertyInfoExtensions.cs (.../PropertyInfoExtensions.cs) (revision 9383ddebb862ad6d2e18939d544c3710745a7e3f) +++ Core/Common/src/Core.Common.Gui/Plugin/PropertyInfoExtensions.cs (.../PropertyInfoExtensions.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -51,11 +51,6 @@ objectProperties.Data = sourceData; } - if (propertyInfo.AfterCreate != null) - { - propertyInfo.AfterCreate(objectProperties, sourceData); - } - return objectProperties; } } Index: Core/Common/test/Core.Common.Gui.Test/Forms/PropertyGridView/PropertyResolverTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Core/Common/test/Core.Common.Gui.Test/Forms/PropertyGridView/PropertyResolverTest.cs (.../PropertyResolverTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Core/Common/test/Core.Common.Gui.Test/Forms/PropertyGridView/PropertyResolverTest.cs (.../PropertyResolverTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -126,40 +126,6 @@ } [Test] - public void GetObjectProperties_DataMatchesInfoWithAfterCreate_ReturnObjectPropertiesAfterCreateExecuted() - { - // Setup - var otherObject = new B - { - Name = "" - }; - var source = new A(); - - var propertyInfos = new PropertyInfo[] - { - new PropertyInfo - { - AfterCreate = (p, d) => - { - Assert.AreSame(source, p.Data, - "properties object should have been initialized with 'source'."); - p.Data = otherObject; - } - } - }; - - var resolver = new PropertyResolver(propertyInfos); - - // Call - var result = resolver.GetObjectProperties(source); - - // Assert - var bag = (DynamicPropertyBag) result; - var properties = (PropertiesForA) bag.WrappedObject; - Assert.AreSame(otherObject, properties.Data); - } - - [Test] public void GetObjectProperties_DataMatchesMultiplePropertyInfoByDataTypeInheritance_PrioritizeMostSpecialized() { // Setup Index: Core/Common/test/Core.Common.Gui.Test/Plugin/PropertyInfoExtensionsTest.cs =================================================================== diff -u -r9383ddebb862ad6d2e18939d544c3710745a7e3f -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Core/Common/test/Core.Common.Gui.Test/Plugin/PropertyInfoExtensionsTest.cs (.../PropertyInfoExtensionsTest.cs) (revision 9383ddebb862ad6d2e18939d544c3710745a7e3f) +++ Core/Common/test/Core.Common.Gui.Test/Plugin/PropertyInfoExtensionsTest.cs (.../PropertyInfoExtensionsTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -85,24 +85,6 @@ } [Test] - public void CreateObjectProperties_PropertyInfoWithGetObjectPropertiesDataAndAfterCreate_CreateObjectPropertiesObjectForTransformedData() - { - // Setup - int afterCreateCalled = 0; - PropertyInfo propertyInfo = new PropertyInfo - { - AfterCreate = (intProperties, data) => afterCreateCalled++ - }; - - // Call - var properties = propertyInfo.CreateObjectProperties(new Random(21).Next()); - - // Assert - Assert.IsInstanceOf(properties); - Assert.AreEqual(1, afterCreateCalled); - } - - [Test] public void CreateObjectProperties_WithDataNotSetInCreateInstance_CreateObjectPropertiesObjectWithSourceData() { // Setup Index: Core/Common/test/Core.Common.Gui.Test/Plugin/PropertyInfoTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Core/Common/test/Core.Common.Gui.Test/Plugin/PropertyInfoTest.cs (.../PropertyInfoTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Core/Common/test/Core.Common.Gui.Test/Plugin/PropertyInfoTest.cs (.../PropertyInfoTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -38,7 +38,6 @@ // Assert Assert.IsNull(info.DataType); Assert.IsNull(info.PropertyObjectType); - Assert.IsNull(info.AfterCreate); } [Test] @@ -50,20 +49,14 @@ var newDataType = typeof(object); var newPropertyObjectType = typeof(TestObjectProperties); Func newAdditionalDataDelegate = o => true; - Action newAfterCreateDelegate = (properties, data) => - { - // Do something with the view - }; // Call info.DataType = newDataType; info.PropertyObjectType = newPropertyObjectType; - info.AfterCreate = newAfterCreateDelegate; // Assert Assert.AreEqual(newDataType, info.DataType); Assert.AreEqual(newPropertyObjectType, info.PropertyObjectType); - Assert.AreEqual(newAfterCreateDelegate, info.AfterCreate); } [Test] @@ -75,7 +68,6 @@ // Assert Assert.AreEqual(typeof(int), info.DataType); Assert.AreEqual(typeof(TestObjectProperties), info.PropertyObjectType); - Assert.IsNull(info.AfterCreate); } [Test] @@ -108,27 +100,7 @@ Assert.IsNotNull(properties); } - [Test] - public void SimpleProperties_SetValuesForGenericPropertyInfo_GetNewlySetValues() - { - // Setup - var info = new PropertyInfo(); - - Func newAdditionalDataDelegate = o => true; - Action newAfterCreateDelegate = (property, data) => - { - // Do something with the view - }; - - // Call - info.AfterCreate = newAfterCreateDelegate; - - // Assert - Assert.AreEqual(newAfterCreateDelegate, info.AfterCreate); - } - - [Test] public void ImplicitOperator_OptionalDelegatesSet_PropertyInfoFullyConverted() { // Setup @@ -137,16 +109,6 @@ const int inputData = 42; var testProperties = new TestObjectProperties(); - bool afterCreateDelegateCalled = false; - Action newAfterCreateDelegate = (properties, data) => - { - Assert.AreSame(testProperties, properties); - Assert.AreEqual(inputData, data); - afterCreateDelegateCalled = true; - }; - - info.AfterCreate = newAfterCreateDelegate; - // Precondition Assert.IsInstanceOf>(info); @@ -157,10 +119,6 @@ Assert.IsInstanceOf(convertedInfo); Assert.AreEqual(typeof(int), convertedInfo.DataType); Assert.AreEqual(typeof(TestObjectProperties), convertedInfo.PropertyObjectType); - - Assert.IsNotNull(convertedInfo.AfterCreate); - convertedInfo.AfterCreate(testProperties, inputData); - Assert.IsTrue(afterCreateDelegateCalled); } [Test] @@ -179,8 +137,6 @@ Assert.IsInstanceOf(convertedInfo); Assert.AreEqual(typeof(int), convertedInfo.DataType); Assert.AreEqual(typeof(TestObjectProperties), convertedInfo.PropertyObjectType); - - Assert.IsNull(convertedInfo.AfterCreate); } private class TestObjectProperties : ObjectProperties {} Index: Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs (.../MapPluginTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Core/Plugins/test/Core.Plugins.Map.Test/MapPluginTest.cs (.../MapPluginTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -127,25 +127,21 @@ propertyInfos, typeof(MapDataCollection), typeof(MapDataCollectionProperties)); - Assert.IsNull(mapDataCollectionPropertyInfo.AfterCreate); PropertyInfo mapPointDataPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(MapPointData), typeof(MapPointDataProperties)); - Assert.IsNull(mapPointDataPropertyInfo.AfterCreate); PropertyInfo mapLineDataPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(MapLineData), typeof(MapLineDataProperties)); - Assert.IsNull(mapLineDataPropertyInfo.AfterCreate); PropertyInfo mapPolygonDataPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(MapPolygonData), typeof(MapPolygonDataProperties)); - Assert.IsNull(mapPolygonDataPropertyInfo.AfterCreate); } } Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs (.../ClosingStructuresPluginTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/ClosingStructuresPluginTest.cs (.../ClosingStructuresPluginTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -73,19 +73,16 @@ propertyInfos, typeof(ClosingStructuresFailureMechanismContext), typeof(ClosingStructureFailureMechanismProperties)); - Assert.IsNull(closingStructuresFailureMechanismContextPropertyInfo.AfterCreate); PropertyInfo closingStructurePropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(ClosingStructure), typeof(ClosingStructureProperties)); - Assert.IsNull(closingStructurePropertyInfo.AfterCreate); PropertyInfo closingStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(ClosingStructuresInputContext), typeof(ClosingStructuresInputContextProperties)); - Assert.IsNull(closingStructuresInputContextPropertyInfo.AfterCreate); } mocks.VerifyAll(); } Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs (.../GrassCoverErosionInwardsPluginTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/GrassCoverErosionInwardsPluginTest.cs (.../GrassCoverErosionInwardsPluginTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -63,25 +63,21 @@ propertyInfos, typeof(GrassCoverErosionInwardsFailureMechanismContext), typeof(GrassCoverErosionInwardsFailureMechanismContextProperties)); - Assert.IsNull(failureMechanismContextProperties.AfterCreate); PropertyInfo dikeProfileProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(DikeProfile), typeof(DikeProfileProperties)); - Assert.IsNull(dikeProfileProperties.AfterCreate); PropertyInfo inputContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(GrassCoverErosionInwardsInputContext), typeof(GrassCoverErosionInwardsInputContextProperties)); - Assert.IsNull(inputContextProperties.AfterCreate); PropertyInfo outputProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(GrassCoverErosionInwardsOutput), typeof(GrassCoverErosionInwardsOutputProperties)); - Assert.IsNull(outputProperties.AfterCreate); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs (.../GrassCoverErosionOutwardsPluginTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/GrassCoverErosionOutwardsPluginTest.cs (.../GrassCoverErosionOutwardsPluginTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -127,43 +127,36 @@ propertyInfos, typeof(GrassCoverErosionOutwardsFailureMechanismContext), typeof(GrassCoverErosionOutwardsFailureMechanismProperties)); - Assert.IsNull(grassCoverErosionOutwardsFailureMechanismProperties.AfterCreate); var waterLevelHydraulicBoundaryLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationsContext), typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationsContextProperties)); - Assert.IsNull(waterLevelHydraulicBoundaryLocationsContextProperties.AfterCreate); var waveHeightLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(GrassCoverErosionOutwardsWaveHeightLocationsContext), typeof(GrassCoverErosionOutwardsWaveHeightLocationsContextProperties)); - Assert.IsNull(waveHeightLocationContextProperties.AfterCreate); var grassCoverErosionWaveConditionsOutputProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(GrassCoverErosionOutwardsWaveConditionsOutput), typeof(GrassCoverErosionOutwardsWaveConditionsOutputProperties)); - Assert.IsNull(grassCoverErosionWaveConditionsOutputProperties.AfterCreate); var grassCoverErosionWaveConditionsInputContextroperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(GrassCoverErosionOutwardsWaveConditionsInputContext), typeof(GrassCoverErosionOutwardsWaveConditionsInputContextProperties)); - Assert.IsNull(grassCoverErosionWaveConditionsInputContextroperties.AfterCreate); var grassCoverErosionDesignWaterLevelLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationContext), typeof(GrassCoverErosionOutwardsDesignWaterLevelLocationContextProperties)); - Assert.IsNull(grassCoverErosionDesignWaterLevelLocationContextProperties.AfterCreate); var grasCoverErosionWaveHeightWaterLevelLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(GrassCoverErosionOutwardsWaveHeightLocationContext), typeof(GrassCoverErosionOutwardsWaveHeightLocationContextProperties)); - Assert.IsNull(grasCoverErosionWaveHeightWaterLevelLocationContextProperties.AfterCreate); } } Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/PropertyInfos/GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextPropertyInfoTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -43,7 +43,6 @@ PropertyInfo info = GetInfo(plugin); // Assert - Assert.IsNull(info.AfterCreate); Assert.AreEqual(typeof(GrassCoverErosionOutwardsFailureMechanismContext), info.DataType); Assert.AreEqual(typeof(GrassCoverErosionOutwardsFailureMechanismProperties), info.PropertyObjectType); } Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs (.../HeightStructuresPluginTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/HeightStructuresPluginTest.cs (.../HeightStructuresPluginTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -74,19 +74,16 @@ propertyInfos, typeof(HeightStructuresFailureMechanismContext), typeof(HeightStructuresFailureMechanismProperties)); - Assert.IsNull(heightStructuresFailureMechanismContextPropertyInfo.AfterCreate); PropertyInfo heightStructurePropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(HeightStructure), typeof(HeightStructureProperties)); - Assert.IsNull(heightStructurePropertyInfo.AfterCreate); PropertyInfo heightStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(HeightStructuresInputContext), typeof(HeightStructuresInputContextProperties)); - Assert.IsNull(heightStructuresInputContextPropertyInfo.AfterCreate); } mocks.VerifyAll(); } Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs =================================================================== diff -u -r9383ddebb862ad6d2e18939d544c3710745a7e3f -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision 9383ddebb862ad6d2e18939d544c3710745a7e3f) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/RingtoetsPlugin.cs (.../RingtoetsPlugin.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -274,13 +274,10 @@ { CreateInstance = context => new FailureMechanismContributionProperties { - Data = context.WrappedData - }, - AfterCreate = (properties, context) => - { - properties.NormChangeHandler = new FailureMechanismContributionNormChangeHandler(); - properties.CompositionChangeHandler = new AssessmentSectionCompositionChangeHandler(); - properties.AssessmentSection = context.Parent; + Data = context.WrappedData, + NormChangeHandler = new FailureMechanismContributionNormChangeHandler(), + CompositionChangeHandler = new AssessmentSectionCompositionChangeHandler(), + AssessmentSection = context.Parent } }; yield return new PropertyInfo, StandAloneFailureMechanismContextProperties>(); Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismContributionPropertyInfoTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismContributionPropertyInfoTest.cs (.../FailureMechanismContributionPropertyInfoTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/PropertyInfos/FailureMechanismContributionPropertyInfoTest.cs (.../FailureMechanismContributionPropertyInfoTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -55,7 +55,6 @@ public void Initialized_Always_ExpectedPropertiesSet() { // Assert - Assert.IsNotNull(info.AfterCreate); Assert.AreEqual(typeof(FailureMechanismContributionContext), info.DataType); Assert.AreEqual(typeof(FailureMechanismContributionProperties), info.PropertyObjectType); } @@ -80,48 +79,5 @@ mocks.VerifyAll(); } - - [Test] - public void AfterCreate_Always_SetsAssessmentSection() - { - // Setup - var mocks = new MockRepository(); - IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms(mocks); - mocks.ReplayAll(); - - var propertyInfo = new FailureMechanismContributionProperties(); - var context = new FailureMechanismContributionContext(assessmentSectionStub.FailureMechanismContribution, assessmentSectionStub); - - // Call - info.AfterCreate(propertyInfo, context); - - // Assert - Assert.AreSame(assessmentSectionStub, propertyInfo.AssessmentSection); - - mocks.VerifyAll(); - } - - [Test] - public void AfterCreate_Always_SetsChangeHandlers() - { - // Setup - var mocks = new MockRepository(); - IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStubWithoutBoundaryDatabaseOrFailureMechanisms(mocks); - mocks.ReplayAll(); - - var propertyInfo = new FailureMechanismContributionProperties(); - var context = new FailureMechanismContributionContext(assessmentSectionStub.FailureMechanismContribution, assessmentSectionStub); - - info = plugin.GetPropertyInfos().First(tni => tni.PropertyObjectType == typeof(FailureMechanismContributionProperties)); - - // Call - info.AfterCreate(propertyInfo, context); - - // Assert - Assert.IsNotNull(propertyInfo.NormChangeHandler); - Assert.IsNotNull(propertyInfo.CompositionChangeHandler); - - mocks.VerifyAll(); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/RingtoetsPluginTest.cs (.../RingtoetsPluginTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -206,79 +206,66 @@ propertyInfos, typeof(IProject), typeof(RingtoetsProjectProperties)); - Assert.IsNull(ringtoetsProjectProperties.AfterCreate); PropertyInfo assessmentSectionProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(IAssessmentSection), typeof(AssessmentSectionProperties)); - Assert.IsNull(assessmentSectionProperties.AfterCreate); PropertyInfo hydraulicBoundaryDatabaseProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(HydraulicBoundaryDatabaseContext), typeof(HydraulicBoundaryDatabaseProperties)); - Assert.IsNull(hydraulicBoundaryDatabaseProperties.AfterCreate); PropertyInfo failureMechanismContributionProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(FailureMechanismContributionContext), typeof(FailureMechanismContributionProperties)); - Assert.IsNotNull(failureMechanismContributionProperties.AfterCreate); PropertyInfo standAloneFailureMechanismProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(FailureMechanismContext), typeof(StandAloneFailureMechanismContextProperties)); - Assert.IsNull(standAloneFailureMechanismProperties.AfterCreate); PropertyInfo calculationGroupProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(ICalculationContext), typeof(CalculationGroupContextProperties)); - Assert.IsNull(calculationGroupProperties.AfterCreate); PropertyInfo calculationContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(ICalculationContext), typeof(CalculationContextProperties)); - Assert.IsNull(calculationContextProperties.AfterCreate); PropertyInfo outputContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(ProbabilityAssessmentOutput), typeof(ProbabilityAssessmentOutputProperties)); - Assert.IsNull(outputContextProperties.AfterCreate); PropertyInfo designWaterLevelLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(DesignWaterLevelLocationsContext), typeof(DesignWaterLevelLocationsContextProperties)); - Assert.IsNull(designWaterLevelLocationsContextProperties.AfterCreate); PropertyInfo designWaterLevelLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(DesignWaterLevelLocationContext), typeof(DesignWaterLevelLocationContextProperties)); - Assert.IsNull(designWaterLevelLocationContextProperties.AfterCreate); PropertyInfo waveHeightLocationsContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(WaveHeightLocationsContext), typeof(WaveHeightLocationsContextProperties)); - Assert.IsNull(waveHeightLocationsContextProperties.AfterCreate); PropertyInfo waveHeightLocationContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(WaveHeightLocationContext), typeof(WaveHeightLocationContextProperties)); - Assert.IsNull(waveHeightLocationContextProperties.AfterCreate); PropertyInfo foreshoreProfileProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(ForeshoreProfile), typeof(ForeshoreProfileProperties)); - Assert.IsNull(foreshoreProfileProperties.AfterCreate); } } Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs (.../PipingPluginTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/PipingPluginTest.cs (.../PipingPluginTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -74,37 +74,31 @@ propertyInfos, typeof(PipingFailureMechanismContext), typeof(PipingFailureMechanismContextProperties)); - Assert.IsNull(pipingFailureMechanismContextProperties.AfterCreate); PropertyInfo pipingInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(PipingInputContext), typeof(PipingInputContextProperties)); - Assert.IsNull(pipingInputContextProperties.AfterCreate); PropertyInfo pipingOutputProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(PipingOutputContext), typeof(PipingOutputContextProperties)); - Assert.IsNull(pipingOutputProperties.AfterCreate); PropertyInfo pipingSurfaceLineProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(RingtoetsPipingSurfaceLine), typeof(RingtoetsPipingSurfaceLineProperties)); - Assert.IsNull(pipingSurfaceLineProperties.AfterCreate); PropertyInfo stochasticSoilModelProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(StochasticSoilModel), typeof(StochasticSoilModelProperties)); - Assert.IsNull(stochasticSoilModelProperties.AfterCreate); PropertyInfo stochasticSoilProfileProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(StochasticSoilProfile), typeof(StochasticSoilProfileProperties)); - Assert.IsNull(stochasticSoilProfileProperties.AfterCreate); mocks.VerifyAll(); } Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs (.../StabilityPointStructuresPluginTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/StabilityPointStructuresPluginTest.cs (.../StabilityPointStructuresPluginTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -68,19 +68,16 @@ propertyInfos, typeof(StabilityPointStructuresFailureMechanismContext), typeof(StabilityPointStructuresFailureMechanismProperties)); - Assert.IsNull(failureMechanismContextProperties.AfterCreate); PropertyInfo stabilityPointStructureProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(StabilityPointStructure), typeof(StabilityPointStructureProperties)); - Assert.IsNull(stabilityPointStructureProperties.AfterCreate); PropertyInfo stabilityPointStructuresInputContextPropertyInfo = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(StabilityPointStructuresInputContext), typeof(StabilityPointStructuresInputContextProperties)); - Assert.IsNull(stabilityPointStructuresInputContextPropertyInfo.AfterCreate); } } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/PropertyInfos/StabilityStoneCoverFailureMechanismContextPropertyInfoTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/PropertyInfos/StabilityStoneCoverFailureMechanismContextPropertyInfoTest.cs (.../StabilityStoneCoverFailureMechanismContextPropertyInfoTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/PropertyInfos/StabilityStoneCoverFailureMechanismContextPropertyInfoTest.cs (.../StabilityStoneCoverFailureMechanismContextPropertyInfoTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -43,7 +43,6 @@ PropertyInfo info = GetInfo(plugin); // Assert - Assert.IsNull(info.AfterCreate); Assert.AreEqual(typeof(StabilityStoneCoverFailureMechanismContext), info.DataType); Assert.AreEqual(typeof(StabilityStoneCoverFailureMechanismProperties), info.PropertyObjectType); } Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs (.../StabilityStoneCoverPluginTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs (.../StabilityStoneCoverPluginTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -53,17 +53,14 @@ propertyInfos, typeof(StabilityStoneCoverFailureMechanismContext), typeof(StabilityStoneCoverFailureMechanismProperties)); - Assert.IsNull(failureMechanismProperties.AfterCreate); PropertyInfo waveConditionsOutputProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(StabilityStoneCoverWaveConditionsOutput), typeof(StabilityStoneCoverWaveConditionsOutputProperties)); - Assert.IsNull(waveConditionsOutputProperties.AfterCreate); PropertyInfo waveConditionsInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(StabilityStoneCoverWaveConditionsInputContext), typeof(StabilityStoneCoverWaveConditionsInputContextProperties)); - Assert.IsNull(waveConditionsInputContextProperties.AfterCreate); } } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/PropertyInfos/WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs (.../WaveImpactAsphaltCoverFailureMechanismContextPropertyInfoTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -43,7 +43,6 @@ PropertyInfo info = GetInfo(plugin); // Assert - Assert.IsNull(info.AfterCreate); Assert.AreEqual(typeof(WaveImpactAsphaltCoverFailureMechanismContext), info.DataType); Assert.AreEqual(typeof(WaveImpactAsphaltCoverFailureMechanismProperties), info.PropertyObjectType); } Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs =================================================================== diff -u -r45184350a353efe0c9e03da61e60a817470d2d1e -rbcb6b2364bcd2796869223db9942d3338b0f577a --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision 45184350a353efe0c9e03da61e60a817470d2d1e) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/WaveImpactAsphaltCoverPluginTest.cs (.../WaveImpactAsphaltCoverPluginTest.cs) (revision bcb6b2364bcd2796869223db9942d3338b0f577a) @@ -64,19 +64,16 @@ propertyInfos, typeof(WaveImpactAsphaltCoverFailureMechanismContext), typeof(WaveImpactAsphaltCoverFailureMechanismProperties)); - Assert.IsNull(failureMechanismContextProperties.AfterCreate); PropertyInfo waveImpactAsphaltCoverWaveConditionsOutputProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(WaveImpactAsphaltCoverWaveConditionsOutput), typeof(WaveImpactAsphaltCoverWaveConditionsOutputProperties)); - Assert.IsNull(waveImpactAsphaltCoverWaveConditionsOutputProperties.AfterCreate); PropertyInfo waveConditionsInputContextProperties = PluginTestHelper.AssertPropertyInfoDefined( propertyInfos, typeof(WaveImpactAsphaltCoverWaveConditionsInputContext), typeof(WaveImpactAsphaltCoverWaveConditionsInputContextProperties)); - Assert.IsNull(waveConditionsInputContextProperties.AfterCreate); } }