Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/DikeHeightOutputCreateExtensionsTest.cs =================================================================== diff -u -r12d68f588f3d39996a3a34577f9ec94a87bec865 -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/DikeHeightOutputCreateExtensionsTest.cs (.../DikeHeightOutputCreateExtensionsTest.cs) (revision 12d68f588f3d39996a3a34577f9ec94a87bec865) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/DikeHeightOutputCreateExtensionsTest.cs (.../DikeHeightOutputCreateExtensionsTest.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) @@ -69,7 +69,7 @@ Assert.AreEqual(output.CalculatedProbability, entity.CalculatedProbability); Assert.AreEqual(output.CalculatedReliability, entity.CalculatedReliability, output.CalculatedReliability.GetAccuracy()); Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence); - GeneralResultEntityTestHelper.AssertGeneralResultEntity(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); + Assert.IsNull(entity.GeneralResultFaultTreeIllustrationPointEntity); } [Test] @@ -91,7 +91,7 @@ Assert.IsNull(entity.CalculatedProbability); Assert.IsNull(entity.CalculatedReliability); Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence); - GeneralResultEntityTestHelper.AssertGeneralResultEntity(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); + Assert.IsNull(entity.GeneralResultFaultTreeIllustrationPointEntity); } [Test] @@ -108,13 +108,7 @@ // Assert Assert.IsNotNull(entity); - Assert.IsNull(entity.DikeHeight); - Assert.IsNull(entity.TargetProbability); - Assert.IsNull(entity.TargetReliability); - Assert.IsNull(entity.CalculatedProbability); - Assert.IsNull(entity.CalculatedReliability); - Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence); - GeneralResultEntityTestHelper.AssertGeneralResultEntity(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); + GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs =================================================================== diff -u -r0a0d5f3ff03c92aeb3c87ab0430e864f8c104543 -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs) (revision 0a0d5f3ff03c92aeb3c87ab0430e864f8c104543) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationCreateExtensionsTest.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) @@ -271,7 +271,7 @@ Assert.AreEqual(probabilityAssessmentOutput.Reliability, outputEntity.Reliability, probabilityAssessmentOutput.Reliability.GetAccuracy()); Assert.AreEqual(probabilityAssessmentOutput.RequiredProbability, outputEntity.RequiredProbability); Assert.AreEqual(probabilityAssessmentOutput.RequiredReliability.Value, outputEntity.RequiredReliability); - GeneralResultEntityTestHelper.AssertGeneralResultEntity(overtoppingOutput.GeneralResult, outputEntity.GeneralResultFaultTreeIllustrationPointEntity); + Assert.IsNull(outputEntity.GeneralResultFaultTreeIllustrationPointEntity); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs =================================================================== diff -u -r318a00d78d92a99f2cbee197c060494a582bfd37 -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 318a00d78d92a99f2cbee197c060494a582bfd37) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputCreateExtensionsTest.cs (.../GrassCoverErosionInwardsOutputCreateExtensionsTest.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) @@ -71,7 +71,7 @@ Assert.AreEqual(probabilityAssessmentOutput.Reliability, entity.Reliability, probabilityAssessmentOutput.Reliability.GetAccuracy()); Assert.AreEqual(probabilityAssessmentOutput.RequiredProbability, entity.RequiredProbability); Assert.AreEqual(probabilityAssessmentOutput.RequiredReliability.Value, entity.RequiredReliability); - GeneralResultEntityTestHelper.AssertGeneralResultEntity(overtoppingOutput.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); + Assert.IsNull(entity.GeneralResultFaultTreeIllustrationPointEntity); GrassCoverErosionInwardsDikeHeightOutputEntity dikeHeightEntity = entity.GrassCoverErosionInwardsDikeHeightOutputEntities.First(); Assert.AreEqual(dikeHeightOutput.DikeHeight, dikeHeightEntity.DikeHeight, dikeHeightOutput.DikeHeight.GetAccuracy()); @@ -111,7 +111,7 @@ Assert.IsNull(entity.Reliability); Assert.IsNull(entity.RequiredProbability); Assert.IsNull(entity.RequiredReliability); - GeneralResultEntityTestHelper.AssertGeneralResultEntity(overtoppingOutput.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); + Assert.IsNull(entity.GeneralResultFaultTreeIllustrationPointEntity); GrassCoverErosionInwardsDikeHeightOutputEntity dikeHeightEntity = entity.GrassCoverErosionInwardsDikeHeightOutputEntities.First(); Assert.IsNull(dikeHeightEntity.DikeHeight); @@ -175,7 +175,7 @@ GrassCoverErosionInwardsOutputEntity entity = output.Create(); // Assert - GeneralResultEntityTestHelper.AssertGeneralResultEntity(output.OvertoppingOutput.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); + GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(output.OvertoppingOutput.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/OvertoppingRateOutputCreateExtensionsTest.cs =================================================================== diff -u -r12d68f588f3d39996a3a34577f9ec94a87bec865 -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/OvertoppingRateOutputCreateExtensionsTest.cs (.../OvertoppingRateOutputCreateExtensionsTest.cs) (revision 12d68f588f3d39996a3a34577f9ec94a87bec865) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/GrassCoverErosionInwards/OvertoppingRateOutputCreateExtensionsTest.cs (.../OvertoppingRateOutputCreateExtensionsTest.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) @@ -69,7 +69,7 @@ Assert.AreEqual(output.CalculatedProbability, entity.CalculatedProbability); Assert.AreEqual(output.CalculatedReliability, entity.CalculatedReliability, output.CalculatedReliability.GetAccuracy()); Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence); - GeneralResultEntityTestHelper.AssertGeneralResultEntity(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); + Assert.IsNull(entity.GeneralResultFaultTreeIllustrationPointEntity); } [Test] @@ -91,7 +91,7 @@ Assert.IsNull(entity.CalculatedProbability); Assert.IsNull(entity.CalculatedReliability); Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence); - GeneralResultEntityTestHelper.AssertGeneralResultEntity(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); + Assert.IsNull(entity.GeneralResultFaultTreeIllustrationPointEntity); } [Test] @@ -108,13 +108,7 @@ // Assert Assert.IsNotNull(entity); - Assert.IsNull(entity.OvertoppingRate); - Assert.IsNull(entity.TargetProbability); - Assert.IsNull(entity.TargetReliability); - Assert.IsNull(entity.CalculatedProbability); - Assert.IsNull(entity.CalculatedReliability); - Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence); - GeneralResultEntityTestHelper.AssertGeneralResultEntity(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); + GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresOutputCreateExtensionsTest.cs =================================================================== diff -u -r12d68f588f3d39996a3a34577f9ec94a87bec865 -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresOutputCreateExtensionsTest.cs (.../StructuresOutputCreateExtensionsTest.cs) (revision 12d68f588f3d39996a3a34577f9ec94a87bec865) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StructuresOutputCreateExtensionsTest.cs (.../StructuresOutputCreateExtensionsTest.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) @@ -71,7 +71,7 @@ Assert.AreEqual(probabilityAssessmentOutput.RequiredReliability, entity.RequiredReliability, probabilityAssessmentOutput.RequiredReliability.GetAccuracy()); Assert.AreEqual(probabilityAssessmentOutput.RequiredProbability, entity.RequiredProbability); - GeneralResultEntityTestHelper.AssertGeneralResultEntity(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); + Assert.IsNull(entity.GeneralResultFaultTreeIllustrationPointEntity); } [Test] @@ -95,7 +95,7 @@ Assert.IsNull(entity.Probability); Assert.IsNull(entity.RequiredReliability); Assert.IsNull(entity.RequiredProbability); - GeneralResultEntityTestHelper.AssertGeneralResultEntity(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); + Assert.IsNull(entity.GeneralResultFaultTreeIllustrationPointEntity); } [Test] @@ -118,7 +118,7 @@ Assert.AreEqual(probabilityAssessmentOutput.RequiredReliability, entity.RequiredReliability, probabilityAssessmentOutput.RequiredReliability.GetAccuracy()); Assert.AreEqual(probabilityAssessmentOutput.RequiredProbability, entity.RequiredProbability); - GeneralResultEntityTestHelper.AssertGeneralResultEntity(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); + GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(output.GeneralResult, entity.GeneralResultFaultTreeIllustrationPointEntity); } private class TestStructureOutputEntity : IProbabilityAssessmentOutputEntity, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r69742e05f20b6805772530c0cee69f7bf9fd813d -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs) (revision 69742e05f20b6805772530c0cee69f7bf9fd813d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsDikeHeightOutputEntityReadExtensionsTest.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) @@ -76,8 +76,7 @@ Assert.AreEqual(calculatedProbability, output.CalculatedProbability); Assert.AreEqual(calculatedReliability, output.CalculatedReliability, output.CalculatedReliability.GetAccuracy()); Assert.AreEqual(convergence, output.CalculationConvergence); - GeneralResultEntityTestHelper.AssertGeneralResult(entity.GeneralResultFaultTreeIllustrationPointEntity, - output.GeneralResult); + Assert.IsNull(output.GeneralResult); } [Test] @@ -101,8 +100,7 @@ Assert.IsNaN(output.CalculatedProbability); Assert.IsNaN(output.CalculatedReliability); Assert.AreEqual(convergence, output.CalculationConvergence); - GeneralResultEntityTestHelper.AssertGeneralResult(entity.GeneralResultFaultTreeIllustrationPointEntity, - output.GeneralResult); + Assert.IsNull(output.GeneralResult); } [Test] @@ -128,14 +126,8 @@ DikeHeightOutput output = entity.Read(); // Assert - Assert.IsNaN(output.DikeHeight); - Assert.IsNaN(output.TargetProbability); - Assert.IsNaN(output.TargetReliability); - Assert.IsNaN(output.CalculatedProbability); - Assert.IsNaN(output.CalculatedReliability); - Assert.AreEqual(convergence, output.CalculationConvergence); - GeneralResultEntityTestHelper.AssertGeneralResult(generalResultEntity, - output.GeneralResult); + GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(output.GeneralResult, + generalResultEntity); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r69742e05f20b6805772530c0cee69f7bf9fd813d -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision 69742e05f20b6805772530c0cee69f7bf9fd813d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) @@ -108,7 +108,7 @@ Assert.IsNaN(probabilityAssessmentOutput.RequiredProbability); Assert.IsNaN(probabilityAssessmentOutput.Reliability); Assert.IsNaN(probabilityAssessmentOutput.RequiredReliability); - GeneralResultEntityTestHelper.AssertGeneralResult(entity.GeneralResultFaultTreeIllustrationPointEntity, overtoppingOutput.GeneralResult); + Assert.IsNull(overtoppingOutput.GeneralResult); } [Test] @@ -137,19 +137,8 @@ // Assert OvertoppingOutput overtoppingOutput = output.OvertoppingOutput; - ProbabilityAssessmentOutput probabilityAssessmentOutput = overtoppingOutput.ProbabilityAssessmentOutput; - - Assert.IsNaN(overtoppingOutput.WaveHeight); - Assert.IsTrue(overtoppingOutput.IsOvertoppingDominant); - Assert.IsNull(output.DikeHeightOutput); - Assert.IsNull(output.OvertoppingRateOutput); - Assert.IsNaN(probabilityAssessmentOutput.FactorOfSafety); - Assert.IsNaN(probabilityAssessmentOutput.Probability); - Assert.IsNaN(probabilityAssessmentOutput.RequiredProbability); - Assert.IsNaN(probabilityAssessmentOutput.Reliability); - Assert.IsNaN(probabilityAssessmentOutput.RequiredReliability); - - GeneralResultEntityTestHelper.AssertGeneralResult(generalResultEntity, overtoppingOutput.GeneralResult); + GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(overtoppingOutput.GeneralResult, + generalResultEntity); } [Test] Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r69742e05f20b6805772530c0cee69f7bf9fd813d -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensionsTest.cs) (revision 69742e05f20b6805772530c0cee69f7bf9fd813d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOvertoppingRateOutputEntityReadExtensionsTest.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) @@ -77,8 +77,7 @@ Assert.AreEqual(calculatedReliability, output.CalculatedReliability, output.CalculatedReliability.GetAccuracy()); Assert.AreEqual(convergence, output.CalculationConvergence); - GeneralResultEntityTestHelper.AssertGeneralResult(entity.GeneralResultFaultTreeIllustrationPointEntity, - output.GeneralResult); + Assert.IsNull(output.GeneralResult); } [Test] @@ -103,8 +102,7 @@ Assert.IsNaN(output.CalculatedReliability); Assert.AreEqual(convergence, output.CalculationConvergence); - GeneralResultEntityTestHelper.AssertGeneralResult(entity.GeneralResultFaultTreeIllustrationPointEntity, - output.GeneralResult); + Assert.IsNull(output.GeneralResult); } [Test] @@ -129,15 +127,8 @@ OvertoppingRateOutput output = entity.Read(); // Assert - Assert.IsNaN(output.OvertoppingRate); - Assert.IsNaN(output.TargetProbability); - Assert.IsNaN(output.TargetReliability); - Assert.IsNaN(output.CalculatedProbability); - Assert.IsNaN(output.CalculatedReliability); - Assert.AreEqual(convergence, output.CalculationConvergence); - - GeneralResultEntityTestHelper.AssertGeneralResult(generalResultEntity, - output.GeneralResult); + GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(output.GeneralResult, + generalResultEntity); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/IllustrationPoints/GeneralResultEntityTestHelperTest.cs =================================================================== diff -u -r69742e05f20b6805772530c0cee69f7bf9fd813d -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/IllustrationPoints/GeneralResultEntityTestHelperTest.cs (.../GeneralResultEntityTestHelperTest.cs) (revision 69742e05f20b6805772530c0cee69f7bf9fd813d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/IllustrationPoints/GeneralResultEntityTestHelperTest.cs (.../GeneralResultEntityTestHelperTest.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) @@ -34,18 +34,32 @@ public class GeneralResultEntityTestHelperTest { [Test] - public void AssertGeneralResultEntity_WithNullArguments_DoesNotThrowException() + public void AssertGeneralResultPropertyValues_WithGeneralResultNull_DoesNotThrowException() { // Call - TestDelegate call = () => GeneralResultEntityTestHelper.AssertGeneralResultEntity(null, null); + TestDelegate call = () => GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(null, + new GeneralResultFaultTreeIllustrationPointEntity()); // Assert - Assert.DoesNotThrow(call); + var exception = Assert.Throws(call); + Assert.AreEqual("generalResult", exception.ParamName); } [Test] - public void AssertGeneralResultEntity_WithExpectedProperties_DoesNotThrowException() + public void AssertGeneralResultPropertyValues_GeneralResultFaultTreeIllustrationPointEntityNull_ThrowsArgumentNullException() { + // Call + TestDelegate call = () => GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(new TestGeneralResultFaultTreeIllustrationPoint(), + null); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("generalResultEntity", exception.ParamName); + } + + [Test] + public void AssertGeneralResultPropertyValues_GeneralResultAndEntityHaveMatchingPropertyValues_DoesNotThrowException() + { // Setup var random = new Random(21); @@ -73,167 +87,52 @@ generalResultEntity.TopLevelFaultTreeIllustrationPointEntities.Add(new TopLevelFaultTreeIllustrationPointEntity()); // Call - TestDelegate call = () => GeneralResultEntityTestHelper.AssertGeneralResultEntity(generalResult, generalResultEntity); + TestDelegate call = () => GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(generalResult, generalResultEntity); // Assert Assert.DoesNotThrow(call); } [Test] - [TestCaseSource(nameof(GetDifferentGeneralResultEntityProperties))] - public void AssertGeneralResultEntity_DifferentPropertyValues_ThrowsAssertionException(GeneralResult generalResult, - GeneralResultFaultTreeIllustrationPointEntity generalResultEntity) - { - // Call - TestDelegate call = () => GeneralResultEntityTestHelper.AssertGeneralResultEntity(generalResult, generalResultEntity); - - // Assert - Assert.Throws(call); - } - - [Test] - public void AssertGeneralResult_WithNullArguments_DoesNotThrowException() - { - // Call - TestDelegate call = () => GeneralResultEntityTestHelper.AssertGeneralResult(null, null); - - // Assert - Assert.DoesNotThrow(call); - } - - [Test] - public void AssertGeneralResult_WithExpectedProperties_DoesNotThrowException() - { - // Setup - var random = new Random(21); - - var generalResultEntity = new GeneralResultFaultTreeIllustrationPointEntity - { - GoverningWindDirectionName = "SSE", - GoverningWindDirectionAngle = 30 - }; - generalResultEntity.StochastEntities.Add(new StochastEntity()); - generalResultEntity.TopLevelFaultTreeIllustrationPointEntities.Add(new TopLevelFaultTreeIllustrationPointEntity()); - - var governingWindDirection = new WindDirection(generalResultEntity.GoverningWindDirectionName, - generalResultEntity.GoverningWindDirectionAngle); - var stochast = new Stochast("Stochast", random.NextDouble(), random.NextDouble()); - var topLevelFaultTreeIllustrationPoint = new TopLevelFaultTreeIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(), - string.Empty, - new IllustrationPointNode(new TestFaultTreeIllustrationPoint())); - - var generalResult = new GeneralResult( - governingWindDirection, new[] - { - stochast - }, new[] - { - topLevelFaultTreeIllustrationPoint - }); - - // Call - TestDelegate call = () => GeneralResultEntityTestHelper.AssertGeneralResult(generalResultEntity, generalResult); - - // Assert - Assert.DoesNotThrow(call); - } - - [Test] [TestCaseSource(nameof(GetDifferentGeneralResultProperties))] - public void AssertGeneralResult_DifferentPropertyValues_ThrowsAssertionException(GeneralResultFaultTreeIllustrationPointEntity generalResultEntity, - GeneralResult generalResult) + public void AssertGeneralResultPropertyValues_DifferentPropertyValues_ThrowsAssertionException(GeneralResult generalResult, + GeneralResultFaultTreeIllustrationPointEntity generalResultEntity) { // Call - TestDelegate call = () => GeneralResultEntityTestHelper.AssertGeneralResult(generalResultEntity, generalResult); + TestDelegate call = () => GeneralResultEntityTestHelper.AssertGeneralResultPropertyValues(generalResult, generalResultEntity); // Assert Assert.Throws(call); } - #region TestData GeneralResult - private static IEnumerable GetDifferentGeneralResultProperties() { - var generalResultEntity = new GeneralResultFaultTreeIllustrationPointEntity - { - GoverningWindDirectionName = "SSE", - GoverningWindDirectionAngle = 30 - }; - var baseLineGoverningWindDirection = new WindDirection(generalResultEntity.GoverningWindDirectionName, - generalResultEntity.GoverningWindDirectionAngle); - - yield return new TestCaseData(null, new GeneralResult( - baseLineGoverningWindDirection, - Enumerable.Empty(), - Enumerable.Empty())) - .SetName("GeneralResultNotNullWhenExpectedNull"); - yield return new TestCaseData(generalResultEntity, null).SetName("GeneralResultNullWhenExpectedNotNull"); - - yield return new TestCaseData(generalResultEntity, - new GeneralResult(new WindDirection("DifferentName", - baseLineGoverningWindDirection.Angle), - Enumerable.Empty(), - Enumerable.Empty())) - .SetName("GeneralResultDoesNotMatchWindDirectionName"); - - yield return new TestCaseData(generalResultEntity, - new GeneralResult(new WindDirection(baseLineGoverningWindDirection.Name, - 10), - Enumerable.Empty(), - Enumerable.Empty())) - .SetName("GeneralResultDoesNotMatchWindDirectionAngle"); - - yield return new TestCaseData(generalResultEntity, - new GeneralResult(baseLineGoverningWindDirection, - new[] - { - new Stochast("Wrong item", double.NaN, double.NaN) - }, Enumerable.Empty())) - .SetName("GeneralResultDoesNotMatchStochastCount"); - yield return new TestCaseData(generalResultEntity, - new GeneralResult( - baseLineGoverningWindDirection, - Enumerable.Empty(), - new[] - { - new TopLevelFaultTreeIllustrationPoint(WindDirectionTestFactory.CreateTestWindDirection(), - string.Empty, - new IllustrationPointNode(new TestFaultTreeIllustrationPoint())) - })) - .SetName("GeneralResultDoesNotMatchTopLevelIllustrationPointCount"); - } - - #endregion - - #region TestData GeneralResultEntity - - private static IEnumerable GetDifferentGeneralResultEntityProperties() - { var governingWindDirection = new WindDirection("SSE", 50); var generalResult = new GeneralResult(governingWindDirection, Enumerable.Empty(), Enumerable.Empty()); - yield return new TestCaseData(null, new GeneralResultFaultTreeIllustrationPointEntity()).SetName("EntityNotNullWhenExpectedNull"); - yield return new TestCaseData(new TestGeneralResultFaultTreeIllustrationPoint(), null).SetName("EntityNullWhenExpectedNotNull"); - GeneralResultFaultTreeIllustrationPointEntity generalResultEntityWrongStochastCount = GetBaseLineGeneralResultEntity(governingWindDirection); - generalResultEntityWrongStochastCount.TopLevelFaultTreeIllustrationPointEntities.Add(new TopLevelFaultTreeIllustrationPointEntity()); - yield return new TestCaseData(generalResult, null).SetName("EntityDoesNotMatchStochastCount"); + generalResultEntityWrongStochastCount.StochastEntities.Add(new StochastEntity()); + yield return new TestCaseData(generalResult, generalResultEntityWrongStochastCount) + .SetName("DoesNotMatchStochastCount"); GeneralResultFaultTreeIllustrationPointEntity generalResultEntityWrongTopLevelCount = GetBaseLineGeneralResultEntity(governingWindDirection); generalResultEntityWrongTopLevelCount.TopLevelFaultTreeIllustrationPointEntities.Add(new TopLevelFaultTreeIllustrationPointEntity()); - yield return new TestCaseData(generalResult, generalResultEntityWrongTopLevelCount).SetName("EntityDoesNotMatchTopLevelIllustrationPointCount"); + yield return new TestCaseData(generalResult, generalResultEntityWrongTopLevelCount) + .SetName("DoesNotMatchTopLevelIllustrationPointCount"); GeneralResultFaultTreeIllustrationPointEntity generalResultEntityWrongName = GetBaseLineGeneralResultEntity(governingWindDirection); generalResultEntityWrongName.GoverningWindDirectionName = "totally different"; - yield return new TestCaseData(generalResult, generalResultEntityWrongName).SetName("EntityDoesNotMatchGoverningWindDirectionName"); + yield return new TestCaseData(generalResult, generalResultEntityWrongName) + .SetName("DoesNotMatchGoverningWindDirectionName"); GeneralResultFaultTreeIllustrationPointEntity generalResultEntityWrongAngle = GetBaseLineGeneralResultEntity(governingWindDirection); generalResultEntityWrongAngle.GoverningWindDirectionAngle = 60; - yield return new TestCaseData(generalResult, generalResultEntityWrongAngle).SetName("EntityDoesNotMatchGoverningWindDirectionAngle"); + yield return new TestCaseData(generalResult, generalResultEntityWrongAngle) + .SetName("DoesNotMatchGoverningWindDirectionAngle"); } /// @@ -251,7 +150,5 @@ GoverningWindDirectionAngle = windDirection.Angle }; } - - #endregion } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectTestHelperTest.cs (.../RingtoetsProjectTestHelperTest.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) @@ -157,9 +157,9 @@ Assert.IsFalse(calculationOutput.DikeHeightOutput.HasGeneralResult); Assert.IsFalse(calculationOutput.OvertoppingRateOutput.HasGeneralResult); - var calculationOutputWithGeneralResult = (GrassCoverErosionInwardsCalculation) firstCalculationGroup.Children[1]; - Assert.IsTrue(calculationOutputWithGeneralResult.HasOutput); - GrassCoverErosionInwardsOutput outputCalculationWithGeneralResult = calculationOutputWithGeneralResult.Output; + var calculationWithOutputAndGeneralResult = (GrassCoverErosionInwardsCalculation) firstCalculationGroup.Children[1]; + Assert.IsTrue(calculationWithOutputAndGeneralResult.HasOutput); + GrassCoverErosionInwardsOutput outputCalculationWithGeneralResult = calculationWithOutputAndGeneralResult.Output; AssertGeneralResultTopLevelFaultTreeIllustrationPoint(outputCalculationWithGeneralResult.OvertoppingOutput.GeneralResult); AssertGeneralResultTopLevelFaultTreeIllustrationPoint(outputCalculationWithGeneralResult.DikeHeightOutput.GeneralResult); AssertGeneralResultTopLevelFaultTreeIllustrationPoint(outputCalculationWithGeneralResult.OvertoppingRateOutput.GeneralResult); @@ -250,10 +250,10 @@ Assert.IsTrue(calculationWithOutput.HasOutput); Assert.IsFalse(calculationWithOutput.Output.HasGeneralResult); - var calculationGeneralResult = (StructuresCalculation) firstCalculationGroup.Children[1]; - Assert.IsTrue(calculationGeneralResult.HasOutput); - Assert.IsTrue(calculationGeneralResult.Output.HasGeneralResult); - AssertGeneralResultTopLevelFaultTreeIllustrationPoint(calculationGeneralResult.Output.GeneralResult); + var calculationWithOutputAndGeneralResult = (StructuresCalculation) firstCalculationGroup.Children[1]; + Assert.IsTrue(calculationWithOutputAndGeneralResult.HasOutput); + Assert.IsTrue(calculationWithOutputAndGeneralResult.Output.HasGeneralResult); + AssertGeneralResultTopLevelFaultTreeIllustrationPoint(calculationWithOutputAndGeneralResult.Output.GeneralResult); var secondCalculationGroup = (CalculationGroup) failureMechanism.CalculationsGroup.Children[1]; Assert.AreEqual(0, secondCalculationGroup.Children.Count); @@ -280,10 +280,10 @@ Assert.IsTrue(calculationWithOutput.HasOutput); Assert.IsFalse(calculationWithOutput.Output.HasGeneralResult); - var calculationGeneralResult = (StructuresCalculation) firstCalculationGroup.Children[1]; - Assert.IsTrue(calculationGeneralResult.HasOutput); - Assert.IsTrue(calculationGeneralResult.Output.HasGeneralResult); - AssertGeneralResultTopLevelFaultTreeIllustrationPoint(calculationGeneralResult.Output.GeneralResult); + var calculationWithOutputAndGeneralResult = (StructuresCalculation) firstCalculationGroup.Children[1]; + Assert.IsTrue(calculationWithOutputAndGeneralResult.HasOutput); + Assert.IsTrue(calculationWithOutputAndGeneralResult.Output.HasGeneralResult); + AssertGeneralResultTopLevelFaultTreeIllustrationPoint(calculationWithOutputAndGeneralResult.Output.GeneralResult); ClosingStructuresFailureMechanismSectionResult firstSectionResult = failureMechanism.SectionResults.First(); Assert.AreSame(calculationWithOutput, firstSectionResult.Calculation); @@ -329,10 +329,10 @@ Assert.IsTrue(calculationWithOutput.HasOutput); Assert.IsFalse(calculationWithOutput.Output.HasGeneralResult); - var calculationGeneralResult = (StructuresCalculation) firstCalculationGroup.Children[1]; - Assert.IsTrue(calculationGeneralResult.HasOutput); - Assert.IsTrue(calculationGeneralResult.Output.HasGeneralResult); - AssertGeneralResultTopLevelFaultTreeIllustrationPoint(calculationGeneralResult.Output.GeneralResult); + var calculationWithOutputAndGeneralResult = (StructuresCalculation) firstCalculationGroup.Children[1]; + Assert.IsTrue(calculationWithOutputAndGeneralResult.HasOutput); + Assert.IsTrue(calculationWithOutputAndGeneralResult.Output.HasGeneralResult); + AssertGeneralResultTopLevelFaultTreeIllustrationPoint(calculationWithOutputAndGeneralResult.Output.GeneralResult); var secondCalculationGroup = (CalculationGroup) failureMechanism.CalculationsGroup.Children[1]; Assert.AreEqual(0, secondCalculationGroup.Children.Count); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/IllustrationPoints/GeneralResultEntityTestHelper.cs =================================================================== diff -u -r69742e05f20b6805772530c0cee69f7bf9fd813d -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/IllustrationPoints/GeneralResultEntityTestHelper.cs (.../GeneralResultEntityTestHelper.cs) (revision 69742e05f20b6805772530c0cee69f7bf9fd813d) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/IllustrationPoints/GeneralResultEntityTestHelper.cs (.../GeneralResultEntityTestHelper.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) @@ -19,6 +19,7 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using System.Linq; using Application.Ringtoets.Storage.DbContext; using NUnit.Framework; @@ -33,35 +34,33 @@ public static class GeneralResultEntityTestHelper { /// - /// Determines if the properties of the match - /// with the . + /// Matches the property values of the and + /// against each other to determine if they match. /// - /// The to assert against to. + /// The to compare. /// The - /// to assert. + /// to compare. + /// Thrown if any of the argument is null. /// Thrown when: /// - /// is null and - /// is not null. - /// is not null and - /// is null. /// The values of the governing wind direction name and angles do not match. /// The count of the stochasts do not match. /// The count of the top level illustration points do not match. /// /// This only asserts the properties of the /// that are directly associated with it, but not the values of the items it is composed of. - public static void AssertGeneralResultEntity(GeneralResult generalResult, - GeneralResultFaultTreeIllustrationPointEntity generalResultEntity) + public static void AssertGeneralResultPropertyValues(GeneralResult generalResult, + GeneralResultFaultTreeIllustrationPointEntity generalResultEntity) { if (generalResult == null) { - Assert.IsNull(generalResultEntity); - return; + throw new ArgumentNullException(nameof(generalResult)); } + if (generalResultEntity == null) + { + throw new ArgumentNullException(nameof(generalResultEntity)); + } - Assert.IsNotNull(generalResultEntity); - WindDirection governingWindDirection = generalResult.GoverningWindDirection; Assert.AreEqual(governingWindDirection.Name, generalResultEntity.GoverningWindDirectionName); Assert.AreEqual(governingWindDirection.Angle, generalResultEntity.GoverningWindDirectionAngle, @@ -70,43 +69,5 @@ Assert.AreEqual(generalResult.Stochasts.Count(), generalResultEntity.StochastEntities.Count); Assert.AreEqual(generalResult.TopLevelIllustrationPoints.Count(), generalResultEntity.TopLevelFaultTreeIllustrationPointEntities.Count); } - - /// - /// Determines if the properties of the match - /// with the . - /// - /// The - /// to assert against to. - /// The to assert. - /// Thrown when: - /// - /// is null and - /// is not null. - /// is not null and - /// is null. - /// The values of the governing wind direction name and angles do not match. - /// The count of the stochasts do not match. - /// The count of the top level illustration points do not match. - /// - /// This only asserts the properties of that are directly - /// associated with it, but not the value of the items it is composed of. - public static void AssertGeneralResult(GeneralResultFaultTreeIllustrationPointEntity generalResultEntity, - GeneralResult generalResult) - { - if (generalResultEntity == null) - { - Assert.IsNull(generalResult); - return; - } - - Assert.IsNotNull(generalResult); - - WindDirection governingWindDirection = generalResult.GoverningWindDirection; - Assert.AreEqual(generalResultEntity.GoverningWindDirectionName, governingWindDirection.Name); - Assert.AreEqual(generalResultEntity.GoverningWindDirectionAngle, governingWindDirection.Angle, governingWindDirection.Angle.GetAccuracy()); - - Assert.AreEqual(generalResultEntity.TopLevelFaultTreeIllustrationPointEntities.Count, generalResult.TopLevelIllustrationPoints.Count()); - Assert.AreEqual(generalResultEntity.StochastEntities.Count, generalResult.Stochasts.Count()); - } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs =================================================================== diff -u -r26f527fb809a2325c8f883ece9da01a8f8040eb3 -r82c8dcdc0f254596b25e1e201a07c29500e9cab9 --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 26f527fb809a2325c8f883ece9da01a8f8040eb3) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectTestHelper.cs (.../RingtoetsProjectTestHelper.cs) (revision 82c8dcdc0f254596b25e1e201a07c29500e9cab9) @@ -1139,10 +1139,10 @@ }, new GrassCoverErosionInwardsCalculation { - Name = "Calculation 1", + Name = "Calculation 2", Comments = { - Body = "Comments for Calculation 1" + Body = "Comments for Calculation 2" }, InputParameters = {