Index: Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationCalculationsForTargetProbabilityTest.cs =================================================================== diff -u -rfc870bc3b2986643a242e5519a2f6fad5e6771f4 -rc83058d87a9988e201849887565c4329f1c121f9 --- Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationCalculationsForTargetProbabilityTest.cs (.../HydraulicBoundaryLocationCalculationsForTargetProbabilityTest.cs) (revision fc870bc3b2986643a242e5519a2f6fad5e6771f4) +++ Riskeer/Common/test/Riskeer.Common.Data.Test/Hydraulics/HydraulicBoundaryLocationCalculationsForTargetProbabilityTest.cs (.../HydraulicBoundaryLocationCalculationsForTargetProbabilityTest.cs) (revision c83058d87a9988e201849887565c4329f1c121f9) @@ -66,7 +66,7 @@ public void TargetProbability_InvalidValue_ThrowsArgumentOutOfRangeException(double invalidValue) { // Setup - var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); + var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01); // Call void Call() => calculationsForTargetProbability.TargetProbability = invalidValue; @@ -84,7 +84,7 @@ public void TargetProbability_ValidValue_NewValueSet(double validValue) { // Setup - var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.1); + var calculationsForTargetProbability = new HydraulicBoundaryLocationCalculationsForTargetProbability(0.01); // Call calculationsForTargetProbability.TargetProbability = validValue; Index: Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs =================================================================== diff -u -ra228fa87c173763ac0593adc031c0bbf1499bcc2 -rc83058d87a9988e201849887565c4329f1c121f9 --- Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision a228fa87c173763ac0593adc031c0bbf1499bcc2) +++ Riskeer/DuneErosion/src/Riskeer.DuneErosion.Plugin/DuneErosionPlugin.cs (.../DuneErosionPlugin.cs) (revision c83058d87a9988e201849887565c4329f1c121f9) @@ -475,10 +475,7 @@ private static DuneLocationCalculationsForTargetProbability CreateDuneLocationCalculationsForTargetProbability(DuneErosionFailureMechanism failureMechanism) { - var hydraulicBoundaryLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability - { - TargetProbability = 0.01 - }; + var hydraulicBoundaryLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.01); hydraulicBoundaryLocationCalculationsForTargetProbability.DuneLocationCalculations.AddRange( failureMechanism.DuneLocations.Select(dl => new DuneLocationCalculation(dl))); Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs =================================================================== diff -u -r2e0536ede507cc8b3e9d1f6c79437b38e7c01bb3 -rc83058d87a9988e201849887565c4329f1c121f9 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs (.../DuneErosionFailureMechanismTest.cs) (revision 2e0536ede507cc8b3e9d1f6c79437b38e7c01bb3) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneErosionFailureMechanismTest.cs (.../DuneErosionFailureMechanismTest.cs) (revision c83058d87a9988e201849887565c4329f1c121f9) @@ -120,8 +120,8 @@ public void SetDuneLocations_Always_PreviousLocationsAndCalculationsCleared() { // Setup - var calculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(); - var calculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(0.1); + var calculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(0.01); var failureMechanism = new DuneErosionFailureMechanism { DuneLocationCalculationsForUserDefinedTargetProbabilities = @@ -154,8 +154,8 @@ public void SetDuneLocations_MultipleDuneLocations_SetsExpectedLocationsAndCalculations() { // Setup - var calculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(); - var calculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability1 = new DuneLocationCalculationsForTargetProbability(0.1); + var calculationsForTargetProbability2 = new DuneLocationCalculationsForTargetProbability(0.01); var failureMechanism = new DuneErosionFailureMechanism { DuneLocationCalculationsForUserDefinedTargetProbabilities = Index: Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneLocationCalculationsForTargetProbabilityTest.cs =================================================================== diff -u -r7e05e7e0efc5bd5b33c705bf4b682930321ad4b9 -rc83058d87a9988e201849887565c4329f1c121f9 --- Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneLocationCalculationsForTargetProbabilityTest.cs (.../DuneLocationCalculationsForTargetProbabilityTest.cs) (revision 7e05e7e0efc5bd5b33c705bf4b682930321ad4b9) +++ Riskeer/DuneErosion/test/Riskeer.DuneErosion.Data.Test/DuneLocationCalculationsForTargetProbabilityTest.cs (.../DuneLocationCalculationsForTargetProbabilityTest.cs) (revision c83058d87a9988e201849887565c4329f1c121f9) @@ -29,14 +29,32 @@ public class DuneLocationCalculationsForTargetProbabilityTest { [Test] - public void Constructor_ExpectedProperties() + [TestCase(double.NaN)] + [TestCase(0.0)] + [TestCase(0.11)] + public void Constructor_InvalidTargetProbability_ThrowsArgumentOutOfRangeException(double invalidValue) { // Call - var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(); + void Call() => new DuneLocationCalculationsForTargetProbability(invalidValue); // Assert + const string expectedMessage = "De waarde van de doelkans moet groter zijn dan 0 en kleiner dan of gelijk aan 0,1."; + var exception = Assert.Throws(Call); + StringAssert.StartsWith(expectedMessage, exception.Message); + } + + [Test] + [TestCase(1e-100)] + [TestCase(0.05)] + [TestCase(0.1)] + public void Constructor_ValidTargetProbability_ExpectedProperties(double validValue) + { + // Call + var duneLocationCalculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(validValue); + + // Assert Assert.IsInstanceOf(duneLocationCalculationsForTargetProbability); - Assert.AreEqual(0.1, duneLocationCalculationsForTargetProbability.TargetProbability); + Assert.AreEqual(validValue, duneLocationCalculationsForTargetProbability.TargetProbability); Assert.IsEmpty(duneLocationCalculationsForTargetProbability.DuneLocationCalculations); } @@ -47,7 +65,7 @@ public void TargetProbability_InvalidValue_ThrowsArgumentOutOfRangeException(double invalidValue) { // Setup - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.01); // Call void Call() => calculationsForTargetProbability.TargetProbability = invalidValue; @@ -62,16 +80,16 @@ [TestCase(1e-100)] [TestCase(0.05)] [TestCase(0.1)] - public void TargetProbability_ValidValue_NewValueSet(double newValue) + public void TargetProbability_ValidValue_NewValueSet(double validValue) { // Setup - var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(); + var calculationsForTargetProbability = new DuneLocationCalculationsForTargetProbability(0.01); // Call - calculationsForTargetProbability.TargetProbability = newValue; + calculationsForTargetProbability.TargetProbability = validValue; // Assert - Assert.AreEqual(newValue, calculationsForTargetProbability.TargetProbability); + Assert.AreEqual(validValue, calculationsForTargetProbability.TargetProbability); } } } \ No newline at end of file