Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -r0bf82125822690e5a0a757815c6cb9a48aff83b4 -r3b863fee27bbd11b773356a5b8548090b6c394cd --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 0bf82125822690e5a0a757815c6cb9a48aff83b4) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 3b863fee27bbd11b773356a5b8548090b6c394cd) @@ -53,11 +53,11 @@ public void Validate_InputNull_ThrowArgumentNullException() { // Call - TestDelegate action = () => new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(null, - GetValidNormativeAssessmentLevel(), - validFilePath, - validPreprocessorDirectory, - string.Empty); + TestDelegate action = () => TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(null, + GetValidNormativeAssessmentLevel(), + validFilePath, + validPreprocessorDirectory, + string.Empty); // Assert var exception = Assert.Throws(action); @@ -74,11 +74,11 @@ }; // Call - TestDelegate action = () => new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - GetValidNormativeAssessmentLevel(), - validFilePath, - validPreprocessorDirectory, - null); + TestDelegate action = () => TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, + GetValidNormativeAssessmentLevel(), + validFilePath, + validPreprocessorDirectory, + null); // Assert var exception = Assert.Throws(action); @@ -92,11 +92,11 @@ var isValid = false; // Call - Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidNormativeAssessmentLevel(), - string.Empty, - validPreprocessorDirectory, - string.Empty); + Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), + GetValidNormativeAssessmentLevel(), + string.Empty, + validPreprocessorDirectory, + string.Empty); // Assert TestHelper.AssertLogMessages(action, messages => @@ -119,11 +119,11 @@ string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite"); // Call - Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidNormativeAssessmentLevel(), - invalidFilePath, - validPreprocessorDirectory, - string.Empty); + Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), + GetValidNormativeAssessmentLevel(), + invalidFilePath, + validPreprocessorDirectory, + string.Empty); // Assert TestHelper.AssertLogMessages(action, messages => @@ -146,11 +146,11 @@ const string invalidPreprocessorDirectory = "NonExistingPreprocessorDirectory"; // Call - Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidNormativeAssessmentLevel(), - validFilePath, - invalidPreprocessorDirectory, - string.Empty); + Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), + GetValidNormativeAssessmentLevel(), + validFilePath, + invalidPreprocessorDirectory, + string.Empty); // Assert TestHelper.AssertLogMessages(action, messages => @@ -173,11 +173,11 @@ string dbFilePath = Path.Combine(testDataPath, "HRD nosettings.sqlite"); // Call - Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidNormativeAssessmentLevel(), - dbFilePath, - validPreprocessorDirectory, - string.Empty); + Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), + GetValidNormativeAssessmentLevel(), + dbFilePath, + validPreprocessorDirectory, + string.Empty); // Assert TestHelper.AssertLogMessages(action, messages => @@ -201,11 +201,11 @@ var input = new TestWaveConditionsInput(); // Call - Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - GetValidNormativeAssessmentLevel(), - validFilePath, - validPreprocessorDirectory, - string.Empty); + Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, + GetValidNormativeAssessmentLevel(), + validFilePath, + validPreprocessorDirectory, + string.Empty); // Assert TestHelper.AssertLogMessages(action, messages => @@ -234,11 +234,11 @@ const string designWaterLevelName = ""; // Call - Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - RoundedDouble.NaN, - validFilePath, - validPreprocessorDirectory, - designWaterLevelName); + Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, + RoundedDouble.NaN, + validFilePath, + validPreprocessorDirectory, + designWaterLevelName); // Assert string expectedMessage = $"Kan {designWaterLevelName} niet afleiden op basis van de invoer"; @@ -277,11 +277,11 @@ }; // Call - Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - (RoundedDouble) normativeAssessmentLevel, - validFilePath, - validPreprocessorDirectory, - "DesignWaterLevelName"); + Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, + (RoundedDouble) normativeAssessmentLevel, + validFilePath, + validPreprocessorDirectory, + "DesignWaterLevelName"); // Assert TestHelper.AssertLogMessages(action, messages => @@ -310,11 +310,11 @@ input.UseBreakWater = true; // Call - Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - GetValidNormativeAssessmentLevel(), - validFilePath, - validPreprocessorDirectory, - "DesignWaterLevelName"); + Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, + GetValidNormativeAssessmentLevel(), + validFilePath, + validPreprocessorDirectory, + "DesignWaterLevelName"); // Assert TestHelper.AssertLogMessages(action, messages => @@ -343,11 +343,11 @@ input.UseBreakWater = false; // Call - Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - GetValidNormativeAssessmentLevel(), - validFilePath, - validPreprocessorDirectory, - "DesignWaterLevelName"); + Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, + GetValidNormativeAssessmentLevel(), + validFilePath, + validPreprocessorDirectory, + "DesignWaterLevelName"); // Assert TestHelper.AssertLogMessages(action, messages => @@ -389,11 +389,11 @@ } // Call - Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - GetValidNormativeAssessmentLevel(), - validFilePath, - validPreprocessorDirectory, - "DesignWaterLevelName"); + Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, + GetValidNormativeAssessmentLevel(), + validFilePath, + validPreprocessorDirectory, + "DesignWaterLevelName"); // Assert TestHelper.AssertLogMessages(action, messages => @@ -417,11 +417,11 @@ input.Orientation = RoundedDouble.NaN; // Call - Action action = () => isValid = new WaveConditionsCalculationService().PublicValidateWaveConditionsInput(input, - GetValidNormativeAssessmentLevel(), - validFilePath, - validPreprocessorDirectory, - "DesignWaterLevelName"); + Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, + GetValidNormativeAssessmentLevel(), + validFilePath, + validPreprocessorDirectory, + "DesignWaterLevelName"); // Assert TestHelper.AssertLogMessages(action, messages => @@ -448,14 +448,14 @@ string hcldFilePath = Path.Combine(testDataPath, "HRD ijsselmeer.sqlite"); // Call - TestDelegate test = () => new WaveConditionsCalculationService().PublicCalculate(a, - b, - c, - norm, - null, - GetValidNormativeAssessmentLevel(), - hcldFilePath, - string.Empty); + TestDelegate test = () => new TestWaveConditionsCalculationService().PublicCalculate(a, + b, + c, + norm, + null, + GetValidNormativeAssessmentLevel(), + hcldFilePath, + string.Empty); // Assert var exception = Assert.Throws(test); @@ -502,14 +502,14 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call - new WaveConditionsCalculationService().PublicCalculate(a, - b, - c, - norm, - input, - waterLevel, - hcldFilePath, - string.Empty); + new TestWaveConditionsCalculationService().PublicCalculate(a, + b, + c, + norm, + input, + waterLevel, + hcldFilePath, + string.Empty); // Assert for (var i = 0; i < nrOfCalculators; i++) @@ -568,14 +568,14 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call - new WaveConditionsCalculationService().PublicCalculate(a, - b, - c, - norm, - input, - waterLevel, - hcldFilePath, - validPreprocessorDirectory); + new TestWaveConditionsCalculationService().PublicCalculate(a, + b, + c, + norm, + input, + waterLevel, + hcldFilePath, + validPreprocessorDirectory); // Assert for (var i = 0; i < nrOfCalculators; i++) @@ -629,14 +629,14 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { // Call - new WaveConditionsCalculationService().PublicCalculate(a, - b, - c, - norm, - input, - waterLevel, - hcldFilePath, - preprocessorDirectory); + new TestWaveConditionsCalculationService().PublicCalculate(a, + b, + c, + norm, + input, + waterLevel, + hcldFilePath, + preprocessorDirectory); // Assert for (var i = 0; i < nrOfCalculators; i++) @@ -701,14 +701,14 @@ { try { - new WaveConditionsCalculationService().PublicCalculate(a, - b, - c, - norm, - input, - waterLevel, - hcldFilePath, - string.Empty); + new TestWaveConditionsCalculationService().PublicCalculate(a, + b, + c, + norm, + input, + waterLevel, + hcldFilePath, + string.Empty); } catch (HydraRingCalculationException e) { @@ -789,7 +789,7 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { - var service = new WaveConditionsCalculationService(); + var service = new TestWaveConditionsCalculationService(); // Call Action call = () => service.PublicCalculate(a, @@ -858,7 +858,7 @@ using (new HydraRingCalculatorFactoryConfig(calculatorFactory)) { - var service = new WaveConditionsCalculationService(); + var service = new TestWaveConditionsCalculationService(); calculator.CalculationFinishedHandler += (s, e) => service.Cancel(); // Call @@ -918,42 +918,42 @@ { return (RoundedDouble) 12; } - } - public class WaveConditionsCalculationService : WaveConditionsCalculationServiceBase - { - public IEnumerable Outputs; - - public bool PublicValidateWaveConditionsInput(WaveConditionsInput waveConditionsInput, - RoundedDouble normativeAssessmentLevel, - string dbFilePath, - string preprocessorDirectory, - string valueName) + private class TestWaveConditionsCalculationService : WaveConditionsCalculationServiceBase { - return ValidateWaveConditionsInput(waveConditionsInput, - normativeAssessmentLevel, - dbFilePath, - preprocessorDirectory, - valueName); - } + public IEnumerable Outputs; - public void PublicCalculate(RoundedDouble a, - RoundedDouble b, - RoundedDouble c, - double norm, - WaveConditionsInput input, - RoundedDouble normativeAssessmentLevel, - string dbFilePath, - string preprocessorDirectory) - { - Outputs = CalculateWaveConditions(input, - normativeAssessmentLevel, - a, - b, - c, - norm, - dbFilePath, - preprocessorDirectory); + public static bool PublicValidateWaveConditionsInput(WaveConditionsInput waveConditionsInput, + RoundedDouble normativeAssessmentLevel, + string dbFilePath, + string preprocessorDirectory, + string valueName) + { + return ValidateWaveConditionsInput(waveConditionsInput, + normativeAssessmentLevel, + dbFilePath, + preprocessorDirectory, + valueName); + } + + public void PublicCalculate(RoundedDouble a, + RoundedDouble b, + RoundedDouble c, + double norm, + WaveConditionsInput input, + RoundedDouble normativeAssessmentLevel, + string dbFilePath, + string preprocessorDirectory) + { + Outputs = CalculateWaveConditions(input, + normativeAssessmentLevel, + a, + b, + c, + norm, + dbFilePath, + preprocessorDirectory); + } } } } \ No newline at end of file