Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsProjectMigratorTest.cs
===================================================================
diff -u -rdd694bc76d6e75bcda83ff3f42edacf16451c58d -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsProjectMigratorTest.cs	(.../RingtoetsProjectMigratorTest.cs)	(revision dd694bc76d6e75bcda83ff3f42edacf16451c58d)
+++ Application/Ringtoets/test/Application.Ringtoets.Migration.Test/RingtoetsProjectMigratorTest.cs	(.../RingtoetsProjectMigratorTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -209,7 +209,7 @@
         }
 
         [Test]
-        public void DetermineMigrationLocation_OriginalFilePathNull_ThrownArgumentNullException()
+        public void DetermineMigrationLocation_OriginalFilePathNull_ThrowArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
Index: Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs
===================================================================
diff -u -rb78031fb9b9ce636bdd01d6d6dc3f1fa5f6b2060 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs	(.../AssemblyUtilsTest.cs)	(revision b78031fb9b9ce636bdd01d6d6dc3f1fa5f6b2060)
+++ Core/Common/test/Core.Common.Utils.Test/Reflection/AssemblyUtilsTest.cs	(.../AssemblyUtilsTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -131,7 +131,7 @@
         }
 
         [Test]
-        public void GetAssemblyResourceStream_AssemblyNull_ThrownArgumentNullException()
+        public void GetAssemblyResourceStream_AssemblyNull_ThrowArgumentNullException()
         {
             // Call
             TestDelegate call = () => AssemblyUtils.GetAssemblyResourceStream(null, "nice.txt");
Index: Core/Components/test/Core.Components.BruTile.Test/Configurations/PersistentCacheConfigurationTest.cs
===================================================================
diff -u -r99f9004206bfb9de084275d749b7aeccafd6da18 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Core/Components/test/Core.Components.BruTile.Test/Configurations/PersistentCacheConfigurationTest.cs	(.../PersistentCacheConfigurationTest.cs)	(revision 99f9004206bfb9de084275d749b7aeccafd6da18)
+++ Core/Components/test/Core.Components.BruTile.Test/Configurations/PersistentCacheConfigurationTest.cs	(.../PersistentCacheConfigurationTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -219,7 +219,7 @@
         }
 
         [Test]
-        public void InitializeFromTileSource_ConfigurationDisposed_ThrownObjectDisposedException()
+        public void InitializeFromTileSource_ConfigurationDisposed_ThrowObjectDisposedException()
         {
             // Setup
             var mocks = new MockRepository();
Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/WellKnownBackgroundLayerStatusTest.cs
===================================================================
diff -u -r6f806998a17fa46d14678596d71c9c935408b948 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/WellKnownBackgroundLayerStatusTest.cs	(.../WellKnownBackgroundLayerStatusTest.cs)	(revision 6f806998a17fa46d14678596d71c9c935408b948)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/WellKnownBackgroundLayerStatusTest.cs	(.../WellKnownBackgroundLayerStatusTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -50,7 +50,7 @@
         }
 
         [Test]
-        public void HasSameConfiguration_MapDataNull_ThrownArgumentNullException()
+        public void HasSameConfiguration_MapDataNull_ThrowArgumentNullException()
         {
             // Setup
             using (var layerStatus = new WellKnownBackgroundLayerStatus())
@@ -110,7 +110,7 @@
         }
 
         [Test]
-        public void SuccessfullyInitializedLayer_LayerNull_ThrownArgumentNullException()
+        public void SuccessfullyInitializedLayer_LayerNull_ThrowArgumentNullException()
         {
             // Setup
             using (var layerStatus = new WellKnownBackgroundLayerStatus())
@@ -127,7 +127,7 @@
         }
 
         [Test]
-        public void SuccessfullyInitializedLayer_MapDataNull_ThrownArgumentNullException()
+        public void SuccessfullyInitializedLayer_MapDataNull_ThrowArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
Index: Core/Components/test/Core.Components.DotSpatial.Forms.Test/WmtsBackgroundLayerStatusTest.cs
===================================================================
diff -u -r6f806998a17fa46d14678596d71c9c935408b948 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Core/Components/test/Core.Components.DotSpatial.Forms.Test/WmtsBackgroundLayerStatusTest.cs	(.../WmtsBackgroundLayerStatusTest.cs)	(revision 6f806998a17fa46d14678596d71c9c935408b948)
+++ Core/Components/test/Core.Components.DotSpatial.Forms.Test/WmtsBackgroundLayerStatusTest.cs	(.../WmtsBackgroundLayerStatusTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -72,7 +72,7 @@
         }
 
         [Test]
-        public void HasSameConfiguration_MapDataNull_ThrownArgumentNullException()
+        public void HasSameConfiguration_MapDataNull_ThrowArgumentNullException()
         {
             // Setup
             using (var layerStatus = new WmtsBackgroundLayerStatus())
@@ -176,7 +176,7 @@
         }
 
         [Test]
-        public void SuccessfullyInitializedLayer_LayerNull_ThrownArgumentNullException()
+        public void SuccessfullyInitializedLayer_LayerNull_ThrowArgumentNullException()
         {
             // Setup
             using (var layerStatus = new WmtsBackgroundLayerStatus())
@@ -193,7 +193,7 @@
         }
 
         [Test]
-        public void SuccessfullyInitializedLayer_MapDataNull_ThrownArgumentNullException()
+        public void SuccessfullyInitializedLayer_MapDataNull_ThrowArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/FeatureBasedMapDataLayerFactoryTest.cs
===================================================================
diff -u -r8b36313c9a9136c821c2614762889a63968aa8e6 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Core/Components/test/Core.Components.DotSpatial.Test/Layer/FeatureBasedMapDataLayerFactoryTest.cs	(.../FeatureBasedMapDataLayerFactoryTest.cs)	(revision 8b36313c9a9136c821c2614762889a63968aa8e6)
+++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/FeatureBasedMapDataLayerFactoryTest.cs	(.../FeatureBasedMapDataLayerFactoryTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -61,7 +61,7 @@
         }
 
         [Test]
-        public void Create_OtherData_ThrownsNotSupportedException()
+        public void Create_OtherData_ThrowsNotSupportedException()
         {
             // Setup
             var testData = new TestFeatureBasedMapData("test data");
Index: Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ItemBasedChartDataSeriesFactoryTest.cs
===================================================================
diff -u -r4c580b17f584bdfcaae96992b11f90025647ca20 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ItemBasedChartDataSeriesFactoryTest.cs	(.../ItemBasedChartDataSeriesFactoryTest.cs)	(revision 4c580b17f584bdfcaae96992b11f90025647ca20)
+++ Core/Components/test/Core.Components.OxyPlot.Test/DataSeries/ItemBasedChartDataSeriesFactoryTest.cs	(.../ItemBasedChartDataSeriesFactoryTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -70,7 +70,7 @@
         }
 
         [Test]
-        public void Create_OtherData_ThrownsNotSupportedException()
+        public void Create_OtherData_ThrowsNotSupportedException()
         {
             // Setup
             var testData = new TestItemBasedChartData("test data");
@@ -83,7 +83,7 @@
         }
 
         [Test]
-        public void Create_NullData_ThrownsArgumentNullException()
+        public void Create_NullData_ThrowsArgumentNullException()
         {
             // Call
             TestDelegate test = () => ItemBasedChartDataSeriesFactory.Create(null);
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/ProfileLocationTest.cs
===================================================================
diff -u -rd2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/ProfileLocationTest.cs	(.../ProfileLocationTest.cs)	(revision d2b9feaf8aceaa9a96d0e6e19fd6fbbee8987ca6)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/ProfileLocationTest.cs	(.../ProfileLocationTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -58,7 +58,7 @@
         }
 
         [Test]
-        public void Constructor_InitializedWithNullId_ThrownArgumentException()
+        public void Constructor_InitializedWithNullId_ThrowArgumentException()
         {
             // Setup
             var referencePoint = new Point2D(2.2, 3.3);
@@ -73,7 +73,7 @@
         }
 
         [Test]
-        public void Constructor_InitializedWithNullPoint_ThrownArgumentException()
+        public void Constructor_InitializedWithNullPoint_ThrowArgumentException()
         {
             // Call
             TestDelegate call = () => new ProfileLocation("anID", "aNAME", 1.1, null);
@@ -89,7 +89,7 @@
         [TestCase("a#1")]
         [TestCase("   ")]
         [TestCase("*&(%&$")]
-        public void Constructor_InitializedWithInvalidId_ThrownArgumentException(string id)
+        public void Constructor_InitializedWithInvalidId_ThrowArgumentException(string id)
         {
             // Setup
             var referencePoint = new Point2D(2.2, 3.3);
@@ -107,7 +107,7 @@
         [TestCase(double.NaN)]
         [TestCase(double.PositiveInfinity)]
         [TestCase(double.NegativeInfinity)]
-        public void Constructor_InitializedWithInvalidId_ThrownArgumentException(double x0)
+        public void Constructor_InitializedWithInvalidId_ThrowArgumentException(double x0)
         {
             // Setup
             var referencePoint = new Point2D(2.2, 3.3);
Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/XElementExtensionsTest.cs
===================================================================
diff -u -r2f53d16cbd0b025fdad148df97ffdf056df314ce -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/XElementExtensionsTest.cs	(.../XElementExtensionsTest.cs)	(revision 2f53d16cbd0b025fdad148df97ffdf056df314ce)
+++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Readers/XElementExtensionsTest.cs	(.../XElementExtensionsTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -290,7 +290,7 @@
         }
 
         [Test]
-        public void GetStochastElement_StochastNameNull_ThrownArgumentNullException()
+        public void GetStochastElement_StochastNameNull_ThrowArgumentNullException()
         {
             // Setup
             var element = new XElement("Root");
Index: Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Readers/GrassCoverErosionInwardsCalculationConfigurationReader.cs
===================================================================
diff -u -r09fb591f0e8017e22b62ca554f6eceeeafa51219 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Readers/GrassCoverErosionInwardsCalculationConfigurationReader.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReader.cs)	(revision 09fb591f0e8017e22b62ca554f6eceeeafa51219)
+++ Ringtoets/GrassCoverErosionInwards/src/Ringtoets.GrassCoverErosionInwards.IO/Readers/GrassCoverErosionInwardsCalculationConfigurationReader.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReader.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -76,7 +76,7 @@
         {
             var constructionProperties = new ReadGrassCoverErosionInwardsCalculation.ConstructionProperties
             {
-                Name = calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute)?.Value,
+                Name = calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value,
                 HydraulicBoundaryLocation = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
                 DikeProfile = calculationElement.GetStringValueFromDescendantElement(GrassCoverErosionInwardsCalculationConfigurationSchemaIdentifiers.DikeProfileElement),
                 Orientation = calculationElement.GetDoubleValueFromDescendantElement(ConfigurationSchemaIdentifiers.Orientation),
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/DikeHeightCalculationConverterTest.cs
===================================================================
diff -u -r09fb591f0e8017e22b62ca554f6eceeeafa51219 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/DikeHeightCalculationConverterTest.cs	(.../DikeHeightCalculationConverterTest.cs)	(revision 09fb591f0e8017e22b62ca554f6eceeeafa51219)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/DikeHeightCalculationConverterTest.cs	(.../DikeHeightCalculationConverterTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -82,7 +82,7 @@
         }
 
         [Test]
-        public void ConvertTo_InvalidDikeHeightCalculationTypeValue_ThrownNotSupportedException()
+        public void ConvertTo_InvalidDikeHeightCalculationTypeValue_ThrowNotSupportedException()
         {
             // Setup
             var converter = new DikeHeightCalculationTypeConverter();
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r7a466d4ccb9d859b47f565b400808eb6933b18f0 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs)	(revision 7a466d4ccb9d859b47f565b400808eb6933b18f0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/Readers/GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs	(.../GrassCoverErosionInwardsCalculationConfigurationReaderTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -136,6 +136,16 @@
                                               "The element 'golfreductie' has invalid child element 'voorlandgebruiken'.")
                     .SetName("invalidMultipleUseForeshores");
 
+                yield return new TestCaseData("invalidMultipleCriticalFlowRateStochast.xml",
+                                              "There is a duplicate key sequence 'overslagdebiet' for the 'uniqueStochastNameConstraint' key or unique identity constraint.")
+                    .SetName("invalidMultipleCriticalFlowRateStochast");
+                yield return new TestCaseData("invalidCriticalFlowRateMissingMean.xml",
+                                              "The element 'stochast' has invalid child element 'standaardafwijking'. List of possible elements expected: 'verwachtingswaarde'.")
+                    .SetName("invalidCriticalFlowRateMissingMean");
+                yield return new TestCaseData("invalidCriticalFlowRateMissingStandardDeviation.xml",
+                                              "The element 'stochast' has incomplete content. List of possible elements expected: 'standaardafwijking'.")
+                    .SetName("invalidCriticalFlowRateMissingStandardDeviation");
+
                 yield return new TestCaseData("invalidCriticalFlowRateMeanEmpty.xml",
                                               "The 'verwachtingswaarde' element is invalid - The value '' is invalid according to its datatype 'Double'")
                     .SetName("invalidCriticalFlowRateMeanEmpty");
@@ -295,11 +305,11 @@
             Assert.IsNotNull(calculation.CriticalFlowRateMean);
             Assert.IsNotNull(calculation.CriticalFlowRateStandardDeviation);
 
-            Assert.IsTrue(double.IsPositiveInfinity((double) calculation.Orientation));
-            Assert.IsTrue(double.IsNegativeInfinity((double) calculation.DikeHeight));
-            Assert.IsTrue(double.IsNegativeInfinity((double) calculation.BreakWaterHeight));
-            Assert.IsTrue(double.IsPositiveInfinity((double) calculation.CriticalFlowRateMean));
-            Assert.IsTrue(double.IsPositiveInfinity((double) calculation.CriticalFlowRateStandardDeviation));
+            Assert.IsTrue(double.IsPositiveInfinity(calculation.Orientation.Value));
+            Assert.IsTrue(double.IsNegativeInfinity(calculation.DikeHeight.Value));
+            Assert.IsTrue(double.IsNegativeInfinity(calculation.BreakWaterHeight.Value));
+            Assert.IsTrue(double.IsPositiveInfinity(calculation.CriticalFlowRateMean.Value));
+            Assert.IsTrue(double.IsPositiveInfinity(calculation.CriticalFlowRateStandardDeviation.Value));
         }
 
         [Test]
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidCriticalFlowRateMissingMean.xml
===================================================================
diff -u
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidCriticalFlowRateMissingMean.xml	(revision 0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidCriticalFlowRateMissingMean.xml	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <stochasten>
+	  <stochast naam="overslagdebiet">
+		<standaardafwijking>2.2</standaardafwijking>
+	  </stochast>
+	</stochasten>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidCriticalFlowRateMissingStandardDeviation.xml
===================================================================
diff -u
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidCriticalFlowRateMissingStandardDeviation.xml	(revision 0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidCriticalFlowRateMissingStandardDeviation.xml	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <stochasten>
+	  <stochast naam="overslagdebiet">
+	    <verwachtingswaarde>1.1</verwachtingswaarde>
+	  </stochast>
+	</stochasten>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidMultipleCriticalFlowRateStochast.xml
===================================================================
diff -u
--- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidMultipleCriticalFlowRateStochast.xml	(revision 0)
+++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.IO.Test/test-data/GrassCoverErosionInwardsCalculationConfigurationReader/invalidMultipleCriticalFlowRateStochast.xml	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuratie>
+  <berekening naam="Calculation">
+    <stochasten>
+	  <stochast naam="overslagdebiet">
+	    <verwachtingswaarde>1.1</verwachtingswaarde>
+		<standaardafwijking>2.2</standaardafwijking>
+	  </stochast>
+	  <stochast naam="overslagdebiet">
+	    <verwachtingswaarde>3.3</verwachtingswaarde>
+		<standaardafwijking>4.4</standaardafwijking>
+	  </stochast>
+	</stochasten>
+  </berekening>
+</configuratie>
\ No newline at end of file
Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/ReferenceLineReplacementHandlerTest.cs
===================================================================
diff -u -r43435200452dd3b310c0c9d044d685209c685eb3 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/ReferenceLineReplacementHandlerTest.cs	(.../ReferenceLineReplacementHandlerTest.cs)	(revision 43435200452dd3b310c0c9d044d685209c685eb3)
+++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/Handlers/ReferenceLineReplacementHandlerTest.cs	(.../ReferenceLineReplacementHandlerTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -118,7 +118,7 @@
 
 
         [Test]
-        public void Replace_AssessmentSectionNull_ThrownArgumentNullException()
+        public void Replace_AssessmentSectionNull_ThrowArgumentNullException()
         {
             // Setup
             var mocks = new MockRepository();
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs
===================================================================
diff -u -r09fb591f0e8017e22b62ca554f6eceeeafa51219 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision 09fb591f0e8017e22b62ca554f6eceeeafa51219)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Properties/Resources.Designer.cs	(.../Resources.Designer.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -1,4 +1,25 @@
-//------------------------------------------------------------------------------
+// Copyright (C) Stichting Deltares 2016. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+// 
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see <http://www.gnu.org/licenses/>.
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+//------------------------------------------------------------------------------
 // <auto-generated>
 //     This code was generated by a tool.
 //     Runtime Version:4.0.30319.42000
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/app.config
===================================================================
diff -u -r7cc1fd960a912443ccc3c6995eccb5673d1d8d22 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/app.config	(.../app.config)	(revision 7cc1fd960a912443ccc3c6995eccb5673d1d8d22)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/app.config	(.../app.config)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -1,4 +1,26 @@
 <?xml version="1.0" encoding="utf-8"?>
+<!--
+Copyright (C) Stichting Deltares 2016. All rights reserved.
+
+This file is part of Ringtoets.
+
+Ringtoets is free software: you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program. If not, see <http://www.gnu.org/licenses/>.
+
+All names, logos, and references to "Deltares" are registered trademarks of
+Stichting Deltares and remain full property of Stichting Deltares at all times.
+All rights reserved.
+-->
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/packages.config
===================================================================
diff -u -rfea3ed82dfb6dfcad535eef16efcbaa9c01564ed -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/Piping/src/Ringtoets.Piping.Forms/packages.config	(.../packages.config)	(revision fea3ed82dfb6dfcad535eef16efcbaa9c01564ed)
+++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/packages.config	(.../packages.config)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
+
 <!--
 Copyright (C) Stichting Deltares 2016. All rights reserved.
 
Index: Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/PipingCalculationConfigurationReader.cs
===================================================================
diff -u -r9b6fa40a91299ecbbaffdbc79faf904b6c492d2f -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/PipingCalculationConfigurationReader.cs	(.../PipingCalculationConfigurationReader.cs)	(revision 9b6fa40a91299ecbbaffdbc79faf904b6c492d2f)
+++ Ringtoets/Piping/src/Ringtoets.Piping.IO/Readers/PipingCalculationConfigurationReader.cs	(.../PipingCalculationConfigurationReader.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -70,7 +70,7 @@
         {
             var constructionProperties = new ReadPipingCalculation.ConstructionProperties
             {
-                Name = calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute)?.Value,
+                Name = calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value,
                 AssessmentLevel = calculationElement.GetDoubleValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.AssessmentLevelElement),
                 HydraulicBoundaryLocation = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
                 SurfaceLine = calculationElement.GetStringValueFromDescendantElement(PipingCalculationConfigurationSchemaIdentifiers.SurfaceLineElement),
Index: Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r7594d7f46113b5c5f4f41bfbd0183a3789f648b9 -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingCalculationConfigurationReaderTest.cs	(.../PipingCalculationConfigurationReaderTest.cs)	(revision 7594d7f46113b5c5f4f41bfbd0183a3789f648b9)
+++ Ringtoets/Piping/test/Ringtoets.Piping.IO.Test/Readers/PipingCalculationConfigurationReaderTest.cs	(.../PipingCalculationConfigurationReaderTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -270,13 +270,22 @@
 
             var calculation = readConfigurationItems[0] as ReadPipingCalculation;
             Assert.IsNotNull(calculation);
-            Assert.IsTrue(calculation.AssessmentLevel != null && double.IsNegativeInfinity((double) calculation.AssessmentLevel));
-            Assert.IsTrue(calculation.EntryPointL != null && double.IsNegativeInfinity((double) calculation.EntryPointL));
-            Assert.IsTrue(calculation.ExitPointL != null && double.IsPositiveInfinity((double) calculation.ExitPointL));
-            Assert.IsTrue(calculation.PhreaticLevelExitMean != null && double.IsNegativeInfinity((double) calculation.PhreaticLevelExitMean));
-            Assert.IsTrue(calculation.PhreaticLevelExitStandardDeviation != null && double.IsPositiveInfinity((double) calculation.PhreaticLevelExitStandardDeviation));
-            Assert.IsTrue(calculation.DampingFactorExitMean != null && double.IsPositiveInfinity((double) calculation.DampingFactorExitMean));
-            Assert.IsTrue(calculation.DampingFactorExitStandardDeviation != null && double.IsPositiveInfinity((double) calculation.DampingFactorExitStandardDeviation));
+
+            Assert.IsNotNull(calculation.AssessmentLevel);
+            Assert.IsNotNull(calculation.EntryPointL);
+            Assert.IsNotNull(calculation.ExitPointL);
+            Assert.IsNotNull(calculation.PhreaticLevelExitMean);
+            Assert.IsNotNull(calculation.PhreaticLevelExitStandardDeviation);
+            Assert.IsNotNull(calculation.DampingFactorExitMean);
+            Assert.IsNotNull(calculation.DampingFactorExitStandardDeviation);
+
+            Assert.IsTrue(double.IsNegativeInfinity(calculation.AssessmentLevel.Value));
+            Assert.IsTrue(double.IsNegativeInfinity(calculation.EntryPointL.Value));
+            Assert.IsTrue(double.IsPositiveInfinity(calculation.ExitPointL.Value));
+            Assert.IsTrue(double.IsNegativeInfinity(calculation.PhreaticLevelExitMean.Value));
+            Assert.IsTrue(double.IsPositiveInfinity(calculation.PhreaticLevelExitStandardDeviation.Value));
+            Assert.IsTrue(double.IsPositiveInfinity(calculation.DampingFactorExitMean.Value));
+            Assert.IsTrue(double.IsPositiveInfinity(calculation.DampingFactorExitStandardDeviation.Value));
         }
 
         [Test]
Index: Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/WaveConditionsCalculationConfigurationReader.cs
===================================================================
diff -u -r29289635457e7d05e24c8fb923e0c6f56f152add -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision 29289635457e7d05e24c8fb923e0c6f56f152add)
+++ Ringtoets/Revetment/src/Ringtoets.Revetment.IO/Readers/WaveConditionsCalculationConfigurationReader.cs	(.../WaveConditionsCalculationConfigurationReader.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -80,7 +80,7 @@
         {
             var constructionProperties = new ReadWaveConditionsCalculation.ConstructionProperties
             {
-                Name = calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute)?.Value,
+                Name = calculationElement.Attribute(ConfigurationSchemaIdentifiers.NameAttribute).Value,
                 HydraulicBoundaryLocation = calculationElement.GetStringValueFromDescendantElement(ConfigurationSchemaIdentifiers.HydraulicBoundaryLocationElement),
                 UpperBoundaryRevetment = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.UpperBoundaryRevetment),
                 LowerBoundaryRevetment = calculationElement.GetDoubleValueFromDescendantElement(WaveConditionsCalculationConfigurationSchemaIdentifiers.LowerBoundaryRevetment),
Index: Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsCalculationConfigurationReaderTest.cs
===================================================================
diff -u -r29289635457e7d05e24c8fb923e0c6f56f152add -ra5c5133ec23681679e77ff31b89e6410d366f247
--- Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsCalculationConfigurationReaderTest.cs	(.../WaveConditionsCalculationConfigurationReaderTest.cs)	(revision 29289635457e7d05e24c8fb923e0c6f56f152add)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.IO.Test/Readers/WaveConditionsCalculationConfigurationReaderTest.cs	(.../WaveConditionsCalculationConfigurationReaderTest.cs)	(revision a5c5133ec23681679e77ff31b89e6410d366f247)
@@ -293,12 +293,20 @@
 
             var calculation = readItems[0] as ReadWaveConditionsCalculation;
             Assert.IsNotNull(calculation);
-            Assert.IsTrue(calculation.UpperBoundaryRevetment != null && double.IsPositiveInfinity((double) calculation.UpperBoundaryRevetment));
-            Assert.IsTrue(calculation.LowerBoundaryRevetment != null && double.IsNegativeInfinity((double) calculation.LowerBoundaryRevetment));
-            Assert.IsTrue(calculation.UpperBoundaryWaterLevels != null && double.IsPositiveInfinity((double) calculation.UpperBoundaryWaterLevels));
-            Assert.IsTrue(calculation.LowerBoundaryWaterLevels != null && double.IsNegativeInfinity((double) calculation.LowerBoundaryWaterLevels));
-            Assert.IsTrue(calculation.Orientation != null && double.IsPositiveInfinity((double) calculation.Orientation));
-            Assert.IsTrue(calculation.BreakWaterHeight != null && double.IsPositiveInfinity((double) calculation.BreakWaterHeight));
+
+            Assert.NotNull(calculation.UpperBoundaryRevetment);
+            Assert.NotNull(calculation.LowerBoundaryRevetment);
+            Assert.NotNull(calculation.UpperBoundaryWaterLevels);
+            Assert.NotNull(calculation.LowerBoundaryWaterLevels);
+            Assert.NotNull(calculation.Orientation);
+            Assert.NotNull(calculation.BreakWaterHeight);
+
+            Assert.IsTrue(double.IsPositiveInfinity(calculation.UpperBoundaryRevetment.Value));
+            Assert.IsTrue(double.IsNegativeInfinity(calculation.LowerBoundaryRevetment.Value));
+            Assert.IsTrue(double.IsPositiveInfinity(calculation.UpperBoundaryWaterLevels.Value));
+            Assert.IsTrue(double.IsNegativeInfinity(calculation.LowerBoundaryWaterLevels.Value));
+            Assert.IsTrue(double.IsPositiveInfinity(calculation.Orientation.Value));
+            Assert.IsTrue(double.IsPositiveInfinity(calculation.BreakWaterHeight.Value));
         }
 
         [Test]