Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs
===================================================================
diff -u -rf00ef179f4b76ecd6fcfe67b1e6ea797e8525509 -r2f0f4e0bd2be4afb1e2b8f5b2380c6a8abea8ad3
--- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision f00ef179f4b76ecd6fcfe67b1e6ea797e8525509)
+++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Forms.Test/PropertyClasses/MacroStabilityInwardsInputContextPropertiesTest.cs	(.../MacroStabilityInwardsInputContextPropertiesTest.cs)	(revision 2f0f4e0bd2be4afb1e2b8f5b2380c6a8abea8ad3)
@@ -75,7 +75,7 @@
             mocks.ReplayAll();
 
             // Call
-            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(null, GetTestNormativeAssessmentLevel(), handler);
+            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(null, GetTestNormativeAssessmentLevel, handler);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -84,6 +84,34 @@
         }
 
         [Test]
+        public void Constructor_GetAssessmentLevelFuncNull_ThrowArgumentNullException()
+        {
+            // Setup
+            var mocks = new MockRepository();
+            var assessmentSection = mocks.Stub<IAssessmentSection>();
+            var handler = mocks.Stub<IObservablePropertyChangeHandler>();
+            mocks.ReplayAll();
+
+            var calculationItem = new MacroStabilityInwardsCalculationScenario();
+            var failureMechanism = new MacroStabilityInwardsFailureMechanism();
+
+            var context = new MacroStabilityInwardsInputContext(calculationItem.InputParameters,
+                                                                calculationItem,
+                                                                Enumerable.Empty<MacroStabilityInwardsSurfaceLine>(),
+                                                                Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
+                                                                failureMechanism,
+                                                                assessmentSection);
+
+            // Call
+            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(context, null, handler);
+
+            // Assert
+            var exception = Assert.Throws<ArgumentNullException>(test);
+            Assert.AreEqual("getNormativeAssessmentLevelFunc", exception.ParamName);
+            mocks.VerifyAll();
+        }
+
+        [Test]
         public void Constructor_PropertyChangeHandlerNull_ThrowArgumentNullException()
         {
             // Setup
@@ -102,7 +130,7 @@
                                                                 assessmentSection);
 
             // Call
-            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), null);
+            TestDelegate test = () => new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, null);
 
             // Assert
             var exception = Assert.Throws<ArgumentNullException>(test);
@@ -129,7 +157,7 @@
                                                                 assessmentSection);
 
             // Call
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Assert
             Assert.IsInstanceOf<ObjectProperties<MacroStabilityInwardsInputContext>>(properties);
@@ -159,7 +187,7 @@
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
 
             // Call
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler)
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler)
             {
                 UseAssessmentLevelManualInput = false
             };
@@ -302,7 +330,7 @@
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
 
             // Call
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler)
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler)
             {
                 UseAssessmentLevelManualInput = useManualAssessmentLevelInput
             };
@@ -400,7 +428,7 @@
                                                                 assessmentSection);
 
             // Call
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Assert
             RoundedDouble expectedAssessmentLevel = useManualAssessmentLevelInput
@@ -449,7 +477,7 @@
                                                                 assessmentSection);
 
             var handler = new ObservablePropertyChangeHandler(calculationItem, calculationItem.InputParameters);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             var random = new Random(21);
             const double assessmentLevel = 0.36;
@@ -624,7 +652,7 @@
 
             var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             MacroStabilityInwardsSoilProfile1D soilProfile = MacroStabilityInwardsSoilProfile1DTestFactory.CreateMacroStabilityInwardsSoilProfile1D();
             inputParameters.StochasticSoilProfile = new MacroStabilityInwardsStochasticSoilProfile(0.0, soilProfile);
@@ -678,7 +706,7 @@
                                                                 failureMechanism,
                                                                 assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             properties.SurfaceLine = testSurfaceLine;
@@ -732,7 +760,7 @@
 
             var handler = new SetPropertyValueAfterConfirmationParameterTester(new IObservable[0]);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             properties.SurfaceLine = newSurfaceLine;
@@ -797,7 +825,7 @@
                 observable
             });
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             properties.StochasticSoilModel = stochasticSoilModel2;
@@ -821,7 +849,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             IEnumerable<MacroStabilityInwardsSurfaceLine> surfaceLines = properties.GetAvailableSurfaceLines();
@@ -845,7 +873,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Precondition:
             Assert.IsNull(calculation.InputParameters.SurfaceLine);
@@ -915,7 +943,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Precondition:
             Assert.IsNotNull(calculation.InputParameters.SurfaceLine);
@@ -946,7 +974,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Precondition
             Assert.IsNull(calculation.InputParameters.StochasticSoilModel);
@@ -985,7 +1013,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Precondition
             Assert.IsNotNull(calculation.InputParameters.StochasticSoilModel);
@@ -1012,7 +1040,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             SelectableHydraulicBoundaryLocation selectedHydraulicBoundaryLocation = null;
 
@@ -1062,7 +1090,7 @@
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // When
             IEnumerable<SelectableHydraulicBoundaryLocation> availableHydraulicBoundaryLocations =
@@ -1104,7 +1132,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             IEnumerable<SelectableHydraulicBoundaryLocation> selectableHydraulicBoundaryLocations =
@@ -1156,7 +1184,7 @@
             var context = new MacroStabilityInwardsInputContext(calculation.InputParameters, calculation,
                                                                 failureMechanism.SurfaceLines, failureMechanism.StochasticSoilModels,
                                                                 failureMechanism, assessmentSection);
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             IEnumerable<SelectableHydraulicBoundaryLocation> selectableHydraulicBoundaryLocations =
@@ -1221,7 +1249,7 @@
                 observable
             });
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             IEnumerable<SelectableHydraulicBoundaryLocation> originalList = properties.GetSelectableHydraulicBoundaryLocations()
                                                                                       .ToList();
@@ -1271,7 +1299,7 @@
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             bool result = properties.DynamicReadOnlyValidationMethod("AssessmentLevel");
@@ -1298,7 +1326,7 @@
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             bool result = properties.DynamicReadOnlyValidationMethod("prop");
@@ -1334,7 +1362,7 @@
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             bool result = properties.DynamicVisibleValidationMethod("SelectedHydraulicBoundaryLocation");
@@ -1361,7 +1389,7 @@
                                                                 Enumerable.Empty<MacroStabilityInwardsStochasticSoilModel>(),
                                                                 failureMechanism, assessmentSection);
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             bool result = properties.DynamicVisibleValidationMethod("prop");
@@ -1397,7 +1425,7 @@
                 observable
             });
 
-            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel(), handler);
+            var properties = new MacroStabilityInwardsInputContextProperties(context, GetTestNormativeAssessmentLevel, handler);
 
             // Call
             setProperty(properties);