Index: Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationTest.cs =================================================================== diff -u -r8cc644609de02fddbdc3259cebd745e299e7444f -rbdb060e3b2a5569ba3c8c9b0e8e940109c183cb5 --- Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationTest.cs (.../HydraulicBoundaryLocationTest.cs) (revision 8cc644609de02fddbdc3259cebd745e299e7444f) +++ Ringtoets/Common/test/Ringtoets.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationTest.cs (.../HydraulicBoundaryLocationTest.cs) (revision bdb060e3b2a5569ba3c8c9b0e8e940109c183cb5) @@ -24,7 +24,6 @@ using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; -using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.Common.Data.Test.Hydraulics { @@ -67,51 +66,15 @@ Assert.IsInstanceOf(hydraulicBoundaryLocation.WaveHeightCalculation); Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel); - Assert.AreEqual(CalculationConvergence.NotCalculated, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculation.HasOutput); Assert.IsNull(hydraulicBoundaryLocation.DesignWaterLevelCalculation.Output); Assert.IsNaN(hydraulicBoundaryLocation.WaveHeight); - Assert.AreEqual(CalculationConvergence.NotCalculated, hydraulicBoundaryLocation.WaveHeightCalculationConvergence); Assert.IsFalse(hydraulicBoundaryLocation.WaveHeightCalculation.HasOutput); Assert.IsNull(hydraulicBoundaryLocation.WaveHeightCalculation.Output); } [Test] - [TestCase(CalculationConvergence.CalculatedConverged)] - [TestCase(CalculationConvergence.CalculatedNotConverged)] - public void DesignWaterLevelCalculationConvergence_ValidOutput_SetsCalculationOutputAndCalculationConvergence(CalculationConvergence converged) - { - // Setup - var location = new HydraulicBoundaryLocation(0, "", 0, 0); - var output = new TestHydraulicBoundaryLocationOutput(0, converged); - - // Call - location.DesignWaterLevelCalculation.Output = output; - - // Assert - Assert.AreSame(output, location.DesignWaterLevelCalculation.Output); - Assert.AreEqual(converged, location.DesignWaterLevelCalculationConvergence); - } - - [Test] - [TestCase(CalculationConvergence.CalculatedConverged)] - [TestCase(CalculationConvergence.CalculatedNotConverged)] - public void WaveHeightCalculationConvergence_ValidOutput_SetsCalculationOutputAndCalculationConvergence(CalculationConvergence converged) - { - // Setup - var location = new HydraulicBoundaryLocation(0, "", 0, 0); - var output = new TestHydraulicBoundaryLocationOutput(0, converged); - - // Call - location.WaveHeightCalculation.Output = output; - - // Assert - Assert.AreSame(output, location.WaveHeightCalculation.Output); - Assert.AreEqual(converged, location.WaveHeightCalculationConvergence); - } - - [Test] public void ToString_Always_ReturnsName() { // Setup