Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj =================================================================== diff -u -r0bc3d23ba7c6e8521df5786cc2680911e5865259 -r5bdd0c27e3d42a0d68a6e9abea9b875d0e06cb5f --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj (.../Application.Ringtoets.Storage.TestUtil.csproj) (revision 0bc3d23ba7c6e8521df5786cc2680911e5865259) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/Application.Ringtoets.Storage.TestUtil.csproj (.../Application.Ringtoets.Storage.TestUtil.csproj) (revision 5bdd0c27e3d42a0d68a6e9abea9b875d0e06cb5f) @@ -71,6 +71,10 @@ {3BBFD65B-B277-4E50-AE6D-BD24C3434609} Core.Common.Base + + {D749EE4C-CE50-4C17-BF01-9A953028C126} + Core.Common.TestUtil + {C6309704-D67B-434C-BC98-9F8910BC1D10} Ringtoets.ClosingStructures.Data Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -rfd75ff7d1794c6a64fd3ce1aa1f159effba2e102 -r5bdd0c27e3d42a0d68a6e9abea9b875d0e06cb5f --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision fd75ff7d1794c6a64fd3ce1aa1f159effba2e102) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 5bdd0c27e3d42a0d68a6e9abea9b875d0e06cb5f) @@ -26,6 +26,7 @@ using Core.Common.Base; using Core.Common.Base.Data; using Core.Common.Base.Geometry; +using Core.Common.TestUtil; using Ringtoets.ClosingStructures.Data; using Ringtoets.ClosingStructures.Data.TestUtil; using Ringtoets.Common.Data.AssessmentSection; @@ -154,7 +155,7 @@ var random = new Random(21); foreach (var sectionResult in sectionResults) { - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } } @@ -164,7 +165,7 @@ var random = new Random(21); foreach (var sectionResult in sectionResults) { - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } } @@ -174,7 +175,7 @@ var random = new Random(21); foreach (var sectionResult in sectionResults) { - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } } @@ -184,7 +185,7 @@ var random = new Random(21); foreach (var sectionResult in sectionResults) { - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } } @@ -194,7 +195,7 @@ var random = new Random(21); foreach (var sectionResult in sectionResults) { - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } } @@ -204,7 +205,7 @@ var random = new Random(21); foreach (var sectionResult in sectionResults) { - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } @@ -215,7 +216,7 @@ var random = new Random(21); foreach (var sectionResult in sectionResults) { - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } @@ -228,7 +229,7 @@ { var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length); - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerTwoA = randomLayer2AResult; sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } @@ -241,7 +242,7 @@ { var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length); - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerTwoA = randomLayer2AResult; sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } @@ -254,7 +255,7 @@ { var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length); - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerTwoA = randomLayer2AResult; sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } @@ -267,7 +268,7 @@ { var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length); - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerTwoA = randomLayer2AResult; sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } @@ -280,7 +281,7 @@ { var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length); - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerTwoA = randomLayer2AResult; sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } @@ -291,7 +292,7 @@ var random = new Random(21); foreach (var sectionResult in sectionResults) { - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } @@ -615,7 +616,7 @@ var random = new Random(21); foreach (var sectionResult in sectionResults) { - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } } @@ -749,7 +750,7 @@ foreach (var sectionResult in sectionResults) { - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); if (!firstSectionResultHasCalculation) { @@ -844,7 +845,7 @@ { var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length); - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerTwoA = randomLayer2AResult; sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } @@ -933,7 +934,7 @@ { var randomLayer2AResult = (AssessmentLayerTwoAResult) random.Next(0, Enum.GetValues(typeof(AssessmentLayerTwoAResult)).Length); - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerTwoA = randomLayer2AResult; sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } @@ -1016,7 +1017,7 @@ var random = new Random(21); foreach (var sectionResult in sectionResults) { - sectionResult.AssessmentLayerOne = Convert.ToBoolean(random.Next(0, 1)); + sectionResult.AssessmentLayerOne = random.NextBoolean(); sectionResult.AssessmentLayerTwoA = (RoundedDouble) random.NextDouble(); sectionResult.AssessmentLayerThree = (RoundedDouble) random.NextDouble(); } Index: Core/Common/test/Core.Common.TestUtil.Test/RandomExtensionsTest.cs =================================================================== diff -u -r8a11d2a7974d1fb39e142516dc3fd041e1eb4603 -r5bdd0c27e3d42a0d68a6e9abea9b875d0e06cb5f --- Core/Common/test/Core.Common.TestUtil.Test/RandomExtensionsTest.cs (.../RandomExtensionsTest.cs) (revision 8a11d2a7974d1fb39e142516dc3fd041e1eb4603) +++ Core/Common/test/Core.Common.TestUtil.Test/RandomExtensionsTest.cs (.../RandomExtensionsTest.cs) (revision 5bdd0c27e3d42a0d68a6e9abea9b875d0e06cb5f) @@ -93,5 +93,20 @@ Assert.LessOrEqual(randomValue, upperLimit); Assert.GreaterOrEqual(randomValue, lowerLimit); } + + [Test] + [TestCase(0, true)] + [TestCase(1, false)] + public void NextBoolean_ReturnRandomTrueOrFalse(int seed, bool expectedFirstCallResult) + { + // Setup + var random = new Random(seed); + + // Call + bool result = random.NextBoolean(); + + // Assert + Assert.AreEqual(expectedFirstCallResult, result); + } } } \ No newline at end of file Index: Core/Common/test/Core.Common.TestUtil/RandomExtensions.cs =================================================================== diff -u -r8a11d2a7974d1fb39e142516dc3fd041e1eb4603 -r5bdd0c27e3d42a0d68a6e9abea9b875d0e06cb5f --- Core/Common/test/Core.Common.TestUtil/RandomExtensions.cs (.../RandomExtensions.cs) (revision 8a11d2a7974d1fb39e142516dc3fd041e1eb4603) +++ Core/Common/test/Core.Common.TestUtil/RandomExtensions.cs (.../RandomExtensions.cs) (revision 5bdd0c27e3d42a0d68a6e9abea9b875d0e06cb5f) @@ -61,5 +61,15 @@ } return randomValue; } + + /// + /// Returns a random boolean value. + /// + /// A pseudo-random number generator. + /// A new random boolean value. + public static bool NextBoolean(this Random random) + { + return Convert.ToBoolean(random.Next(0, 2)); + } } } \ No newline at end of file