Index: Core/Common/src/Core.Common.Base/ObservableUniqueItemCollectionWithSourcePath.cs =================================================================== diff -u -r56ac4eb28f5fcc5b20117474e9e4030399d6806a -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Core/Common/src/Core.Common.Base/ObservableUniqueItemCollectionWithSourcePath.cs (.../ObservableUniqueItemCollectionWithSourcePath.cs) (revision 56ac4eb28f5fcc5b20117474e9e4030399d6806a) +++ Core/Common/src/Core.Common.Base/ObservableUniqueItemCollectionWithSourcePath.cs (.../ObservableUniqueItemCollectionWithSourcePath.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -47,9 +47,9 @@ /// A function to retrieve the unique feature of the items it stores. /// The description of the item that is validated. /// The description of the feature of the item to be validated on. - public ObservableUniqueItemCollectionWithSourcePath(Func getUniqueFeature, - string typeDescriptor, - string featureDescription) + protected ObservableUniqueItemCollectionWithSourcePath(Func getUniqueFeature, + string typeDescriptor, + string featureDescription) { if (getUniqueFeature == null) { Index: Core/Common/src/Core.Common.Gui/ExceptionDialog.cs =================================================================== diff -u -rd372f6daa918d18feb719e78d5fdc315f2a1b0f5 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Core/Common/src/Core.Common.Gui/ExceptionDialog.cs (.../ExceptionDialog.cs) (revision d372f6daa918d18feb719e78d5fdc315f2a1b0f5) +++ Core/Common/src/Core.Common.Gui/ExceptionDialog.cs (.../ExceptionDialog.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Drawing; using System.Windows.Forms; using Core.Common.Controls.Dialogs; using Core.Common.Gui.Commands; Index: Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs =================================================================== diff -u -r7ac739bd142fda419737a1e3ce328f373ab3531f -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 7ac739bd142fda419737a1e3ce328f373ab3531f) +++ Core/Common/src/Core.Common.Gui/Forms/MainWindow/MainWindow.xaml.cs (.../MainWindow.xaml.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -476,7 +476,7 @@ private void FillContextualGroupsFromRibbonComponent(Ribbon ribbonControl) { foreach (RibbonContextualTabGroup group in ribbonControl.ContextualGroups.Where( - group => Ribbon.ContextualGroups.All(g => g.Name != @group.Name))) + group => Ribbon.ContextualGroups.All(g => g.Name != group.Name))) { Ribbon.ContextualGroups.Add(group); } Index: Core/Common/src/Core.Common.Utils/IOUtils.cs =================================================================== diff -u -r7ac739bd142fda419737a1e3ce328f373ab3531f -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Core/Common/src/Core.Common.Utils/IOUtils.cs (.../IOUtils.cs) (revision 7ac739bd142fda419737a1e3ce328f373ab3531f) +++ Core/Common/src/Core.Common.Utils/IOUtils.cs (.../IOUtils.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -74,7 +74,7 @@ { try { - string fullPath = GetFullPath(path); + GetFullPath(path); } catch (ArgumentException exception) { Index: Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs =================================================================== diff -u -r7ac739bd142fda419737a1e3ce328f373ab3531f -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision 7ac739bd142fda419737a1e3ce328f373ab3531f) +++ Core/Common/src/Core.Common.Utils/Reflection/TypeUtils.cs (.../TypeUtils.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -45,7 +45,7 @@ /// is an invalid value for . public static string GetDisplayName(TEnumType enumValue) where TEnumType : IConvertible { - string valueString = enumValue.ToString(); + string valueString = enumValue.ToString(CultureInfo.InvariantCulture); FieldInfo fieldInfo = typeof(TEnumType).GetField(valueString); if (fieldInfo == null) { Index: Core/Common/test/Core.Common.IO.Test/Readers/SqLiteDatabaseReaderBaseTest.cs =================================================================== diff -u -r7ac739bd142fda419737a1e3ce328f373ab3531f -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Core/Common/test/Core.Common.IO.Test/Readers/SqLiteDatabaseReaderBaseTest.cs (.../SqLiteDatabaseReaderBaseTest.cs) (revision 7ac739bd142fda419737a1e3ce328f373ab3531f) +++ Core/Common/test/Core.Common.IO.Test/Readers/SqLiteDatabaseReaderBaseTest.cs (.../SqLiteDatabaseReaderBaseTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -112,7 +112,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 TestReader(fileName).Dispose(); Index: Core/Common/test/Core.Common.Utils.Test/Drawing/ColorAccessTest.cs =================================================================== diff -u -r7ac739bd142fda419737a1e3ce328f373ab3531f -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Core/Common/test/Core.Common.Utils.Test/Drawing/ColorAccessTest.cs (.../ColorAccessTest.cs) (revision 7ac739bd142fda419737a1e3ce328f373ab3531f) +++ Core/Common/test/Core.Common.Utils.Test/Drawing/ColorAccessTest.cs (.../ColorAccessTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -93,8 +93,10 @@ ColorAccess colorAccess = ColorAccess.Create(Resources.Black2x2); // Call - Color c; - TestDelegate call = () => c = colorAccess[x, y]; + TestDelegate call = () => + { + Color c = colorAccess[x, y]; + }; // Assert var message = "Index must be in range x:[0,1], y:[0,1]."; Index: Core/Components/src/Core.Components.BruTile.IO/AsyncTileFetcher.cs =================================================================== diff -u -r7ac739bd142fda419737a1e3ce328f373ab3531f -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Core/Components/src/Core.Components.BruTile.IO/AsyncTileFetcher.cs (.../AsyncTileFetcher.cs) (revision 7ac739bd142fda419737a1e3ce328f373ab3531f) +++ Core/Components/src/Core.Components.BruTile.IO/AsyncTileFetcher.cs (.../AsyncTileFetcher.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -125,11 +125,11 @@ // Notes: http://dotspatial.codeplex.com/discussions/473428 threadPool.Cancel(false); - int dummy; foreach (KeyValuePair request in activeTileRequests.ToArray()) { if (!openTileRequests.ContainsKey(request.Key)) { + int dummy; if (!activeTileRequests.TryRemove(request.Key, out dummy)) { activeTileRequests.TryRemove(request.Key, out dummy); Index: Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs =================================================================== diff -u -r7ac739bd142fda419737a1e3ce328f373ab3531f -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs (.../BruTileLayerTest.cs) (revision 7ac739bd142fda419737a1e3ce328f373ab3531f) +++ Core/Components/test/Core.Components.DotSpatial.Test/Layer/BruTile/BruTileLayerTest.cs (.../BruTileLayerTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -189,10 +189,9 @@ // Setup const string authorityCode = "EPSG:28992"; var extent = new Extent(10000, 123456, 987654321, 321654); - const string legendText = "A"; var mocks = new MockRepository(); - IConfiguration configuration = CreateStubConfiguration(mocks, authorityCode, extent, legendText); + IConfiguration configuration = CreateStubConfiguration(mocks, authorityCode, extent); mocks.ReplayAll(); // Call @@ -902,7 +901,7 @@ IConfiguration configuration = CreateStubConfiguration(mocks); mocks.ReplayAll(); - using (var layer = new BruTileLayer(configuration) + using (new BruTileLayer(configuration) { MapFrame = mapFrame }) @@ -1081,8 +1080,7 @@ private static IConfiguration CreateStubConfiguration(MockRepository mocks, string tileSchemaSrsString = "EPSG:28992", - Extent tileSourceExtent = new Extent(), - string legendText = "") + Extent tileSourceExtent = new Extent()) { var schema = mocks.Stub(); schema.Stub(s => s.Srs).Return(tileSchemaSrsString); Index: Core/Plugins/src/Core.Plugins.Map/MapPlugin.cs =================================================================== diff -u -r7fb7b486bcbdd216ef834eaed0c89a1362e119e2 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Core/Plugins/src/Core.Plugins.Map/MapPlugin.cs (.../MapPlugin.cs) (revision 7fb7b486bcbdd216ef834eaed0c89a1362e119e2) +++ Core/Plugins/src/Core.Plugins.Map/MapPlugin.cs (.../MapPlugin.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -36,7 +36,7 @@ namespace Core.Plugins.Map { /// - /// The plug-in for the map component. + /// The plug-in that ties together all the components to enable map interactions. /// public class MapPlugin : PluginBase { Fisheye: Tag 4c93a7304d2790d347cc65847ee82f4d600fce96 refers to a dead (removed) revision in file `Ringtoets/Common/src/Ringtoets.Common.Forms/PropertyClasses/IPropertyChangeHandler.cs'. Fisheye: No comparison available. Pass `N' to diff? Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj =================================================================== diff -u -r8aeff3f1153aaac2b2980ca207e298b6d764947b -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 8aeff3f1153aaac2b2980ca207e298b6d764947b) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Ringtoets.Common.Forms.csproj (.../Ringtoets.Common.Forms.csproj) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -79,7 +79,6 @@ - Index: Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs =================================================================== diff -u -ra1bba29ba0d84061cca88da8324957087d564db9 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision a1bba29ba0d84061cca88da8324957087d564db9) +++ Ringtoets/Common/src/Ringtoets.Common.Service/DesignWaterLevelCalculationService.cs (.../DesignWaterLevelCalculationService.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -169,6 +169,7 @@ /// The name of the hydraulic boundary location. /// The target reliability for the calculation. /// The target probability for the calculation. + /// The value indicating whether the calculation converged. /// A . /// Thrown when /// or the calculated probability falls outside the [0.0, 1.0] range and is not . Index: Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs =================================================================== diff -u -ra1bba29ba0d84061cca88da8324957087d564db9 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs (.../TestForeshoreProfile.cs) (revision a1bba29ba0d84061cca88da8324957087d564db9) +++ Ringtoets/Common/test/Ringtoets.Common.Data.TestUtil/TestForeshoreProfile.cs (.../TestForeshoreProfile.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -56,6 +56,7 @@ /// name and geometry. /// /// Name of the profile. + /// The geometry of the profile. public TestForeshoreProfile(string profileName, IEnumerable geometry) : this("id", profileName, new Point2D(0, 0), null, geometry) {} /// Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/FailureMechanismPropertyChangeHandlerTest.cs =================================================================== diff -u -ra1bba29ba0d84061cca88da8324957087d564db9 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/FailureMechanismPropertyChangeHandlerTest.cs (.../FailureMechanismPropertyChangeHandlerTest.cs) (revision a1bba29ba0d84061cca88da8324957087d564db9) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/ChangeHandlers/FailureMechanismPropertyChangeHandlerTest.cs (.../FailureMechanismPropertyChangeHandlerTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -55,7 +55,7 @@ var changeHandler = new FailureMechanismPropertyChangeHandler(); // Call - TestDelegate test = () => changeHandler.SetPropertyValueAfterConfirmation( + TestDelegate test = () => changeHandler.SetPropertyValueAfterConfirmation( null, 3, (f, v) => { }); Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/SchemaCalculationConfigurationWriterTest.cs =================================================================== diff -u -ra1bba29ba0d84061cca88da8324957087d564db9 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/SchemaCalculationConfigurationWriterTest.cs (.../SchemaCalculationConfigurationWriterTest.cs) (revision a1bba29ba0d84061cca88da8324957087d564db9) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Export/SchemaCalculationConfigurationWriterTest.cs (.../SchemaCalculationConfigurationWriterTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -77,7 +77,7 @@ TestDelegate test = () => ExposedSchemaCalculationConfigurationWriter.PublicWriteDistributionWhenAvailable( null, "some name", - (StochastConfiguration) null); + null); // Assert var exception = Assert.Throws(test); @@ -96,7 +96,7 @@ TestDelegate test = () => ExposedSchemaCalculationConfigurationWriter.PublicWriteDistributionWhenAvailable( xmlWriter, null, - (StochastConfiguration) null); + null); // Assert var exception = Assert.Throws(test); @@ -115,7 +115,7 @@ ExposedSchemaCalculationConfigurationWriter.PublicWriteDistributionWhenAvailable( xmlWriter, "some name", - (StochastConfiguration) null); + null); // Assert mocks.VerifyAll(); @@ -150,7 +150,7 @@ TestDelegate test = () => ExposedSchemaCalculationConfigurationWriter.PublicWriteDistributionWhenAvailable( null, "some name", - (StochastConfiguration) null); + null); // Assert var exception = Assert.Throws(test); @@ -169,7 +169,7 @@ TestDelegate test = () => ExposedSchemaCalculationConfigurationWriter.PublicWriteDistributionWhenAvailable( xmlWriter, null, - (StochastConfiguration) null); + null); // Assert var exception = Assert.Throws(test); @@ -188,7 +188,7 @@ ExposedSchemaCalculationConfigurationWriter.PublicWriteDistributionWhenAvailable( xmlWriter, "some name", - (StochastConfiguration) null); + null); // Assert mocks.VerifyAll(); @@ -466,35 +466,35 @@ { return new TestSchemaCalculationConfigurationWriter(filePath); } - } - public class ExposedSchemaCalculationConfigurationWriter : SchemaCalculationConfigurationWriter - { - public ExposedSchemaCalculationConfigurationWriter(string filePath) : base(filePath) {} - - public static void PublicWriteDistributionWhenAvailable(XmlWriter writer, string distributionName, StochastConfiguration configuration) + private class ExposedSchemaCalculationConfigurationWriter : SchemaCalculationConfigurationWriter { - WriteDistributionWhenAvailable(writer, distributionName, configuration); - } + public ExposedSchemaCalculationConfigurationWriter(string filePath) : base(filePath) { } - public static void PublicWriteElementWhenContentAvailable(XmlWriter writer, string elementName, string elementContent) - { - WriteElementWhenContentAvailable(writer, elementName, elementContent); - } + public static void PublicWriteDistributionWhenAvailable(XmlWriter writer, string distributionName, StochastConfiguration configuration) + { + WriteDistributionWhenAvailable(writer, distributionName, configuration); + } - public static void PublicWriteElementWhenContentAvailable(XmlWriter writer, string elementName, double? elementContent) - { - WriteElementWhenContentAvailable(writer, elementName, elementContent); - } + public static void PublicWriteElementWhenContentAvailable(XmlWriter writer, string elementName, string elementContent) + { + WriteElementWhenContentAvailable(writer, elementName, elementContent); + } - public static void PublicWriteWaveReductionWhenAvailable(XmlWriter writer, WaveReductionConfiguration configuration) - { - WriteWaveReductionWhenAvailable(writer, configuration); - } + public static void PublicWriteElementWhenContentAvailable(XmlWriter writer, string elementName, double? elementContent) + { + WriteElementWhenContentAvailable(writer, elementName, elementContent); + } - protected override void WriteCalculation(TestConfigurationItem calculation, XmlWriter writer) - { - throw new NotImplementedException(); + public static void PublicWriteWaveReductionWhenAvailable(XmlWriter writer, WaveReductionConfiguration configuration) + { + WriteWaveReductionWhenAvailable(writer, configuration); + } + + protected override void WriteCalculation(TestConfigurationItem calculation, XmlWriter writer) + { + throw new NotImplementedException(); + } } } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/XmlWriterExtensionsTest.cs =================================================================== diff -u -ra1bba29ba0d84061cca88da8324957087d564db9 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/XmlWriterExtensionsTest.cs (.../XmlWriterExtensionsTest.cs) (revision a1bba29ba0d84061cca88da8324957087d564db9) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/Configurations/Helpers/XmlWriterExtensionsTest.cs (.../XmlWriterExtensionsTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -144,7 +144,7 @@ using (XmlWriter xmlWriter = CreateXmlWriter(filePath)) { // Call - TestDelegate testDelegate = () => xmlWriter.WriteDistribution("name", (StochastConfiguration) null); + TestDelegate testDelegate = () => xmlWriter.WriteDistribution("name", null); // Assert var exception = Assert.Throws(testDelegate); @@ -230,7 +230,7 @@ using (XmlWriter xmlWriter = CreateXmlWriter(filePath)) { // Call - TestDelegate testDelegate = () => xmlWriter.WriteDistribution("name", (StochastConfiguration) null); + TestDelegate testDelegate = () => xmlWriter.WriteDistribution("name", null); // Assert var exception = Assert.Throws(testDelegate); @@ -428,9 +428,4 @@ }); } } - - public class SimpleStructuresCalculationConfiguration : StructuresCalculationConfiguration - { - public SimpleStructuresCalculationConfiguration(string name) : base(name) {} - } } \ No newline at end of file Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/DikeProfileDataReaderTest.cs =================================================================== diff -u -ra1bba29ba0d84061cca88da8324957087d564db9 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/DikeProfileDataReaderTest.cs (.../DikeProfileDataReaderTest.cs) (revision a1bba29ba0d84061cca88da8324957087d564db9) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/DikeProfiles/DikeProfileDataReaderTest.cs (.../DikeProfileDataReaderTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -330,7 +330,7 @@ // Assert string message = Assert.Throws(call).Message; - string expectedMessage = $"De ingelezen ID ('{"profiel001"}') is ongeldig."; + string expectedMessage = "De ingelezen ID (\'profiel001\') is ongeldig."; Assert.AreEqual(expectedMessage, message); } Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/ProfilesImporterTest.cs =================================================================== diff -u -ra1bba29ba0d84061cca88da8324957087d564db9 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/ProfilesImporterTest.cs (.../ProfilesImporterTest.cs) (revision a1bba29ba0d84061cca88da8324957087d564db9) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/ProfilesImporterTest.cs (.../ProfilesImporterTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -760,19 +760,5 @@ } private class TestProfile {} - - private class ProgressNotification - { - public ProgressNotification(string description, int currentStep, int totalSteps) - { - Text = description; - CurrentStep = currentStep; - TotalSteps = totalSteps; - } - - public string Text { get; private set; } - public int CurrentStep { get; private set; } - public int TotalSteps { get; private set; } - } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs =================================================================== diff -u -r3b0648a0690a99bfce101b605ecf42daa0c0e211 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs) (revision 3b0648a0690a99bfce101b605ecf42daa0c0e211) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandlerTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -43,7 +43,7 @@ var changeHandler = new GrassCoverErosionOutwardsFailureMechanismPropertyChangeHandler(); // Call - TestDelegate test = () => changeHandler.SetPropertyValueAfterConfirmation( + TestDelegate test = () => changeHandler.SetPropertyValueAfterConfirmation( null, 3, (f, v) => { }); Index: Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs =================================================================== diff -u -r07ae03e7286102b1ba1d1e19cc6aa684f7d47144 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs (.../HeightStructuresImporter.cs) (revision 07ae03e7286102b1ba1d1e19cc6aa684f7d47144) +++ Ringtoets/HeightStructures/src/Ringtoets.HeightStructures.IO/HeightStructuresImporter.cs (.../HeightStructuresImporter.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -24,7 +24,6 @@ using System.Linq; using Core.Common.Base; using Core.Common.Base.Data; -using log4net; using Ringtoets.Common.Data.AssessmentSection; using Ringtoets.Common.IO.FileImporters; using Ringtoets.Common.IO.Structures; @@ -38,8 +37,6 @@ /// public class HeightStructuresImporter : StructuresImporter> { - private readonly ILog log = LogManager.GetLogger(typeof(HeightStructuresImporter)); - /// /// Creates a new instance of . /// Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/LastErrorFileParser.cs =================================================================== diff -u -ra1bba29ba0d84061cca88da8324957087d564db9 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/LastErrorFileParser.cs (.../LastErrorFileParser.cs) (revision a1bba29ba0d84061cca88da8324957087d564db9) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Parsers/LastErrorFileParser.cs (.../LastErrorFileParser.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -22,7 +22,6 @@ using System.IO; using Ringtoets.HydraRing.Calculation.Exceptions; using Ringtoets.HydraRing.Calculation.Properties; -using Ringtoets.HydraRing.IO; namespace Ringtoets.HydraRing.Calculation.Parsers { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs =================================================================== diff -u -r43a84f4c8402972a269b12fcc1eaf262fb6393b8 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs (.../HydraRingDatabaseReader.cs) (revision 43a84f4c8402972a269b12fcc1eaf262fb6393b8) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Readers/HydraRingDatabaseReader.cs (.../HydraRingDatabaseReader.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -27,7 +27,6 @@ using Core.Common.Utils; using Ringtoets.HydraRing.Calculation.Exceptions; using Ringtoets.HydraRing.Calculation.Properties; -using Ringtoets.HydraRing.IO; namespace Ringtoets.HydraRing.Calculation.Readers { Index: Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingInitializationService.cs =================================================================== diff -u -r91bc465d7d00e5558c6cda67ccde9fd5629b53da -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingInitializationService.cs (.../HydraRingInitializationService.cs) (revision 91bc465d7d00e5558c6cda67ccde9fd5629b53da) +++ Ringtoets/HydraRing/src/Ringtoets.HydraRing.Calculation/Services/HydraRingInitializationService.cs (.../HydraRingInitializationService.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -25,7 +25,6 @@ using System.Security; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Providers; -using Ringtoets.HydraRing.IO; namespace Ringtoets.HydraRing.Calculation.Services { Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs =================================================================== diff -u -ra1bba29ba0d84061cca88da8324957087d564db9 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs (.../LastErrorFileParserTest.cs) (revision a1bba29ba0d84061cca88da8324957087d564db9) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.Test/Parsers/LastErrorFileParserTest.cs (.../LastErrorFileParserTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -26,7 +26,6 @@ using NUnit.Framework; using Ringtoets.HydraRing.Calculation.Exceptions; using Ringtoets.HydraRing.Calculation.Parsers; -using Ringtoets.HydraRing.IO; namespace Ringtoets.HydraRing.Calculation.Test.Parsers { Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenarioRow.cs =================================================================== diff -u -r6afbb616ce84cccaf56617d60c5cd821b00daab0 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenarioRow.cs (.../PipingScenarioRow.cs) (revision 6afbb616ce84cccaf56617d60c5cd821b00daab0) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingScenarioRow.cs (.../PipingScenarioRow.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -46,7 +46,7 @@ throw new ArgumentNullException(nameof(pipingCalculation)); } - this.PipingCalculation = pipingCalculation; + PipingCalculation = pipingCalculation; } /// Index: Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs =================================================================== diff -u -rf817bfc2122cfa0a48bd19ad8518a948dfd7c95c -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs (.../PipingSoilLayerTable.cs) (revision f817bfc2122cfa0a48bd19ad8518a948dfd7c95c) +++ Ringtoets/Piping/src/Ringtoets.Piping.Forms/Views/PipingSoilLayerTable.cs (.../PipingSoilLayerTable.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Collections.Generic; using System.Drawing; using System.Linq; @@ -143,7 +142,6 @@ /// /// Gets the name of the material that was assigned to the . /// - /// Thrown when is null. public string MaterialName { get; } /// Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs =================================================================== diff -u -r6afbb616ce84cccaf56617d60c5cd821b00daab0 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision 6afbb616ce84cccaf56617d60c5cd821b00daab0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingCalculationScenarioTest.cs (.../PipingCalculationScenarioTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -105,8 +105,10 @@ var scenario = new PipingCalculationScenario(new GeneralPipingInput()); // Call - double probability; - TestDelegate call = () => probability = scenario.Probability; + TestDelegate call = () => + { + double probability = scenario.Probability; + }; // Assert Assert.Throws(call); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs =================================================================== diff -u -r6afbb616ce84cccaf56617d60c5cd821b00daab0 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs (.../DesignVariablePropertiesTest.cs) (revision 6afbb616ce84cccaf56617d60c5cd821b00daab0) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/PropertyClasses/DesignVariablePropertiesTest.cs (.../DesignVariablePropertiesTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -25,8 +25,6 @@ using Rhino.Mocks; using Ringtoets.Common.Data.Probabilistics; using Ringtoets.Common.Forms.PropertyClasses; -using Ringtoets.Piping.Data; -using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.PropertyClasses; namespace Ringtoets.Piping.Forms.Test.PropertyClasses @@ -42,8 +40,6 @@ var handler = mocks.Stub(); mocks.ReplayAll(); - PipingCalculationScenario calculation = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); - // Call TestDelegate test = () => new SimpleDesignVariableProperties(DistributionPropertiesReadOnly.None, null, @@ -66,8 +62,6 @@ var distribution = new LogNormalDistribution(); var designVariable = new LogNormalDistributionDesignVariable(distribution); - PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); - // Call var properties = new SimpleDesignVariableProperties(DistributionPropertiesReadOnly.All, designVariable, @@ -95,8 +89,6 @@ }; var designVariable = new LogNormalDistributionDesignVariable(distribution); - PipingCalculationScenario calculationScenario = PipingCalculationScenarioFactory.CreatePipingCalculationScenarioWithValidInput(); - // Call var properties = new SimpleDesignVariableProperties(DistributionPropertiesReadOnly.None, designVariable, Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs =================================================================== diff -u -r4f9135243197ba3b1238f964bb38f3e9971d1282 -r4c93a7304d2790d347cc65847ee82f4d600fce96 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 4f9135243197ba3b1238f964bb38f3e9971d1282) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/Views/PipingCalculationsViewTest.cs (.../PipingCalculationsViewTest.cs) (revision 4c93a7304d2790d347cc65847ee82f4d600fce96) @@ -35,8 +35,6 @@ using Ringtoets.Common.Data.Calculation; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.Hydraulics; -using Ringtoets.Common.Forms.PropertyClasses; -using Ringtoets.Common.Forms.TestUtil; using Ringtoets.Piping.Data; using Ringtoets.Piping.Data.TestUtil; using Ringtoets.Piping.Forms.PresentationObjects; @@ -94,13 +92,8 @@ [Test] public void Constructor_DataGridViewCorrectlyInitialized() { - // Setup - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - // Call - using (ShowPipingCalculationsView(handler)) + using (ShowPipingCalculationsView()) { var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; @@ -122,45 +115,33 @@ DataGridViewComboBoxCell.ObjectCollection hydraulicBoundaryLocationComboboxItems = hydraulicBoundaryLocationCombobox.Items; Assert.AreEqual(0, hydraulicBoundaryLocationComboboxItems.Count); // Row dependent } - mocks.VerifyAll(); } [Test] public void Constructor_ListBoxCorrectlyInitialized() { - // Setup - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - // Call - using (ShowPipingCalculationsView(handler)) + using (ShowPipingCalculationsView()) { var listBox = (ListBox) new ControlTester("listBox").TheObject; // Assert Assert.AreEqual(0, listBox.Items.Count); } - mocks.VerifyAll(); } [Test] public void Data_SetToNull_DoesNotThrow() { // Setup - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { // Call var testDelegate = new TestDelegate(() => pipingCalculationsView.Data = null); // Assert Assert.DoesNotThrow(testDelegate); } - mocks.VerifyAll(); } [Test] @@ -169,11 +150,10 @@ // Setup var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); using (PipingCalculationsView pipingCalculationsView = ShowSimplePipingCalculationsViewWithoutSurfaceLines( - assessmentSection, new HydraulicBoundaryDatabase(), handler)) + assessmentSection, new HydraulicBoundaryDatabase())) { // Call pipingCalculationsView.AssessmentSection = assessmentSection; @@ -196,11 +176,10 @@ // Setup var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); using (PipingCalculationsView pipingCalculationsView = ShowSimplePipingCalculationsViewWithSurfaceLines( - assessmentSection, handler)) + assessmentSection)) { // Call pipingCalculationsView.AssessmentSection = assessmentSection; @@ -221,11 +200,10 @@ // Setup var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); using (PipingCalculationsView pipingCalculationsView = ShowFullyConfiguredPipingCalculationsView( - assessmentSection, handler)) + assessmentSection)) { // Call pipingCalculationsView.AssessmentSection = assessmentSection; @@ -250,10 +228,6 @@ public void PipingFailureMechanism_PipingFailureMechanismWithSections_SectionsListBoxCorrectlyInitialized() { // Setup - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - var pipingFailureMechanism = new PipingFailureMechanism(); var failureMechanismSection1 = new FailureMechanismSection("Section 1", new List { @@ -275,7 +249,7 @@ pipingFailureMechanism.AddSection(failureMechanismSection2); pipingFailureMechanism.AddSection(failureMechanismSection3); - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { // Call pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; @@ -287,7 +261,6 @@ Assert.AreSame(failureMechanismSection2, listBox.Items[1]); Assert.AreSame(failureMechanismSection3, listBox.Items[2]); } - mocks.VerifyAll(); } [Test] @@ -296,10 +269,9 @@ // Setup & Call var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); - using (ShowFullyConfiguredPipingCalculationsView(assessmentSection, handler)) + using (ShowFullyConfiguredPipingCalculationsView(assessmentSection)) { var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; @@ -323,10 +295,9 @@ // Setup & Call var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); - using (ShowFullyConfiguredPipingCalculationsView(assessmentSection, handler)) + using (ShowFullyConfiguredPipingCalculationsView(assessmentSection)) { var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; @@ -350,10 +321,9 @@ // Setup & Call var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); - using (ShowFullyConfiguredPipingCalculationsView(assessmentSection, handler)) + using (ShowFullyConfiguredPipingCalculationsView(assessmentSection)) { var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; @@ -394,11 +364,10 @@ // Setup var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); PipingCalculationsView pipingCalculationsView = ShowFullyConfiguredPipingCalculationsView( - assessmentSection, handler); + assessmentSection); var selectionChangedCount = 0; pipingCalculationsView.SelectionChanged += (sender, args) => selectionChangedCount++; @@ -421,11 +390,10 @@ // Setup var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); using (PipingCalculationsView pipingCalculationsView = ShowFullyConfiguredPipingCalculationsView( - assessmentSection, handler)) + assessmentSection)) { var selectionChangedCount = 0; pipingCalculationsView.SelectionChanged += (sender, args) => selectionChangedCount++; @@ -463,10 +431,9 @@ // Setup var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); - using (ShowFullyConfiguredPipingCalculationsView(assessmentSection, handler)) + using (ShowFullyConfiguredPipingCalculationsView(assessmentSection)) { var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; @@ -507,9 +474,7 @@ var newRoundedvalue = (RoundedDouble) newValue; - var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new IObservable[0]); - - using (ShowFullyConfiguredPipingCalculationsView(assessmentSection, failureMechanism, calculationGroup, handler)) + using (ShowFullyConfiguredPipingCalculationsView(assessmentSection, failureMechanism, calculationGroup)) { mocks.ReplayAll(); @@ -528,17 +493,13 @@ public void ButtonGenerateScenarios_WithoutSurfaceLines_ButtonDisabled() { // Setup - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - var pipingFailureMechanism = new PipingFailureMechanism(); pipingFailureMechanism.StochasticSoilModels.AddRange(new[] { new TestStochasticSoilModel() }, "path"); - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; var button = (Button) pipingCalculationsView.Controls.Find("buttonGenerateScenarios", true)[0]; @@ -549,24 +510,19 @@ // Assert Assert.IsFalse(state); } - mocks.VerifyAll(); } [Test] public void ButtonGenerateScenarios_WithoutSoilModels_ButtonDisabled() { // Setup - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - var pipingFailureMechanism = new PipingFailureMechanism(); pipingFailureMechanism.SurfaceLines.AddRange(new[] { new RingtoetsPipingSurfaceLine() }, "path"); - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; var button = (Button) pipingCalculationsView.Controls.Find("buttonGenerateScenarios", true)[0]; @@ -577,17 +533,12 @@ // Assert Assert.IsFalse(state); } - mocks.VerifyAll(); } [Test] public void ButtonGenerateScenarios_WithSurfaceLinesAndSoilModels_ButtonEnabled() { // Setup - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - var pipingFailureMechanism = new PipingFailureMechanism(); const string arbitrarySourcePath = "path"; pipingFailureMechanism.SurfaceLines.AddRange(new[] @@ -599,7 +550,7 @@ new TestStochasticSoilModel() }, arbitrarySourcePath); - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; @@ -611,17 +562,12 @@ // Assert Assert.IsTrue(state); } - mocks.VerifyAll(); } [Test] public void GivenPipingCalculationsViewWithPipingFailureMechanism_WhenSectionsAddedAndPipingFailureMechanismNotified_ThenSectionsListBoxCorrectlyUpdated() { // Given - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - var pipingFailureMechanismWithSections = new PipingFailureMechanism(); var failureMechanismSection1 = new FailureMechanismSection("Section 1", new List { @@ -639,7 +585,7 @@ new Point2D(15.0, 0.0) }); - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanismWithSections; @@ -661,17 +607,12 @@ Assert.AreSame(failureMechanismSection2, listBox.Items[1]); Assert.AreSame(failureMechanismSection3, listBox.Items[2]); } - mocks.VerifyAll(); } [Test] public void GivenPipingCalculationsView_WhenGenerateScenariosButtonClicked_ThenShowViewWithSurfaceLines() { // Given - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - var pipingFailureMechanism = new PipingFailureMechanism(); const string arbitraryFilePath = "path"; pipingFailureMechanism.SurfaceLines.AddRange(new[] @@ -690,7 +631,7 @@ new TestStochasticSoilModel() }, arbitraryFilePath); - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; pipingCalculationsView.Data = pipingFailureMechanism.CalculationsGroup; @@ -714,7 +655,6 @@ Assert.NotNull(grid); Assert.AreEqual(2, grid.Rows.Count); } - mocks.VerifyAll(); } [Test] @@ -723,7 +663,6 @@ // Given var mocks = new MockRepository(); var observer = mocks.StrictMock(); - var handler = mocks.Stub(); mocks.ReplayAll(); var pipingFailureMechanism = new PipingFailureMechanism(); @@ -745,7 +684,7 @@ }, arbitraryFilePath); pipingFailureMechanism.CalculationsGroup.Attach(observer); - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; @@ -768,7 +707,6 @@ var mocks = new MockRepository(); var observer = mocks.StrictMock(); observer.Expect(o => o.UpdateObserver()); - var handler = mocks.Stub(); mocks.ReplayAll(); var pipingFailureMechanism = new PipingFailureMechanism(); @@ -790,7 +728,7 @@ }, arbitryFilePath); pipingFailureMechanism.CalculationsGroup.Attach(observer); - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; pipingCalculationsView.Data = pipingFailureMechanism.CalculationsGroup; @@ -817,11 +755,7 @@ public void GivenPipingCalculationsViewGenerateScenariosButtonClicked_WhenSurfaceLineSelectedAndDialogClosed_ThenUpdateSectionResultScenarios() { // Given - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { PipingFailureMechanism pipingFailureMechanism = ConfigureSimpleFailureMechanism(); @@ -857,18 +791,13 @@ CollectionAssert.IsEmpty(failureMechanismSectionResult2.GetCalculationScenarios(pipingCalculationScenarios)); } - mocks.VerifyAll(); } [Test] public void GivenPipingCalculationsViewGenerateScenariosCancelButtonClicked_WhenDialogClosed_CalculationsNotUpdated() { // Given - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { PipingFailureMechanism pipingFailureMechanism = ConfigureSimpleFailureMechanism(); @@ -892,18 +821,13 @@ // Then Assert.IsEmpty(pipingCalculationsView.PipingFailureMechanism.Calculations); } - mocks.VerifyAll(); } [Test] public void GivenFailureMechanismWithoutSurfaceLinesAndSoilModels_WhenAddSoilModelAndNotify_ThenButtonDisabled() { // Given - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { var pipingFailureMechanism = new PipingFailureMechanism(); pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; @@ -919,18 +843,13 @@ var button = (Button) pipingCalculationsView.Controls.Find("buttonGenerateScenarios", true)[0]; Assert.IsFalse(button.Enabled); } - mocks.VerifyAll(); } [Test] public void GivenFailureMechanismWithoutSurfaceLinesAndSoilModels_WhenAddSurfaceLineAndNotify_ThenButtonDisabled() { // Given - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { var pipingFailureMechanism = new PipingFailureMechanism(); pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; @@ -946,18 +865,13 @@ var button = (Button) pipingCalculationsView.Controls.Find("buttonGenerateScenarios", true)[0]; Assert.IsFalse(button.Enabled); } - mocks.VerifyAll(); } [Test] public void GivenFailureMechanismWithoutSurfaceLinesAndSoilModels_WhenAddSurfaceLineAndSoilModelAndDoNotNotifyObservers_ThenButtonDisabled() { // Given - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { var pipingFailureMechanism = new PipingFailureMechanism(); pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; @@ -977,18 +891,13 @@ var button = (Button) pipingCalculationsView.Controls.Find("buttonGenerateScenarios", true)[0]; Assert.IsFalse(button.Enabled); } - mocks.VerifyAll(); } [Test] public void GivenFailureMechanismWithoutSurfaceLinesAndSoilModels_WhenAddSurfaceLineAndSoilModelAndNotifyObservers_ThenButtonEnabled() { // Given - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { var pipingFailureMechanism = new PipingFailureMechanism(); pipingCalculationsView.PipingFailureMechanism = pipingFailureMechanism; @@ -1009,18 +918,13 @@ var button = (Button) pipingCalculationsView.Controls.Find("buttonGenerateScenarios", true)[0]; Assert.IsTrue(button.Enabled); } - mocks.VerifyAll(); } [Test] public void GivenFailureMechanismWithSurfaceLinesAndSoilModels_WhenSurfaceLinesAndSoilModelsClearedAndNotifyObservers_ThenButtonDisabled() { // Given - var mocks = new MockRepository(); - var handler = mocks.Stub(); - mocks.ReplayAll(); - - using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler)) + using (PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView()) { var pipingFailureMechanism = new PipingFailureMechanism(); const string arbitraryFilePath = "path"; @@ -1043,7 +947,6 @@ var button = (Button) pipingCalculationsView.Controls.Find("buttonGenerateScenarios", true)[0]; Assert.IsFalse(button.Enabled); } - mocks.VerifyAll(); } [Test] @@ -1063,18 +966,11 @@ ConfigureHydraulicBoundaryDatabase(assessmentSection); PipingFailureMechanism failureMechanism = ConfigureFailuremechanism(); CalculationGroup calculationGroup = ConfigureCalculationGroup(assessmentSection, failureMechanism); - var calculation = (PipingCalculationScenario) calculationGroup.Children.First(); var value = (RoundedDouble) newValue; - var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new Observable[] - { - calculation.InputParameters, - calculation - }); - using (PipingCalculationsView pipingCalculationView = ShowFullyConfiguredPipingCalculationsView( - assessmentSection, failureMechanism, calculationGroup, handler)) + assessmentSection, failureMechanism, calculationGroup)) { var data = (CalculationGroup) pipingCalculationView.Data; var pipingCalculation = (PipingCalculationScenario) data.Children.First(); @@ -1111,16 +1007,9 @@ ConfigureHydraulicBoundaryDatabase(assessmentSection); PipingFailureMechanism failureMechanism = ConfigureFailuremechanism(); CalculationGroup calculationGroup = ConfigureCalculationGroup(assessmentSection, failureMechanism); - var calculation = (PipingCalculationScenario) calculationGroup.Children.First(); - var handler = new CalculationInputSetPropertyValueAfterConfirmationParameterTester(new Observable[] - { - calculation.InputParameters, - calculation - }); - using (PipingCalculationsView pipingCalculationView = ShowFullyConfiguredPipingCalculationsView( - assessmentSection, failureMechanism, calculationGroup, handler)) + assessmentSection, failureMechanism, calculationGroup)) { var data = (CalculationGroup) pipingCalculationView.Data; var pipingCalculation = (PipingCalculationScenario) data.Children.First(); @@ -1148,11 +1037,10 @@ // Setup var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); using (PipingCalculationsView pipingCalculationView = ShowFullyConfiguredPipingCalculationsView( - assessmentSection, handler)) + assessmentSection)) { var dataGridView = (DataGridView) new ControlTester("dataGridView").TheObject; @@ -1182,11 +1070,10 @@ pipingCalculationObserver.Expect(o => o.UpdateObserver()); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); using (PipingCalculationsView pipingCalculationView = ShowFullyConfiguredPipingCalculationsView( - assessmentSection, handler)) + assessmentSection)) { var data = (CalculationGroup) pipingCalculationView.Data; var pipingCalculation = (PipingCalculationScenario) data.Children.First(); @@ -1232,7 +1119,6 @@ var mocks = new MockRepository(); var pipingCalculationObserver = mocks.StrictMock(); var pipingCalculationInputObserver = mocks.StrictMock(); - var handler = mocks.Stub(); if (useCalculationWithOutput) { @@ -1253,7 +1139,7 @@ CalculationGroup calculationGroup = ConfigureCalculationGroup(assessmentSection, failureMechanism); using (PipingCalculationsView pipingCalculationView = ShowFullyConfiguredPipingCalculationsView( - assessmentSection, failureMechanism, calculationGroup, handler)) + assessmentSection, failureMechanism, calculationGroup)) { mocks.ReplayAll(); @@ -1285,11 +1171,10 @@ // Given var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); using (PipingCalculationsView pipingCalculationView = ShowFullyConfiguredPipingCalculationsView( - assessmentSection, handler)) + assessmentSection)) { var data = (CalculationGroup) pipingCalculationView.Data; var pipingCalculation = (PipingCalculationScenario) data.Children.First(); @@ -1321,11 +1206,10 @@ // Given var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); using (PipingCalculationsView pipingCalculationView = ShowFullyConfiguredPipingCalculationsView( - assessmentSection, handler)) + assessmentSection)) { var data = (CalculationGroup) pipingCalculationView.Data; var pipingCalculation = (PipingCalculationScenario) data.Children[1]; @@ -1366,11 +1250,10 @@ // Given var mocks = new MockRepository(); var assessmentSection = mocks.Stub(); - var handler = mocks.Stub(); mocks.ReplayAll(); using (PipingCalculationsView pipingCalculationView = ShowFullyConfiguredPipingCalculationsView( - assessmentSection, handler)) + assessmentSection)) { var data = (CalculationGroup) pipingCalculationView.Data; var pipingCalculation = (PipingCalculationScenario) data.Children[0]; @@ -1419,25 +1302,22 @@ } private PipingCalculationsView ShowFullyConfiguredPipingCalculationsView( - IAssessmentSection assessmentSection, - IObservablePropertyChangeHandler handler) + IAssessmentSection assessmentSection) { ConfigureHydraulicBoundaryDatabase(assessmentSection); PipingFailureMechanism failureMechanism = ConfigureFailuremechanism(); return ShowFullyConfiguredPipingCalculationsView(assessmentSection, failureMechanism, - ConfigureCalculationGroup(assessmentSection, failureMechanism), - handler); + ConfigureCalculationGroup(assessmentSection, failureMechanism)); } private PipingCalculationsView ShowFullyConfiguredPipingCalculationsView(IAssessmentSection assessmentSection, PipingFailureMechanism failureMechanism, - CalculationGroup calculationGroup, - IObservablePropertyChangeHandler handler) + CalculationGroup calculationGroup) { - PipingCalculationsView view = ShowPipingCalculationsView(handler); + PipingCalculationsView view = ShowPipingCalculationsView(); view.Data = calculationGroup; view.AssessmentSection = assessmentSection; view.PipingFailureMechanism = failureMechanism; @@ -1456,8 +1336,7 @@ assessmentSection.HydraulicBoundaryDatabase = hydraulicBoundaryDatabase; } - private PipingCalculationsView ShowSimplePipingCalculationsViewWithSurfaceLines(IAssessmentSection assessmentSection, - IObservablePropertyChangeHandler handler) + private PipingCalculationsView ShowSimplePipingCalculationsViewWithSurfaceLines(IAssessmentSection assessmentSection) { var surfaceLine1 = new RingtoetsPipingSurfaceLine { @@ -1504,7 +1383,7 @@ new Point2D(10.0, 0.0) })); - PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler); + PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(); pipingCalculationsView.Data = new CalculationGroup("Group", true) { @@ -1536,8 +1415,7 @@ } private PipingCalculationsView ShowSimplePipingCalculationsViewWithoutSurfaceLines(IAssessmentSection assessmentSection, - HydraulicBoundaryDatabase hydraulicBoundaryDatabase, - IObservablePropertyChangeHandler handler) + HydraulicBoundaryDatabase hydraulicBoundaryDatabase) { var hydraulicBoundaryLocation1 = new HydraulicBoundaryLocation(1, "Location 1", 1.1, 2.2); var hydraulicBoundaryLocation2 = new HydraulicBoundaryLocation(2, "Location 2", 3.3, 4.4); @@ -1559,7 +1437,7 @@ new Point2D(10.0, 0.0) })); - PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(handler); + PipingCalculationsView pipingCalculationsView = ShowPipingCalculationsView(); pipingCalculationsView.Data = new CalculationGroup("Group", true) { @@ -1840,7 +1718,7 @@ return pipingFailureMechanism; } - private PipingCalculationsView ShowPipingCalculationsView(IObservablePropertyChangeHandler handler) + private PipingCalculationsView ShowPipingCalculationsView() { var pipingCalculationsView = new PipingCalculationsView();