Index: Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -r088622f30c5e20eab63775cbfda1e3177ddb2a79 -rf5963071e103dcd74297f9659c04b253b26d3a94 --- Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 088622f30c5e20eab63775cbfda1e3177ddb2a79) +++ Ringtoets/Revetment/test/Ringtoets.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision f5963071e103dcd74297f9659c04b253b26d3a94) @@ -54,10 +54,10 @@ public void Validate_InputNull_ThrowArgumentNullException() { // Call - TestDelegate action = () => TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(null, - GetValidAssessmentLevel(), - GetValidHydraulicBoundaryDatabase(), - validNorm); + TestDelegate action = () => WaveConditionsCalculationServiceBase.Validate(null, + GetValidAssessmentLevel(), + GetValidHydraulicBoundaryDatabase(), + validNorm); // Assert var exception = Assert.Throws(action); @@ -71,10 +71,10 @@ var input = new TestWaveConditionsInput(); // Call - TestDelegate action = () => TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - GetValidAssessmentLevel(), - null, - validNorm); + TestDelegate action = () => WaveConditionsCalculationServiceBase.Validate(input, + GetValidAssessmentLevel(), + null, + validNorm); // Assert var exception = Assert.Throws(action); @@ -89,15 +89,15 @@ string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite"); // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidAssessmentLevel(), - new HydraulicBoundaryDatabase - { - FilePath = invalidFilePath, - CanUsePreprocessor = true, - PreprocessorDirectory = validPreprocessorDirectory - }, - validNorm); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(new TestWaveConditionsInput(), + GetValidAssessmentLevel(), + new HydraulicBoundaryDatabase + { + FilePath = invalidFilePath, + CanUsePreprocessor = true, + PreprocessorDirectory = validPreprocessorDirectory + }, + validNorm); // Assert TestHelper.AssertLogMessages(action, messages => @@ -121,16 +121,16 @@ const string invalidPreprocessorDirectory = "NonExistingPreprocessorDirectory"; // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidAssessmentLevel(), - new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - CanUsePreprocessor = true, - UsePreprocessor = true, - PreprocessorDirectory = invalidPreprocessorDirectory - }, - validNorm); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(new TestWaveConditionsInput(), + GetValidAssessmentLevel(), + new HydraulicBoundaryDatabase + { + FilePath = validFilePath, + CanUsePreprocessor = true, + UsePreprocessor = true, + PreprocessorDirectory = invalidPreprocessorDirectory + }, + validNorm); // Assert TestHelper.AssertLogMessages(action, messages => @@ -153,15 +153,15 @@ string dbFilePath = Path.Combine(testDataPath, "HRD nosettings.sqlite"); // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidAssessmentLevel(), - new HydraulicBoundaryDatabase - { - FilePath = dbFilePath, - CanUsePreprocessor = true, - PreprocessorDirectory = validPreprocessorDirectory - }, - validNorm); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(new TestWaveConditionsInput(), + GetValidAssessmentLevel(), + new HydraulicBoundaryDatabase + { + FilePath = dbFilePath, + CanUsePreprocessor = true, + PreprocessorDirectory = validPreprocessorDirectory + }, + validNorm); // Assert TestHelper.AssertLogMessages(action, messages => @@ -184,10 +184,10 @@ var isValid = false; // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidAssessmentLevel(), - new HydraulicBoundaryDatabase(), - validNorm); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(new TestWaveConditionsInput(), + GetValidAssessmentLevel(), + new HydraulicBoundaryDatabase(), + validNorm); // Assert TestHelper.AssertLogMessages(action, messages => @@ -209,10 +209,10 @@ var isValid = false; // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidAssessmentLevel(), - GetValidHydraulicBoundaryDatabase(), - double.NaN); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(new TestWaveConditionsInput(), + GetValidAssessmentLevel(), + GetValidHydraulicBoundaryDatabase(), + double.NaN); // Assert TestHelper.AssertLogMessages(action, messages => @@ -234,10 +234,10 @@ var isValid = false; // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(new TestWaveConditionsInput(), - GetValidAssessmentLevel(), - GetValidHydraulicBoundaryDatabase(), - 1.0); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(new TestWaveConditionsInput(), + GetValidAssessmentLevel(), + GetValidHydraulicBoundaryDatabase(), + 1.0); // Assert TestHelper.AssertLogMessages(action, messages => @@ -261,10 +261,10 @@ var input = new TestWaveConditionsInput(); // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - GetValidAssessmentLevel(), - GetValidHydraulicBoundaryDatabase(), - validNorm); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(input, + GetValidAssessmentLevel(), + GetValidHydraulicBoundaryDatabase(), + validNorm); // Assert TestHelper.AssertLogMessages(action, messages => @@ -291,10 +291,10 @@ }; // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - RoundedDouble.NaN, - GetValidHydraulicBoundaryDatabase(), - validNorm); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(input, + RoundedDouble.NaN, + GetValidHydraulicBoundaryDatabase(), + validNorm); // Assert TestHelper.AssertLogMessages(action, messages => @@ -331,10 +331,10 @@ }; // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - (RoundedDouble) assessmentLevel, - GetValidHydraulicBoundaryDatabase(), - validNorm); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(input, + (RoundedDouble) assessmentLevel, + GetValidHydraulicBoundaryDatabase(), + validNorm); // Assert TestHelper.AssertLogMessages(action, messages => @@ -363,10 +363,10 @@ input.UseBreakWater = true; // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - GetValidAssessmentLevel(), - GetValidHydraulicBoundaryDatabase(), - validNorm); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(input, + GetValidAssessmentLevel(), + GetValidHydraulicBoundaryDatabase(), + validNorm); // Assert TestHelper.AssertLogMessages(action, messages => @@ -395,10 +395,10 @@ input.UseBreakWater = false; // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - GetValidAssessmentLevel(), - GetValidHydraulicBoundaryDatabase(), - validNorm); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(input, + GetValidAssessmentLevel(), + GetValidHydraulicBoundaryDatabase(), + validNorm); // Assert TestHelper.AssertLogMessages(action, messages => @@ -440,10 +440,10 @@ } // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - GetValidAssessmentLevel(), - GetValidHydraulicBoundaryDatabase(), - validNorm); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(input, + GetValidAssessmentLevel(), + GetValidHydraulicBoundaryDatabase(), + validNorm); // Assert TestHelper.AssertLogMessages(action, messages => @@ -467,10 +467,10 @@ input.Orientation = RoundedDouble.NaN; // Call - Action action = () => isValid = TestWaveConditionsCalculationService.PublicValidateWaveConditionsInput(input, - GetValidAssessmentLevel(), - GetValidHydraulicBoundaryDatabase(), - validNorm); + Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(input, + GetValidAssessmentLevel(), + GetValidHydraulicBoundaryDatabase(), + validNorm); // Assert TestHelper.AssertLogMessages(action, messages => @@ -982,17 +982,6 @@ { public IEnumerable Outputs; - public static bool PublicValidateWaveConditionsInput(WaveConditionsInput waveConditionsInput, - RoundedDouble assessmentLevel, - HydraulicBoundaryDatabase hydraulicBoundaryDatabase, - double targetProbability) - { - return ValidateWaveConditionsInput(waveConditionsInput, - assessmentLevel, - hydraulicBoundaryDatabase, - targetProbability); - } - public void PublicCalculate(RoundedDouble a, RoundedDouble b, RoundedDouble c,