Index: Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs =================================================================== diff -u -r6d22f982b31fe2e9c59fef8a91a4a919b27a4537 -r4281cdbdb27daa30df7125d5bbfe2763b99329d0 --- Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs (.../HydraRingSettingsDatabaseReader.cs) (revision 6d22f982b31fe2e9c59fef8a91a4a919b27a4537) +++ Riskeer/Common/src/Riskeer.Common.IO/HydraRing/HydraRingSettingsDatabaseReader.cs (.../HydraRingSettingsDatabaseReader.cs) (revision 4281cdbdb27daa30df7125d5bbfe2763b99329d0) @@ -68,7 +68,6 @@ private readonly string designTablesSettingsForLocationAndCalculationTypeQuery; private readonly string numericsSettingsForLocationMechanismAndSubMechanismQuery; private readonly string excludedLocationsQuery; - private readonly string excludedPreprocessorLocationsQuery; private readonly string timeIntegrationSettingsForLocationAndCalculationTypeQuery; /// @@ -109,8 +108,6 @@ $"AND CalculationTypeID = {calculationTypeIdParameterName}"; excludedLocationsQuery = $"SELECT {locationIdColumn} FROM ExcludedLocations"; - - excludedPreprocessorLocationsQuery = $"SELECT {locationIdColumn} FROM ExcludedLocationsPreprocessor"; } /// @@ -247,30 +244,13 @@ } /// - /// Reads the excluded preprocessor locations (those for which no preprocessor calculation is possible) from the database. - /// - /// A of ids for all the excluded locations. - /// Thrown when a column that is being read doesn't - /// contain expected type. - public IEnumerable ReadExcludedPreprocessorLocations() - { - using (IDataReader reader = CreateExcludedPreprocessorLocationsDataReader()) - { - while (MoveNext(reader)) - { - yield return TryReadLocationIdColumn(reader); - } - } - } - - /// /// Tries to read the from the . /// /// The reader to read the column's value from. /// The id of the location that was read from the . /// Thrown when the /// column contains a value of unexpected type. - private long TryReadLocationIdColumn(IDataReader reader) + private static long TryReadLocationIdColumn(IDataReader reader) { try { @@ -360,10 +340,5 @@ { return CreateDataReader(excludedLocationsQuery); } - - private IDataReader CreateExcludedPreprocessorLocationsDataReader() - { - return CreateDataReader(excludedPreprocessorLocationsQuery); - } } } \ No newline at end of file Index: Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs =================================================================== diff -u -r6d22f982b31fe2e9c59fef8a91a4a919b27a4537 -r4281cdbdb27daa30df7125d5bbfe2763b99329d0 --- Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs (.../HydraRingSettingsDatabaseReaderTest.cs) (revision 6d22f982b31fe2e9c59fef8a91a4a919b27a4537) +++ Riskeer/Common/test/Riskeer.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs (.../HydraRingSettingsDatabaseReaderTest.cs) (revision 4281cdbdb27daa30df7125d5bbfe2763b99329d0) @@ -50,10 +50,6 @@ TestDataPath.Riskeer.Common.IO, Path.Combine(testDataSubDirectory, "7_67-invalid-value-types.config.sqlite")); - private static readonly string invalidSchemaDatabasePath = TestHelper.GetTestDataPath( - TestDataPath.Riskeer.Common.IO, - Path.Combine(testDataSubDirectory, "invalid-settings-schema.config.sqlite")); - [Test] public void Constructor_DatabaseWithValidSchema_ReturnsNewReader() { @@ -383,50 +379,5 @@ CollectionAssert.IsEmpty(locations); } } - - [Test] - public void ReadExcludedPreprocessorLocations_TableWithRows_ReturnsAllLocationIdsInTable() - { - // Setup - using (var reader = new HydraRingSettingsDatabaseReader(completeDatabasePath)) - { - // Call - IEnumerable locations = reader.ReadExcludedPreprocessorLocations(); - - // Assert - CollectionAssert.AreEqual(new[] - { - 700136 - }, locations); - } - } - - [Test] - public void ReadExcludedPreprocessorLocations_InvalidValueInReadLocation_ThrowsCriticalFileReadException() - { - // Setup - using (var reader = new HydraRingSettingsDatabaseReader(invalidDatabasePath)) - { - // Call - TestDelegate test = () => reader.ReadExcludedPreprocessorLocations().ToArray(); - - // Assert - Assert.Throws(test); - } - } - - [Test] - public void ReadExcludedPreprocessorLocations_EmptyTable_ReturnsEmptyEnumerable() - { - // Setup - using (var reader = new HydraRingSettingsDatabaseReader(emptyDatabasePath)) - { - // Call - IEnumerable locations = reader.ReadExcludedPreprocessorLocations(); - - // Assert - CollectionAssert.IsEmpty(locations); - } - } } } \ No newline at end of file