Index: Core/Components/src/Core.Components.BruTile/Configurations/PersistentCacheConfiguration.cs =================================================================== diff -u -r4f87cc4af28d688129fd0fb70feabf04dd7b0e59 -r2e3ff507c0ae6e1defa1168445d6b01af5168862 --- Core/Components/src/Core.Components.BruTile/Configurations/PersistentCacheConfiguration.cs (.../PersistentCacheConfiguration.cs) (revision 4f87cc4af28d688129fd0fb70feabf04dd7b0e59) +++ Core/Components/src/Core.Components.BruTile/Configurations/PersistentCacheConfiguration.cs (.../PersistentCacheConfiguration.cs) (revision 2e3ff507c0ae6e1defa1168445d6b01af5168862) @@ -48,7 +48,7 @@ /// /// Initializes a new instance of . /// - /// The path to the directory for thisn + /// The path to the directory for this /// cache to keep its data. /// Thrown when /// is invalid. Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs =================================================================== diff -u -rd345cd556de0034cdff06806280d28dcf86c859b -r2e3ff507c0ae6e1defa1168445d6b01af5168862 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision d345cd556de0034cdff06806280d28dcf86c859b) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Factories/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision 2e3ff507c0ae6e1defa1168445d6b01af5168862) @@ -366,19 +366,21 @@ }); } - private static MapCalculationData CreatemapCalculationData(StructuresCalculation calculation) - where T : StructuresInputBase, new() - where TU : StructureBase + private static MapCalculationData CreatemapCalculationData( + StructuresCalculation calculation) + where TStructuresInput : StructuresInputBase, new() + where TStructure : StructureBase { return new MapCalculationData( calculation.Name, calculation.InputParameters.Structure.Location, calculation.InputParameters.HydraulicBoundaryLocation); } - private static bool CalculationHasStructureAndHydraulicBoundaryLocation(StructuresCalculation calculation) - where T : StructuresInputBase, new() - where TU : StructureBase + private static bool CalculationHasStructureAndHydraulicBoundaryLocation( + StructuresCalculation calculation) + where TStructuresInput : StructuresInputBase, new() + where TStructure : StructureBase { return calculation.InputParameters.Structure != null && calculation.InputParameters.HydraulicBoundaryLocation != null; Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestCalculationWithForeshoreProfile.cs =================================================================== diff -u -r00da0d2f72214f140bceff0eaae5f14172c587de -r2e3ff507c0ae6e1defa1168445d6b01af5168862 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestCalculationWithForeshoreProfile.cs (.../TestCalculationWithForeshoreProfile.cs) (revision 00da0d2f72214f140bceff0eaae5f14172c587de) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestCalculationWithForeshoreProfile.cs (.../TestCalculationWithForeshoreProfile.cs) (revision 2e3ff507c0ae6e1defa1168445d6b01af5168862) @@ -103,11 +103,6 @@ HasOutput = false; } - public override object Clone() - { - throw new NotImplementedException(); - } - /// /// A simple input class with a . /// Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs =================================================================== diff -u -r8853e1a9e9eef19262eb25668799dffc978afe23 -r2e3ff507c0ae6e1defa1168445d6b01af5168862 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs (.../IllustrationPointsParser.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/IllustrationPoints/IllustrationPointsParser.cs (.../IllustrationPointsParser.cs) (revision 2e3ff507c0ae6e1defa1168445d6b01af5168862) @@ -79,7 +79,7 @@ ParseResultsFromReader(reader); } } - catch (Exception e) when (e is SQLiteException) + catch (SQLiteException e) { throw new HydraRingFileParserException(Resources.IllustrationPointsParser_Parse_Could_not_read_illustration_point_data, e); } Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingInitializationService.cs =================================================================== diff -u -r8853e1a9e9eef19262eb25668799dffc978afe23 -r2e3ff507c0ae6e1defa1168445d6b01af5168862 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingInitializationService.cs (.../HydraRingInitializationService.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingInitializationService.cs (.../HydraRingInitializationService.cs) (revision 2e3ff507c0ae6e1defa1168445d6b01af5168862) @@ -52,7 +52,6 @@ // Working directories private readonly string hydraRingDirectory; - private readonly string hlcdDirectory; /// Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HydraulicBoundaryDatabaseQueryBuilder.cs =================================================================== diff -u -r8853e1a9e9eef19262eb25668799dffc978afe23 -r2e3ff507c0ae6e1defa1168445d6b01af5168862 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HydraulicBoundaryDatabaseQueryBuilder.cs (.../HydraulicBoundaryDatabaseQueryBuilder.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.IO/HydraulicBoundaryDatabaseContext/HydraulicBoundaryDatabaseQueryBuilder.cs (.../HydraulicBoundaryDatabaseQueryBuilder.cs) (revision 2e3ff507c0ae6e1defa1168445d6b01af5168862) @@ -54,7 +54,8 @@ public static string GetRelevantLocationsCountQuery() { return $"SELECT count({HrdLocationsTableDefinitions.HrdLocationId}) as {HrdLocationsTableDefinitions.Count} " + - $"FROM {HrdLocationsTableDefinitions.TableName} WHERE {HrdLocationsTableDefinitions.LocationTypeId} > 1 ;"; + $"FROM {HrdLocationsTableDefinitions.TableName} " + + $"WHERE {HrdLocationsTableDefinitions.LocationTypeId} > 1;"; // Value > 1 makes it relevant } /// @@ -65,7 +66,8 @@ { return $"SELECT {HrdLocationsTableDefinitions.HrdLocationId}, {HrdLocationsTableDefinitions.Name}, " + $"{HrdLocationsTableDefinitions.XCoordinate}, {HrdLocationsTableDefinitions.YCoordinate} " + - $"FROM {HrdLocationsTableDefinitions.TableName} WHERE {HrdLocationsTableDefinitions.LocationTypeId} > 1;"; + $"FROM {HrdLocationsTableDefinitions.TableName} " + + $"WHERE {HrdLocationsTableDefinitions.LocationTypeId} > 1;"; // Value > 1 makes it relevant } } } \ No newline at end of file Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundaryDatabaseQueryBuilderTest.cs =================================================================== diff -u -r64d60335b1deab4bafd37f78f3514660cc4afb27 -r2e3ff507c0ae6e1defa1168445d6b01af5168862 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundaryDatabaseQueryBuilderTest.cs (.../HydraulicBoundaryDatabaseQueryBuilderTest.cs) (revision 64d60335b1deab4bafd37f78f3514660cc4afb27) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundaryDatabaseQueryBuilderTest.cs (.../HydraulicBoundaryDatabaseQueryBuilderTest.cs) (revision 2e3ff507c0ae6e1defa1168445d6b01af5168862) @@ -57,7 +57,7 @@ public void GetRelevantLocationsCountQuery_Always_ReturnsExpectedValues() { // Setup - const string expectedQuery = "SELECT count(HRDLocationId) as nrOfRows FROM HRDLocations WHERE LocationTypeId > 1 ;"; + const string expectedQuery = "SELECT count(HRDLocationId) as nrOfRows FROM HRDLocations WHERE LocationTypeId > 1;"; // Call string query = HydraulicBoundaryDatabaseQueryBuilder.GetRelevantLocationsCountQuery(); Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReaderTest.cs =================================================================== diff -u -r8853e1a9e9eef19262eb25668799dffc978afe23 -r2e3ff507c0ae6e1defa1168445d6b01af5168862 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReaderTest.cs (.../HydraulicBoundarySqLiteDatabaseReaderTest.cs) (revision 8853e1a9e9eef19262eb25668799dffc978afe23) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.IO.Test/HydraulicBoundaryDatabaseContext/HydraulicBoundarySqLiteDatabaseReaderTest.cs (.../HydraulicBoundarySqLiteDatabaseReaderTest.cs) (revision 2e3ff507c0ae6e1defa1168445d6b01af5168862) @@ -61,7 +61,7 @@ public void Constructor_FileNullOrEmpty_ThrowsCriticalFileReadException(string fileName) { // Setup - string expectedMessage = $"Fout bij het lezen van bestand \'{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/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsScenariosContext.cs =================================================================== diff -u -rc4392a12110e2bb3549c5fee1ec319c229b67198 -r2e3ff507c0ae6e1defa1168445d6b01af5168862 --- Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsScenariosContext.cs (.../MacroStabilityInwardsScenariosContext.cs) (revision c4392a12110e2bb3549c5fee1ec319c229b67198) +++ Ringtoets/MacroStabilityInwards/src/Ringtoets.MacroStabilityInwards.Forms/PresentationObjects/MacroStabilityInwardsScenariosContext.cs (.../MacroStabilityInwardsScenariosContext.cs) (revision 2e3ff507c0ae6e1defa1168445d6b01af5168862) @@ -47,6 +47,9 @@ ParentFailureMechanism = failureMechanism; } + /// + /// Gets the parent failure mechanism of the calculation group. + /// public MacroStabilityInwardsFailureMechanism ParentFailureMechanism { get; } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -rc4392a12110e2bb3549c5fee1ec319c229b67198 -r2e3ff507c0ae6e1defa1168445d6b01af5168862 --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision c4392a12110e2bb3549c5fee1ec319c229b67198) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/TreeNodeInfos/MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs (.../MacroStabilityInwardsCalculationScenarioContextTreeNodeInfoTest.cs) (revision 2e3ff507c0ae6e1defa1168445d6b01af5168862) @@ -625,20 +625,21 @@ // Then TestHelper.AssertLogMessages(action, messages => { - IEnumerator msgs = messages.GetEnumerator(); - Assert.IsTrue(msgs.MoveNext()); - Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs.Current); - Assert.IsTrue(msgs.MoveNext()); - CalculationServiceTestHelper.AssertValidationStartMessage(msgs.Current); - Assert.IsTrue(msgs.MoveNext()); - CalculationServiceTestHelper.AssertValidationEndMessage(msgs.Current); - Assert.IsTrue(msgs.MoveNext()); - CalculationServiceTestHelper.AssertCalculationStartMessage(msgs.Current); - Assert.IsTrue(msgs.MoveNext()); - CalculationServiceTestHelper.AssertCalculationEndMessage(msgs.Current); - Assert.IsTrue(msgs.MoveNext()); - Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gelukt.", msgs.Current); - msgs.Dispose(); + using (IEnumerator msgs = messages.GetEnumerator()) + { + Assert.IsTrue(msgs.MoveNext()); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs.Current); + Assert.IsTrue(msgs.MoveNext()); + CalculationServiceTestHelper.AssertValidationStartMessage(msgs.Current); + Assert.IsTrue(msgs.MoveNext()); + CalculationServiceTestHelper.AssertValidationEndMessage(msgs.Current); + Assert.IsTrue(msgs.MoveNext()); + CalculationServiceTestHelper.AssertCalculationStartMessage(msgs.Current); + Assert.IsTrue(msgs.MoveNext()); + CalculationServiceTestHelper.AssertCalculationEndMessage(msgs.Current); + Assert.IsTrue(msgs.MoveNext()); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gelukt.", msgs.Current); + } }); Assert.IsNotNull(calculation.Output); Assert.IsNotNull(calculation.SemiProbabilisticOutput); Index: Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Creators/PipingSurfaceLineCreator.cs =================================================================== diff -u -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 -r2e3ff507c0ae6e1defa1168445d6b01af5168862 --- Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Creators/PipingSurfaceLineCreator.cs (.../PipingSurfaceLineCreator.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) +++ Ringtoets/Piping/src/Ringtoets.Piping.KernelWrapper/Creators/PipingSurfaceLineCreator.cs (.../PipingSurfaceLineCreator.cs) (revision 2e3ff507c0ae6e1defa1168445d6b01af5168862) @@ -23,21 +23,22 @@ using System.Linq; using Core.Common.Base.Geometry; using Deltares.WTIPiping; +using RingtoetsPipingSurfaceLine = Ringtoets.Piping.Primitives.PipingSurfaceLine; namespace Ringtoets.Piping.KernelWrapper.Creators { /// - /// Creates instances which are required by the . + /// Creates instances which are required by the . /// internal static class PipingSurfaceLineCreator { /// - /// Creates a for the kernel + /// Creates a for the kernel /// given different surface line. /// /// The surface line configured in the Ringtoets application. /// The surface line to be consumed by the kernel. - public static PipingSurfaceLine Create(Primitives.PipingSurfaceLine line) + public static PipingSurfaceLine Create(RingtoetsPipingSurfaceLine line) { var surfaceLine = new PipingSurfaceLine { @@ -51,7 +52,7 @@ return surfaceLine; } - private static IEnumerable CreatePoints(Primitives.PipingSurfaceLine line) + private static IEnumerable CreatePoints(RingtoetsPipingSurfaceLine line) { Point2D[] projectedPoints = line.LocalGeometry.ToArray(); var pipingPoints = new List(); @@ -64,7 +65,7 @@ return pipingPoints; } - private static IEnumerable CreatePoint(Primitives.PipingSurfaceLine line, Point2D[] projectedPoints, int index) + private static IEnumerable CreatePoint(RingtoetsPipingSurfaceLine line, Point2D[] projectedPoints, int index) { Point3D surfaceLinePoint = line.Points[index]; Point2D projectedPoint = projectedPoints[index]; Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs =================================================================== diff -u -rdb77ae03f93f27b25268dd9f62f0091a47fe22d8 -r2e3ff507c0ae6e1defa1168445d6b01af5168862 --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision db77ae03f93f27b25268dd9f62f0091a47fe22d8) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/TreeNodeInfos/PipingCalculationScenarioContextTreeNodeInfoTest.cs (.../PipingCalculationScenarioContextTreeNodeInfoTest.cs) (revision 2e3ff507c0ae6e1defa1168445d6b01af5168862) @@ -1028,20 +1028,21 @@ // Then TestHelper.AssertLogMessages(action, messages => { - IEnumerator msgs = messages.GetEnumerator(); - Assert.IsTrue(msgs.MoveNext()); - Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs.Current); - Assert.IsTrue(msgs.MoveNext()); - CalculationServiceTestHelper.AssertValidationStartMessage(msgs.Current); - Assert.IsTrue(msgs.MoveNext()); - CalculationServiceTestHelper.AssertValidationEndMessage(msgs.Current); - Assert.IsTrue(msgs.MoveNext()); - CalculationServiceTestHelper.AssertCalculationStartMessage(msgs.Current); - Assert.IsTrue(msgs.MoveNext()); - CalculationServiceTestHelper.AssertCalculationEndMessage(msgs.Current); - Assert.IsTrue(msgs.MoveNext()); - Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gelukt.", msgs.Current); - msgs.Dispose(); + using (IEnumerator msgs = messages.GetEnumerator()) + { + Assert.IsTrue(msgs.MoveNext()); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gestart.", msgs.Current); + Assert.IsTrue(msgs.MoveNext()); + CalculationServiceTestHelper.AssertValidationStartMessage(msgs.Current); + Assert.IsTrue(msgs.MoveNext()); + CalculationServiceTestHelper.AssertValidationEndMessage(msgs.Current); + Assert.IsTrue(msgs.MoveNext()); + CalculationServiceTestHelper.AssertCalculationStartMessage(msgs.Current); + Assert.IsTrue(msgs.MoveNext()); + CalculationServiceTestHelper.AssertCalculationEndMessage(msgs.Current); + Assert.IsTrue(msgs.MoveNext()); + Assert.AreEqual($"Uitvoeren van berekening '{calculation.Name}' is gelukt.", msgs.Current); + } }); Assert.IsNotNull(calculation.Output); Assert.IsNotNull(calculation.SemiProbabilisticOutput);