Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs =================================================================== diff -u -r97e2900ca91f73950ef19ff8a5eaabc2823a4373 -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision 97e2900ca91f73950ef19ff8a5eaabc2823a4373) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -113,26 +113,26 @@ /// /// Reads the hydraulic location configuration settings from the database. /// - /// A collection of as found in the database. + /// A collection of as found in the database. /// Thrown when the database query failed. /// Thrown when the database returned incorrect values for required properties. - private IEnumerable ReadConfigurationSettings() + private IEnumerable ReadConfigurationSettings() { - var readSettings = new Collection(); + var readSettings = new Collection(); using (IDataReader dataReader = CreateDataReader(HydraulicLocationConfigurationDatabaseQueryBuilder.GetScenarioInformationQuery())) { while (MoveNext(dataReader)) { - readSettings.Add(new ReadHydraulicLocationConfigurationDatabaseSettings(dataReader.Read(ScenarioInformationTableDefinitions.ScenarioName), - dataReader.Read(ScenarioInformationTableDefinitions.Year), - dataReader.Read(ScenarioInformationTableDefinitions.Scope), - dataReader.Read(ScenarioInformationTableDefinitions.SeaLevel), - dataReader.Read(ScenarioInformationTableDefinitions.RiverDischarge), - dataReader.Read(ScenarioInformationTableDefinitions.LakeLevel), - dataReader.Read(ScenarioInformationTableDefinitions.WindDirection), - dataReader.Read(ScenarioInformationTableDefinitions.WindSpeed), - dataReader.Read(ScenarioInformationTableDefinitions.Comment))); + readSettings.Add(new ReadHydraulicLocationConfigurationSettings(dataReader.Read(ScenarioInformationTableDefinitions.ScenarioName), + dataReader.Read(ScenarioInformationTableDefinitions.Year), + dataReader.Read(ScenarioInformationTableDefinitions.Scope), + dataReader.Read(ScenarioInformationTableDefinitions.SeaLevel), + dataReader.Read(ScenarioInformationTableDefinitions.RiverDischarge), + dataReader.Read(ScenarioInformationTableDefinitions.LakeLevel), + dataReader.Read(ScenarioInformationTableDefinitions.WindDirection), + dataReader.Read(ScenarioInformationTableDefinitions.WindSpeed), + dataReader.Read(ScenarioInformationTableDefinitions.Comment))); } } Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabase.cs =================================================================== diff -u -r8f774d93e042c775c781c3801dd50f1101594fb7 -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabase.cs (.../ReadHydraulicLocationConfigurationDatabase.cs) (revision 8f774d93e042c775c781c3801dd50f1101594fb7) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabase.cs (.../ReadHydraulicLocationConfigurationDatabase.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -32,14 +32,14 @@ /// Creates a new instance of . /// /// The read hydraulic locations. - /// The read hydraulic location configuration settings. + /// The read hydraulic location configuration settings. /// The read tracks. internal ReadHydraulicLocationConfigurationDatabase(IEnumerable readHydraulicLocations, - IEnumerable readHydraulicLocationConfigurationDatabaseSettings, + IEnumerable readHydraulicLocationConfigurationSettings, IEnumerable readTracks) { ReadHydraulicLocations = readHydraulicLocations; - ReadHydraulicLocationConfigurationDatabaseSettings = readHydraulicLocationConfigurationDatabaseSettings; + ReadHydraulicLocationConfigurationSettings = readHydraulicLocationConfigurationSettings; ReadTracks = readTracks; } @@ -51,7 +51,7 @@ /// /// Gets the read hydraulic location configuration settings. /// - public IEnumerable ReadHydraulicLocationConfigurationDatabaseSettings { get; } + public IEnumerable ReadHydraulicLocationConfigurationSettings { get; } /// /// Gets the read tracks. Fisheye: Tag 2a8d8bea2ffbf74c5e223e3676e02358384a8891 refers to a dead (removed) revision in file `Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseSettings.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationSettings.cs =================================================================== diff -u --- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationSettings.cs (revision 0) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationSettings.cs (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -0,0 +1,102 @@ +// Copyright (C) Stichting Deltares 2022. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +namespace Riskeer.HydraRing.IO.HydraulicLocationConfigurationDatabase +{ + /// + /// Class for holding configuration settings that are read from a hydraulic location + /// configuration database file. + /// + public class ReadHydraulicLocationConfigurationSettings + { + /// + /// Creates a new instance of . + /// + /// The name of the scenario. + /// The year. + /// The scope. + /// The sea level. + /// The river discharge. + /// The lake level. + /// The wind direction. + /// The wind speed. + /// The comment. + internal ReadHydraulicLocationConfigurationSettings(string scenarioName, int year, string scope, + string seaLevel, string riverDischarge, string lakeLevel, + string windDirection, string windSpeed, string comment) + { + ScenarioName = scenarioName; + Year = year; + Scope = scope; + SeaLevel = seaLevel; + RiverDischarge = riverDischarge; + LakeLevel = lakeLevel; + WindDirection = windDirection; + WindSpeed = windSpeed; + Comment = comment; + } + + /// + /// Gets the scenario name. + /// + public string ScenarioName { get; } + + /// + /// Gets the year. + /// + public int Year { get; } + + /// + /// Gets the scope. + /// + public string Scope { get; } + + /// + /// Gets the sea level. + /// + public string SeaLevel { get; } + + /// + /// Gets the river discharge. + /// + public string RiverDischarge { get; } + + /// + /// Gets the lake level. + /// + public string LakeLevel { get; } + + /// + /// Gets the wind direction. + /// + public string WindDirection { get; } + + /// + /// Gets the wind speed. + /// + public string WindSpeed { get; } + + /// + /// Gets the comment. + /// + public string Comment { get; } + } +} \ No newline at end of file Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs =================================================================== diff -u -re6867a42e7549e691840200684a320ce092b4bb3 -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision e6867a42e7549e691840200684a320ce092b4bb3) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -82,7 +82,7 @@ // Assert AssertReadHydraulicLocations(readHydraulicLocationConfigurationDatabase); - Assert.IsNull(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings); + Assert.IsNull(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings); AssertReadTracks(readHydraulicLocationConfigurationDatabase); } } @@ -100,7 +100,7 @@ // Assert AssertReadHydraulicLocations(readHydraulicLocationConfigurationDatabase); - AssertReadHydraulicLocationConfigurationDatabaseSettings(readHydraulicLocationConfigurationDatabase); + AssertReadHydraulicLocationConfigurationSettings(readHydraulicLocationConfigurationDatabase); AssertReadTracks(readHydraulicLocationConfigurationDatabase); } } @@ -228,57 +228,57 @@ && rhl.TrackId == 1000)); } - private static void AssertReadHydraulicLocationConfigurationDatabaseSettings(ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase) + private static void AssertReadHydraulicLocationConfigurationSettings(ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase) { - ReadHydraulicLocationConfigurationDatabaseSettings[] readHydraulicLocationConfigurationDatabaseSettings = - readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings.ToArray(); - Assert.AreEqual(2, readHydraulicLocationConfigurationDatabaseSettings.Length); + ReadHydraulicLocationConfigurationSettings[] readHydraulicLocationConfigurationSettings = + readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings.ToArray(); + Assert.AreEqual(2, readHydraulicLocationConfigurationSettings.Length); CollectionAssert.AreEqual(new[] { "ScenarioName WBI2017", "ScenarioName WBI2018" - }, readHydraulicLocationConfigurationDatabaseSettings.Select(s => s.ScenarioName)); + }, readHydraulicLocationConfigurationSettings.Select(s => s.ScenarioName)); CollectionAssert.AreEqual(new[] { 2023, 2024 - }, readHydraulicLocationConfigurationDatabaseSettings.Select(s => s.Year)); + }, readHydraulicLocationConfigurationSettings.Select(s => s.Year)); CollectionAssert.AreEqual(new[] { "Scope WBI2017", "Scope WBI2018" - }, readHydraulicLocationConfigurationDatabaseSettings.Select(s => s.Scope)); + }, readHydraulicLocationConfigurationSettings.Select(s => s.Scope)); CollectionAssert.AreEqual(new[] { "SeaLevel WBI2017", "SeaLevel WBI2018" - }, readHydraulicLocationConfigurationDatabaseSettings.Select(s => s.SeaLevel)); + }, readHydraulicLocationConfigurationSettings.Select(s => s.SeaLevel)); CollectionAssert.AreEqual(new[] { "RiverDischarge WBI2017", "RiverDischarge WBI2018" - }, readHydraulicLocationConfigurationDatabaseSettings.Select(s => s.RiverDischarge)); + }, readHydraulicLocationConfigurationSettings.Select(s => s.RiverDischarge)); CollectionAssert.AreEqual(new[] { "LakeLevel WBI2017", "LakeLevel WBI2018" - }, readHydraulicLocationConfigurationDatabaseSettings.Select(s => s.LakeLevel)); + }, readHydraulicLocationConfigurationSettings.Select(s => s.LakeLevel)); CollectionAssert.AreEqual(new[] { "WindDirection WBI2017", "WindDirection WBI2018" - }, readHydraulicLocationConfigurationDatabaseSettings.Select(s => s.WindDirection)); + }, readHydraulicLocationConfigurationSettings.Select(s => s.WindDirection)); CollectionAssert.AreEqual(new[] { "WindSpeed WBI2017", "WindSpeed WBI2018" - }, readHydraulicLocationConfigurationDatabaseSettings.Select(s => s.WindSpeed)); + }, readHydraulicLocationConfigurationSettings.Select(s => s.WindSpeed)); CollectionAssert.AreEqual(new[] { "Comment WBI2017", "Comment WBI2018" - }, readHydraulicLocationConfigurationDatabaseSettings.Select(s => s.Comment)); + }, readHydraulicLocationConfigurationSettings.Select(s => s.Comment)); } private static void AssertReadTracks(ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase) Fisheye: Tag 2a8d8bea2ffbf74c5e223e3676e02358384a8891 refers to a dead (removed) revision in file `Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseSettingsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseTest.cs =================================================================== diff -u -r8f774d93e042c775c781c3801dd50f1101594fb7 -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseTest.cs (.../ReadHydraulicLocationConfigurationDatabaseTest.cs) (revision 8f774d93e042c775c781c3801dd50f1101594fb7) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseTest.cs (.../ReadHydraulicLocationConfigurationDatabaseTest.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -34,18 +34,18 @@ { // Setup IEnumerable readHydraulicLocations = Enumerable.Empty(); - IEnumerable readHydraulicLocationConfigurationDatabaseSettings = - Enumerable.Empty(); + IEnumerable readHydraulicLocationConfigurationSettings = + Enumerable.Empty(); IEnumerable readTracks = Enumerable.Empty(); // Call var readHydraulicLocationConfigurationDatabase = new ReadHydraulicLocationConfigurationDatabase(readHydraulicLocations, - readHydraulicLocationConfigurationDatabaseSettings, + readHydraulicLocationConfigurationSettings, readTracks); // Assert Assert.AreSame(readHydraulicLocations, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations); - Assert.AreSame(readHydraulicLocationConfigurationDatabaseSettings, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings); + Assert.AreSame(readHydraulicLocationConfigurationSettings, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings); Assert.AreSame(readTracks, readHydraulicLocationConfigurationDatabase.ReadTracks); } } Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationSettingsTest.cs =================================================================== diff -u --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationSettingsTest.cs (revision 0) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationSettingsTest.cs (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -0,0 +1,86 @@ +// Copyright (C) Stichting Deltares 2022. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using System; +using NUnit.Framework; +using Riskeer.HydraRing.IO.HydraulicLocationConfigurationDatabase; + +namespace Riskeer.HydraRing.IO.Test.HydraulicLocationConfigurationDatabase +{ + [TestFixture] + public class ReadHydraulicLocationConfigurationSettingsTest + { + [Test] + public void Constructor_WithArgumentsNull_ExpectedValues() + { + // Setup + var random = new Random(21); + int year = random.Next(); + + // Call + var settings = new ReadHydraulicLocationConfigurationSettings(null, year, null, null, null, + null, null, null, null); + + // Assert + Assert.IsNull(settings.ScenarioName); + Assert.AreEqual(year, settings.Year); + Assert.IsNull(settings.Scope); + Assert.IsNull(settings.SeaLevel); + Assert.IsNull(settings.RiverDischarge); + Assert.IsNull(settings.LakeLevel); + Assert.IsNull(settings.WindDirection); + Assert.IsNull(settings.WindSpeed); + Assert.IsNull(settings.Comment); + } + + [Test] + public void Constructor_WithArgumentValues_ExpectedValues() + { + // Setup + var random = new Random(21); + const string scenarioName = "ScenarioName"; + int year = random.Next(); + const string scope = "Scope"; + const string seaLevel = "SeaLevel"; + const string riverDischarge = "RiverDischarge"; + const string lakeLevel = "LakeLevel"; + const string windDirection = "WindDirection"; + const string windSpeed = "WindSpeed"; + const string comment = "Comment"; + + // Call + var settings = new ReadHydraulicLocationConfigurationSettings(scenarioName, year, scope, + seaLevel, riverDischarge, lakeLevel, + windDirection, windSpeed, comment); + + // Assert + Assert.AreEqual(scenarioName, settings.ScenarioName); + Assert.AreEqual(year, settings.Year); + Assert.AreEqual(scope, settings.Scope); + Assert.AreEqual(seaLevel, settings.SeaLevel); + Assert.AreEqual(riverDischarge, settings.RiverDischarge); + Assert.AreEqual(lakeLevel, settings.LakeLevel); + Assert.AreEqual(windDirection, settings.WindDirection); + Assert.AreEqual(windSpeed, settings.WindSpeed); + Assert.AreEqual(comment, settings.Comment); + } + } +} \ No newline at end of file Fisheye: Tag 2a8d8bea2ffbf74c5e223e3676e02358384a8891 refers to a dead (removed) revision in file `Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs =================================================================== diff -u -rb537243cd675f922b6c86d3f537134b923683119 -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs (.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs) (revision b537243cd675f922b6c86d3f537134b923683119) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs (.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -65,9 +65,9 @@ /// database settings. public static ReadHydraulicLocationConfigurationDatabase CreateWithConfigurationSettings(long trackId) { - ReadHydraulicLocationConfigurationDatabaseSettings[] settings = + ReadHydraulicLocationConfigurationSettings[] settings = { - ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create() + ReadHydraulicLocationConfigurationSettingsTestFactory.Create() }; return CreateWithConfigurationSettings(settings, trackId); @@ -77,11 +77,11 @@ /// Create a valid instance of with hydraulic location /// configuration database settings. /// - /// The to set. + /// The to set. /// The id of the track that should be part of the read tracks. /// The created with hydraulic location configuration /// database settings. - public static ReadHydraulicLocationConfigurationDatabase CreateWithConfigurationSettings(IEnumerable settings, + public static ReadHydraulicLocationConfigurationDatabase CreateWithConfigurationSettings(IEnumerable settings, long trackId) { return Create(new long[] @@ -92,7 +92,7 @@ } private static ReadHydraulicLocationConfigurationDatabase Create(IEnumerable locationIds, - IEnumerable settings, + IEnumerable settings, long trackId) { return new ReadHydraulicLocationConfigurationDatabase(locationIds.Select(locationId => new ReadHydraulicLocation(locationId + 100, locationId, trackId)), Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationSettingsTestFactory.cs =================================================================== diff -u --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationSettingsTestFactory.cs (revision 0) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationSettingsTestFactory.cs (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -0,0 +1,43 @@ +// Copyright (C) Stichting Deltares 2022. All rights reserved. +// +// This file is part of Riskeer. +// +// Riskeer is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// This program is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with this program. If not, see . +// +// All names, logos, and references to "Deltares" are registered trademarks of +// Stichting Deltares and remain full property of Stichting Deltares at all times. +// All rights reserved. + +using Riskeer.HydraRing.IO.HydraulicLocationConfigurationDatabase; + +namespace Riskeer.HydraRing.IO.TestUtil +{ + /// + /// Factory that creates simple instances + /// that can be used for testing. + /// + public static class ReadHydraulicLocationConfigurationSettingsTestFactory + { + /// + /// Creates a . + /// + /// The created . + public static ReadHydraulicLocationConfigurationSettings Create() + { + return new ReadHydraulicLocationConfigurationSettings("scenarioName", 1337, "scope", "seaLevel", + "riverDischarge", "lakeLevel", "windDirection", + "windSpeed", "comment"); + } + } +} \ No newline at end of file Index: Riskeer/Integration/src/Riskeer.Integration.IO/Handlers/IHydraulicLocationConfigurationDatabaseUpdateHandler.cs =================================================================== diff -u -r539e59d09b07ec28247986b20b75bfffa8562f0d -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/src/Riskeer.Integration.IO/Handlers/IHydraulicLocationConfigurationDatabaseUpdateHandler.cs (.../IHydraulicLocationConfigurationDatabaseUpdateHandler.cs) (revision 539e59d09b07ec28247986b20b75bfffa8562f0d) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Handlers/IHydraulicLocationConfigurationDatabaseUpdateHandler.cs (.../IHydraulicLocationConfigurationDatabaseUpdateHandler.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -28,30 +28,31 @@ namespace Riskeer.Integration.IO.Handlers { /// - /// Interface for an object that can properly update . + /// Interface for an object that can properly update . /// public interface IHydraulicLocationConfigurationDatabaseUpdateHandler { /// - /// Gets confirmation for updating the . + /// Gets confirmation for updating the . /// /// true when confirmation is given; false otherwise. bool InquireConfirmation(); /// - /// Updates the and its dependent data with the - /// . + /// Updates the and its dependent data with the + /// . /// - /// The hydraulic boundary data to update the settings for. - /// The read hydraulic location configuration database - /// settings to update with. + /// The hydraulic boundary data to update the hydraulic location configuration + /// database for. + /// The read hydraulic location configuration settings to + /// update with. /// Indicator whether to use the preprocessor closure. /// The file path of the hydraulic location configuration database. /// All objects that have been affected by the update. /// Thrown when or /// is null. IEnumerable Update(HydraulicBoundaryData hydraulicBoundaryData, - ReadHydraulicLocationConfigurationDatabaseSettings readHydraulicLocationConfigurationDatabaseSettings, + ReadHydraulicLocationConfigurationSettings readHydraulicLocationConfigurationSettings, bool usePreprocessorClosure, string hlcdFilePath); } Index: Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDataImporter.cs =================================================================== diff -u -r4aedfe8afd992377cec03829270a7c741a1d1467 -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDataImporter.cs (.../HydraulicBoundaryDataImporter.cs) (revision 4aedfe8afd992377cec03829270a7c741a1d1467) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicBoundaryDataImporter.cs (.../HydraulicBoundaryDataImporter.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -94,9 +94,9 @@ } ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = readHydraulicLocationConfigurationDatabaseResult.Items.Single(); - IEnumerable hydraulicLocationConfigurationDatabaseSettings = - readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings; - if (hydraulicLocationConfigurationDatabaseSettings != null && hydraulicLocationConfigurationDatabaseSettings.Count() != 1) + IEnumerable readHydraulicLocationConfigurationSettings = + readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings; + if (readHydraulicLocationConfigurationSettings != null && readHydraulicLocationConfigurationSettings.Count() != 1) { Log.Error(BuildErrorMessage(hlcdFilePath, Resources.HydraulicBoundaryDataImporter_Hlcd_Invalid_number_of_ScenarioInformation_entries)); return false; Index: Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs =================================================================== diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs (.../HydraulicLocationConfigurationDatabaseImporter.cs) (revision ecbba2f636e82f8d94ee7deea09730e39190d2bb) +++ Riskeer/Integration/src/Riskeer.Integration.IO/Importers/HydraulicLocationConfigurationDatabaseImporter.cs (.../HydraulicLocationConfigurationDatabaseImporter.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -100,8 +100,8 @@ } ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase = readHydraulicLocationConfigurationDatabaseResult.Items.Single(); - if (readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings != null - && readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings.Count() != 1) + if (readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings != null + && readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings.Count() != 1) { Log.Error(BuildErrorMessage(FilePath, Resources.HydraulicLocationConfigurationDatabaseImporter_Invalid_number_of_ScenarioInformation_entries)); return false; @@ -124,8 +124,8 @@ return false; } - SetReadHydraulicLocationConfigurationDatabaseToDataModel( - readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings?.Single(), + SetReadHydraulicLocationConfigurationSettingsToDataModel( + readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings?.Single(), usePreprocessorClosure); return true; @@ -176,11 +176,11 @@ } } - private void SetReadHydraulicLocationConfigurationDatabaseToDataModel(ReadHydraulicLocationConfigurationDatabaseSettings readHydraulicLocationConfigurationDatabaseSettings, + private void SetReadHydraulicLocationConfigurationSettingsToDataModel(ReadHydraulicLocationConfigurationSettings readHydraulicLocationConfigurationSettings, bool usePrepocessorClosure) { NotifyProgress(RiskeerCommonIOResources.Importer_ProgressText_Adding_imported_data_to_AssessmentSection, 2, numberOfSteps); - changedObservables.AddRange(updateHandler.Update(hydraulicBoundaryData, readHydraulicLocationConfigurationDatabaseSettings, usePrepocessorClosure, FilePath)); + changedObservables.AddRange(updateHandler.Update(hydraulicBoundaryData, readHydraulicLocationConfigurationSettings, usePrepocessorClosure, FilePath)); } private ReadResult HandleCriticalFileReadError(Exception e) Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs =================================================================== diff -u -r3ac558c812599cebeeeda70c2be7e6fbd51e814b -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs (.../HydraulicBoundaryDataUpdateHandler.cs) (revision 3ac558c812599cebeeeda70c2be7e6fbd51e814b) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicBoundaryDataUpdateHandler.cs (.../HydraulicBoundaryDataUpdateHandler.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -163,7 +163,7 @@ HydraulicLocationConfigurationDatabaseUpdateHelper.UpdateHydraulicLocationConfigurationDatabase( hydraulicBoundaryData.HydraulicLocationConfigurationDatabase, - readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings?.Single(), + readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings?.Single(), readHydraulicLocationConfigurationDatabase.ReadTracks.First(rt => rt.TrackId == readHydraulicBoundaryDatabase.TrackId).UsePreprocessorClosure, hlcdFilePath); @@ -180,8 +180,8 @@ private static bool IsValidReadHydraulicLocationConfigurationDatabase(ReadHydraulicLocationConfigurationDatabase readHydraulicLocationConfigurationDatabase) { - return readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings == null - || readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings.Count() == 1; + return readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings == null + || readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings.Count() == 1; } private IEnumerable GetLocationsAndCalculationsObservables(HydraulicBoundaryData hydraulicBoundaryData) Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs =================================================================== diff -u -r3ac558c812599cebeeeda70c2be7e6fbd51e814b -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandler.cs) (revision 3ac558c812599cebeeeda70c2be7e6fbd51e814b) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandler.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandler.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -72,7 +72,7 @@ } public IEnumerable Update(HydraulicBoundaryData hydraulicBoundaryData, - ReadHydraulicLocationConfigurationDatabaseSettings readHydraulicLocationConfigurationDatabaseSettings, + ReadHydraulicLocationConfigurationSettings readHydraulicLocationConfigurationSettings, bool usePreprocessorClosure, string hlcdFilePath) { @@ -88,7 +88,7 @@ HydraulicLocationConfigurationDatabaseUpdateHelper.UpdateHydraulicLocationConfigurationDatabase( hydraulicBoundaryData.HydraulicLocationConfigurationDatabase, - readHydraulicLocationConfigurationDatabaseSettings, usePreprocessorClosure, hlcdFilePath); + readHydraulicLocationConfigurationSettings, usePreprocessorClosure, hlcdFilePath); var changedObjects = new List { Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/Helpers/HydraulicLocationConfigurationDatabaseUpdateHelper.cs =================================================================== diff -u -r3ac558c812599cebeeeda70c2be7e6fbd51e814b -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/Helpers/HydraulicLocationConfigurationDatabaseUpdateHelper.cs (.../HydraulicLocationConfigurationDatabaseUpdateHelper.cs) (revision 3ac558c812599cebeeeda70c2be7e6fbd51e814b) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/Helpers/HydraulicLocationConfigurationDatabaseUpdateHelper.cs (.../HydraulicLocationConfigurationDatabaseUpdateHelper.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -38,15 +38,15 @@ /// Updates the hydraulic location configuration database. /// /// The hydraulic location configuration database to update. - /// The read hydraulic location configuration database. + /// The read hydraulic location configuration settings. /// Indicator whether to use the preprocessor closure. /// The file path of the hydraulic location configuration database. /// Thrown when or /// is null. public static void UpdateHydraulicLocationConfigurationDatabase(HydraulicLocationConfigurationDatabase hydraulicLocationConfigurationDatabase, - ReadHydraulicLocationConfigurationDatabaseSettings readHydraulicLocationConfigurationDatabase, - bool usePreprocessorClosure, - string hlcdFilePath) + ReadHydraulicLocationConfigurationSettings readHydraulicLocationConfigurationSettings, + bool usePreprocessorClosure, + string hlcdFilePath) { if (hydraulicLocationConfigurationDatabase == null) { @@ -58,18 +58,18 @@ throw new ArgumentNullException(nameof(hlcdFilePath)); } - if (readHydraulicLocationConfigurationDatabase != null) + if (readHydraulicLocationConfigurationSettings != null) { hydraulicLocationConfigurationDatabase.FilePath = hlcdFilePath; - hydraulicLocationConfigurationDatabase.ScenarioName = readHydraulicLocationConfigurationDatabase.ScenarioName; - hydraulicLocationConfigurationDatabase.Year = readHydraulicLocationConfigurationDatabase.Year; - hydraulicLocationConfigurationDatabase.Scope = readHydraulicLocationConfigurationDatabase.Scope; - hydraulicLocationConfigurationDatabase.SeaLevel = readHydraulicLocationConfigurationDatabase.SeaLevel; - hydraulicLocationConfigurationDatabase.RiverDischarge = readHydraulicLocationConfigurationDatabase.RiverDischarge; - hydraulicLocationConfigurationDatabase.LakeLevel = readHydraulicLocationConfigurationDatabase.LakeLevel; - hydraulicLocationConfigurationDatabase.WindDirection = readHydraulicLocationConfigurationDatabase.WindDirection; - hydraulicLocationConfigurationDatabase.WindSpeed = readHydraulicLocationConfigurationDatabase.WindSpeed; - hydraulicLocationConfigurationDatabase.Comment = readHydraulicLocationConfigurationDatabase.Comment; + hydraulicLocationConfigurationDatabase.ScenarioName = readHydraulicLocationConfigurationSettings.ScenarioName; + hydraulicLocationConfigurationDatabase.Year = readHydraulicLocationConfigurationSettings.Year; + hydraulicLocationConfigurationDatabase.Scope = readHydraulicLocationConfigurationSettings.Scope; + hydraulicLocationConfigurationDatabase.SeaLevel = readHydraulicLocationConfigurationSettings.SeaLevel; + hydraulicLocationConfigurationDatabase.RiverDischarge = readHydraulicLocationConfigurationSettings.RiverDischarge; + hydraulicLocationConfigurationDatabase.LakeLevel = readHydraulicLocationConfigurationSettings.LakeLevel; + hydraulicLocationConfigurationDatabase.WindDirection = readHydraulicLocationConfigurationSettings.WindDirection; + hydraulicLocationConfigurationDatabase.WindSpeed = readHydraulicLocationConfigurationSettings.WindSpeed; + hydraulicLocationConfigurationDatabase.Comment = readHydraulicLocationConfigurationSettings.Comment; hydraulicLocationConfigurationDatabase.UsePreprocessorClosure = usePreprocessorClosure; } else Index: Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs =================================================================== diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision ecbba2f636e82f8d94ee7deea09730e39190d2bb) +++ Riskeer/Integration/src/Riskeer.Integration.Plugin/RiskeerPlugin.cs (.../RiskeerPlugin.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -2483,7 +2483,7 @@ } } }); - + builder.AddImportItem(RiskeerFormsResources.HydraulicBoundaryData_Connect_To_Different_Hlcd, RiskeerFormsResources.HydraulicBoundaryData_Connect_To_Different_Hlcd_ToolTip, RiskeerCommonFormsResources.DatabaseIcon) @@ -2509,7 +2509,7 @@ .AddPropertiesItem() .Build(); } - + private string GetNewFolderPath(string filePath, string newFolderPath) { return Path.Combine(newFolderPath, Path.GetFileName(filePath)); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDataImporterTest.cs =================================================================== diff -u -r076e51876183b4791531d87e93248f29d3fd9365 -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDataImporterTest.cs (.../HydraulicBoundaryDataImporterTest.cs) (revision 076e51876183b4791531d87e93248f29d3fd9365) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicBoundaryDataImporterTest.cs (.../HydraulicBoundaryDataImporterTest.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -396,12 +396,12 @@ .WhenCalled(invocation => { var readHydraulicBoundaryDatabase = (ReadHydraulicBoundaryDatabase) invocation.Arguments[1]; - + AssertReadHydraulicBoundaryDatabase(readHydraulicBoundaryDatabase); var readHydraulicLocationConfigurationDatabase = (ReadHydraulicLocationConfigurationDatabase) invocation.Arguments[2]; Assert.AreEqual(43376, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations.Count()); - Assert.IsNull(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings); + Assert.IsNull(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings); Assert.AreEqual(usePreprocessorClosure, readHydraulicLocationConfigurationDatabase.ReadTracks.First(rt => rt.TrackId == readHydraulicBoundaryDatabase.TrackId).UsePreprocessorClosure); var excludedLocationIds = (IEnumerable) invocation.Arguments[3]; @@ -448,7 +448,7 @@ var readHydraulicLocationConfigurationDatabase = (ReadHydraulicLocationConfigurationDatabase) invocation.Arguments[2]; Assert.AreEqual(43376, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocations.Count()); - Assert.AreEqual(1, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings.Count()); + Assert.AreEqual(1, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings.Count()); var excludedLocationIds = (IEnumerable) invocation.Arguments[3]; Assert.AreEqual(0, excludedLocationIds.Count()); Index: Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs =================================================================== diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs (.../HydraulicLocationConfigurationDatabaseImporterTest.cs) (revision ecbba2f636e82f8d94ee7deea09730e39190d2bb) +++ Riskeer/Integration/test/Riskeer.Integration.IO.Test/Importers/HydraulicLocationConfigurationDatabaseImporterTest.cs (.../HydraulicLocationConfigurationDatabaseImporterTest.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -397,7 +397,7 @@ var handler = mocks.StrictMock(); handler.Expect(h => h.InquireConfirmation()).Return(true); handler.Expect(h => h.Update(Arg.Is.Same(hydraulicBoundaryData), - Arg.Is.Null, + Arg.Is.Null, Arg.Is.Equal(usePreprocessorClosure), Arg.Is.Equal(filePath))) .Return(Enumerable.Empty()); @@ -430,7 +430,7 @@ var handler = mocks.StrictMock(); handler.Expect(h => h.InquireConfirmation()).Return(true); handler.Expect(h => h.Update(Arg.Is.Same(hydraulicBoundaryData), - Arg.Is.NotNull, + Arg.Is.NotNull, Arg.Is.Equal(false), Arg.Is.Equal(filePath))) .Return(Enumerable.Empty()); @@ -464,7 +464,7 @@ var handler = mocks.StrictMock(); handler.Expect(h => h.InquireConfirmation()).Return(true); handler.Expect(h => h.Update(Arg.Is.NotNull, - Arg.Is.Null, + Arg.Is.Null, Arg.Is.Equal(false), Arg.Is.NotNull)) .Return(new[] Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs =================================================================== diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs (.../HydraulicBoundaryDataUpdateHandlerTest.cs) (revision ecbba2f636e82f8d94ee7deea09730e39190d2bb) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicBoundaryDataUpdateHandlerTest.cs (.../HydraulicBoundaryDataUpdateHandlerTest.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -704,8 +704,8 @@ ReadHydraulicLocationConfigurationDatabaseTestFactory.CreateWithConfigurationSettings(readHydraulicBoundaryDatabase.TrackId); // Precondition - Assert.IsNotNull(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings); - Assert.AreEqual(1, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings.Count()); + Assert.IsNotNull(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings); + Assert.AreEqual(1, readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings.Count()); // Call void Call() @@ -722,19 +722,18 @@ TestHelper.AssertLogMessagesCount(Call, 0); HydraulicLocationConfigurationDatabase actualDatabase = hydraulicBoundaryData.HydraulicLocationConfigurationDatabase; - ReadHydraulicLocationConfigurationDatabaseSettings readDatabase = readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings - .Single(); + ReadHydraulicLocationConfigurationSettings readSettings = readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings.Single(); Assert.AreEqual(hlcdFilePath, actualDatabase.FilePath); - Assert.AreEqual(readDatabase.ScenarioName, actualDatabase.ScenarioName); - Assert.AreEqual(readDatabase.Year, actualDatabase.Year); - Assert.AreEqual(readDatabase.Scope, actualDatabase.Scope); - Assert.AreEqual(readDatabase.SeaLevel, actualDatabase.SeaLevel); - Assert.AreEqual(readDatabase.RiverDischarge, actualDatabase.RiverDischarge); - Assert.AreEqual(readDatabase.LakeLevel, actualDatabase.LakeLevel); - Assert.AreEqual(readDatabase.WindDirection, actualDatabase.WindDirection); - Assert.AreEqual(readDatabase.WindSpeed, actualDatabase.WindSpeed); - Assert.AreEqual(readDatabase.Comment, actualDatabase.Comment); + Assert.AreEqual(readSettings.ScenarioName, actualDatabase.ScenarioName); + Assert.AreEqual(readSettings.Year, actualDatabase.Year); + Assert.AreEqual(readSettings.Scope, actualDatabase.Scope); + Assert.AreEqual(readSettings.SeaLevel, actualDatabase.SeaLevel); + Assert.AreEqual(readSettings.RiverDischarge, actualDatabase.RiverDischarge); + Assert.AreEqual(readSettings.LakeLevel, actualDatabase.LakeLevel); + Assert.AreEqual(readSettings.WindDirection, actualDatabase.WindDirection); + Assert.AreEqual(readSettings.WindSpeed, actualDatabase.WindSpeed); + Assert.AreEqual(readSettings.Comment, actualDatabase.Comment); Assert.AreEqual(readHydraulicLocationConfigurationDatabase.ReadTracks.First().UsePreprocessorClosure, actualDatabase.UsePreprocessorClosure); } @@ -758,7 +757,7 @@ ReadHydraulicLocationConfigurationDatabaseTestFactory.Create(readHydraulicBoundaryDatabase.TrackId); // Precondition - Assert.IsNull(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings); + Assert.IsNull(readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationSettings); // Call void Call() @@ -1038,13 +1037,13 @@ private static IEnumerable GetInvalidReadHydraulicBoundaryDatabaseConfigurations() { yield return new TestCaseData(ReadHydraulicLocationConfigurationDatabaseTestFactory.CreateWithConfigurationSettings( - Enumerable.Empty(), 1)) + Enumerable.Empty(), 1)) .SetName("ReadHydraulicLocationConfigurationDatabaseSettingsEmpty"); yield return new TestCaseData(ReadHydraulicLocationConfigurationDatabaseTestFactory.CreateWithConfigurationSettings( new[] { - ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(), - ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create() + ReadHydraulicLocationConfigurationSettingsTestFactory.Create(), + ReadHydraulicLocationConfigurationSettingsTestFactory.Create() }, 1)) .SetName("ReadHydraulicLocationConfigurationDatabaseSettingsMultipleItems"); } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs =================================================================== diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision ecbba2f636e82f8d94ee7deea09730e39190d2bb) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Handlers/HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHandlerTest.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -125,7 +125,7 @@ var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithHydraulicBoundaryDatabases()); // Call - void Call() => handler.Update(null, ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(), false, ""); + void Call() => handler.Update(null, ReadHydraulicLocationConfigurationSettingsTestFactory.Create(), false, ""); // Assert var exception = Assert.Throws(Call); @@ -139,7 +139,7 @@ var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithHydraulicBoundaryDatabases()); // Call - void Call() => handler.Update(new HydraulicBoundaryData(), ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(), false, null); + void Call() => handler.Update(new HydraulicBoundaryData(), ReadHydraulicLocationConfigurationSettingsTestFactory.Create(), false, null); // Assert var exception = Assert.Throws(Call); @@ -184,7 +184,7 @@ const string hlcdFilePath = "some/file/path"; var handler = new HydraulicLocationConfigurationDatabaseUpdateHandler(CreateAssessmentSectionWithHydraulicBoundaryDatabases()); var hydraulicBoundaryData = new HydraulicBoundaryData(); - ReadHydraulicLocationConfigurationDatabaseSettings readSettings = ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(); + ReadHydraulicLocationConfigurationSettings readSettings = ReadHydraulicLocationConfigurationSettingsTestFactory.Create(); bool usePreprocessorClosure = new Random(21).NextBoolean(); // Call Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationDatabaseUpdateHelperTest.cs =================================================================== diff -u -r3ac558c812599cebeeeda70c2be7e6fbd51e814b -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationDatabaseUpdateHelperTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHelperTest.cs) (revision 3ac558c812599cebeeeda70c2be7e6fbd51e814b) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/Helpers/HydraulicLocationConfigurationDatabaseUpdateHelperTest.cs (.../HydraulicLocationConfigurationDatabaseUpdateHelperTest.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -37,7 +37,7 @@ { // Call TestDelegate call = () => HydraulicLocationConfigurationDatabaseUpdateHelper.UpdateHydraulicLocationConfigurationDatabase( - null, ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(), false, ""); + null, ReadHydraulicLocationConfigurationSettingsTestFactory.Create(), false, ""); // Assert var exception = Assert.Throws(call); @@ -49,7 +49,7 @@ { // Call TestDelegate call = () => HydraulicLocationConfigurationDatabaseUpdateHelper.UpdateHydraulicLocationConfigurationDatabase( - new HydraulicLocationConfigurationDatabase(), ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(), false, null); + new HydraulicLocationConfigurationDatabase(), ReadHydraulicLocationConfigurationSettingsTestFactory.Create(), false, null); // Assert var exception = Assert.Throws(call); @@ -92,26 +92,26 @@ // Setup const string filePath = "some/file/path"; var hydraulicLocationConfigurationDatabase = new HydraulicLocationConfigurationDatabase(); - ReadHydraulicLocationConfigurationDatabaseSettings readDatabase = ReadHydraulicLocationConfigurationDatabaseSettingsTestFactory.Create(); + ReadHydraulicLocationConfigurationSettings readSettings = ReadHydraulicLocationConfigurationSettingsTestFactory.Create(); bool usePreprocessorClosure = new Random(21).NextBoolean(); // Call Action call = () => HydraulicLocationConfigurationDatabaseUpdateHelper.UpdateHydraulicLocationConfigurationDatabase( - hydraulicLocationConfigurationDatabase, readDatabase, usePreprocessorClosure, filePath); + hydraulicLocationConfigurationDatabase, readSettings, usePreprocessorClosure, filePath); // Assert TestHelper.AssertLogMessagesCount(call, 0); Assert.AreEqual(filePath, hydraulicLocationConfigurationDatabase.FilePath); - Assert.AreEqual(readDatabase.ScenarioName, hydraulicLocationConfigurationDatabase.ScenarioName); - Assert.AreEqual(readDatabase.Year, hydraulicLocationConfigurationDatabase.Year); - Assert.AreEqual(readDatabase.Scope, hydraulicLocationConfigurationDatabase.Scope); - Assert.AreEqual(readDatabase.SeaLevel, hydraulicLocationConfigurationDatabase.SeaLevel); - Assert.AreEqual(readDatabase.RiverDischarge, hydraulicLocationConfigurationDatabase.RiverDischarge); - Assert.AreEqual(readDatabase.LakeLevel, hydraulicLocationConfigurationDatabase.LakeLevel); - Assert.AreEqual(readDatabase.WindDirection, hydraulicLocationConfigurationDatabase.WindDirection); - Assert.AreEqual(readDatabase.WindSpeed, hydraulicLocationConfigurationDatabase.WindSpeed); - Assert.AreEqual(readDatabase.Comment, hydraulicLocationConfigurationDatabase.Comment); + Assert.AreEqual(readSettings.ScenarioName, hydraulicLocationConfigurationDatabase.ScenarioName); + Assert.AreEqual(readSettings.Year, hydraulicLocationConfigurationDatabase.Year); + Assert.AreEqual(readSettings.Scope, hydraulicLocationConfigurationDatabase.Scope); + Assert.AreEqual(readSettings.SeaLevel, hydraulicLocationConfigurationDatabase.SeaLevel); + Assert.AreEqual(readSettings.RiverDischarge, hydraulicLocationConfigurationDatabase.RiverDischarge); + Assert.AreEqual(readSettings.LakeLevel, hydraulicLocationConfigurationDatabase.LakeLevel); + Assert.AreEqual(readSettings.WindDirection, hydraulicLocationConfigurationDatabase.WindDirection); + Assert.AreEqual(readSettings.WindSpeed, hydraulicLocationConfigurationDatabase.WindSpeed); + Assert.AreEqual(readSettings.Comment, hydraulicLocationConfigurationDatabase.Comment); Assert.AreEqual(usePreprocessorClosure, hydraulicLocationConfigurationDatabase.UsePreprocessorClosure); } } Index: Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs =================================================================== diff -u -recbba2f636e82f8d94ee7deea09730e39190d2bb -r2a8d8bea2ffbf74c5e223e3676e02358384a8891 --- Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision ecbba2f636e82f8d94ee7deea09730e39190d2bb) +++ Riskeer/Integration/test/Riskeer.Integration.Plugin.Test/TreeNodeInfos/WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs (.../WaterLevelCalculationsForUserDefinedTargetProbabilityContextTreeNodeInfoTest.cs) (revision 2a8d8bea2ffbf74c5e223e3676e02358384a8891) @@ -484,7 +484,7 @@ } }; assessmentSection.WaterLevelCalculationsForUserDefinedTargetProbabilities.Add(calculations); - + var nodeData = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(calculations, assessmentSection); using (var treeViewControl = new TreeViewControl()) @@ -653,7 +653,7 @@ calculations } }; - + var context = new WaterLevelCalculationsForUserDefinedTargetProbabilityContext(calculations, assessmentSection); using (var treeViewControl = new TreeViewControl())