Index: Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs =================================================================== diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r381edf2be213935a72a7a1712b23664ff9339a4a --- Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs (.../HydraulicBoundaryDatabaseReader.cs) (revision 2e55afd890468db1b25c734216956ab5c2126e58) +++ Riskeer/HydraRing/src/Riskeer.HydraRing.IO/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReader.cs (.../HydraulicBoundaryDatabaseReader.cs) (revision 381edf2be213935a72a7a1712b23664ff9339a4a) @@ -110,7 +110,6 @@ { using (IDataReader reader = CreateDataReader(HydraulicBoundaryDatabaseQueryBuilder.GetVersionQuery(), null)) { - if (reader.Read()) { string version = Convert.ToString(reader[GeneralTableDefinitions.GeneratedVersion]); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs =================================================================== diff -u -rca70cc2f84e2f3ef65e7356dfe391b5a05951061 -r381edf2be213935a72a7a1712b23664ff9339a4a --- Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs (.../LastErrorFileParserTest.cs) (revision ca70cc2f84e2f3ef65e7356dfe391b5a05951061) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs (.../LastErrorFileParserTest.cs) (revision 381edf2be213935a72a7a1712b23664ff9339a4a) @@ -24,7 +24,6 @@ using System.Security.AccessControl; using Core.Common.TestUtil; using NUnit.Framework; -using Riskeer.HydraRing.Calculation; using Riskeer.HydraRing.Calculation.Exceptions; using Riskeer.HydraRing.Calculation.Parsers; Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReaderTest.cs =================================================================== diff -u -rca70cc2f84e2f3ef65e7356dfe391b5a05951061 -r381edf2be213935a72a7a1712b23664ff9339a4a --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReaderTest.cs (.../HydraulicBoundaryDatabaseReaderTest.cs) (revision ca70cc2f84e2f3ef65e7356dfe391b5a05951061) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicBoundaryDatabase/HydraulicBoundaryDatabaseReaderTest.cs (.../HydraulicBoundaryDatabaseReaderTest.cs) (revision 381edf2be213935a72a7a1712b23664ff9339a4a) @@ -303,7 +303,7 @@ using (var reader = new HydraulicBoundaryDatabaseReader(hydraulicBoundaryDatabaseFile)) { // Call - string version= reader.ReadVersion(); + string version = reader.ReadVersion(); // Assert Assert.AreEqual("Dutch coast South19-11-2015 12:0013", version); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs =================================================================== diff -u -rca70cc2f84e2f3ef65e7356dfe391b5a05951061 -r381edf2be213935a72a7a1712b23664ff9339a4a --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision ca70cc2f84e2f3ef65e7356dfe391b5a05951061) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/HydraulicLocationConfigurationDatabaseReaderTest.cs (.../HydraulicLocationConfigurationDatabaseReaderTest.cs) (revision 381edf2be213935a72a7a1712b23664ff9339a4a) @@ -111,7 +111,7 @@ .Select(m => m.HlcdLocationId) .SingleOrDefault(); Assert.AreEqual(expectedLocationId, actualLocationId); - IEnumerable readHydraulicLocationConfigurationDatabaseSettings = + IEnumerable readHydraulicLocationConfigurationDatabaseSettings = readHydraulicLocationConfigurationDatabase.ReadHydraulicLocationConfigurationDatabaseSettings; Assert.AreEqual(2, readHydraulicLocationConfigurationDatabaseSettings.Count()); Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ScenarioInformationTableDefinitionsTest.cs =================================================================== diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r381edf2be213935a72a7a1712b23664ff9339a4a --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ScenarioInformationTableDefinitionsTest.cs (.../ScenarioInformationTableDefinitionsTest.cs) (revision 2e55afd890468db1b25c734216956ab5c2126e58) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.Test/HydraulicLocationConfigurationDatabase/ScenarioInformationTableDefinitionsTest.cs (.../ScenarioInformationTableDefinitionsTest.cs) (revision 381edf2be213935a72a7a1712b23664ff9339a4a) @@ -30,17 +30,17 @@ [Test] public void Constants_Always_ExpectedValues() { - Assert.AreEqual("ScenarioName", ScenarioInformationTableDefinitions.ScenarioName); - Assert.AreEqual("Year", ScenarioInformationTableDefinitions.Year); - Assert.AreEqual("Scope", ScenarioInformationTableDefinitions.Scope); - Assert.AreEqual("SeaLevel", ScenarioInformationTableDefinitions.SeaLevel); - Assert.AreEqual("RiverDischarge", ScenarioInformationTableDefinitions.RiverDischarge); - Assert.AreEqual("LakeLevel", ScenarioInformationTableDefinitions.LakeLevel); - Assert.AreEqual("WindDirection", ScenarioInformationTableDefinitions.WindDirection); - Assert.AreEqual("WindSpeed", ScenarioInformationTableDefinitions.WindSpeed); - Assert.AreEqual("Comment", ScenarioInformationTableDefinitions.Comment); - Assert.AreEqual("IsScenarioInformationPresent", ScenarioInformationTableDefinitions.IsScenarioInformationPresent); - Assert.AreEqual("ScenarioInformation", ScenarioInformationTableDefinitions.TableName); + Assert.AreEqual("ScenarioName", ScenarioInformationTableDefinitions.ScenarioName); + Assert.AreEqual("Year", ScenarioInformationTableDefinitions.Year); + Assert.AreEqual("Scope", ScenarioInformationTableDefinitions.Scope); + Assert.AreEqual("SeaLevel", ScenarioInformationTableDefinitions.SeaLevel); + Assert.AreEqual("RiverDischarge", ScenarioInformationTableDefinitions.RiverDischarge); + Assert.AreEqual("LakeLevel", ScenarioInformationTableDefinitions.LakeLevel); + Assert.AreEqual("WindDirection", ScenarioInformationTableDefinitions.WindDirection); + Assert.AreEqual("WindSpeed", ScenarioInformationTableDefinitions.WindSpeed); + Assert.AreEqual("Comment", ScenarioInformationTableDefinitions.Comment); + Assert.AreEqual("IsScenarioInformationPresent", ScenarioInformationTableDefinitions.IsScenarioInformationPresent); + Assert.AreEqual("ScenarioInformation", ScenarioInformationTableDefinitions.TableName); } } } \ No newline at end of file Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil.Test/ReadHydraulicBoundaryDatabaseTestFactoryTest.cs =================================================================== diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r381edf2be213935a72a7a1712b23664ff9339a4a --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil.Test/ReadHydraulicBoundaryDatabaseTestFactoryTest.cs (.../ReadHydraulicBoundaryDatabaseTestFactoryTest.cs) (revision 2e55afd890468db1b25c734216956ab5c2126e58) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil.Test/ReadHydraulicBoundaryDatabaseTestFactoryTest.cs (.../ReadHydraulicBoundaryDatabaseTestFactoryTest.cs) (revision 381edf2be213935a72a7a1712b23664ff9339a4a) @@ -44,8 +44,8 @@ for (var i = 0; i < locations.Length; i++) { - Assert.AreEqual(i+1, locations[i].Id); - Assert.AreEqual($"location{i+1}", locations[i].Name); + Assert.AreEqual(i + 1, locations[i].Id); + Assert.AreEqual($"location{i + 1}", locations[i].Name); Assert.IsFalse(double.IsNaN(locations[i].CoordinateX)); Assert.IsFalse(double.IsNaN(locations[i].CoordinateY)); } Index: Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicBoundaryDatabaseTestFactory.cs =================================================================== diff -u -r2e55afd890468db1b25c734216956ab5c2126e58 -r381edf2be213935a72a7a1712b23664ff9339a4a --- Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicBoundaryDatabaseTestFactory.cs (.../ReadHydraulicBoundaryDatabaseTestFactory.cs) (revision 2e55afd890468db1b25c734216956ab5c2126e58) +++ Riskeer/HydraRing/test/Riskeer.HydraRing.IO.TestUtil/ReadHydraulicBoundaryDatabaseTestFactory.cs (.../ReadHydraulicBoundaryDatabaseTestFactory.cs) (revision 381edf2be213935a72a7a1712b23664ff9339a4a) @@ -40,7 +40,7 @@ var random = new Random(21); return Create(new[] { - new ReadHydraulicBoundaryLocation(1, "location1", random.NextDouble(), random.NextDouble()), + new ReadHydraulicBoundaryLocation(1, "location1", random.NextDouble(), random.NextDouble()), new ReadHydraulicBoundaryLocation(2, "location2", random.NextDouble(), random.NextDouble()) }); }