Index: Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryDataConnectionValidatorTest.cs
===================================================================
diff -u -rfcb7ebcdbb68ad01d074b09afcce94d5786f29e4 -r5ed6320f359270c612c45b2d32d9a5d5c3c99f35
--- Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryDataConnectionValidatorTest.cs	(.../HydraulicBoundaryDataConnectionValidatorTest.cs)	(revision fcb7ebcdbb68ad01d074b09afcce94d5786f29e4)
+++ Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryDataConnectionValidatorTest.cs	(.../HydraulicBoundaryDataConnectionValidatorTest.cs)	(revision 5ed6320f359270c612c45b2d32d9a5d5c3c99f35)
@@ -24,6 +24,7 @@
 using Core.Common.TestUtil;
 using NUnit.Framework;
 using Riskeer.Common.Data.Hydraulics;
+using Riskeer.Common.Data.TestUtil;
 
 namespace Riskeer.Common.Service.Test
 {
@@ -36,21 +37,32 @@
         public void Validate_HydraulicBoundaryDataNull_ThrowsArgumentNullException()
         {
             // Call
-            void Call() => HydraulicBoundaryDataConnectionValidator.Validate(null);
+            void Call() => HydraulicBoundaryDataConnectionValidator.Validate(null, new TestHydraulicBoundaryLocation());
 
             // Assert
             string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
             Assert.AreEqual("hydraulicBoundaryData", paramName);
         }
 
         [Test]
+        public void Validate_HydraulicBoundaryLocationNull_ThrowsArgumentNullException()
+        {
+            // Call
+            void Call() => HydraulicBoundaryDataConnectionValidator.Validate(new HydraulicBoundaryData(), null);
+
+            // Assert
+            string paramName = Assert.Throws<ArgumentNullException>(Call).ParamName;
+            Assert.AreEqual("hydraulicBoundaryLocation", paramName);
+        }
+
+        [Test]
         public void Validate_HydraulicBoundaryDataNotLinked_ReturnErrorMessage()
         {
             // Setup
             var hydraulicBoundaryData = new HydraulicBoundaryData();
 
             // Call
-            string message = HydraulicBoundaryDataConnectionValidator.Validate(hydraulicBoundaryData);
+            string message = HydraulicBoundaryDataConnectionValidator.Validate(hydraulicBoundaryData, new TestHydraulicBoundaryLocation());
 
             // Assert
             const string expectedMessage = "Er is geen hydraulische belastingendatabase geïmporteerd.";
@@ -67,7 +79,7 @@
             };
 
             // Call
-            string message = HydraulicBoundaryDataConnectionValidator.Validate(hydraulicBoundaryData);
+            string message = HydraulicBoundaryDataConnectionValidator.Validate(hydraulicBoundaryData, new TestHydraulicBoundaryLocation());
 
             // Assert
             const string expectedMessage = "Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. Fout bij het lezen van bestand 'I_do_not_exist.sqlite': het bestand bestaat niet.";
@@ -89,7 +101,7 @@
             };
 
             // Call
-            string message = HydraulicBoundaryDataConnectionValidator.Validate(hydraulicBoundaryData);
+            string message = HydraulicBoundaryDataConnectionValidator.Validate(hydraulicBoundaryData, new TestHydraulicBoundaryLocation());
 
             // Assert
             const string expectedMessage = "Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. De rekeninstellingen database heeft niet het juiste schema.";
@@ -112,7 +124,7 @@
             };
 
             // Call
-            string message = HydraulicBoundaryDataConnectionValidator.Validate(hydraulicBoundaryData);
+            string message = HydraulicBoundaryDataConnectionValidator.Validate(hydraulicBoundaryData, new TestHydraulicBoundaryLocation());
 
             // Assert
             string preprocessorClosureFilePath = Path.Combine(testDataPath, "withoutPreprocessorClosure", "hlcd_preprocClosure.sqlite");
@@ -137,7 +149,7 @@
             };
 
             // Call
-            string message = HydraulicBoundaryDataConnectionValidator.Validate(hydraulicBoundaryData);
+            string message = HydraulicBoundaryDataConnectionValidator.Validate(hydraulicBoundaryData, new TestHydraulicBoundaryLocation());
 
             // Assert
             Assert.IsNull(message);