Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs
===================================================================
diff -u -r275811c8e133cba03f636224f40a9536a733fb1f -r752b8000ca808d85710d985c6c9b69dee1a05ae0
--- Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs	(.../WaveConditionsInputTest.cs)	(revision 275811c8e133cba03f636224f40a9536a733fb1f)
+++ Ringtoets/Revetment/test/Ringtoets.Revetment.Data.Test/WaveConditionsInputTest.cs	(.../WaveConditionsInputTest.cs)	(revision 752b8000ca808d85710d985c6c9b69dee1a05ae0)
@@ -114,6 +114,7 @@
             Assert.AreEqual(new RoundedDouble(2), input.BreakWater.Height);
             Assert.IsFalse(input.UseForeshore);
             CollectionAssert.IsEmpty(input.ForeshoreGeometry);
+            Assert.AreEqual(new RoundedDouble(2, double.NaN), input.UpperBoundaryDesignWaterLevel);
             Assert.AreEqual(new RoundedDouble(2, double.NaN), input.LowerBoundaryRevetment);
             Assert.AreEqual(new RoundedDouble(2, double.NaN), input.UpperBoundaryRevetment);
             Assert.AreEqual(new RoundedDouble(1, double.NaN), input.StepSize);
@@ -217,6 +218,49 @@
         }
 
         [Test]
+        public void UpperBoundaryDesignWaterLevel_NoHydraulicBoundaryLocation_ReturnNaN()
+        {
+            // Setup
+            var waveConditionsInput = new WaveConditionsInput();
+
+            // Call
+            waveConditionsInput.HydraulicBoundaryLocation = null;
+
+            // Assert
+            Assert.AreEqual(new RoundedDouble(2, double.NaN), waveConditionsInput.UpperBoundaryDesignWaterLevel);
+        }
+
+        [Test]
+        public void UpperBoundaryDesignWaterLevel_NoDesignWaterLevel_ReturnNaN()
+        {
+            // Setup
+            var waveConditionsInput = new WaveConditionsInput();
+
+            // Call
+            waveConditionsInput.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 0, 0);
+
+            // Assert
+            Assert.AreEqual(new RoundedDouble(2, double.NaN), waveConditionsInput.UpperBoundaryDesignWaterLevel);
+        }
+
+        [Test]
+        public void UpperBoundaryDesignWaterLevel_DesignWaterLevelSet_ReturnValueJustBelowDesignWaterLevel()
+        {
+            // Setup
+            var designWaterLevel = (RoundedDouble) 1.0;
+            var waveConditionsInput = new WaveConditionsInput();
+
+            // Call
+            waveConditionsInput.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "", 0, 0)
+            {
+                DesignWaterLevel = designWaterLevel
+            };
+
+            // Assert
+            Assert.AreEqual(new RoundedDouble(2, designWaterLevel - 0.01), waveConditionsInput.UpperBoundaryDesignWaterLevel);
+        }
+
+        [Test]
         public void LowerBoundaryRevetment_SetNewValue_ValueIsRounded()
         {
             // Setup