Index: Application/Ringtoets/test/Application.Ringtoets.Test/AppTest.cs =================================================================== diff -u -rfb79e3759044b8f89bf725e8e4cc47408a2b0576 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Application/Ringtoets/test/Application.Ringtoets.Test/AppTest.cs (.../AppTest.cs) (revision fb79e3759044b8f89bf725e8e4cc47408a2b0576) +++ Application/Ringtoets/test/Application.Ringtoets.Test/AppTest.cs (.../AppTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -22,8 +22,6 @@ using System; using System.DirectoryServices.AccountManagement; using System.Linq; -using System.Security; -using System.Security.Principal; using Core.Common.Gui.Settings; using Core.Common.TestUtil; using NUnit.Framework; Index: Core/Common/test/Core.Common.Base.Test/ObserverTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Core/Common/test/Core.Common.Base.Test/ObserverTest.cs (.../ObserverTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/test/Core.Common.Base.Test/ObserverTest.cs (.../ObserverTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -33,15 +33,17 @@ var counter = 0; // Call - var observer = new Observer(() => { counter++; }); + using (var observer = new Observer(() => { counter++; })) + { - // Assert - Assert.IsInstanceOf(observer); - Assert.IsNull(observer.Observable); - Assert.AreEqual(0, counter); + // Assert + Assert.IsInstanceOf(observer); + Assert.IsNull(observer.Observable); + Assert.AreEqual(0, counter); - observer.UpdateObserver(); - Assert.AreEqual(1, counter); + observer.UpdateObserver(); + Assert.AreEqual(1, counter); + } } [Test] @@ -50,16 +52,17 @@ // Setup var counter = 0; var observable = new TestObservable(); - var observer = new Observer(() => counter++) + using (new Observer(() => counter++) { Observable = observable - }; + }) + { + // Call + observable.NotifyObservers(); - // Call - observable.NotifyObservers(); - - // Assert - Assert.AreEqual(1, counter); + // Assert + Assert.AreEqual(1, counter); + } } [Test] @@ -68,18 +71,19 @@ // Setup var counter = 0; var observable = new TestObservable(); - var observer = new Observer(() => counter++) + using (var observer = new Observer(() => counter++) { Observable = observable - }; + }) + { + observer.Observable = null; - observer.Observable = null; + // Call + observable.NotifyObservers(); - // Call - observable.NotifyObservers(); - - // Assert - Assert.AreEqual(0, counter); + // Assert + Assert.AreEqual(0, counter); + } } [Test] Index: Core/Common/test/Core.Common.Base.Test/RecursiveObserverTest.cs =================================================================== diff -u -r24da3aa72ccc0776599628c9f971081694048d9a -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Core/Common/test/Core.Common.Base.Test/RecursiveObserverTest.cs (.../RecursiveObserverTest.cs) (revision 24da3aa72ccc0776599628c9f971081694048d9a) +++ Core/Common/test/Core.Common.Base.Test/RecursiveObserverTest.cs (.../RecursiveObserverTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -34,15 +34,16 @@ var counter = 0; // Call - var recursiveObserver = new RecursiveObserver(() => { counter++; }, GetChildren); + using (var recursiveObserver = new RecursiveObserver(() => { counter++; }, GetChildren)) + { + // Assert + Assert.IsInstanceOf(recursiveObserver); + Assert.IsNull(recursiveObserver.Observable); + Assert.AreEqual(0, counter); - // Assert - Assert.IsInstanceOf(recursiveObserver); - Assert.IsNull(recursiveObserver.Observable); - Assert.AreEqual(0, counter); - - recursiveObserver.UpdateObserver(); - Assert.AreEqual(1, counter); + recursiveObserver.UpdateObserver(); + Assert.AreEqual(1, counter); + } } [TestCase(0)] @@ -59,19 +60,20 @@ InitializeHierarchy(nestingLevel, ref currentNestedContainer, ref currentTestObservable); - var recursiveObserver = new RecursiveObserver(() => counter++, GetChildren) + using (new RecursiveObserver(() => counter++, GetChildren) { Observable = rootContainer - }; + }) + { + // When + currentNestedContainer.NotifyObservers(); - // When - currentNestedContainer.NotifyObservers(); + // Then + Assert.AreEqual(1, counter); - // Then - Assert.AreEqual(1, counter); - - currentTestObservable.NotifyObservers(); - Assert.AreEqual(1, counter); // Nothing should have happened + currentTestObservable.NotifyObservers(); + Assert.AreEqual(1, counter); // Nothing should have happened + } } [TestCase(1)] @@ -87,19 +89,20 @@ InitializeHierarchy(nestingLevel, ref currentNestedContainer, ref currentTestObservable); - var recursiveObserver = new RecursiveObserver(() => counter++, GetChildren) + using (new RecursiveObserver(() => counter++, GetChildren) { Observable = rootContainer - }; + }) + { + // When + currentTestObservable.NotifyObservers(); - // When - currentTestObservable.NotifyObservers(); + // Then + Assert.AreEqual(1, counter); - // Then - Assert.AreEqual(1, counter); - - currentNestedContainer.NotifyObservers(); - Assert.AreEqual(1, counter); // Nothing should have happened + currentNestedContainer.NotifyObservers(); + Assert.AreEqual(1, counter); // Nothing should have happened + } } [TestCase(0)] @@ -116,17 +119,18 @@ InitializeHierarchy(nestingLevel, ref currentNestedContainer, ref currentTestObservable); - var recursiveObserver = new RecursiveObserver(() => counter++, GetChildren) + using (var recursiveObserver = new RecursiveObserver(() => counter++, GetChildren) { Observable = rootContainer - }; + }) + { + // When + recursiveObserver.Observable = null; + currentNestedContainer.NotifyObservers(); - // When - recursiveObserver.Observable = null; - currentNestedContainer.NotifyObservers(); - - // Then - Assert.AreEqual(0, counter); + // Then + Assert.AreEqual(0, counter); + } } [TestCase(1)] @@ -142,17 +146,18 @@ InitializeHierarchy(nestingLevel, ref currentNestedContainer, ref currentTestObservable); - var recursiveObserver = new RecursiveObserver(() => counter++, GetChildren) + using (var recursiveObserver = new RecursiveObserver(() => counter++, GetChildren) { Observable = rootContainer - }; + }) + { + // When + recursiveObserver.Observable = null; + currentTestObservable.NotifyObservers(); - // When - recursiveObserver.Observable = null; - currentTestObservable.NotifyObservers(); - - // Then - Assert.AreEqual(0, counter); + // Then + Assert.AreEqual(0, counter); + } } [TestCase(0)] @@ -223,22 +228,23 @@ InitializeHierarchy(nestingLevel, ref currentNestedContainer, ref currentTestObservable); - var recursiveObserver = new RecursiveObserver(() => counter++, GetChildren) + using (new RecursiveObserver(() => counter++, GetChildren) { Observable = rootContainer - }; + }) + { + // When + rootContainer.Children.Clear(); + rootContainer.NotifyObservers(); // Collection changes should always be notified - // When - rootContainer.Children.Clear(); - rootContainer.NotifyObservers(); // Collection changes should always be notified + // Precondition (counter equals 1 due to previous notification) + Assert.AreEqual(1, counter); - // Precondition (counter equals 1 due to previous notification) - Assert.AreEqual(1, counter); + currentNestedContainer.NotifyObservers(); - currentNestedContainer.NotifyObservers(); - - // Then - Assert.AreEqual(1, counter); + // Then + Assert.AreEqual(1, counter); + } } [TestCase(1)] @@ -254,19 +260,20 @@ InitializeHierarchy(nestingLevel, ref currentNestedContainer, ref currentTestObservable); - var recursiveObserver = new RecursiveObserver(() => counter++, GetChildren) + using (new RecursiveObserver(() => counter++, GetChildren) { Observable = rootContainer - }; + }) + { + // When + rootContainer.Children.Clear(); + rootContainer.NotifyObservers(); // Collection changes should always be notified - // When - rootContainer.Children.Clear(); - rootContainer.NotifyObservers(); // Collection changes should always be notified + currentTestObservable.NotifyObservers(); - currentTestObservable.NotifyObservers(); - - // Then - Assert.AreEqual(0, counter); + // Then + Assert.AreEqual(0, counter); + } } private static void InitializeHierarchy(int nestingLevel, ref TestContainer currentNestedContainer, ref TestObservable currentTestObservable) Index: Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs =================================================================== diff -u -rd481a5ba0fb5309250e76a7e8dc12a512a6d3312 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs (.../MapLegendView.cs) (revision d481a5ba0fb5309250e76a7e8dc12a512a6d3312) +++ Core/Plugins/src/Core.Plugins.Map/Legend/MapLegendView.cs (.../MapLegendView.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -23,7 +23,6 @@ using System.IO; using System.Linq; using System.Windows.Forms; -using Core.Common.Base; using Core.Common.Controls.TreeView; using Core.Common.Controls.Views; using Core.Common.Gui.ContextMenu; Index: Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/MapDataViewTest.cs =================================================================== diff -u -r675771641656abfb56ef89be86bad7bd21684016 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/MapDataViewTest.cs (.../MapDataViewTest.cs) (revision 675771641656abfb56ef89be86bad7bd21684016) +++ Demo/Ringtoets/test/Demo.Ringtoets.Test/Views/MapDataViewTest.cs (.../MapDataViewTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using System.Linq; using System.Windows.Forms; using Core.Common.Base.Geometry; Index: Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/Common/src/Ringtoets.Common.Forms/Views/RingtoetsMapDataFeaturesFactory.cs (.../RingtoetsMapDataFeaturesFactory.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -233,8 +233,9 @@ { if ((calculations != null && calculations.Any())) { - MapCalculationData[] calculationData = Enumerable.ToArray(calculations.Where(CalculationHasStructureAndHydraulicBoundaryLocation) - .Select(CreatemapCalculationData)); + MapCalculationData[] calculationData = calculations.Where(CalculationHasStructureAndHydraulicBoundaryLocation) + .Select(CreatemapCalculationData) + .ToArray(); return CreateCalculationFeatures(calculationData); } Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs =================================================================== diff -u -r71eba24cc0be4f2cfe3cca917430cd23510eaa4f -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs (.../TruncatedNormalDistributionTest.cs) (revision 71eba24cc0be4f2cfe3cca917430cd23510eaa4f) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Probabilistics/TruncatedNormalDistributionTest.cs (.../TruncatedNormalDistributionTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -19,9 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using Core.Common.Base.Data; -using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Data.Probabilistics; Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/DesignWaterLevelLocationRowTest.cs =================================================================== diff -u -r19db52c6c2776ade0a18342b78f1d64f809ce9d7 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/DesignWaterLevelLocationRowTest.cs (.../DesignWaterLevelLocationRowTest.cs) (revision 19db52c6c2776ade0a18342b78f1d64f809ce9d7) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/DesignWaterLevelLocationRowTest.cs (.../DesignWaterLevelLocationRowTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -20,8 +20,6 @@ // All rights reserved. using System; -using Core.Common.Base.Data; -using Core.Common.Base.Geometry; using Core.Common.Utils.Reflection; using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; Index: Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs =================================================================== diff -u -r533cfb6b8d9c3e198204d1c6ee022b79049e6d43 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs (.../HydraulicBoundaryLocationsViewTest.cs) (revision 533cfb6b8d9c3e198204d1c6ee022b79049e6d43) +++ Ringtoets/Common/test/Ringtoets.Common.Forms.Test/Views/HydraulicBoundaryLocationsViewTest.cs (.../HydraulicBoundaryLocationsViewTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -24,7 +24,6 @@ using System.Linq; using System.Windows.Forms; using Core.Common.Base; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.Controls.Views; using NUnit.Extensions.Forms; Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/StructuresImporterTest.cs =================================================================== diff -u -r2aa9661130f20e88c41dac921ffb780573dcf799 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/StructuresImporterTest.cs (.../StructuresImporterTest.cs) (revision 2aa9661130f20e88c41dac921ffb780573dcf799) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/FileImporters/StructuresImporterTest.cs (.../StructuresImporterTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -153,6 +153,7 @@ string expectedMessage = new FileReaderErrorMessageBuilder(folderPath) .Build(CoreCommonUtilsResources.Error_Path_must_not_point_to_empty_file_name); TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + Assert.IsFalse(importResult); } [Test] @@ -178,6 +179,7 @@ string expectedMessage = string.Format("Fout bij het lezen van bestand '{0}': kon geen punten vinden in dit bestand.", filePath); TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + Assert.IsFalse(importResult); } [Test] @@ -336,6 +338,7 @@ // Assert string expectedMessage = "Kunstwerklocatie met KWKIDENT 'KUNST3' is opnieuw ingelezen."; TestHelper.AssertLogMessageIsGenerated(call, expectedMessage, 1); + Assert.IsTrue(importResult); } [Test] @@ -372,6 +375,7 @@ "Fout bij het lezen van kunstwerk op regel 5. Het kunstwerk heeft geen geldige waarde voor attribuut 'KWKIDENT'. Dit kunstwerk wordt overgeslagen." }; TestHelper.AssertLogMessagesAreGenerated(call, expectedMessages); + Assert.IsFalse(importResult); } [Test] Index: Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs =================================================================== diff -u -rd73c509c93f18a87da76086c871eca2a2c903e12 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs (.../HydraRingSettingsDatabaseReaderTest.cs) (revision d73c509c93f18a87da76086c871eca2a2c903e12) +++ Ringtoets/Common/test/Ringtoets.Common.IO.Test/HydraRing/HydraRingSettingsDatabaseReaderTest.cs (.../HydraRingSettingsDatabaseReaderTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -27,7 +27,6 @@ using Core.Common.IO.Readers; using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.Common.Data.TestUtil; using Ringtoets.Common.IO.HydraRing; using Ringtoets.HydraRing.Calculation.Data; using Ringtoets.HydraRing.Calculation.Data.Settings; Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs =================================================================== diff -u -r19db52c6c2776ade0a18342b78f1d64f809ce9d7 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 19db52c6c2776ade0a18342b78f1d64f809ce9d7) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/DesignWaterLevelCalculationServiceTest.cs (.../DesignWaterLevelCalculationServiceTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -22,7 +22,6 @@ using System; using System.IO; using System.Linq; -using Core.Common.Base.Data; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; Index: Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs =================================================================== diff -u -r19db52c6c2776ade0a18342b78f1d64f809ce9d7 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 19db52c6c2776ade0a18342b78f1d64f809ce9d7) +++ Ringtoets/Common/test/Ringtoets.Common.Service.Test/WaveHeightCalculationServiceTest.cs (.../WaveHeightCalculationServiceTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -22,7 +22,6 @@ using System; using System.IO; using System.Linq; -using Core.Common.Base.Data; using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs =================================================================== diff -u -re182f6f394aa75e739467a77e7bcacd9a8b25429 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision e182f6f394aa75e739467a77e7bcacd9a8b25429) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Forms.Test/TreeNodeInfos/GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs (.../GrassCoverErosionInwardsFailureMechanismContextTreeNodeInfoTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -57,7 +57,6 @@ private const int contextMenuRelevancyIndexWhenRelevant = 2; private const int contextMenuRelevancyIndexWhenNotRelevant = 0; - private const int contextMenuOpenItemIndex = 0; private const int contextMenuValidateAllIndex = 4; private const int contextMenuCalculateAllIndex = 5; private const int contextMenuClearAllIndex = 6; Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Utils.Test/GrassCoverErosionInwardsHelperTest.cs =================================================================== diff -u -rc4972d4aec336f991ac1b4ab3dcd56161c238516 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Utils.Test/GrassCoverErosionInwardsHelperTest.cs (.../GrassCoverErosionInwardsHelperTest.cs) (revision c4972d4aec336f991ac1b4ab3dcd56161c238516) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Utils.Test/GrassCoverErosionInwardsHelperTest.cs (.../GrassCoverErosionInwardsHelperTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -25,7 +25,6 @@ using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.Common.Data.DikeProfiles; using Ringtoets.Common.Data.FailureMechanism; using Ringtoets.Common.Data.TestUtil; using Ringtoets.GrassCoverErosionInwards.Data; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs =================================================================== diff -u -r87aafc58782eb7ce49b1e06b1db2feda8cd85948 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision 87aafc58782eb7ce49b1e06b1db2feda8cd85948) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/PropertyClasses/GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs (.../GrassCoverErosionOutwardsFailureMechanismPropertiesTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -22,7 +22,6 @@ using System; using System.ComponentModel; using Core.Common.Base; -using Core.Common.Base.Data; using Core.Common.Gui.PropertyBag; using Core.Common.TestUtil; using NUnit.Framework; Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs =================================================================== diff -u -r19db52c6c2776ade0a18342b78f1d64f809ce9d7 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 19db52c6c2776ade0a18342b78f1d64f809ce9d7) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Forms.Test/Views/GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs (.../GrassCoverErosionOutwardsDesignWaterLevelLocationsViewTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -25,7 +25,6 @@ using System.Linq; using System.Windows.Forms; using Core.Common.Base; -using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Extensions.Forms; Index: Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs =================================================================== diff -u -r484b07491e6cbb52ef2dc36bb236fb3b349d3141 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 484b07491e6cbb52ef2dc36bb236fb3b349d3141) +++ Ringtoets/HydraRing/test/Ringtoets.HydraRing.Calculation.TestUtil/Calculator/TestHydraRingCalculatorFactory.cs (.../TestHydraRingCalculatorFactory.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -28,7 +28,6 @@ using Ringtoets.HydraRing.Calculation.Data.Input.Structures; using Ringtoets.HydraRing.Calculation.Data.Input.WaveConditions; using Ringtoets.HydraRing.Calculation.Exceptions; -using Ringtoets.HydraRing.Calculation.Parsers; namespace Ringtoets.HydraRing.Calculation.TestUtil.Calculator { Index: Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs =================================================================== diff -u -rc9bc3ec71edfc189d0d9724627b15f1abdc7fc1d -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision c9bc3ec71edfc189d0d9724627b15f1abdc7fc1d) +++ Ringtoets/Piping/test/Ringtoets.Piping.Data.Test/PipingInputTest.cs (.../PipingInputTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -1014,11 +1014,6 @@ Assert.IsNaN(seepageLength.StandardDeviation); } - private static double GetErrorTolerance(RoundedDouble roundedDouble) - { - return Math.Pow(10.0, -roundedDouble.NumberOfDecimalPlaces); - } - private static RingtoetsPipingSurfaceLine CreateSurfaceLine() { RingtoetsPipingSurfaceLine surfaceLine = new RingtoetsPipingSurfaceLine(); Index: Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingOutputContextTreeNodeInfoTest.cs =================================================================== diff -u -r76095f14a847cd54fd958c5b326f7eb903dfd456 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingOutputContextTreeNodeInfoTest.cs (.../PipingOutputContextTreeNodeInfoTest.cs) (revision 76095f14a847cd54fd958c5b326f7eb903dfd456) +++ Ringtoets/Piping/test/Ringtoets.Piping.Forms.Test/TreeNodeInfos/PipingOutputContextTreeNodeInfoTest.cs (.../PipingOutputContextTreeNodeInfoTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -26,7 +26,6 @@ using Core.Common.TestUtil; using NUnit.Framework; using Rhino.Mocks; -using Ringtoets.Piping.Data; using Ringtoets.Piping.Forms.PresentationObjects; using Ringtoets.Piping.Plugin; using RingtoetsCommonFormsResources = Ringtoets.Common.Forms.Properties.Resources; Index: Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/PiezoHeadCalculatorStub.cs =================================================================== diff -u -r603e8bd9a029ad240267e5aec4d89aab7709bb06 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/PiezoHeadCalculatorStub.cs (.../PiezoHeadCalculatorStub.cs) (revision 603e8bd9a029ad240267e5aec4d89aab7709bb06) +++ Ringtoets/Piping/test/Ringtoets.Piping.KernelWrapper.TestUtil/SubCalculator/PiezoHeadCalculatorStub.cs (.../PiezoHeadCalculatorStub.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -19,7 +19,6 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System.Collections.Generic; using Ringtoets.Piping.KernelWrapper.SubCalculator; namespace Ringtoets.Piping.KernelWrapper.TestUtil.SubCalculator Index: Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs =================================================================== diff -u -r5cebd1bde0e31fe6099039a89333ce5c21245e50 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision 5cebd1bde0e31fe6099039a89333ce5c21245e50) +++ Ringtoets/StabilityPointStructures/src/Ringtoets.StabilityPointStructures.Forms/PropertyClasses/StabilityPointStructuresFailureMechanismProperties.cs (.../StabilityPointStructuresFailureMechanismProperties.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -44,8 +44,6 @@ private const int modelFactorSubCriticalFlowPropertyIndex = 6; private const int modelFactorCollisionLoadPropertyIndex = 7; private const int modelFactorLoadEffectPropertyIndex = 8; - private const int waveRatioMaxHNPropertyIndex = 9; - private const int waveRatioMaxHStandardDeviationPropertyIndex = 10; #region Length effect parameters Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs =================================================================== diff -u -rf718135c08ce7b90cc0eaf40bfb83c9af48a1776 -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs (.../StabilityStoneCoverPluginTest.cs) (revision f718135c08ce7b90cc0eaf40bfb83c9af48a1776) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/StabilityStoneCoverPluginTest.cs (.../StabilityStoneCoverPluginTest.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -24,7 +24,6 @@ using Core.Common.Controls.TreeView; using Core.Common.Gui.Plugin; using Core.Common.Gui.TestUtil; -using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.Common.Forms.PresentationObjects; using Ringtoets.StabilityStoneCover.Data; Index: Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs =================================================================== diff -u -r1122c77d39fb41b02f4ea32a269884ca1ea5ad5e -r8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61 --- Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs) (revision 1122c77d39fb41b02f4ea32a269884ca1ea5ad5e) +++ Ringtoets/WaveImpactAsphaltCover/src/Ringtoets.WaveImpactAsphaltCover.Forms/Views/WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultRow.cs) (revision 8dcb8c0fa8992c488bdea7d0631c84b7b1b09e61) @@ -20,10 +20,7 @@ // All rights reserved. using System; -using System.ComponentModel; -using Core.Common.Base.Data; using Ringtoets.Common.Data.FailureMechanism; -using Ringtoets.Common.Forms.TypeConverters; using Ringtoets.Common.Forms.Views; using Ringtoets.WaveImpactAsphaltCover.Data;