Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs =================================================================== diff -u -r13898fd5c275bf31e77a47d31e95cb45ab5752be -r4f6a54b97b4102b79fa75d8eb087321a9e6975a2 --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 13898fd5c275bf31e77a47d31e95cb45ab5752be) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Service.Test/HeightStructuresCalculationServiceTest.cs (.../HeightStructuresCalculationServiceTest.cs) (revision 4f6a54b97b4102b79fa75d8eb087321a9e6975a2) @@ -49,7 +49,8 @@ [TestFixture] public class HeightStructuresCalculationServiceTest { - private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + private readonly static string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Ringtoets.Integration.Service, "HydraRingCalculation"); + private readonly static string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); [Test] public void Validate_ValidCalculationInvalidHydraulicBoundaryDatabase_ReturnsFalse() @@ -99,7 +100,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -138,7 +139,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -178,7 +179,7 @@ mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; const string parameterName = "afwijking golfrichting"; @@ -222,7 +223,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; string expectedValidationMessage = "Validatie mislukt: Er is geen concreet getal ingevoerd voor 'oriƫntatie'."; @@ -267,7 +268,7 @@ mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; string expectedValidationMessage = string.Format("Validatie mislukt: De verwachtingswaarde voor '{0}' moet een concreet getal zijn.", parameterName); @@ -314,7 +315,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; string expectedValidationMessage = string.Format("Validatie mislukt: De verwachtingswaarde voor '{0}' moet een positief getal zijn.", parameterName); @@ -363,7 +364,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; string expectedValidationMessage = string.Format("Validatie mislukt: De standaard afwijking voor '{0}' moet groter zijn dan of gelijk zijn aan 0.", parameterName); @@ -411,7 +412,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; string expectedValidationMessage = string.Format("Validatie mislukt: De variatiecoƫfficient voor '{0}' moet groter zijn dan of gelijk zijn aan 0.", parameterName); @@ -460,7 +461,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -502,7 +503,7 @@ IAssessmentSection assessmentSectionStub = AssessmentSectionHelper.CreateAssessmentSectionStub(new HeightStructuresFailureMechanism(), mockRepository); mockRepository.ReplayAll(); - assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + assessmentSectionStub.HydraulicBoundaryDatabase.FilePath = validFilePath; const string name = ""; @@ -579,8 +580,6 @@ break; } - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - // Call using (new HydraRingCalculatorFactoryConfig()) { @@ -634,8 +633,6 @@ } }; - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); - // Call using (new HydraRingCalculatorFactoryConfig()) { @@ -665,7 +662,6 @@ public void Calculate_VariousCalculations_InputPropertiesCorrectlySentToCalculator(bool useForeshore, bool useBreakWater) { // Setup - string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); var heightStructuresFailureMechanism = new HeightStructuresFailureMechanism(); var mockRepository = new MockRepository(); @@ -775,7 +771,7 @@ service.Calculate(calculation, assessmentSectionStub, heightStructuresFailureMechanism, - testDataPath); + validFilePath); // Assert Assert.IsNull(calculation.Output); @@ -824,7 +820,7 @@ new HeightStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); } catch (HydraRingFileParserException) { @@ -886,7 +882,7 @@ new HeightStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); } catch (HydraRingFileParserException) { @@ -950,7 +946,7 @@ new HeightStructuresCalculationService().Calculate(calculation, assessmentSectionStub, failureMechanism, - testDataPath); + validFilePath); } catch (HydraRingFileParserException e) {