Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs =================================================================== diff -u -r7be7725d522fa62ca6c7abadeb13da2b571ae9ab -r15d8894c81cd8293663d6d1232d1df00eb13b1e4 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision 7be7725d522fa62ca6c7abadeb13da2b571ae9ab) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Calculator/HydraRingCalculatorBaseTest.cs (.../HydraRingCalculatorBaseTest.cs) (revision 15d8894c81cd8293663d6d1232d1df00eb13b1e4) @@ -31,6 +31,7 @@ using Ringtoets.HydraRing.Calculation.Data.Settings; using Ringtoets.HydraRing.Calculation.Exceptions; using Ringtoets.HydraRing.Calculation.Parsers; +using Ringtoets.HydraRing.Calculation.TestUtil; namespace Ringtoets.HydraRing.Calculation.Test.Calculator { @@ -53,7 +54,7 @@ { // Setup var parser = new TestParser(); - HydraRingCalculationSettings settings = CreateHydraRingCalculationSettings(); + var settings = new HydraRingCalculationSettings("D:\\hlcd.sqlity", string.Empty); var calculator = new TestHydraRingCalculator(settings, parser); var hydraRingCalculationInput = new TestHydraRingCalculationInput(); @@ -72,7 +73,8 @@ { // Setup var parser = new TestParser(); - var calculator = new TestHydraRingCalculator(CreateHydraRingCalculationSettings(), parser); + var calculator = new TestHydraRingCalculator(HydraRingCalculationSettingsTestFactory.CreateSettings(), + parser); // Call calculator.PublicCalculate(new TestHydraRingCalculationInput()); @@ -88,7 +90,8 @@ // Setup var parseException = new HydraRingFileParserException("message", new Exception()); var parser = new TestParser(parseException); - var calculator = new TestHydraRingCalculator(CreateHydraRingCalculationSettings(), parser); + var calculator = new TestHydraRingCalculator(HydraRingCalculationSettingsTestFactory.CreateSettings(), + parser); // Call TestDelegate test = () => calculator.PublicCalculate(new TestHydraRingCalculationInput()); @@ -113,7 +116,8 @@ "Exception message", new Exception("InnerException")); var parser = new TestParser(supportedException); - var calculator = new TestHydraRingCalculator(CreateHydraRingCalculationSettings(), parser); + var calculator = new TestHydraRingCalculator(HydraRingCalculationSettingsTestFactory.CreateSettings(), + parser); // Call TestDelegate test = () => calculator.PublicCalculate(new TestHydraRingCalculationInput()); @@ -146,7 +150,8 @@ public void Calculate_IllustrationPointsParserThrowsException_SetsIllustrationPointsParserError() { // Setup - var calculator = new TestHydraRingCalculator(CreateHydraRingCalculationSettings(), new TestParser()); + var calculator = new TestHydraRingCalculator(HydraRingCalculationSettingsTestFactory.CreateSettings(), + new TestParser()); // Call calculator.PublicCalculate(new TestHydraRingCalculationInput()); @@ -156,13 +161,6 @@ Assert.AreEqual(expectedMessage, calculator.IllustrationPointsParserErrorMessage); Assert.IsNull(calculator.IllustrationPointsResult); } - - private static HydraRingCalculationSettings CreateHydraRingCalculationSettings() - { - var settings = new HydraRingCalculationSettings(string.Empty, - string.Empty); - return settings; - } } internal class TestHydraRingCalculator : HydraRingCalculatorBase Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingCalculationSettingsTestFactoryTest.cs =================================================================== diff -u --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingCalculationSettingsTestFactoryTest.cs (revision 0) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/HydraRingCalculationSettingsTestFactoryTest.cs (revision 15d8894c81cd8293663d6d1232d1df00eb13b1e4) @@ -0,0 +1,20 @@ +using NUnit.Framework; +using Ringtoets.HydraRing.Calculation.Data.Input; + +namespace Ringtoets.HydraRing.Calculation.TestUtil.Test +{ + [TestFixture] + public class HydraRingCalculationSettingsTestFactoryTest + { + [Test] + public void CreateSettings_Always_ReturnsHydraRingCalculationSettings() + { + // Call + HydraRingCalculationSettings settings = HydraRingCalculationSettingsTestFactory.CreateSettings(); + + // Assert + Assert.IsEmpty(settings.HlcdFilePath); + Assert.IsEmpty(settings.PreprocessorDirectory); + } + } +} \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/Ringtoets.HydraRing.Calculation.TestUtil.Test.csproj =================================================================== diff -u -r63fc151e9cf722527465c1eddfa6567a90feb5e6 -r15d8894c81cd8293663d6d1232d1df00eb13b1e4 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/Ringtoets.HydraRing.Calculation.TestUtil.Test.csproj (.../Ringtoets.HydraRing.Calculation.TestUtil.Test.csproj) (revision 63fc151e9cf722527465c1eddfa6567a90feb5e6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil.Test/Ringtoets.HydraRing.Calculation.TestUtil.Test.csproj (.../Ringtoets.HydraRing.Calculation.TestUtil.Test.csproj) (revision 15d8894c81cd8293663d6d1232d1df00eb13b1e4) @@ -15,6 +15,7 @@ + Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingCalculationSettingsTestFactory.cs =================================================================== diff -u --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingCalculationSettingsTestFactory.cs (revision 0) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/HydraRingCalculationSettingsTestFactory.cs (revision 15d8894c81cd8293663d6d1232d1df00eb13b1e4) @@ -0,0 +1,21 @@ +using Ringtoets.HydraRing.Calculation.Data.Input; + +namespace Ringtoets.HydraRing.Calculation.TestUtil +{ + /// + /// Factory which creates valid instances of + /// which can be used for testing. + /// + public static class HydraRingCalculationSettingsTestFactory + { + /// + /// Creates an instance of + /// with empty values. + /// + /// A . + public static HydraRingCalculationSettings CreateSettings() + { + return new HydraRingCalculationSettings(string.Empty, string.Empty); + } + } +} \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Ringtoets.HydraRing.Calculation.TestUtil.csproj =================================================================== diff -u -r63fc151e9cf722527465c1eddfa6567a90feb5e6 -r15d8894c81cd8293663d6d1232d1df00eb13b1e4 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Ringtoets.HydraRing.Calculation.TestUtil.csproj (.../Ringtoets.HydraRing.Calculation.TestUtil.csproj) (revision 63fc151e9cf722527465c1eddfa6567a90feb5e6) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Ringtoets.HydraRing.Calculation.TestUtil.csproj (.../Ringtoets.HydraRing.Calculation.TestUtil.csproj) (revision 15d8894c81cd8293663d6d1232d1df00eb13b1e4) @@ -17,6 +17,7 @@ +