Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDataImporterTest.cs =================================================================== diff -u -r2ce70de3d6d063317e1ae1088281ded8704975cf -r155da63245e0f3c49ea90e6fb9f8a171c6684ee6 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDataImporterTest.cs (.../HydraulicBoundaryDataImporterTest.cs) (revision 2ce70de3d6d063317e1ae1088281ded8704975cf) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDataImporterTest.cs (.../HydraulicBoundaryDataImporterTest.cs) (revision 155da63245e0f3c49ea90e6fb9f8a171c6684ee6) @@ -424,9 +424,9 @@ public void Import_WithValidFileAndHlcdWithValidScenarioInformation_UpdatesHydraulicBoundaryDatabaseWithImportedData() { // Setup - string hydraulicBoundaryDatabaseFilePath = Path.Combine(testDataPath, "hlcdWithValidScenarioInformation", "complete.sqlite"); - string hlcdFilePath = Path.Combine(testDataPath, "hlcdWithValidScenarioInformation", "hlcd.sqlite"); var hydraulicBoundaryData = new HydraulicBoundaryData(); + string hrdFilePath = Path.Combine(testDataPath, "hlcdWithValidScenarioInformation", "complete.sqlite"); + string hlcdFilePath = Path.Combine(testDataPath, "hlcdWithValidScenarioInformation", "hlcd.sqlite"); var mocks = new MockRepository(); var handler = mocks.StrictMock(); @@ -438,7 +438,7 @@ Arg.Is.NotNull, Arg.Is.NotNull, Arg>.Is.NotNull, - Arg.Is.Equal(hydraulicBoundaryDatabaseFilePath), + Arg.Is.Equal(hrdFilePath), Arg.Is.Equal(hlcdFilePath))) .WhenCalled(invocation => { @@ -454,14 +454,14 @@ .Return(Enumerable.Empty()); mocks.ReplayAll(); - var importer = new HydraulicBoundaryDataImporter(hydraulicBoundaryData, handler, hydraulicBoundaryDatabaseFilePath); + var importer = new HydraulicBoundaryDataImporter(hydraulicBoundaryData, handler, hrdFilePath); // Call var importResult = false; void Call() => importResult = importer.Import(); // Assert - TestHelper.AssertLogMessageIsGenerated(Call, $"Gegevens zijn geïmporteerd vanuit bestand '{hydraulicBoundaryDatabaseFilePath}'.", 1); + TestHelper.AssertLogMessageIsGenerated(Call, $"Gegevens zijn geïmporteerd vanuit bestand '{hrdFilePath}'.", 1); Assert.IsTrue(importResult); mocks.VerifyAll(); } Index: Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs =================================================================== diff -u -r4d7c9c8f257857bc491477d9f6dedbfe1adbc684 -r155da63245e0f3c49ea90e6fb9f8a171c6684ee6 --- Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs (.../ProbabilisticPipingCalculationService.cs) (revision 4d7c9c8f257857bc491477d9f6dedbfe1adbc684) +++ Riskeer/Piping/src/Riskeer.Piping.Service/Probabilistic/ProbabilisticPipingCalculationService.cs (.../ProbabilisticPipingCalculationService.cs) (revision 155da63245e0f3c49ea90e6fb9f8a171c6684ee6) @@ -153,7 +153,7 @@ throw new ArgumentNullException(nameof(calculationSettings)); } - string hydraulicBoundaryDatabaseFilePath = calculationSettings.HrdFilePath; + string hrdFilePath = calculationSettings.HrdFilePath; bool usePreprocessor = !string.IsNullOrEmpty(calculationSettings.PreprocessorDirectory); HydraRingCalculationSettings hydraRingCalculationSettings = HydraRingCalculationSettingsFactory.CreateSettings(calculationSettings); @@ -168,15 +168,15 @@ try { IPartialProbabilisticPipingOutput profileSpecificOutput = CalculateProfileSpecific( - calculation, generalInput, hydraulicBoundaryDatabaseFilePath, usePreprocessor); + calculation, generalInput, hrdFilePath, usePreprocessor); if (canceled) { return; } IPartialProbabilisticPipingOutput sectionSpecificOutput = CalculateSectionSpecific( - calculation, generalInput, sectionLength, hydraulicBoundaryDatabaseFilePath, usePreprocessor); + calculation, generalInput, sectionLength, hrdFilePath, usePreprocessor); if (canceled) { @@ -199,19 +199,19 @@ /// /// The calculation containing the input for the profile specific calculation. /// The general piping calculation input parameters. - /// The path which points to the hydraulic boundary database file. + /// The file path of the hydraulic boundary database. /// Indicator whether to use the preprocessor in the calculation. /// A . /// Thrown when an error occurs while performing the calculation. private IPartialProbabilisticPipingOutput CalculateProfileSpecific(ProbabilisticPipingCalculation calculation, GeneralPipingInput generalInput, - string hydraulicBoundaryDatabaseFilePath, bool usePreprocessor) + string hrdFilePath, bool usePreprocessor) { NotifyProgress(string.Format(Resources.ProbabilisticPipingCalculationService_Calculate_Executing_calculation_of_type_0, Resources.ProbabilisticPipingCalculationService_ProfileSpecific), 1, numberOfCalculators); PipingCalculationInput profileSpecificCalculationInput = CreateInput( - calculation, generalInput, 0, hydraulicBoundaryDatabaseFilePath, usePreprocessor); + calculation, generalInput, 0, hrdFilePath, usePreprocessor); PerformCalculation(() => profileSpecificCalculator.Calculate(profileSpecificCalculationInput), () => profileSpecificCalculator.LastErrorFileContent, @@ -260,20 +260,20 @@ /// The calculation containing the input for the section specific calculation. /// The general piping calculation input parameters. /// The length of the section. - /// The path which points to the hydraulic boundary database file. + /// The file path of the hydraulic boundary database. /// Indicator whether to use the preprocessor in the calculation. /// A . /// Thrown when an error occurs while performing the calculation. private IPartialProbabilisticPipingOutput CalculateSectionSpecific(ProbabilisticPipingCalculation calculation, GeneralPipingInput generalInput, - double sectionLength, string hydraulicBoundaryDatabaseFilePath, bool usePreprocessor) + double sectionLength, string hrdFilePath, bool usePreprocessor) { NotifyProgress(string.Format(Resources.ProbabilisticPipingCalculationService_Calculate_Executing_calculation_of_type_0, Resources.ProbabilisticPipingCalculationService_SectionSpecific), 2, numberOfCalculators); PipingCalculationInput sectionSpecificCalculationInput = CreateInput( calculation, generalInput, sectionLength, - hydraulicBoundaryDatabaseFilePath, usePreprocessor); + hrdFilePath, usePreprocessor); PerformCalculation(() => sectionSpecificCalculator.Calculate(sectionSpecificCalculationInput), () => sectionSpecificCalculator.LastErrorFileContent, @@ -390,7 +390,7 @@ } private static PipingCalculationInput CreateInput(ProbabilisticPipingCalculation calculation, GeneralPipingInput generalInput, - double sectionLength, string hydraulicBoundaryDatabaseFilePath, bool usePreprocessor) + double sectionLength, string hrdFilePath, bool usePreprocessor) { ProbabilisticPipingInput pipingInput = calculation.InputParameters; LogNormalDistribution thicknessCoverageLayer = DerivedPipingInput.GetThicknessCoverageLayer(pipingInput); @@ -450,7 +450,7 @@ generalInput.CriticalHeaveGradient.Mean, generalInput.CriticalHeaveGradient.StandardDeviation); } - HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(input, hydraulicBoundaryDatabaseFilePath, usePreprocessor); + HydraRingSettingsDatabaseHelper.AssignSettingsFromDatabase(input, hrdFilePath, usePreprocessor); return input; } Index: Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r155da63245e0f3c49ea90e6fb9f8a171c6684ee6 --- Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs (.../ProbabilisticPipingCalculationServiceTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/Piping/test/Riskeer.Piping.Service.Test/Probabilistic/ProbabilisticPipingCalculationServiceTest.cs (.../ProbabilisticPipingCalculationServiceTest.cs) (revision 155da63245e0f3c49ea90e6fb9f8a171c6684ee6) @@ -58,7 +58,7 @@ private const string averagingSoilLayerPropertiesMessage = "Meerdere aaneengesloten deklagen gevonden. De grondeigenschappen worden bepaald door het nemen van een gewogen gemiddelde, mits de standaardafwijkingen en verschuivingen voor alle lagen gelijk zijn."; private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Integration.Service, "HydraRingCalculation"); - private static readonly string validHydraulicBoundaryDatabaseFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); + private static readonly string validHrdFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); private static readonly string validHlcdFilePath = Path.Combine(testDataPath, "Hlcd.sqlite"); private static readonly string validPreprocessorDirectory = TestHelper.GetScratchPadPath(); @@ -134,7 +134,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); // Call @@ -160,7 +160,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); calculation.InputParameters.HydraulicBoundaryLocation = null; @@ -228,7 +228,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.UsePreprocessor = true; assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "NonExistingPreprocessorDirectory"; @@ -332,7 +332,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); // Call @@ -367,7 +367,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); var aquitardLayer = new PipingSoilLayer(2.0) @@ -413,7 +413,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); var aquiferLayer = new PipingSoilLayer(10.56) @@ -467,7 +467,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); var coverageLayerAboveSurfaceLine = new PipingSoilLayer(13.0) @@ -526,7 +526,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); var random = new Random(21); @@ -611,7 +611,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); var random = new Random(21); @@ -686,7 +686,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); var random = new Random(21); @@ -762,7 +762,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); var random = new Random(21); @@ -836,7 +836,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); var topCoverageLayer = new PipingSoilLayer(testSurfaceLineTopLevel) @@ -912,7 +912,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); var coverageLayerInvalidSaturatedVolumicWeight = new PipingSoilLayer(testSurfaceLineTopLevel) @@ -980,7 +980,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); // Call @@ -1013,7 +1013,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); mocks.ReplayAll(); // Call @@ -1109,7 +1109,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); var profileSpecificCalculator = new TestPipingCalculator(); var sectionSpecificCalculator = new TestPipingCalculator(); @@ -1156,7 +1156,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); var profileSpecificCalculator = new TestPipingCalculator(); var sectionSpecificCalculator = new TestPipingCalculator(); @@ -1208,7 +1208,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); var calculatorFactory = mocks.StrictMock(); calculatorFactory.Expect(cf => cf.CreatePipingCalculator(null)) @@ -1260,7 +1260,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); var calculatorFactory = mocks.StrictMock(); calculatorFactory.Expect(cf => cf.CreatePipingCalculator(null)) @@ -1311,7 +1311,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); var profileSpecificCalculator = new TestPipingCalculator { @@ -1379,7 +1379,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); var profileSpecificCalculator = new TestPipingCalculator { @@ -1449,7 +1449,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); var profileSpecificCalculator = new TestPipingCalculator(); var sectionSpecificCalculator = new TestPipingCalculator @@ -1520,7 +1520,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); var profileSpecificCalculator = new TestPipingCalculator(); var sectionSpecificCalculator = new TestPipingCalculator @@ -2118,7 +2118,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); HydraulicBoundaryCalculationSettings calculationSettings = HydraulicBoundaryCalculationSettingsFactory.CreateSettings(assessmentSection.HydraulicBoundaryData); var calculatorFactory = mocks.StrictMock(); @@ -2153,7 +2153,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.UsePreprocessor = true; assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.PreprocessorDirectory = validPreprocessorDirectory; @@ -2202,7 +2202,7 @@ var mocks = new MockRepository(); IAssessmentSection assessmentSection = AssessmentSectionTestHelper.CreateAssessmentSectionStub( - failureMechanism, mocks, validHydraulicBoundaryDatabaseFilePath); + failureMechanism, mocks, validHrdFilePath); assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.CanUsePreprocessor = true; assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.UsePreprocessor = false; assessmentSection.HydraulicBoundaryData.HydraulicLocationConfigurationSettings.PreprocessorDirectory = "NonExistingPreprocessorDirectory"; @@ -2321,7 +2321,7 @@ private static HydraulicBoundaryCalculationSettings CreateCalculationSettings() { - return new HydraulicBoundaryCalculationSettings(validHydraulicBoundaryDatabaseFilePath, + return new HydraulicBoundaryCalculationSettings(validHrdFilePath, validHlcdFilePath, false, string.Empty); Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r155da63245e0f3c49ea90e6fb9f8a171c6684ee6 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Integration.Test/StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../StabilityStoneCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 155da63245e0f3c49ea90e6fb9f8a171c6684ee6) @@ -54,7 +54,7 @@ private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); [Test] - public void Run_CalculationWithInvalidHydraulicBoundaryDatabaseFilePath_DoesNotPerformCalculationAndLogsError() + public void Run_CalculationWithInvalidHrdFilePath_DoesNotPerformCalculationAndLogsError() { // Setup string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite"); Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs =================================================================== diff -u -r8339953df3276b6c7b4a3d9f5a278e4c19e85be3 -r155da63245e0f3c49ea90e6fb9f8a171c6684ee6 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 8339953df3276b6c7b4a3d9f5a278e4c19e85be3) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Integration.Test/WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationActivityIntegrationTest.cs) (revision 155da63245e0f3c49ea90e6fb9f8a171c6684ee6) @@ -54,7 +54,7 @@ private static readonly string validFilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite"); [Test] - public void Run_CalculationWithInvalidHydraulicBoundaryDatabaseFilePath_DoesNotPerformCalculationAndLogsError() + public void Run_CalculationWithInvalidHrdFilePath_DoesNotPerformCalculationAndLogsError() { // Setup string invalidFilePath = Path.Combine(testDataPath, "NonExisting.sqlite");