Index: Core/Common/src/Core.Common.Gui/Appenders/RingtoetsUserDataFolderConverter.cs =================================================================== diff -u -r67284323e2785c651633d9c52049ba12a9c70e6a -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Core/Common/src/Core.Common.Gui/Appenders/RingtoetsUserDataFolderConverter.cs (.../RingtoetsUserDataFolderConverter.cs) (revision 67284323e2785c651633d9c52049ba12a9c70e6a) +++ Core/Common/src/Core.Common.Gui/Appenders/RingtoetsUserDataFolderConverter.cs (.../RingtoetsUserDataFolderConverter.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -28,7 +28,7 @@ /// /// Converter that injects the application user data folder. /// - public class RingtoetsUserDataFolderConverter : PatternConverter // NOTE: Class might be marked as unused, but it's actually created in Application.Ringtoets/app.config! + public class RingtoetsUserDataFolderConverter : PatternConverter // NOTE: Class might look like it's only used in tests, but it's actually created in Application.Ringtoets/app.config! { protected override void Convert(TextWriter writer, object state) { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs =================================================================== diff -u -r19f983eab8eac43d27e39f6eb9de019bad677652 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs (.../IHydraRingCalculatorFactory.cs) (revision 19f983eab8eac43d27e39f6eb9de019bad677652) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Calculator/Factory/IHydraRingCalculatorFactory.cs (.../IHydraRingCalculatorFactory.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -93,7 +93,7 @@ /// The directory where the hydraulic database can be found. /// A new . /// Thrown when is null. - IStructuresCalculator CreateStructuresCalculator(string hlcdDirectory) + IStructuresCalculator CreateStructuresCalculator(string hlcdDirectory) where TCalculationInput : ExceedanceProbabilityCalculationInput; } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingBreakWater.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingBreakWater.cs (.../HydraRingBreakWater.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingBreakWater.cs (.../HydraRingBreakWater.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -40,11 +40,11 @@ /// /// Gets the type. /// - public int Type { get; private set; } + public int Type { get; } /// /// Gets the height. /// - public double Height { get; private set; } + public double Height { get; } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingForelandPoint.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingForelandPoint.cs (.../HydraRingForelandPoint.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/HydraRingForelandPoint.cs (.../HydraRingForelandPoint.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -40,11 +40,11 @@ /// /// Gets the X-coordinate. /// - public double X { get; private set; } + public double X { get; } /// /// Gets the Z-coordinate. /// - public double Z { get; private set; } + public double Z { get; } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/DunesBoundaryConditionsCalculationOutput.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/DunesBoundaryConditionsCalculationOutput.cs (.../DunesBoundaryConditionsCalculationOutput.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/DunesBoundaryConditionsCalculationOutput.cs (.../DunesBoundaryConditionsCalculationOutput.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -42,16 +42,16 @@ /// /// Gets the calculated water level. /// - public double WaterLevel { get; private set; } + public double WaterLevel { get; } /// /// Gets the calculated wave height. /// - public double WaveHeight { get; private set; } + public double WaveHeight { get; } /// /// Gets the calculated wave period. /// - public double WavePeriod { get; private set; } + public double WavePeriod { get; } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/IllustrationPointTreeNode.cs =================================================================== diff -u -rf288f9ccb9ac465f017170a59279909d8431fdc7 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/IllustrationPointTreeNode.cs (.../IllustrationPointTreeNode.cs) (revision f288f9ccb9ac465f017170a59279909d8431fdc7) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/IllustrationPoints/IllustrationPointTreeNode.cs (.../IllustrationPointTreeNode.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -76,8 +76,7 @@ if (nrOfChildren != 0 && nrOfChildren != 2) { throw new ArgumentException(Resources.IllustrationPointTreeNode_SetChildren_Node_must_have_zero_or_two_child_nodes, - nameof(children)); - + nameof(children)); } Children = children; } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/OvertoppingCalculationWaveHeightOutput.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/OvertoppingCalculationWaveHeightOutput.cs (.../OvertoppingCalculationWaveHeightOutput.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/OvertoppingCalculationWaveHeightOutput.cs (.../OvertoppingCalculationWaveHeightOutput.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -41,12 +41,12 @@ /// /// Gets the wave height that was a result of the overtopping calculation. /// - public double WaveHeight { get; private set; } + public double WaveHeight { get; } /// /// Gets whether the overtopping sub failure mechanism was dominant over /// the overflow sub failure mechanism. /// - public bool IsOvertoppingDominant { get; private set; } + public bool IsOvertoppingDominant { get; } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/WaveConditionsCalculationOutput.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/WaveConditionsCalculationOutput.cs (.../WaveConditionsCalculationOutput.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Data/Output/WaveConditionsCalculationOutput.cs (.../WaveConditionsCalculationOutput.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -44,21 +44,21 @@ /// /// Gets the calculated wave height. /// - public double WaveHeight { get; private set; } + public double WaveHeight { get; } /// /// Gets the calculated wave peak period. /// - public double WavePeakPeriod { get; private set; } + public double WavePeakPeriod { get; } /// /// Gets the calculated wave angle with respect to the dike normal. /// - public double WaveAngle { get; private set; } + public double WaveAngle { get; } /// /// Gets the calculated wave direction with respect to North. /// - public double WaveDirection { get; private set; } + public double WaveDirection { get; } } } \ No newline at end of file Fisheye: Tag 8853e1a9e9eef19262eb25668799dffc978afe23 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Exceptions/HydraRingDatabaseReaderException.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs =================================================================== diff -u -r01bd90d4fab9699280c5619754fc55b4f03be08a -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs (.../IllustrationPointsParser.cs) (revision 01bd90d4fab9699280c5619754fc55b4f03be08a) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs (.../IllustrationPointsParser.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -79,7 +79,7 @@ ParseResultsFromReader(reader); } } - catch (Exception e) when (e is HydraRingDatabaseReaderException || e is SQLiteException) + catch (Exception e) when (e is SQLiteException) { throw new HydraRingFileParserException(Resources.IllustrationPointsParser_Parse_Could_not_read_illustration_point_data, e); } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs =================================================================== diff -u -rb75888ac4a86ce24369ba0dad93cfe5bcd3fc794 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs (.../HydraRingDatabaseReader.cs) (revision b75888ac4a86ce24369ba0dad93cfe5bcd3fc794) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs (.../HydraRingDatabaseReader.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -102,6 +102,16 @@ return null; } + /// + /// Progresses the reader to the next result in the data set. + /// + /// true if there was another result in the data set, false + /// otherwise. + public bool NextResult() + { + return reader.NextResult(); + } + public void Dispose() { Dispose(true); @@ -156,15 +166,5 @@ { connection.Open(); } - - /// - /// Progresses the reader to the next result in the data set. - /// - /// true if there was another result in the data set, false - /// otherwise. - public bool NextResult() - { - return reader.NextResult(); - } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Ringtoets.HydraRing.Calculation.csproj (.../Ringtoets.HydraRing.Calculation.csproj) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -62,7 +62,6 @@ - Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingInitializationService.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingInitializationService.cs (.../HydraRingInitializationService.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingInitializationService.cs (.../HydraRingInitializationService.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -52,6 +52,7 @@ // Working directories private readonly string hydraRingDirectory; + private readonly string hlcdDirectory; /// Fisheye: Tag 8853e1a9e9eef19262eb25668799dffc978afe23 refers to a dead (removed) revision in file `Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Exceptions/HydraulicBoundaryDatabaseReadException.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HrdLocation.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HrdLocation.cs (.../HrdLocation.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HrdLocation.cs (.../HrdLocation.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -51,21 +51,21 @@ /// /// Gets the database HrdLocationId of . /// - public long HrdLocationId { get; private set; } + public long HrdLocationId { get; } /// /// Gets the name of . /// - public string Name { get; private set; } + public string Name { get; } /// /// Gets the X-coordinate of . /// - public double LocationX { get; private set; } + public double LocationX { get; } /// /// Gets the Y-coordinate of . /// - public double LocationY { get; private set; } + public double LocationY { get; } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HydraulicBoundaryDatabaseQueryBuilder.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HydraulicBoundaryDatabaseQueryBuilder.cs (.../HydraulicBoundaryDatabaseQueryBuilder.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HydraulicBoundaryDatabaseQueryBuilder.cs (.../HydraulicBoundaryDatabaseQueryBuilder.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -32,14 +32,10 @@ /// The query to get the version from the database. public static string GetVersionQuery() { - return string.Format( - "SELECT ({0} || {1} || {2}) as {3} FROM {4} LIMIT 0,1;", - GeneralTableDefinitions.RegionName, - GeneralTableDefinitions.CreationDate, - GeneralTableDefinitions.TrackId, - GeneralTableDefinitions.GeneratedVersion, - GeneralTableDefinitions.TableName - ); + return $"SELECT ({GeneralTableDefinitions.RegionName} || " + + $"{GeneralTableDefinitions.CreationDate} || " + + $"{GeneralTableDefinitions.TrackId}) as {GeneralTableDefinitions.GeneratedVersion} " + + $"FROM {GeneralTableDefinitions.TableName} LIMIT 0,1;"; } /// @@ -48,11 +44,7 @@ /// The query to get the track id from the database. public static string GetTrackIdQuery() { - return string.Format( - "SELECT {0} FROM {1} LIMIT 0,1;", - GeneralTableDefinitions.TrackId, - GeneralTableDefinitions.TableName - ); + return $"SELECT {GeneralTableDefinitions.TrackId} FROM {GeneralTableDefinitions.TableName} LIMIT 0,1;"; } /// @@ -61,13 +53,8 @@ /// The query to get the amount of relevant locations from the database. public static string GetRelevantLocationsCountQuery() { - return string.Format( - "SELECT count({0}) as {1} FROM {2} WHERE {3} > 1 ;", - HrdLocationsTableDefinitions.HrdLocationId, - HrdLocationsTableDefinitions.Count, - HrdLocationsTableDefinitions.TableName, - HrdLocationsTableDefinitions.LocationTypeId // Value > 1 makes it relevant - ); + return $"SELECT count({HrdLocationsTableDefinitions.HrdLocationId}) as {HrdLocationsTableDefinitions.Count} " + + $"FROM {HrdLocationsTableDefinitions.TableName} WHERE {HrdLocationsTableDefinitions.LocationTypeId} > 1 ;"; } /// @@ -76,15 +63,9 @@ /// The query to get the all relevant locations from the database. public static string GetRelevantLocationsQuery() { - return string.Format( - "SELECT {0}, {1}, {2}, {3} FROM {4} WHERE {5} > 1;", - HrdLocationsTableDefinitions.HrdLocationId, - HrdLocationsTableDefinitions.Name, - HrdLocationsTableDefinitions.XCoordinate, - HrdLocationsTableDefinitions.YCoordinate, - HrdLocationsTableDefinitions.TableName, - HrdLocationsTableDefinitions.LocationTypeId // Value > 1 makes it relevant - ); + return $"SELECT {HrdLocationsTableDefinitions.HrdLocationId}, {HrdLocationsTableDefinitions.Name}, " + + $"{HrdLocationsTableDefinitions.XCoordinate}, {HrdLocationsTableDefinitions.YCoordinate} " + + $"FROM {HrdLocationsTableDefinitions.TableName} WHERE {HrdLocationsTableDefinitions.LocationTypeId} > 1;"; } } } \ No newline at end of file Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReader.cs =================================================================== diff -u -r190069e93048bfb7abe5a190ada915e4b4e782b0 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReader.cs (.../HydraulicBoundarySqLiteDatabaseReader.cs) (revision 190069e93048bfb7abe5a190ada915e4b4e782b0) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReader.cs (.../HydraulicBoundarySqLiteDatabaseReader.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -87,8 +87,7 @@ } catch (ConversionException e) { - string message = new FileReaderErrorMessageBuilder(Path). - Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column); + string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column); throw new LineParseException(message, e); } } @@ -140,8 +139,7 @@ } catch (InvalidCastException exception) { - string message = new FileReaderErrorMessageBuilder(Path). - Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column); + string message = new FileReaderErrorMessageBuilder(Path).Build(Resources.HydraulicBoundaryDatabaseReader_Critical_Unexpected_value_on_column); throw new LineParseException(message, exception); } catch (SQLiteException exception) Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj =================================================================== diff -u -r04f5526f955c773d4987e820e2aca2614dfbd8d8 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj (.../Ringtoets.HydraRing.IO.csproj) (revision 04f5526f955c773d4987e820e2aca2614dfbd8d8) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/Ringtoets.HydraRing.IO.csproj (.../Ringtoets.HydraRing.IO.csproj) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -54,7 +54,6 @@ Code - Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/FaultTreeIllustrationPointTest.cs =================================================================== diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/FaultTreeIllustrationPointTest.cs (.../FaultTreeIllustrationPointTest.cs) (revision fe90a6d174a01975381e6cda55ed1f7f4e831a51) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/FaultTreeIllustrationPointTest.cs (.../FaultTreeIllustrationPointTest.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Collections.Generic; using System.Linq; using Core.Common.TestUtil; using NUnit.Framework; @@ -39,7 +40,7 @@ // Call TestDelegate call = () => new FaultTreeIllustrationPoint(null, random.NextDouble(), - Enumerable.Empty(), + Enumerable.Empty(), random.NextEnumValue()); // Assert @@ -72,7 +73,7 @@ const string name = "name"; double beta = random.NextDouble(); var combinationType = random.NextEnumValue(); - var stochasts = Enumerable.Empty(); + IEnumerable stochasts = Enumerable.Empty(); // Call var illustrationPoint = new FaultTreeIllustrationPoint(name, beta, stochasts, combinationType); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/IllustrationPointTreeNodeTest.cs =================================================================== diff -u -rfe90a6d174a01975381e6cda55ed1f7f4e831a51 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/IllustrationPointTreeNodeTest.cs (.../IllustrationPointTreeNodeTest.cs) (revision fe90a6d174a01975381e6cda55ed1f7f4e831a51) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Data/Output/IllustrationPoints/IllustrationPointTreeNodeTest.cs (.../IllustrationPointTreeNodeTest.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -92,7 +92,7 @@ var treeNode = new IllustrationPointTreeNode(data); var childrenToBeAttached = new IllustrationPointTreeNode[nrOfChildren]; - + // Call TestDelegate call = () => treeNode.SetChildren(childrenToBeAttached); @@ -113,7 +113,7 @@ var mocks = new MockRepository(); var data = mocks.Stub(); mocks.ReplayAll(); - + var treeNode = new IllustrationPointTreeNode(data); var childrenToBeAttached = new IllustrationPointTreeNode[nrOfChildren]; Fisheye: Tag 8853e1a9e9eef19262eb25668799dffc978afe23 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Exceptions/HydraRingDatabaseReaderExceptionTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingDatabaseParseHelperTest.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingDatabaseParseHelperTest.cs (.../HydraRingDatabaseParseHelperTest.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/HydraRingDatabaseParseHelperTest.cs (.../HydraRingDatabaseParseHelperTest.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -90,7 +90,7 @@ } [Test] - public void Parse_ReaderThrowsHydraRingDatabaseReaderException_ThrowsHydraRingFileParserExceptionWithCustomMessage() + public void Parse_ReaderThrowsSQLiteException_ThrowsHydraRingFileParserExceptionWithCustomMessage() { // Setup const string customMessage = "Exception message"; Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs (.../LastErrorFileParserTest.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs (.../LastErrorFileParserTest.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -105,9 +105,8 @@ // Assert var exception = Assert.Throws(call); - string expectedMessage = string.Format("Kan het Hydra-Ring last_error bestand {0} niet lezen uit de map {1}.", - HydraRingFileConstants.LastErrorFileName, - lastErrorTestDataDirectory); + string expectedMessage = $"Kan het Hydra-Ring last_error bestand {HydraRingFileConstants.LastErrorFileName} " + + $"niet lezen uit de map {lastErrorTestDataDirectory}."; Assert.AreEqual(expectedMessage, exception.Message); } } Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj =================================================================== diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision a1fa1538918813373bcc864f0bce092bf28fd0ce) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Ringtoets.HydraRing.Calculation.Test.csproj (.../Ringtoets.HydraRing.Calculation.Test.csproj) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -106,7 +106,6 @@ - @@ -164,10 +163,6 @@ {888d4097-8bc2-4703-9fb1-8744c94d525e} Ringtoets.HydraRing.Calculation - - {B69D5B6C-6E14-4FA9-9EBC-8F97678CDB70} - Ringtoets.HydraRing.IO - {74CBA865-9338-447F-BAD9-28312446AE84} Ringtoets.HydraRing.Calculation.TestUtil Fisheye: Tag 8853e1a9e9eef19262eb25668799dffc978afe23 refers to a dead (removed) revision in file `Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Exceptions/HydraulicBoundaryDatabaseReadExceptionTest.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReaderTest.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReaderTest.cs (.../HydraulicBoundarySqLiteDatabaseReaderTest.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReaderTest.cs (.../HydraulicBoundarySqLiteDatabaseReaderTest.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -61,7 +61,7 @@ public void Constructor_FileNullOrEmpty_ThrowsCriticalFileReadException(string fileName) { // Setup - string expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': {1}", fileName, "bestandspad mag niet leeg of ongedefinieerd zijn."); + string expectedMessage = $"Fout bij het lezen van bestand \'{fileName}\': bestandspad mag niet leeg of ongedefinieerd zijn."; // Call TestDelegate test = () => new HydraulicBoundarySqLiteDatabaseReader(fileName).Dispose(); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj =================================================================== diff -u -ra1fa1538918813373bcc864f0bce092bf28fd0ce -r8853e1a9e9eef19262eb25668799dffc978afe23 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj (.../Ringtoets.HydraRing.IO.Test.csproj) (revision a1fa1538918813373bcc864f0bce092bf28fd0ce) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/Ringtoets.HydraRing.IO.Test.csproj (.../Ringtoets.HydraRing.IO.Test.csproj) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) @@ -56,7 +56,6 @@ Properties\GlobalAssembly.cs -