Index: Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -rf57f915fa5e8488bf4c853ff53c00da3c150bc2d -r5aad0ff11109f8996fc3dee254abbd7d175f312f --- Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision f57f915fa5e8488bf4c853ff53c00da3c150bc2d) +++ Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 5aad0ff11109f8996fc3dee254abbd7d175f312f) @@ -77,6 +77,31 @@ } [Test] + public void Validate_NoHydraulicBoundaryLocation_ReturnsFalseAndLogsValidationError() + { + // Setup + var isValid = false; + + var input = new WaveConditionsInput(); + + // Call + void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(input, GetValidAssessmentLevel(), + new HydraulicBoundaryData()); + + // Assert + TestHelper.AssertLogMessages(Call, messages => + { + string[] msgs = messages.ToArray(); + Assert.AreEqual(3, msgs.Length); + CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]); + Assert.AreEqual("Er is geen hydraulische belastingenlocatie geselecteerd.", msgs[1]); + CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]); + }); + + Assert.IsFalse(isValid); + } + + [Test] public void Validate_NoHydraulicBoundaryDatabase_LogsValidationMessageAndReturnFalse() { // Setup @@ -111,7 +136,7 @@ // Setup var isValid = false; string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite"); - + var waveConditionsInput = new WaveConditionsInput { HydraulicBoundaryLocation = new TestHydraulicBoundaryLocation() @@ -172,32 +197,7 @@ Assert.IsFalse(isValid); } - - [Test] - public void Validate_NoHydraulicBoundaryLocation_ReturnsFalseAndLogsValidationError() - { - // Setup - var isValid = false; - var input = new WaveConditionsInput(); - - // Call - void Call() => isValid = WaveConditionsCalculationServiceBase.Validate(input, GetValidAssessmentLevel(), - GetValidHydraulicBoundaryData(new TestHydraulicBoundaryLocation())); - - // Assert - TestHelper.AssertLogMessages(Call, messages => - { - string[] msgs = messages.ToArray(); - Assert.AreEqual(3, msgs.Length); - CalculationServiceTestHelper.AssertValidationStartMessage(msgs[0]); - Assert.AreEqual("Er is geen hydraulische belastingenlocatie geselecteerd.", msgs[1]); - CalculationServiceTestHelper.AssertValidationEndMessage(msgs[2]); - }); - - Assert.IsFalse(isValid); - } - [Test] public void Validate_AssessmentLevelNaN_ReturnsFalseAndLogsValidationError() {