Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsFactoryTest.cs =================================================================== diff -u -rfc505a6a1ef0418da1856b654a184044c5470782 -r6a9567f3fbe71ef6a2721018e5da5994a99a6db1 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsFactoryTest.cs (.../HydraulicBoundaryCalculationSettingsFactoryTest.cs) (revision fc505a6a1ef0418da1856b654a184044c5470782) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryCalculationSettingsFactoryTest.cs (.../HydraulicBoundaryCalculationSettingsFactoryTest.cs) (revision 6a9567f3fbe71ef6a2721018e5da5994a99a6db1) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2018. All rights reserved. +// Copyright (C) Stichting Deltares 2018. All rights reserved. // // This file is part of Ringtoets. // @@ -43,26 +43,6 @@ } [Test] - [TestCase(null)] - [TestCase("")] - [TestCase(" ")] - public void CreateSettings_WithHydraulicBoundaryDatabaseWithInvalidFilePath_ReturnsExpectedSettings(string filePath) - { - // Setup - var database = new HydraulicBoundaryDatabase - { - FilePath = filePath - }; - - // Call - HydraulicBoundaryCalculationSettings settings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(database); - - // Assert - Assert.AreEqual(database.FilePath, settings.HydraulicBoundaryDatabaseFilePath); - Assert.IsNull(settings.HlcdFilePath); - } - - [Test] public void CreateSettings_WithHydraulicBoundaryDatabaseWithFilePath_ReturnsExpectedSettings() { // Setup @@ -87,8 +67,6 @@ HydraulicBoundaryDatabase database, string expectedPreprocessorDirectory) { - // Setup - // Call HydraulicBoundaryCalculationSettings settings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(database); @@ -98,12 +76,19 @@ private static IEnumerable GetPreprocessorConfigurations() { - yield return new TestCaseData(new HydraulicBoundaryDatabase(), + string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + + yield return new TestCaseData(new HydraulicBoundaryDatabase + { + FilePath = validFilePath + }, string.Empty) .SetName("UsePreprocessorFalse"); yield return new TestCaseData(new HydraulicBoundaryDatabase { + FilePath = validFilePath, CanUsePreprocessor = true, PreprocessorDirectory = "Directory" }, string.Empty) @@ -112,6 +97,7 @@ const string preprocessorDirectory = "Directory"; yield return new TestCaseData(new HydraulicBoundaryDatabase { + FilePath = validFilePath, CanUsePreprocessor = true, UsePreprocessor = true, PreprocessorDirectory = preprocessorDirectory