Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs (.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationContextTreeNodeInfoTest.cs (.../ClosingStructuresCalculationContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -199,19 +199,22 @@ // Setup string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = validFilePath, + Version = "random" + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var failureMechanism = new TestClosingStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculation(); var nodeData = new ClosingStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - Version = "random" - }); - using (var treeViewControl = new TreeViewControl()) { gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(menuBuilder); @@ -615,18 +618,21 @@ // Setup string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = validFilePath, + Version = "1.0", + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var parent = new CalculationGroup(); var calculation = new StructuresCalculation(); var failureMechanism = new TestClosingStructuresFailureMechanism(); var nodeData = new ClosingStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - Version = "1.0" - }); - using (var treeViewControl = new TreeViewControl()) { gui.Stub(cmp => cmp.Get(nodeData, treeViewControl)).Return(new CustomItemsOnlyContextMenuBuilder()); @@ -1003,18 +1009,20 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "random", Locations = { hydraulicBoundaryLocation } - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var parent = new CalculationGroup(); var calculation = new TestClosingStructuresCalculation { Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../ClosingStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -576,13 +576,16 @@ var failureMechanism = new TestClosingStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new ClosingStructuresCalculationGroupContext(group, null, failureMechanism, @@ -842,12 +845,15 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var groupContext = new ClosingStructuresCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, Index: Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rd28e27005c5da2025e65e0544e70f89e5c08b67e -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision d28e27005c5da2025e65e0544e70f89e5c08b67e) +++ Riskeer/ClosingStructures/test/Riskeer.ClosingStructures.Plugin.Test/TreeNodeInfos/ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../ClosingStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -518,13 +518,16 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocksRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocksRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -673,12 +676,15 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocksRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocksRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var failureMechanismContext = new ClosingStructuresFailureMechanismContext(failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) Index: Riskeer/Common/src/Riskeer.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Common/src/Riskeer.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Forms/GuiServices/HydraulicBoundaryLocationCalculationGuiService.cs (.../HydraulicBoundaryLocationCalculationGuiService.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -71,6 +71,7 @@ } RunActivities(assessmentSection.HydraulicBoundaryDatabase.FilePath, + assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.FilePath, assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(), norm, HydraulicBoundaryLocationCalculationActivityFactory.CreateDesignWaterLevelCalculationActivities(calculations, @@ -95,6 +96,7 @@ } RunActivities(assessmentSection.HydraulicBoundaryDatabase.FilePath, + assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.FilePath, assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(), norm, HydraulicBoundaryLocationCalculationActivityFactory.CreateWaveHeightCalculationActivities(calculations, @@ -104,11 +106,13 @@ } private void RunActivities(string hydraulicBoundaryDatabaseFilePath, + string hlcdFilePath, string preprocessorDirectory, double norm, IEnumerable activities) { string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabaseFilePath, + hlcdFilePath, preprocessorDirectory); if (string.IsNullOrEmpty(validationProblem)) { Index: Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDatabaseHelper.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDatabaseHelper.cs (.../HydraulicBoundaryDatabaseHelper.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraulicBoundaryDatabaseHelper.cs (.../HydraulicBoundaryDatabaseHelper.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2019. All rights reserved. +// Copyright (C) Stichting Deltares 2019. All rights reserved. // // This file is part of Riskeer. // @@ -38,17 +38,18 @@ public static class HydraulicBoundaryDatabaseHelper { private const string hydraRingConfigurationDatabaseExtension = "config.sqlite"; - private const string hlcdFileName = "HLCD.sqlite"; /// /// Attempts to connect to the as if it is a Hydraulic Boundary Locations /// database with a Hydraulic Location Configurations database and settings next to it. /// /// The path of the Hydraulic Boundary Locations database file. + /// The path of the Hydraulic Location Configuration database file. /// The preprocessor directory. + /// Indicator whether the preprocessor closure is used in a calculation. /// A describing the problem when trying to connect to the /// or null if a connection could be correctly made. - public static string ValidateFilesForCalculation(string filePath, string preprocessorDirectory) + public static string ValidateFilesForCalculation(string filePath, string hlcdFilePath, string preprocessorDirectory, bool usePreprocessorClosure) { try { @@ -59,10 +60,9 @@ return e.Message; } - string directoryName; try { - directoryName = Path.GetDirectoryName(filePath); + Path.GetDirectoryName(filePath); } catch (PathTooLongException) { @@ -75,7 +75,6 @@ { using (new HydraulicBoundaryDatabaseReader(filePath)) {} - string hlcdFilePath = Path.Combine(directoryName, hlcdFileName); using (new HydraulicLocationConfigurationDatabaseReader(hlcdFilePath)) {} using (var validator = new HydraRingSettingsDatabaseValidator(settingsDatabaseFileName, preprocessorDirectory)) Index: Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryDatabaseConnectionValidator.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryDatabaseConnectionValidator.cs (.../HydraulicBoundaryDatabaseConnectionValidator.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Service/HydraulicBoundaryDatabaseConnectionValidator.cs (.../HydraulicBoundaryDatabaseConnectionValidator.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -50,6 +50,7 @@ } string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabase.FilePath, + hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.FilePath, hydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); if (!string.IsNullOrEmpty(validationProblem)) { Index: Riskeer/Common/src/Riskeer.Common.Service/TargetProbabilityCalculationService.cs =================================================================== diff -u -r247659d91db1609d27f3d565203f62bd5b70abcc -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Common/src/Riskeer.Common.Service/TargetProbabilityCalculationService.cs (.../TargetProbabilityCalculationService.cs) (revision 247659d91db1609d27f3d565203f62bd5b70abcc) +++ Riskeer/Common/src/Riskeer.Common.Service/TargetProbabilityCalculationService.cs (.../TargetProbabilityCalculationService.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -53,6 +53,7 @@ string preprocessorDirectory = calculationSettings.PreprocessorDirectory; string databaseFilePathValidationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(calculationSettings.HydraulicBoundaryDatabaseFilePath, + calculationSettings.HlcdFilePath, preprocessorDirectory); if (!string.IsNullOrEmpty(databaseFilePathValidationProblem)) { Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/AssessmentSectionTestHelperTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/AssessmentSectionTestHelperTest.cs (.../AssessmentSectionTestHelperTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/AssessmentSectionTestHelperTest.cs (.../AssessmentSectionTestHelperTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -145,7 +145,7 @@ Assert.IsNotNull(assessmentSection.ReferenceLine); HydraulicLocationConfigurationSettings settings = hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings; - Assert.AreEqual("some\\Path\\ToHlcd", settings.FilePath); + Assert.AreEqual("C:\\hlcd.sqlite", settings.FilePath); Assert.AreEqual("ScenarioName", settings.ScenarioName); Assert.AreEqual(1337, settings.Year); Assert.AreEqual("Scope", settings.Scope); Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/HydraulicBoundaryDatabaseTestHelperTest.cs =================================================================== diff -u -r56523c0a7ce1c083093e745596681050ac23d18d -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/HydraulicBoundaryDatabaseTestHelperTest.cs (.../HydraulicBoundaryDatabaseTestHelperTest.cs) (revision 56523c0a7ce1c083093e745596681050ac23d18d) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil.Test/HydraulicBoundaryDatabaseTestHelperTest.cs (.../HydraulicBoundaryDatabaseTestHelperTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -19,6 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; +using System.IO; +using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.Data.Hydraulics; @@ -28,17 +31,21 @@ public class HydraulicBoundaryDatabaseTestHelperTest { [Test] - public void SetHydraulicBoundaryLocationConfigurationSettings_Always_SetsExpectedValues() + public void SetHydraulicBoundaryLocationConfigurationSettings_DatabaseWithFilePath_SetsExpectedValues() { // Setup - var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + const string path = "C:\\TestPath"; + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = Path.Combine(path, "hrd.sqlite") + }; // Call HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); // Assert HydraulicLocationConfigurationSettings settings = hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings; - Assert.AreEqual("some\\Path\\ToHlcd", settings.FilePath); + Assert.AreEqual(Path.Combine(path, "hlcd.sqlite"), settings.FilePath); Assert.AreEqual("ScenarioName", settings.ScenarioName); Assert.AreEqual(1337, settings.Year); Assert.AreEqual("Scope", settings.Scope); @@ -50,5 +57,18 @@ Assert.AreEqual("WindSpeed", settings.WindSpeed); Assert.AreEqual("Comment", settings.Comment); } + + [Test] + public void SetHydraulicBoundaryLocationConfigurationSettings_DatabaseWithoutFilePath_ThrowsArgumentException() + { + // Setup + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase(); + + // Call + TestDelegate call = () => HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + + // Assert + TestHelper.AssertThrowsArgumentExceptionAndTestMessage(call, "FilePath must be set."); + } } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.Data.TestUtil/HydraulicBoundaryDatabaseTestHelper.cs =================================================================== diff -u -r56523c0a7ce1c083093e745596681050ac23d18d -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Common/test/Riskeer.Common.Data.TestUtil/HydraulicBoundaryDatabaseTestHelper.cs (.../HydraulicBoundaryDatabaseTestHelper.cs) (revision 56523c0a7ce1c083093e745596681050ac23d18d) +++ Riskeer/Common/test/Riskeer.Common.Data.TestUtil/HydraulicBoundaryDatabaseTestHelper.cs (.../HydraulicBoundaryDatabaseTestHelper.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -19,6 +19,8 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; +using System.IO; using Riskeer.Common.Data.Hydraulics; namespace Riskeer.Common.Data.TestUtil @@ -32,9 +34,17 @@ /// Sets valid values on the . /// /// The to set the values to. + /// Thrown when is null. public static void SetHydraulicBoundaryLocationConfigurationSettings(HydraulicBoundaryDatabase hydraulicBoundaryDatabase) { - hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.SetValues("some\\Path\\ToHlcd", + if (hydraulicBoundaryDatabase.FilePath == null) + { + throw new ArgumentException("FilePath must be set."); + } + + string hlcdFilePath = Path.Combine(Path.GetDirectoryName(hydraulicBoundaryDatabase.FilePath), "hlcd.sqlite"); + + hydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.SetValues(hlcdFilePath, "ScenarioName", 1337, "Scope", Index: Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraulicBoundaryDatabaseHelperTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraulicBoundaryDatabaseHelperTest.cs (.../HydraulicBoundaryDatabaseHelperTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraulicBoundaryDatabaseHelperTest.cs (.../HydraulicBoundaryDatabaseHelperTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -33,16 +33,17 @@ [TestFixture] public class HydraulicBoundaryDatabaseHelperTest { - private readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)); + private static readonly string testDataPath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)); + string hlcdFilePath = Path.Combine(testDataPath, "HLCD.sqlite"); [Test] public void ValidateFilesForCalculation_ExistingFileWithHlcd_ReturnsNull() { // Setup string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - + // Call - string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(validFilePath, ""); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(validFilePath, hlcdFilePath, ""); // Assert Assert.IsNull(result); @@ -56,7 +57,7 @@ string filePath = Path.Combine(testDataPath, nonexistingSqlite); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(filePath, ""); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(filePath, "", ""); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{filePath}':", result); @@ -70,7 +71,7 @@ invalidPath = invalidPath.Replace('c', Path.GetInvalidPathChars()[0]); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(invalidPath, testDataPath); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(invalidPath, hlcdFilePath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{invalidPath}':", result); @@ -83,7 +84,7 @@ string filePath = Path.Combine(testDataPath, "/"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(filePath, testDataPath); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(filePath, hlcdFilePath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{filePath}':", result); @@ -94,13 +95,13 @@ { // Setup string validFilePath = Path.Combine(testDataPath, "withoutHLCD", "empty.sqlite"); + string customHlcdFilePath = Path.Combine(testDataPath, "withoutHLCD", "HLCD.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(validFilePath, testDataPath); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(validFilePath, customHlcdFilePath, testDataPath); // Assert - string hlcdFilePath = Path.Combine(Path.GetDirectoryName(validFilePath), "HLCD.sqlite"); - StringAssert.StartsWith($"Fout bij het lezen van bestand '{hlcdFilePath}':", result); + StringAssert.StartsWith($"Fout bij het lezen van bestand '{customHlcdFilePath}':", result); } [Test] @@ -110,7 +111,7 @@ string validFilePath = Path.Combine(testDataPath, "withoutSettings", "empty.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(validFilePath, testDataPath); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(validFilePath, hlcdFilePath, testDataPath); // Assert StringAssert.StartsWith($"Fout bij het lezen van bestand '{validFilePath}':", result); @@ -123,7 +124,7 @@ string validFilePath = Path.Combine(testDataPath, "invalidSettingsSchema", "complete.sqlite"); // Call - string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(validFilePath, testDataPath); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(validFilePath, hlcdFilePath, testDataPath); // Assert Assert.AreEqual("De rekeninstellingen database heeft niet het juiste schema.", result); @@ -139,7 +140,7 @@ "\\followedbythefile"; // Call - string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(invalidFilePath, testDataPath); + string result = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(invalidFilePath, hlcdFilePath, testDataPath); // Assert Assert.AreEqual($"Het opgegeven bestandspad ({invalidFilePath}) is niet geldig.", result); Index: Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryDatabaseConnectionValidatorTest.cs =================================================================== diff -u -rc4311504aa83ba59c5a7e80c0e9bc26650986c05 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryDatabaseConnectionValidatorTest.cs (.../HydraulicBoundaryDatabaseConnectionValidatorTest.cs) (revision c4311504aa83ba59c5a7e80c0e9bc26650986c05) +++ Riskeer/Common/test/Riskeer.Common.Service.Test/HydraulicBoundaryDatabaseConnectionValidatorTest.cs (.../HydraulicBoundaryDatabaseConnectionValidatorTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -24,6 +24,7 @@ using Core.Common.TestUtil; using NUnit.Framework; using Riskeer.Common.Data.Hydraulics; +using Riskeer.Common.Data.TestUtil; namespace Riskeer.Common.Service.Test { @@ -83,6 +84,7 @@ { FilePath = invalidFilePath }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); // Call string message = HydraulicBoundaryDatabaseConnectionValidator.Validate(hydraulicBoundaryDatabase); @@ -101,6 +103,7 @@ { FilePath = validFilePath }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); // Call string message = HydraulicBoundaryDatabaseConnectionValidator.Validate(hydraulicBoundaryDatabase); Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs =================================================================== diff -u -r52c3d6c3c369cbdb020756c537ab5c6cea4c5514 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 52c3d6c3c369cbdb020756c537ab5c6cea4c5514) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Forms/GuiServices/DuneLocationCalculationGuiService.cs (.../DuneLocationCalculationGuiService.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -86,6 +86,7 @@ string preprocessorDirectory = assessmentSection.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory(); string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(hydraulicBoundaryDatabaseFilePath, + assessmentSection.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.FilePath, preprocessorDirectory); if (string.IsNullOrEmpty(validationProblem)) Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs =================================================================== diff -u -r1ee2605815d118a7eaf5d96df7f9a3fd55c00550 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs (.../DuneLocationCalculationGuiServiceTest.cs) (revision 1ee2605815d118a7eaf5d96df7f9a3fd55c00550) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Forms.Test/GuiServices/DuneLocationCalculationGuiServiceTest.cs (.../DuneLocationCalculationGuiServiceTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -149,6 +149,7 @@ { FilePath = validFilePath }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); var mockRepository = new MockRepository(); var assessmentSection = mockRepository.Stub(); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r1ee2605815d118a7eaf5d96df7f9a3fd55c00550 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision 1ee2605815d118a7eaf5d96df7f9a3fd55c00550) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneErosionFailureMechanismContextTreeNodeInfoTest.cs (.../DuneErosionFailureMechanismContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -459,6 +459,7 @@ FilePath = Path.Combine(testDataPath, "HRD dutch coast south.sqlite") } }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); var failureMechanismContext = new DuneErosionFailureMechanismContext(failureMechanism, assessmentSection); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r1ee2605815d118a7eaf5d96df7f9a3fd55c00550 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsContextTreeNodeInfoTest.cs) (revision 1ee2605815d118a7eaf5d96df7f9a3fd55c00550) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -230,31 +230,32 @@ public void ContextMenuStrip_InvalidNorm_ContextMenuItemCalculateAllDisabledAndTooltipSet() { // Setup - using (var treeViewControl = new TreeViewControl()) + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { - var assessmentSection = mocks.Stub(); + FilePath = validFilePath, + Version = "1.0" + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - Version = "1.0" - }); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var failureMechanism = new DuneErosionFailureMechanism - { - Contribution = 10 - }; + var failureMechanism = new DuneErosionFailureMechanism + { + Contribution = 10 + }; - var duneLocationCalculations = new ObservableList - { - new DuneLocationCalculation(new TestDuneLocation()) - }; - var context = new DuneLocationCalculationsContext(duneLocationCalculations, - failureMechanism, - assessmentSection, - () => 1.0, - "A"); - + var duneLocationCalculations = new ObservableList + { + new DuneLocationCalculation(new TestDuneLocation()) + }; + var context = new DuneLocationCalculationsContext(duneLocationCalculations, + failureMechanism, + assessmentSection, + () => 1.0, + "A"); + using (var treeViewControl = new TreeViewControl()) + { var builder = new CustomItemsOnlyContextMenuBuilder(); var gui = mocks.Stub(); @@ -286,31 +287,33 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled() { // Setup - using (var treeViewControl = new TreeViewControl()) + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { - var assessmentSection = mocks.Stub(); + FilePath = validFilePath, + Version = "1.0" + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - Version = "1.0" - }); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var failureMechanism = new DuneErosionFailureMechanism - { - Contribution = 10 - }; + var failureMechanism = new DuneErosionFailureMechanism + { + Contribution = 10 + }; - var duneLocationCalculations = new ObservableList - { - new DuneLocationCalculation(new TestDuneLocation()) - }; - var context = new DuneLocationCalculationsContext(duneLocationCalculations, - failureMechanism, - assessmentSection, - () => 0.01, - "A"); + var duneLocationCalculations = new ObservableList + { + new DuneLocationCalculation(new TestDuneLocation()) + }; + var context = new DuneLocationCalculationsContext(duneLocationCalculations, + failureMechanism, + assessmentSection, + () => 0.01, + "A"); + using (var treeViewControl = new TreeViewControl()) + { var builder = new CustomItemsOnlyContextMenuBuilder(); var gui = mocks.Stub(); gui.Stub(cmp => cmp.Get(context, treeViewControl)).Return(builder); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r1ee2605815d118a7eaf5d96df7f9a3fd55c00550 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision 1ee2605815d118a7eaf5d96df7f9a3fd55c00550) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Plugin.Test/TreeNodeInfos/DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs (.../DuneLocationCalculationsGroupContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -363,6 +363,7 @@ FilePath = validFilePath } }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); var groupContext = new DuneLocationCalculationsGroupContext(new ObservableList(), failureMechanism, Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rf1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision f1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -199,19 +199,23 @@ { // Setup string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); + + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = validFilePath, + Version = "random" + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var parent = new CalculationGroup(); var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - Version = "random" - }); - using (var treeViewControl = new TreeViewControl()) { var gui = mocks.Stub(); @@ -617,18 +621,22 @@ { // Setup string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); + + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = validFilePath, + Version = "1.0" + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var parent = new CalculationGroup(); var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, parent, failureMechanism, assessmentSection); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - Version = "1.0" - }); - using (var treeViewControl = new TreeViewControl()) { var gui = mocks.Stub(); @@ -717,18 +725,21 @@ { // Setup string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = validFilePath, + Version = "1.0" + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var parent = new CalculationGroup(); var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); var nodeData = new GrassCoverErosionInwardsCalculationContext(calculation, parent, failureMechanism, assessmentSection); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - Version = "1.0" - }); - using (var treeViewControl = new TreeViewControl()) { var gui = mocks.Stub(); @@ -852,18 +863,20 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "random", Locations = { hydraulicBoundaryLocation } - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var parent = new CalculationGroup(); var calculation = new GrassCoverErosionInwardsCalculation { Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rf1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision f1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsCalculationGroupContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -978,13 +978,16 @@ var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(group, null, failureMechanism, @@ -1135,13 +1138,16 @@ var failureMechanism = new TestGrassCoverErosionInwardsFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new GrassCoverErosionInwardsCalculation()); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new GrassCoverErosionInwardsCalculationGroupContext(group, null, failureMechanism, @@ -1264,12 +1270,15 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var groupContext = new GrassCoverErosionInwardsCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, Index: Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -rf1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision f1a99bd6f1bfda45d8b7b4dbb8d7b7e51fcc718f) +++ Riskeer/GrassCoverErosionInwards/test/Riskeer.GrassCoverErosionInwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -494,13 +494,16 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocksRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocksRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -600,13 +603,16 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocksRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocksRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -756,12 +762,15 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocksRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocksRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var failureMechanismContext = new GrassCoverErosionInwardsFailureMechanismContext(failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -255,20 +255,23 @@ public void ContextMenuStrip_InvalidNorm_ContextMenuItemCalculateAllDisabledAndTooltipSet() { // Setup + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite"), + Version = "1.0" + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mockRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var applicationFeatureCommandHandler = mockRepository.Stub(); var importCommandHandler = mockRepository.Stub(); var exportCommandHandler = mockRepository.Stub(); var updateCommandHandler = mockRepository.Stub(); var viewCommandsHandler = mockRepository.Stub(); viewCommandsHandler.Stub(vch => vch.CanOpenViewFor(null)).IgnoreArguments().Return(true); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite"), - Version = "1.0" - }); - + using (var treeViewControl = new TreeViewControl()) { using (var plugin = new GrassCoverErosionOutwardsPlugin()) @@ -319,20 +322,23 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled() { // Setup + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite"), + Version = "1.0" + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mockRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var applicationFeatureCommandHandler = mockRepository.Stub(); var importCommandHandler = mockRepository.Stub(); var exportCommandHandler = mockRepository.Stub(); var updateCommandHandler = mockRepository.Stub(); var viewCommandsHandler = mockRepository.Stub(); viewCommandsHandler.Stub(vch => vch.CanOpenViewFor(null)).IgnoreArguments().Return(true); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite"), - Version = "1.0" - }); - + using (var treeViewControl = new TreeViewControl()) { using (var plugin = new GrassCoverErosionOutwardsPlugin()) Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rae6913dc9e65387cd005077a2f056b5cd2fd159f -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision ae6913dc9e65387cd005077a2f056b5cd2fd159f) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -256,13 +256,16 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled() { // Setup - var mockRepository = new MockRepository(); - var assessmentSection = mockRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite") - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var mockRepository = new MockRepository(); + var assessmentSection = mockRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new GrassCoverErosionOutwardsDesignWaterLevelCalculationsGroupContext(new ObservableList(), new GrassCoverErosionOutwardsFailureMechanism { Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r1c8a7abfda575f28821ce84a36ec6c5836a751aa -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 1c8a7abfda575f28821ce84a36ec6c5836a751aa) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -371,12 +371,15 @@ var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism(); failureMechanism.WaveConditionsCalculationGroup.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation()); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new GrassCoverErosionOutwardsFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs =================================================================== diff -u -r1c8a7abfda575f28821ce84a36ec6c5836a751aa -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 1c8a7abfda575f28821ce84a36ec6c5836a751aa) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -176,6 +176,7 @@ FilePath = validFilePath } }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); var nodeData = new GrassCoverErosionOutwardsHydraulicBoundaryDatabaseContext(assessmentSection.HydraulicBoundaryDatabase, failureMechanism, Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r5299261dce08137976c5f234f1261d4c0683e6e9 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 5299261dce08137976c5f234f1261d4c0683e6e9) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -485,13 +485,16 @@ public void ContextMenuStrip_Always_AddCustomItems() { // Setup - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "random" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism { Contribution = 5 Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r877f0d6830122b89d78bc3e27aa3c61736617276 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 877f0d6830122b89d78bc3e27aa3c61736617276) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -794,32 +794,34 @@ string validHydraulicBoundaryDatabasePath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, Path.Combine(nameof(HydraulicBoundaryDatabase), "complete.sqlite")); - using (var treeViewControl = new TreeViewControl()) + var group = new CalculationGroup(); + group.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation()); + + var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism { - var group = new CalculationGroup(); - group.Children.Add(new GrassCoverErosionOutwardsWaveConditionsCalculation()); + Contribution = 5 + }; + failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - var failureMechanism = new GrassCoverErosionOutwardsFailureMechanism - { - Contribution = 5 - }; - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = validHydraulicBoundaryDatabasePath + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = validHydraulicBoundaryDatabasePath - }); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, - failureMechanism, - assessmentSection); - var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, - null, - failureMechanism, - assessmentSection); - + var nodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(group, + failureMechanism.WaveConditionsCalculationGroup, + failureMechanism, + assessmentSection); + var parentNodeData = new GrassCoverErosionOutwardsWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + null, + failureMechanism, + assessmentSection); + using (var treeViewControl = new TreeViewControl()) + { var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -247,20 +247,22 @@ public void ContextMenuStrip_InvalidNorm_ContextMenuItemCalculateAllDisabledAndTooltipSet() { // Setup + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite"), + Version = "1.0" + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mockRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var applicationFeatureCommandHandler = mockRepository.Stub(); var importCommandHandler = mockRepository.Stub(); var exportCommandHandler = mockRepository.Stub(); var updateCommandHandler = mockRepository.Stub(); var viewCommandsHandler = mockRepository.Stub(); - viewCommandsHandler.Stub(vch => vch.CanOpenViewFor(null)).IgnoreArguments().Return(true); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite"), - Version = "1.0" - }); - + using (var treeViewControl = new TreeViewControl()) { using (var plugin = new GrassCoverErosionOutwardsPlugin()) @@ -311,13 +313,16 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled() { // Setup - var assessmentSection = mockRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite"), Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mockRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var applicationFeatureCommandHandler = mockRepository.Stub(); var importCommandHandler = mockRepository.Stub(); var exportCommandHandler = mockRepository.Stub(); Index: Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -rae6913dc9e65387cd005077a2f056b5cd2fd159f -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision ae6913dc9e65387cd005077a2f056b5cd2fd159f) +++ Riskeer/GrassCoverErosionOutwards/test/Riskeer.GrassCoverErosionOutwards.Plugin.Test/TreeNodeInfos/GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../GrassCoverErosionOutwardsWaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -256,13 +256,16 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled() { // Setup - var mockRepository = new MockRepository(); - var assessmentSection = mockRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite") - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var mockRepository = new MockRepository(); + var assessmentSection = mockRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new GrassCoverErosionOutwardsWaveHeightCalculationsGroupContext(new ObservableList(), new GrassCoverErosionOutwardsFailureMechanism { Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -199,20 +199,24 @@ public void ContextMenuStrip_Always_AddCustomItems() { // Setup - var failureMechanism = new TestHeightStructuresFailureMechanism(); - var assessmentSection = mocks.Stub(); - var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); - var nodeData = new HeightStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection); - var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "random" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + + var failureMechanism = new TestHeightStructuresFailureMechanism(); + var parent = new CalculationGroup(); + var calculation = new StructuresCalculation(); + var nodeData = new HeightStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection); + var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); + using (var treeViewControl = new TreeViewControl()) { var gui = mocks.Stub(); @@ -629,18 +633,22 @@ { // Setup string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var failureMechanism = new TestHeightStructuresFailureMechanism(); - var assessmentSection = mocks.Stub(); - var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); - var nodeData = new HeightStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + + var failureMechanism = new TestHeightStructuresFailureMechanism(); + var parent = new CalculationGroup(); + var calculation = new StructuresCalculation(); + var nodeData = new HeightStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection); + using (var treeViewControl = new TreeViewControl()) { var gui = mocks.Stub(); @@ -732,18 +740,22 @@ { // Setup string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocks.Stub(); - var parent = new CalculationGroup(); - var calculation = new StructuresCalculation(); - var failureMechanism = new TestHeightStructuresFailureMechanism(); - var nodeData = new HeightStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + + var parent = new CalculationGroup(); + var calculation = new StructuresCalculation(); + var failureMechanism = new TestHeightStructuresFailureMechanism(); + var nodeData = new HeightStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection); + using (var treeViewControl = new TreeViewControl()) { var gui = mocks.Stub(); @@ -1126,18 +1138,20 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "random", Locations = { hydraulicBoundaryLocation } - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var parent = new CalculationGroup(); var calculation = new TestHeightStructuresCalculation { Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../HeightStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -567,13 +567,16 @@ var failureMechanism = new TestHeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new HeightStructuresCalculationGroupContext(group, null, failureMechanism, @@ -706,13 +709,16 @@ var failureMechanism = new TestHeightStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new HeightStructuresCalculationGroupContext(group, null, failureMechanism, @@ -965,12 +971,15 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var groupContext = new HeightStructuresCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, Index: Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/HeightStructures/test/Riskeer.HeightStructures.Plugin.Test/TreeNodeInfos/HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../HeightStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -511,13 +511,16 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocksRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocksRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -620,13 +623,16 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocksRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocksRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -771,12 +777,15 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - var assessmentSection = mocksRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocksRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var failureMechanismContext = new HeightStructuresFailureMechanismContext(failureMechanism, assessmentSection); using (var treeViewControl = new TreeViewControl()) Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -r01ac28cffccda3451783c513b8d2d9130ff0ec60 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 01ac28cffccda3451783c513b8d2d9130ff0ec60) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -1305,6 +1305,7 @@ foreach (AssessmentSection section in sectionsWithHydraulicBoundaryDatabaseLinked) { string validationProblem = HydraulicBoundaryDatabaseHelper.ValidateFilesForCalculation(section.HydraulicBoundaryDatabase.FilePath, + section.HydraulicBoundaryDatabase.HydraulicLocationConfigurationSettings.FilePath, section.HydraulicBoundaryDatabase.EffectivePreprocessorDirectory()); if (validationProblem != null) { Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs =================================================================== diff -u -r01ac28cffccda3451783c513b8d2d9130ff0ec60 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 01ac28cffccda3451783c513b8d2d9130ff0ec60) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/RiskeerPluginTest.cs (.../RiskeerPluginTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -49,6 +49,7 @@ using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.IllustrationPoints; using Riskeer.Common.Data.Structures; +using Riskeer.Common.Data.TestUtil; using Riskeer.Common.Forms.PresentationObjects; using Riskeer.Common.Forms.PropertyClasses; using Riskeer.Common.Forms.Views; @@ -138,17 +139,20 @@ plugin.Gui = gui; gui.Run(); + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) + { + HydraulicBoundaryDatabase = + { + FilePath = testFilePath + } + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(assessmentSection.HydraulicBoundaryDatabase); + var project = new RiskeerProject { AssessmentSections = { - new AssessmentSection(AssessmentSectionComposition.Dike) - { - HydraulicBoundaryDatabase = - { - FilePath = testFilePath - } - } + assessmentSection } }; Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r2e13b9fea3ee6d1dee96f9359db2f796aadc11ef -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision 2e13b9fea3ee6d1dee96f9359db2f796aadc11ef) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -268,12 +268,13 @@ public void ContextMenuStrip_InvalidNorm_ContextMenuItemCalculateAllDisabledAndTooltipSet() { // Setup - var assessmentSection = mockRepository.Stub(); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite") }; - + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + + var assessmentSection = mockRepository.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var nodeData = new DesignWaterLevelCalculationsContext(new ObservableList(), @@ -316,12 +317,13 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled() { // Setup - var assessmentSection = mockRepository.Stub(); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite") }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mockRepository.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var nodeData = new DesignWaterLevelCalculationsContext(new ObservableList(), Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r2e13b9fea3ee6d1dee96f9359db2f796aadc11ef -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 2e13b9fea3ee6d1dee96f9359db2f796aadc11ef) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs (.../DesignWaterLevelCalculationsGroupContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -248,13 +248,16 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled() { // Setup - var mockRepository = new MockRepository(); - var assessmentSection = mockRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite") - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var mockRepository = new MockRepository(); + var assessmentSection = mockRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new DesignWaterLevelCalculationsGroupContext(new ObservableList(), assessmentSection); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs =================================================================== diff -u -r2e13b9fea3ee6d1dee96f9359db2f796aadc11ef -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision 2e13b9fea3ee6d1dee96f9359db2f796aadc11ef) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -268,12 +268,13 @@ public void ContextMenuStrip_InvalidNorm_ContextMenuItemCalculateAllDisabledAndTooltipSet() { // Setup - var assessmentSection = mockRepository.Stub(); var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite") }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mockRepository.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var nodeData = new WaveHeightCalculationsContext(new ObservableList(), @@ -320,6 +321,7 @@ { FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite") }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); var assessmentSection = mockRepository.Stub(); assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r2e13b9fea3ee6d1dee96f9359db2f796aadc11ef -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision 2e13b9fea3ee6d1dee96f9359db2f796aadc11ef) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs (.../WaveHeightCalculationsGroupContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -249,13 +249,16 @@ public void ContextMenuStrip_AllRequiredInputSet_ContextMenuItemCalculateAllEnabled() { // Setup - var mockRepository = new MockRepository(); - var assessmentSection = mockRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = Path.Combine(TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, nameof(HydraulicBoundaryDatabase)), "complete.sqlite") - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var mockRepository = new MockRepository(); + var assessmentSection = mockRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new WaveHeightCalculationsGroupContext(new ObservableList(), assessmentSection); Index: Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Revetment/test/Riskeer.Revetment.Service.Test/WaveConditionsCalculationServiceBaseTest.cs (.../WaveConditionsCalculationServiceBaseTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -121,16 +121,19 @@ var isValid = false; const string invalidPreprocessorDirectory = "NonExistingPreprocessorDirectory"; + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = validHydraulicBoundaryDatabaseFilePath, + CanUsePreprocessor = true, + UsePreprocessor = true, + PreprocessorDirectory = invalidPreprocessorDirectory + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + // Call Action action = () => isValid = WaveConditionsCalculationServiceBase.Validate(new TestWaveConditionsInput(), GetValidAssessmentLevel(), - new HydraulicBoundaryDatabase - { - FilePath = validHydraulicBoundaryDatabaseFilePath, - CanUsePreprocessor = true, - UsePreprocessor = true, - PreprocessorDirectory = invalidPreprocessorDirectory - }, + hydraulicBoundaryDatabase, validNorm); // Assert Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -200,19 +200,22 @@ // Setup string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = validFilePath, + Version = "random" + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculation(); var nodeData = new StabilityPointStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - Version = "random" - }); - using (var treeViewControl = new TreeViewControl()) { var gui = mocks.Stub(); @@ -593,18 +596,22 @@ { // Setup string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); + + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase + { + FilePath = validFilePath, + Version = "1.0" + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StructuresCalculation(); var nodeData = new StabilityPointStructuresCalculationContext(calculation, parent, failureMechanism, assessmentSection); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = validFilePath, - Version = "1.0" - }); - using (var treeViewControl = new TreeViewControl()) { var gui = mocks.Stub(); @@ -994,17 +1001,19 @@ string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); - - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "random", Locations = { hydraulicBoundaryLocation } - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); var parent = new CalculationGroup(); var calculation = new TestStabilityPointStructuresCalculation Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityPointStructuresCalculationGroupContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -445,13 +445,16 @@ var failureMechanism = new TestStabilityPointStructuresFailureMechanism(); failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new StabilityPointStructuresCalculationGroupContext(group, null, failureMechanism, @@ -1354,13 +1357,15 @@ }); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var groupContext = new StabilityPointStructuresCalculationGroupContext(failureMechanism.CalculationsGroup, null, failureMechanism, Index: Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/StabilityPointStructures/test/Riskeer.StabilityPointStructures.Plugin.Test/TreeNodeInfos/StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs (.../StabilityPointStructuresFailureMechanismContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -561,14 +561,16 @@ failureMechanism.CalculationsGroup.Children.Add(new StructuresCalculation()); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - - var assessmentSection = mocksRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "1.0" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocksRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection); var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); @@ -730,13 +732,15 @@ }); string validFilePath = Path.Combine(testDataPath, "complete.sqlite"); - - var assessmentSection = mocksRepository.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocksRepository.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var failureMechanismContext = new StabilityPointStructuresFailureMechanismContext(failureMechanism, assessmentSection); using (var plugin = new StabilityPointStructuresPlugin()) Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -rca96fecb4ca761fdbbb0f320d0eda7a6ea456c56 -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision ca96fecb4ca761fdbbb0f320d0eda7a6ea456c56) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -482,13 +482,16 @@ public void ContextMenuStrip_Always_AddCustomItems() { // Setup - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "random" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var failureMechanism = new StabilityStoneCoverFailureMechanism(); var parent = new CalculationGroup(); var calculation = new StabilityStoneCoverWaveConditionsCalculation(); @@ -707,12 +710,15 @@ // Given var failureMechanism = new StabilityStoneCoverFailureMechanism(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var parent = new CalculationGroup(); var calculation = new StabilityStoneCoverWaveConditionsCalculation { @@ -1207,12 +1213,15 @@ // Given var failureMechanism = new StabilityStoneCoverFailureMechanism(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var parent = new CalculationGroup(); var calculation = new StabilityStoneCoverWaveConditionsCalculation { Index: Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r2d3657179c75196f7b76d66255263deca3efb29d -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 2d3657179c75196f7b76d66255263deca3efb29d) +++ Riskeer/StabilityStoneCover/test/Riskeer.StabilityStoneCover.Plugin.Test/TreeNodeInfos/StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../StabilityStoneCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -783,12 +783,15 @@ group.Children.Add(new StabilityStoneCoverWaveConditionsCalculation()); failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validHydraulicBoundaryDatabasePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var nodeData = new StabilityStoneCoverWaveConditionsCalculationGroupContext(group, failureMechanism.WaveConditionsCalculationGroup, failureMechanism, Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -478,13 +478,16 @@ public void ContextMenuStrip_Always_AddCustomItems() { // Setup - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath, Version = "random" - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); var parent = new CalculationGroup(); var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation(); @@ -648,12 +651,15 @@ { // Given var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var parent = new CalculationGroup(); var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation { @@ -1390,12 +1396,15 @@ { // Given var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { FilePath = validFilePath - }); + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); + var parent = new CalculationGroup(); var calculation = new WaveImpactAsphaltCoverWaveConditionsCalculation { Index: Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r90da65d29cffe6603e285dd47eb922125f11b692 --- Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/WaveImpactAsphaltCover/test/Riskeer.WaveImpactAsphaltCover.Plugin.Test/TreeNodeInfos/WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationGroupContextTreeNodeInfoTest.cs) (revision 90da65d29cffe6603e285dd47eb922125f11b692) @@ -791,28 +791,30 @@ string validHydraulicBoundaryDatabasePath = TestHelper.GetTestDataPath(TestDataPath.Riskeer.Common.IO, Path.Combine(nameof(HydraulicBoundaryDatabase), "complete.sqlite")); - using (var treeViewControl = new TreeViewControl()) + var hydraulicBoundaryDatabase = new HydraulicBoundaryDatabase { - var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); - var group = new CalculationGroup(); - group.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation()); - failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + FilePath = validHydraulicBoundaryDatabasePath + }; + HydraulicBoundaryDatabaseTestHelper.SetHydraulicBoundaryLocationConfigurationSettings(hydraulicBoundaryDatabase); - var assessmentSection = mocks.Stub(); - assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(new HydraulicBoundaryDatabase - { - FilePath = validHydraulicBoundaryDatabasePath - }); + var assessmentSection = mocks.Stub(); + assessmentSection.Stub(a => a.HydraulicBoundaryDatabase).Return(hydraulicBoundaryDatabase); - var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, - failureMechanism.WaveConditionsCalculationGroup, - failureMechanism, - assessmentSection); - var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, - null, - failureMechanism, - assessmentSection); + var failureMechanism = new WaveImpactAsphaltCoverFailureMechanism(); + var group = new CalculationGroup(); + group.Children.Add(new WaveImpactAsphaltCoverWaveConditionsCalculation()); + failureMechanism.WaveConditionsCalculationGroup.Children.Add(group); + var nodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(group, + failureMechanism.WaveConditionsCalculationGroup, + failureMechanism, + assessmentSection); + var parentNodeData = new WaveImpactAsphaltCoverWaveConditionsCalculationGroupContext(failureMechanism.WaveConditionsCalculationGroup, + null, + failureMechanism, + assessmentSection); + using (var treeViewControl = new TreeViewControl()) + { var menuBuilder = new CustomItemsOnlyContextMenuBuilder(); gui.Stub(g => g.Get(nodeData, treeViewControl)).Return(menuBuilder);