Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs =================================================================== diff -u -rb3943c8c4ff02633186b9352f90729dd716062f7 -r5b67ef899e3e919a8965420127ebd20b859b11f8 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision b3943c8c4ff02633186b9352f90729dd716062f7) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReader.cs (.../HydraulicLocationConfigurationDatabaseReader.cs) (revision 5b67ef899e3e919a8965420127ebd20b859b11f8) @@ -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 ReadHydraulicLocationConfigurationDatabaseSetting ReadSetting(IDataReader reader) + private ReadHydraulicLocationConfigurationDatabaseSettings ReadSetting(IDataReader reader) { try { @@ -242,9 +242,9 @@ var windSpeed = reader.Read(ScenarioInformationTableDefinitions.WindSpeed); var comment = reader.Read(ScenarioInformationTableDefinitions.Comment); - return new ReadHydraulicLocationConfigurationDatabaseSetting(scenarioName, year, scope, - seaLevel, riverDischarge, lakeLevel, - windDirection, windSpeed, comment); + return new ReadHydraulicLocationConfigurationDatabaseSettings(scenarioName, year, scope, + seaLevel, riverDischarge, lakeLevel, + windDirection, windSpeed, comment); } catch (ConversionException e) { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabase.cs =================================================================== diff -u -rb3943c8c4ff02633186b9352f90729dd716062f7 -r5b67ef899e3e919a8965420127ebd20b859b11f8 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabase.cs (.../ReadHydraulicLocationConfigurationDatabase.cs) (revision b3943c8c4ff02633186b9352f90729dd716062f7) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabase.cs (.../ReadHydraulicLocationConfigurationDatabase.cs) (revision 5b67ef899e3e919a8965420127ebd20b859b11f8) @@ -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 Fisheye: Tag 5b67ef899e3e919a8965420127ebd20b859b11f8 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseSetting.cs'. Fisheye: No comparison available. Pass `N' to diff? 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 -rb3943c8c4ff02633186b9352f90729dd716062f7 -r5b67ef899e3e919a8965420127ebd20b859b11f8 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj (.../Ringtoets.HydraRing.IO.csproj) (revision b3943c8c4ff02633186b9352f90729dd716062f7) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj (.../Ringtoets.HydraRing.IO.csproj) (revision 5b67ef899e3e919a8965420127ebd20b859b11f8) @@ -30,7 +30,7 @@ - + Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs =================================================================== diff -u -rb3943c8c4ff02633186b9352f90729dd716062f7 -r5b67ef899e3e919a8965420127ebd20b859b11f8 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision b3943c8c4ff02633186b9352f90729dd716062f7) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision 5b67ef899e3e919a8965420127ebd20b859b11f8) @@ -113,7 +113,7 @@ .SingleOrDefault(); Assert.AreEqual(expectedLocationId, actualLocationId); Assert.IsTrue(readHydraulicLocationConfigurationDatabase.IsScenarioInformationPresent); - IEnumerable readHydraulicLocationConfigurationDatabaseSettings = + IEnumerable readHydraulicLocationConfigurationDatabaseSettings = readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings; Assert.AreEqual(2, readHydraulicLocationConfigurationDatabaseSettings.Count()); Fisheye: Tag 5b67ef899e3e919a8965420127ebd20b859b11f8 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseSettingTest.cs'. Fisheye: No comparison available. Pass `N' to diff? 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 -rb3943c8c4ff02633186b9352f90729dd716062f7 -r5b67ef899e3e919a8965420127ebd20b859b11f8 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseTest.cs (.../ReadHydraulicLocationConfigurationDatabaseTest.cs) (revision b3943c8c4ff02633186b9352f90729dd716062f7) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ReadHydraulicLocationConfigurationDatabaseTest.cs (.../ReadHydraulicLocationConfigurationDatabaseTest.cs) (revision 5b67ef899e3e919a8965420127ebd20b859b11f8) @@ -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 -rb3943c8c4ff02633186b9352f90729dd716062f7 -r5b67ef899e3e919a8965420127ebd20b859b11f8 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj (.../Ringtoets.HydraRing.IO.Test.csproj) (revision b3943c8c4ff02633186b9352f90729dd716062f7) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj (.../Ringtoets.HydraRing.IO.Test.csproj) (revision 5b67ef899e3e919a8965420127ebd20b859b11f8) @@ -29,7 +29,7 @@ - + Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs =================================================================== diff -u -rc9e7fb6fb6515a23751381d7c7ba34667d96fa76 -r5b67ef899e3e919a8965420127ebd20b859b11f8 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs (.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs) (revision c9e7fb6fb6515a23751381d7c7ba34667d96fa76) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.TestUtil/ReadHydraulicLocationConfigurationDatabaseTestFactory.cs (.../ReadHydraulicLocationConfigurationDatabaseTestFactory.cs) (revision 5b67ef899e3e919a8965420127ebd20b859b11f8) @@ -1,4 +1,4 @@ -// Copyright (C) Stichting Deltares 2018. All rights reserved. +// Copyright (C) Stichting Deltares 2018. All rights reserved. // // This file is part of Ringtoets. // @@ -54,7 +54,7 @@ return new ReadHydraulicLocationConfigurationDatabase(locationIds.Select(locationId => new ReadHydraulicLocationMapping(locationId, locationId + 100)) .ToList(), false, - Enumerable.Empty()); + Enumerable.Empty()); } /// @@ -70,14 +70,14 @@ 2 }; - var setting = new ReadHydraulicLocationConfigurationDatabaseSetting("scenarioName", 1337, "scope", "seaLevel", - "riverDischarge", "lakeLevel", "windDirection", - "windSpeed", "comment"); + var setting = new ReadHydraulicLocationConfigurationDatabaseSettings("scenarioName", 1337, "scope", "seaLevel", + "riverDischarge", "lakeLevel", "windDirection", + "windSpeed", "comment"); return new ReadHydraulicLocationConfigurationDatabase(locationIds.Select(locationId => new ReadHydraulicLocationMapping(locationId, locationId + 100)) .ToList(), true, - new [] + new[] { setting });