Index: Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationActivityTest.cs =================================================================== diff -u -re04df496f16bc00158ac937fd0919499686883d8 -r6f1e2e16c67292603f19489965183fa7176ff6af --- Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision e04df496f16bc00158ac937fd0919499686883d8) +++ Ringtoets/Integration/test/Ringtoets.Integration.Service.Test/DesignWaterLevelCalculationActivityTest.cs (.../DesignWaterLevelCalculationActivityTest.cs) (revision 6f1e2e16c67292603f19489965183fa7176ff6af) @@ -245,22 +245,22 @@ ImportHydraulicBoundaryDatabase(assessmentSectionStub); var hydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(loc => loc.Id == 1300001); - hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence = true; + hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence = CalculationConvergence.CalculatedConverged; var activity = new DesignWaterLevelCalculationActivity(assessmentSectionStub, hydraulicBoundaryLocation); activity.Run(); // Precondition Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel); - Assert.IsTrue(hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); + Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); // Call activity.Finish(); // Assert Assert.IsFalse(double.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel)); - Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); + Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); mockRepository.VerifyAll(); } @@ -280,22 +280,22 @@ ImportHydraulicBoundaryDatabase(assessmentSectionStub); var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "test", 1, 1); - hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence = true; + hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence = CalculationConvergence.CalculatedConverged; var activity = new DesignWaterLevelCalculationActivity(assessmentSectionStub, hydraulicBoundaryLocation); activity.Run(); // Precondition Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel); - Assert.IsTrue(hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); + Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); // Call activity.Finish(); // Assert Assert.IsNaN(hydraulicBoundaryLocation.DesignWaterLevel); - Assert.IsTrue(hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); + Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); mockRepository.VerifyAll(); } @@ -315,14 +315,14 @@ ImportHydraulicBoundaryDatabase(assessmentSectionStub); var hydraulicBoundaryLocation = assessmentSectionStub.HydraulicBoundaryDatabase.Locations.First(loc => loc.Id == 1300001); - hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence = true; + hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence = CalculationConvergence.CalculatedConverged; var activity = new DesignWaterLevelCalculationActivity(assessmentSectionStub, hydraulicBoundaryLocation); activity.Run(); // Precondition - Assert.IsTrue(hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); + Assert.AreEqual(CalculationConvergence.CalculatedConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); // Call Action call = () => activity.Finish(); @@ -335,7 +335,7 @@ StringAssert.StartsWith("Toetspeil berekening voor locatie punt_flw_ 1 is niet geconvergeerd.", msgs[0]); StringAssert.StartsWith("Uitvoeren van 'Toetspeil berekenen voor locatie 'punt_flw_ 1'' is gelukt.", msgs[1]); }); - Assert.IsFalse(hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); + Assert.AreEqual(CalculationConvergence.CalculatedNotConverged, hydraulicBoundaryLocation.DesignWaterLevelCalculationConvergence); mockRepository.VerifyAll(); }