Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs =================================================================== diff -u -r72ef8cf380c5528ec1d61dc62b8ea61e8920a361 -rb3943c8c4ff02633186b9352f90729dd716062f7 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision 72ef8cf380c5528ec1d61dc62b8ea61e8920a361) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision b3943c8c4ff02633186b9352f90729dd716062f7) @@ -65,10 +65,10 @@ public ReadHydraulicLocationConfigurationDatabase Read(long trackId) { bool isScenarioInformationPresent = IsScenarioInformationTablePresent(); - IEnumerable configurationSettings = + IEnumerable configurationSettings = isScenarioInformationPresent ? GetConfigurationSettings() - : Enumerable.Empty(); + : Enumerable.Empty(); return new ReadHydraulicLocationConfigurationDatabase(GetLocationIdsByTrackId(trackId), isScenarioInformationPresent, @@ -150,7 +150,7 @@ /// Thrown when the database query failed. /// Thrown when the database returned incorrect values for /// required properties. - private IEnumerable GetConfigurationSettings() + private IEnumerable GetConfigurationSettings() { try { @@ -206,10 +206,10 @@ /// Thrown when the database query failed. /// Thrown when the database returned incorrect values for /// required properties. - private IEnumerable GetConfigurationSettingsFromDatabase() + private IEnumerable GetConfigurationSettingsFromDatabase() { string query = HydraulicLocationConfigurationDatabaseQueryBuilder.GetScenarioInformationQuery(); - var readSettings = new List(); + var readSettings = new List(); using (IDataReader dataReader = CreateDataReader(query)) { while (MoveNext(dataReader)) @@ -225,10 +225,10 @@ /// Reads the hydraulic location configuration setting from the database. /// /// The which is used to read the data. - /// The read . + /// The read . /// Thrown when the database returned incorrect values for /// required properties. - private ReadHydraulicLocationConfigurationDatabaseSettings ReadSetting(IDataReader reader) + private ReadHydraulicLocationConfigurationDatabaseSetting ReadSetting(IDataReader reader) { try { @@ -242,9 +242,9 @@ var windSpeed = reader.Read(ScenarioInformationTableDefinitions.WindSpeed); var comment = reader.Read(ScenarioInformationTableDefinitions.Comment); - return new ReadHydraulicLocationConfigurationDatabaseSettings(scenarioName, year, scope, - seaLevel, riverDischarge, lakeLevel, - windDirection, windSpeed, comment); + return new ReadHydraulicLocationConfigurationDatabaseSetting(scenarioName, year, scope, + seaLevel, riverDischarge, lakeLevel, + windDirection, windSpeed, comment); } catch (ConversionException e) { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabase.cs =================================================================== diff -u -r8e4f3d24c6dc2bb0536a5585358732bb74b7f9bf -rb3943c8c4ff02633186b9352f90729dd716062f7 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabase.cs (.../ReadHydraulicLocationConfigurationDatabase.cs) (revision 8e4f3d24c6dc2bb0536a5585358732bb74b7f9bf) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabase.cs (.../ReadHydraulicLocationConfigurationDatabase.cs) (revision b3943c8c4ff02633186b9352f90729dd716062f7) @@ -41,7 +41,7 @@ /// ic null. internal ReadHydraulicLocationConfigurationDatabase(IEnumerable locationIdMappings, bool isScenarioInformationPresent, - IEnumerable readHydraulicLocationConfigurationDatabaseSettings) + IEnumerable readHydraulicLocationConfigurationDatabaseSettings) { LocationIdMappings = locationIdMappings; IsScenarioInformationPresent = isScenarioInformationPresent; @@ -61,6 +61,6 @@ /// /// Gets the settings of the read hydraulic location configuration database. /// - public IEnumerable ReadHydraulicLocationConfigurationDatabaseSettings { get; } + public IEnumerable ReadHydraulicLocationConfigurationDatabaseSettings { get; } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseSetting.cs =================================================================== diff -u --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseSetting.cs (revision 0) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseSetting.cs (revision b3943c8c4ff02633186b9352f90729dd716062f7) @@ -0,0 +1,102 @@ +// Copyright (C) Stichting Deltares 2018. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets 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 Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase +{ + /// + /// Class for holding a configuration setting that are read from a hydraulic location + /// configuration database file. + /// + public class ReadHydraulicLocationConfigurationDatabaseSetting + { + /// + /// 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 ReadHydraulicLocationConfigurationDatabaseSetting(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 Fisheye: Tag b3943c8c4ff02633186b9352f90729dd716062f7 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseSettings.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj =================================================================== diff -u -r72ef8cf380c5528ec1d61dc62b8ea61e8920a361 -rb3943c8c4ff02633186b9352f90729dd716062f7 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj (.../Ringtoets.HydraRing.IO.csproj) (revision 72ef8cf380c5528ec1d61dc62b8ea61e8920a361) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj (.../Ringtoets.HydraRing.IO.csproj) (revision b3943c8c4ff02633186b9352f90729dd716062f7) @@ -30,7 +30,7 @@ - + Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs =================================================================== diff -u -r72ef8cf380c5528ec1d61dc62b8ea61e8920a361 -rb3943c8c4ff02633186b9352f90729dd716062f7 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision 72ef8cf380c5528ec1d61dc62b8ea61e8920a361) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision b3943c8c4ff02633186b9352f90729dd716062f7) @@ -113,7 +113,7 @@ .SingleOrDefault(); Assert.AreEqual(expectedLocationId, actualLocationId); Assert.IsTrue(readHydraulicLocationConfigurationDatabase.IsScenarioInformationPresent); - IEnumerable readHydraulicLocationConfigurationDatabaseSettings = + IEnumerable readHydraulicLocationConfigurationDatabaseSettings = readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings; Assert.AreEqual(2, readHydraulicLocationConfigurationDatabaseSettings.Count()); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseSettingTest.cs =================================================================== diff -u --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseSettingTest.cs (revision 0) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseSettingTest.cs (revision b3943c8c4ff02633186b9352f90729dd716062f7) @@ -0,0 +1,86 @@ +// Copyright (C) Stichting Deltares 2018. All rights reserved. +// +// This file is part of Ringtoets. +// +// Ringtoets 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 Ringtoets.HydraRing.IO.HydraulicLocationConfigurationDatabase; + +namespace Ringtoets.HydraRing.IO.Test.HydraulicLocationConfigurationDatabase +{ + [TestFixture] + public class ReadHydraulicLocationConfigurationDatabaseSettingTest + { + [Test] + public void Constructor_WithArgumentsNull_ExpectedValues() + { + // Setup + var random = new Random(21); + int year = random.Next(); + + // Call + var settings = new ReadHydraulicLocationConfigurationDatabaseSetting(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 ReadHydraulicLocationConfigurationDatabaseSetting(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 b3943c8c4ff02633186b9352f90729dd716062f7 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseSettingsTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseTest.cs =================================================================== diff -u -r8e4f3d24c6dc2bb0536a5585358732bb74b7f9bf -rb3943c8c4ff02633186b9352f90729dd716062f7 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseTest.cs (.../ReadHydraulicLocationConfigurationDatabaseTest.cs) (revision 8e4f3d24c6dc2bb0536a5585358732bb74b7f9bf) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseTest.cs (.../ReadHydraulicLocationConfigurationDatabaseTest.cs) (revision b3943c8c4ff02633186b9352f90729dd716062f7) @@ -37,7 +37,7 @@ var random = new Random(21); bool isScenarioInformationPresent = random.NextBoolean(); IEnumerable locationIdMappings = Enumerable.Empty(); - IEnumerable databaseSettings = Enumerable.Empty(); + IEnumerable databaseSettings = Enumerable.Empty(); // Call var readDatabase = new ReadHydraulicLocationConfigurationDatabase(locationIdMappings, isScenarioInformationPresent, databaseSettings); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj =================================================================== diff -u -r72ef8cf380c5528ec1d61dc62b8ea61e8920a361 -rb3943c8c4ff02633186b9352f90729dd716062f7 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj (.../Ringtoets.HydraRing.IO.Test.csproj) (revision 72ef8cf380c5528ec1d61dc62b8ea61e8920a361) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj (.../Ringtoets.HydraRing.IO.Test.csproj) (revision b3943c8c4ff02633186b9352f90729dd716062f7) @@ -29,7 +29,7 @@ - +