Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs
===================================================================
diff -u -r54ed6c0d1b17e218d89fb5b1a4be658162e11609 -rad8d317ebb0ba3edf0f7f440807750942fc9dc5f
--- Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs	(.../ProbabilisticPipingCalculationServiceTest.cs)	(revision 54ed6c0d1b17e218d89fb5b1a4be658162e11609)
+++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs	(.../ProbabilisticPipingCalculationServiceTest.cs)	(revision ad8d317ebb0ba3edf0f7f440807750942fc9dc5f)
@@ -159,7 +159,7 @@
 
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
-                failureMechanism, mocks, validHrdFilePath);
+                failureMechanism, mocks);
             mocks.ReplayAll();
 
             calculation.InputParameters.HydraulicBoundaryLocation = null;
@@ -185,22 +185,20 @@
         }
 
         [Test]
-        public void Validate_InvalidHydraulicBoundaryDatabase_LogsMessageAndReturnsFalse()
+        public void Validate_NoHydraulicBoundaryDatabase_LogsMessageAndReturnsFalse()
         {
             // Setup
             var failureMechanism = new PipingFailureMechanism();
 
-            string invalidFilePath = Path.Combine(testDataPath, "notexisting.sqlite");
-
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
-                failureMechanism, mocks, invalidFilePath);
+                failureMechanism, mocks);
             mocks.ReplayAll();
 
             calculation.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2);
 
             // Call
-            var isValid = true;
+            var isValid = false;
 
             void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
                                                                                     failureMechanism,
@@ -212,20 +210,20 @@
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(3, msgs.Length);
                 CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
-                StringAssert.StartsWith("Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. Fout bij het lezen van bestand", msgs[1]);
+                Assert.AreEqual("Er is geen hydraulische belastingendatabase geïmporteerd.", msgs[1]);
                 CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
             });
             Assert.IsFalse(isValid);
             mocks.VerifyAll();
         }
 
         [Test]
-        public void Validate_ValidHydraulicBoundaryDatabaseWithoutSettings_LogsMessageAndReturnsFalse()
+        public void Validate_InvalidHydraulicBoundaryDatabase_LogsMessageAndReturnsFalse()
         {
             // Setup
             var failureMechanism = new PipingFailureMechanism();
 
-            string invalidFilePath = Path.Combine(testDataPath, "HRD nosettings.sqlite");
+            string invalidFilePath = Path.Combine(testDataPath, "notexisting.sqlite");
 
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
@@ -235,7 +233,7 @@
             calculation.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2);
 
             // Call
-            var isValid = false;
+            var isValid = true;
 
             void Call() => isValid = ProbabilisticPipingCalculationService.Validate(calculation,
                                                                                     failureMechanism,
@@ -255,14 +253,16 @@
         }
 
         [Test]
-        public void Validate_WithoutImportedHydraulicBoundaryDatabase_LogsMessageAndReturnsFalse()
+        public void Validate_HydraulicBoundaryDatabaseWithoutSettings_LogsMessageAndReturnsFalse()
         {
             // Setup
             var failureMechanism = new PipingFailureMechanism();
 
+            string invalidFilePath = Path.Combine(testDataPath, "HRD nosettings.sqlite");
+
             var mocks = new MockRepository();
             IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub(
-                failureMechanism, mocks);
+                failureMechanism, mocks, invalidFilePath);
             mocks.ReplayAll();
 
             calculation.InputParameters.HydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "name", 2, 2);
@@ -280,7 +280,7 @@
                 string[] msgs = messages.ToArray();
                 Assert.AreEqual(3, msgs.Length);
                 CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
-                Assert.AreEqual("Er is geen hydraulische belastingendatabase geïmporteerd.", msgs[1]);
+                StringAssert.StartsWith("Herstellen van de verbinding met de hydraulische belastingendatabase is mislukt. Fout bij het lezen van bestand", msgs[1]);
                 CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]);
             });
             Assert.IsFalse(isValid);
@@ -301,22 +301,29 @@
             // Call
             var isValid = false;
 
-            void Call() => isValid = ProbabilisticPipingCalculationService.Validate(new TestProbabilisticPipingCalculation(),
+            var probabilisticPipingCalculation = new TestProbabilisticPipingCalculation
+            {
+                InputParameters =
+                {
+                    HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation()
+                }
+            };
+
+            void Call() => isValid = ProbabilisticPipingCalculationService.Validate(probabilisticPipingCalculation,
                                                                                     failureMechanism,
                                                                                     assessmentSection);
 
             // Assert
             TestHelper.AssertLogMessages(Call, messages =>
             {
                 string[] msgs = messages.ToArray();
-                Assert.AreEqual(7, msgs.Length);
+                Assert.AreEqual(6, msgs.Length);
                 CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]);
-                Assert.AreEqual("Er is geen hydraulische belastingenlocatie geselecteerd.", msgs[1]);
-                Assert.AreEqual("Er is geen profielschematisatie geselecteerd.", msgs[2]);
-                Assert.AreEqual("Er is geen ondergrondschematisatie geselecteerd.", msgs[3]);
-                Assert.AreEqual("De waarde voor 'uittredepunt' moet een concreet getal zijn.", msgs[4]);
-                Assert.AreEqual("De waarde voor 'intredepunt' moet een concreet getal zijn.", msgs[5]);
-                CalculationServiceTestHelper.AssertValidationEndMessage(msgs[6]);
+                Assert.AreEqual("Er is geen profielschematisatie geselecteerd.", msgs[1]);
+                Assert.AreEqual("Er is geen ondergrondschematisatie geselecteerd.", msgs[2]);
+                Assert.AreEqual("De waarde voor 'uittredepunt' moet een concreet getal zijn.", msgs[3]);
+                Assert.AreEqual("De waarde voor 'intredepunt' moet een concreet getal zijn.", msgs[4]);
+                CalculationServiceTestHelper.AssertValidationEndMessage(msgs[5]);
             });
             Assert.IsFalse(isValid);
             mocks.VerifyAll();