Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r0c80386e4c06dd8832cfe86ce6bd2201f185cde1 -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs (.../ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 0c80386e4c06dd8832cfe86ce6bd2201f185cde1) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/FileImporters/ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs (.../ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -21,65 +21,28 @@ using System; using NUnit.Framework; +using Ringtoets.ClosingStructures.Data; +using Ringtoets.ClosingStructures.Plugin.FileImporters; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; -using Ringtoets.ClosingStructures.Data; -using Ringtoets.ClosingStructures.Plugin.FileImporters; namespace Ringtoets.ClosingStructures.Plugin.Test.FileImporters { [TestFixture] - public class ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest + public class ClosingStructuresFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + ClosingStructuresFailureMechanismSectionResultUpdateStrategy, ClosingStructuresFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override ClosingStructuresFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new ClosingStructuresFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override ClosingStructuresFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new ClosingStructuresFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new ClosingStructuresFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup var random = new Random(39); - var strategy = new ClosingStructuresFailureMechanismSectionResultUpdateStrategy(); - var originResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { Calculation = new StructuresCalculation(), SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, @@ -89,20 +52,18 @@ UseManualAssemblyProbability = true, ManualAssemblyProbability = random.NextDouble() }; - var targetResult = new ClosingStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(ClosingStructuresFailureMechanismSectionResult originResult, + ClosingStructuresFailureMechanismSectionResult targetResult) + { Assert.AreSame(originResult.Calculation, targetResult.Calculation); Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentProbability, targetResult.TailorMadeAssessmentProbability); Assert.AreEqual(originResult.UseManualAssemblyProbability, targetResult.UseManualAssemblyProbability); Assert.AreEqual(originResult.ManualAssemblyProbability, targetResult.ManualAssemblyProbability); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/Ringtoets.ClosingStructures.Plugin.Test.csproj =================================================================== diff -u -r0c80386e4c06dd8832cfe86ce6bd2201f185cde1 -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/Ringtoets.ClosingStructures.Plugin.Test.csproj (.../Ringtoets.ClosingStructures.Plugin.Test.csproj) (revision 0c80386e4c06dd8832cfe86ce6bd2201f185cde1) +++ Ringtoets/ClosingStructures/test/Ringtoets.ClosingStructures.Plugin.Test/Ringtoets.ClosingStructures.Plugin.Test.csproj (.../Ringtoets.ClosingStructures.Plugin.Test.csproj) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -124,6 +124,10 @@ {4843D6E5-066F-4795-94F5-1D53932DD03C} Ringtoets.Common.Data.TestUtil + + {6346BADF-D331-4948-9772-08E8CD1E1FC9} + Ringtoets.Common.Plugin.TestUtil + {52093DA6-D545-476A-ADFD-12F56625E36B} Ringtoets.Common.Service.TestUtil Index: Ringtoets/Common/test/Ringtoets.Common.Plugin.TestUtil/FileImporters/FailureMechanismSectionResultUpdateStrategyTestFixture.cs =================================================================== diff -u -rf855ac15eef6c6619d535d6d9b4b5c26e2ed0cbe -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/Common/test/Ringtoets.Common.Plugin.TestUtil/FileImporters/FailureMechanismSectionResultUpdateStrategyTestFixture.cs (.../FailureMechanismSectionResultUpdateStrategyTestFixture.cs) (revision f855ac15eef6c6619d535d6d9b4b5c26e2ed0cbe) +++ Ringtoets/Common/test/Ringtoets.Common.Plugin.TestUtil/FileImporters/FailureMechanismSectionResultUpdateStrategyTestFixture.cs (.../FailureMechanismSectionResultUpdateStrategyTestFixture.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -31,8 +31,7 @@ /// /// The type of the update strategy to test. /// The type of the failure mechanism section result the update strategy uses. - public abstract class FailureMechanismSectionResultUpdateStrategyTestFixture< - TUpdateStrategy, TSectionResult> + public abstract class FailureMechanismSectionResultUpdateStrategyTestFixture where TUpdateStrategy : IFailureMechanismSectionResultUpdateStrategy, new() where TSectionResult : FailureMechanismSectionResult { @@ -43,7 +42,7 @@ var strategy = new TUpdateStrategy(); // Assert - Assert.IsInstanceOf(strategy); + Assert.IsInstanceOf>(strategy); } [Test] @@ -53,8 +52,7 @@ var strategy = new TUpdateStrategy(); // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, CreateEmptySectionResult()); + TestDelegate test = () => strategy.UpdateSectionResult(null, CreateEmptySectionResult()); // Assert string paramName = Assert.Throws(test).ParamName; @@ -68,8 +66,7 @@ var strategy = new TUpdateStrategy(); // Call - TestDelegate test = () => strategy.UpdateSectionResult( - CreateEmptySectionResult(), null); + TestDelegate test = () => strategy.UpdateSectionResult(CreateEmptySectionResult(), null); // Assert string paramName = Assert.Throws(test).ParamName; @@ -99,17 +96,17 @@ protected abstract TSectionResult CreateEmptySectionResult(); /// + /// Method for creating a configured instance of . + /// + /// An empty + protected abstract TSectionResult CreateConfiguredSectionResult(); + + /// /// Method that asserts whether and /// are equal. /// /// Thrown when /// and are not equal. protected abstract void AssertSectionResult(TSectionResult originResult, TSectionResult targetResult); - - /// - /// Method for creating a configured instance of . - /// - /// An empty - protected abstract TSectionResult CreateConfiguredSectionResult(); } } \ No newline at end of file Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/FileImporters/DuneErosionFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r84b83644d2c80cbc8ffadbe0c01845efaef70689 -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/FileImporters/DuneErosionFailureMechanismSectionResultUpdateStrategyTest.cs (.../DuneErosionFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 84b83644d2c80cbc8ffadbe0c01845efaef70689) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Plugin.Test/FileImporters/DuneErosionFailureMechanismSectionResultUpdateStrategyTest.cs (.../DuneErosionFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -19,66 +19,28 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using NUnit.Framework; using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.DuneErosion.Data; using Ringtoets.DuneErosion.Plugin.FileImporters; namespace Ringtoets.DuneErosion.Plugin.Test.FileImporters { [TestFixture] - public class DuneErosionFailureMechanismSectionResultUpdateStrategyTest + public class DuneErosionFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + DuneErosionFailureMechanismSectionResultUpdateStrategy, DuneErosionFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override DuneErosionFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new DuneErosionFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new DuneErosionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override DuneErosionFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new DuneErosionFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new DuneErosionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new DuneErosionFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new DuneErosionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup - var strategy = new DuneErosionFailureMechanismSectionResultUpdateStrategy(); - var originResult = new DuneErosionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new DuneErosionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable, DetailedAssessmentResultForFactorizedSignalingNorm = DetailedAssessmentResultType.Sufficient, @@ -90,12 +52,11 @@ UseManualAssemblyCategoryGroup = true, ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.VIv }; - var targetResult = new DuneErosionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(DuneErosionFailureMechanismSectionResult originResult, + DuneErosionFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResultForFactorizedSignalingNorm, targetResult.DetailedAssessmentResultForFactorizedSignalingNorm); Assert.AreEqual(originResult.DetailedAssessmentResultForSignalingNorm, targetResult.DetailedAssessmentResultForSignalingNorm); @@ -105,7 +66,6 @@ Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/FileImporters/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r5a890dc1600bd7e5e060405df22c757daaedd885 -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/FileImporters/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 5a890dc1600bd7e5e060405df22c757daaedd885) +++ Ringtoets/GrassCoverErosionInwards/test/Ringtoets.GrassCoverErosionInwards.Plugin.Test/FileImporters/GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -22,63 +22,26 @@ using System; using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.GrassCoverErosionInwards.Data; using Ringtoets.GrassCoverErosionInwards.Plugin.FileImporters; namespace Ringtoets.GrassCoverErosionInwards.Plugin.Test.FileImporters { [TestFixture] - public class GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategyTest + public class GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategy, GrassCoverErosionInwardsFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override GrassCoverErosionInwardsFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override GrassCoverErosionInwardsFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup var random = new Random(39); - var strategy = new GrassCoverErosionInwardsFailureMechanismSectionResultUpdateStrategy(); - var originResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { Calculation = new GrassCoverErosionInwardsCalculation(), SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable, @@ -88,20 +51,18 @@ UseManualAssemblyProbability = true, ManualAssemblyProbability = random.NextDouble() }; - var targetResult = new GrassCoverErosionInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(GrassCoverErosionInwardsFailureMechanismSectionResult originResult, + GrassCoverErosionInwardsFailureMechanismSectionResult targetResult) + { Assert.AreSame(originResult.Calculation, targetResult.Calculation); Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentProbability, targetResult.TailorMadeAssessmentProbability); Assert.AreEqual(originResult.UseManualAssemblyProbability, targetResult.UseManualAssemblyProbability); Assert.AreEqual(originResult.ManualAssemblyProbability, targetResult.ManualAssemblyProbability); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/FileImporters/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r3e77cae3d2a991e50ee6545f4de36ff84285e754 -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/FileImporters/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 3e77cae3d2a991e50ee6545f4de36ff84285e754) +++ Ringtoets/GrassCoverErosionOutwards/test/Ringtoets.GrassCoverErosionOutwards.Plugin.Test/FileImporters/GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -19,68 +19,30 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using NUnit.Framework; using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.GrassCoverErosionOutwards.Data; using Ringtoets.GrassCoverErosionOutwards.Plugin.FileImporters; namespace Ringtoets.GrassCoverErosionOutwards.Plugin.Test.FileImporters { [TestFixture] - public class GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategyTest + public class GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy, GrassCoverErosionOutwardsFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override GrassCoverErosionOutwardsFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new GrassCoverErosionOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override GrassCoverErosionOutwardsFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new GrassCoverErosionOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new GrassCoverErosionOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup - var strategy = new GrassCoverErosionOutwardsFailureMechanismSectionResultUpdateStrategy(); - var originResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new GrassCoverErosionOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, DetailedAssessmentResultForFactorizedSignalingNorm = DetailedAssessmentResultType.Sufficient, DetailedAssessmentResultForSignalingNorm = DetailedAssessmentResultType.Sufficient, DetailedAssessmentResultForLowerLimitNorm = DetailedAssessmentResultType.Sufficient, @@ -90,12 +52,11 @@ UseManualAssemblyCategoryGroup = true, ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.VIv }; - var targetResult = new GrassCoverErosionOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(GrassCoverErosionOutwardsFailureMechanismSectionResult originResult, + GrassCoverErosionOutwardsFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResultForFactorizedSignalingNorm, targetResult.DetailedAssessmentResultForFactorizedSignalingNorm); Assert.AreEqual(originResult.DetailedAssessmentResultForSignalingNorm, targetResult.DetailedAssessmentResultForSignalingNorm); @@ -105,7 +66,6 @@ Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r246831bfbec8ffdcd4abfdf91c02299711aaea2e -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs (.../HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 246831bfbec8ffdcd4abfdf91c02299711aaea2e) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/FileImporters/HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs (.../HeightStructuresFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -23,63 +23,26 @@ using NUnit.Framework; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.HeightStructures.Data; using Ringtoets.HeightStructures.Plugin.FileImporters; namespace Ringtoets.HeightStructures.Plugin.Test.FileImporters { [TestFixture] - public class HeightStructuresFailureMechanismSectionResultUpdateStrategyTest + public class HeightStructuresFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + HeightStructuresFailureMechanismSectionResultUpdateStrategy, HeightStructuresFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override HeightStructuresFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new HeightStructuresFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override HeightStructuresFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new HeightStructuresFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new HeightStructuresFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup var random = new Random(39); - var strategy = new HeightStructuresFailureMechanismSectionResultUpdateStrategy(); - var originResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { Calculation = new StructuresCalculation(), SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, @@ -89,20 +52,18 @@ UseManualAssemblyProbability = true, ManualAssemblyProbability = random.NextDouble() }; - var targetResult = new HeightStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(HeightStructuresFailureMechanismSectionResult originResult, + HeightStructuresFailureMechanismSectionResult targetResult) + { Assert.AreSame(originResult.Calculation, targetResult.Calculation); Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentProbability, targetResult.TailorMadeAssessmentProbability); Assert.AreEqual(originResult.UseManualAssemblyProbability, targetResult.UseManualAssemblyProbability); Assert.AreEqual(originResult.ManualAssemblyProbability, targetResult.ManualAssemblyProbability); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj =================================================================== diff -u -r246831bfbec8ffdcd4abfdf91c02299711aaea2e -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj (.../Ringtoets.HeightStructures.Plugin.Test.csproj) (revision 246831bfbec8ffdcd4abfdf91c02299711aaea2e) +++ Ringtoets/HeightStructures/test/Ringtoets.HeightStructures.Plugin.Test/Ringtoets.HeightStructures.Plugin.Test.csproj (.../Ringtoets.HeightStructures.Plugin.Test.csproj) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -123,6 +123,10 @@ {4843D6E5-066F-4795-94F5-1D53932DD03C} Ringtoets.Common.Data.TestUtil + + {6346BADF-D331-4948-9772-08E8CD1E1FC9} + Ringtoets.Common.Plugin.TestUtil + {52093DA6-D545-476A-ADFD-12F56625E36B} Ringtoets.Common.Service.TestUtil Index: Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj =================================================================== diff -u -r83533c155d88de10f0a8e37e3918effc0725ba77 -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision 83533c155d88de10f0a8e37e3918effc0725ba77) +++ Ringtoets/Integration/src/Ringtoets.Integration.Plugin/Ringtoets.Integration.Plugin.csproj (.../Ringtoets.Integration.Plugin.csproj) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -136,11 +136,6 @@ Ringtoets.DuneErosion.Plugin False - - {888D4097-8BC2-4703-9FB1-8744C94D525E} - Ringtoets.HydraRing.Calculation - False - {83D6B73E-91D5-46B0-9218-955DA1F75F7C} Ringtoets.MacroStabilityInwards.Data Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r7fcbba731afc00e5d40614b8fda9f3e4b82d5bba -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 7fcbba731afc00e5d40614b8fda9f3e4b82d5bba) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -19,87 +19,44 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Plugin.FileImporters; namespace Ringtoets.Integration.Plugin.Test.FileImporters { [TestFixture] - public class GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategyTest + public class GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategy, GrassCoverSlipOffInwardsFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override GrassCoverSlipOffInwardsFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new GrassCoverSlipOffInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override GrassCoverSlipOffInwardsFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new GrassCoverSlipOffInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new GrassCoverSlipOffInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup - var random = new Random(39); - var strategy = new GrassCoverSlipOffInwardsFailureMechanismSectionResultUpdateStrategy(); - var originResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new GrassCoverSlipOffInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, DetailedAssessmentResult = DetailedAssessmentResultType.Sufficient, TailorMadeAssessmentResult = TailorMadeAssessmentResultType.ProbabilityNegligible, UseManualAssemblyCategoryGroup = true, - ManualAssemblyCategoryGroup = random.NextEnumValue() + ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv }; - var targetResult = new GrassCoverSlipOffInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(GrassCoverSlipOffInwardsFailureMechanismSectionResult originResult, + GrassCoverSlipOffInwardsFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r7fcbba731afc00e5d40614b8fda9f3e4b82d5bba -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 7fcbba731afc00e5d40614b8fda9f3e4b82d5bba) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -19,87 +19,44 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Plugin.FileImporters; namespace Ringtoets.Integration.Plugin.Test.FileImporters { [TestFixture] - public class GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategyTest + public class GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategy, GrassCoverSlipOffOutwardsFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override GrassCoverSlipOffOutwardsFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override GrassCoverSlipOffOutwardsFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup - var random = new Random(39); - var strategy = new GrassCoverSlipOffOutwardsFailureMechanismSectionResultUpdateStrategy(); - var originResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, DetailedAssessmentResult = DetailedAssessmentResultType.Sufficient, TailorMadeAssessmentResult = TailorMadeAssessmentResultType.ProbabilityNegligible, UseManualAssemblyCategoryGroup = true, - ManualAssemblyCategoryGroup = random.NextEnumValue() + ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv }; - var targetResult = new GrassCoverSlipOffOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(GrassCoverSlipOffOutwardsFailureMechanismSectionResult originResult, + GrassCoverSlipOffOutwardsFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r7fcbba731afc00e5d40614b8fda9f3e4b82d5bba -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 7fcbba731afc00e5d40614b8fda9f3e4b82d5bba) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -20,86 +20,49 @@ // All rights reserved. using System; -using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Plugin.FileImporters; namespace Ringtoets.Integration.Plugin.Test.FileImporters { [TestFixture] - public class MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategyTest + public class MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategy, MacroStabilityOutwardsFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override MacroStabilityOutwardsFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override MacroStabilityOutwardsFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup var random = new Random(39); - var strategy = new MacroStabilityOutwardsFailureMechanismSectionResultUpdateStrategy(); - var originResult = new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.NotAssessed, + DetailedAssessmentProbability = random.NextDouble(), TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityAndDetailedCalculationResultType.ProbabilityNegligible, + TailorMadeAssessmentProbability = random.NextDouble(), UseManualAssemblyCategoryGroup = true, - ManualAssemblyCategoryGroup = random.NextEnumValue() + ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv }; - var targetResult = new MacroStabilityOutwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(MacroStabilityOutwardsFailureMechanismSectionResult originResult, + MacroStabilityOutwardsFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult); + Assert.AreEqual(originResult.DetailedAssessmentProbability, targetResult.DetailedAssessmentProbability); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); + Assert.AreEqual(originResult.TailorMadeAssessmentProbability, targetResult.TailorMadeAssessmentProbability); Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/MicrostabilityFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r7fcbba731afc00e5d40614b8fda9f3e4b82d5bba -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/MicrostabilityFailureMechanismSectionResultUpdateStrategyTest.cs (.../MicrostabilityFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 7fcbba731afc00e5d40614b8fda9f3e4b82d5bba) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/MicrostabilityFailureMechanismSectionResultUpdateStrategyTest.cs (.../MicrostabilityFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -19,87 +19,44 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Plugin.FileImporters; namespace Ringtoets.Integration.Plugin.Test.FileImporters { [TestFixture] - public class MicrostabilityFailureMechanismSectionResultUpdateStrategyTest + public class MicrostabilityFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + MicrostabilityFailureMechanismSectionResultUpdateStrategy, MicrostabilityFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override MicrostabilityFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new MicrostabilityFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new MicrostabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override MicrostabilityFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new MicrostabilityFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new MicrostabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new MicrostabilityFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new MicrostabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup - var random = new Random(39); - var strategy = new MicrostabilityFailureMechanismSectionResultUpdateStrategy(); - var originResult = new MicrostabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new MicrostabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, DetailedAssessmentResult = DetailedAssessmentResultType.Sufficient, TailorMadeAssessmentResult = TailorMadeAssessmentResultType.ProbabilityNegligible, UseManualAssemblyCategoryGroup = true, - ManualAssemblyCategoryGroup = random.NextEnumValue() + ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv }; - var targetResult = new MicrostabilityFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(MicrostabilityFailureMechanismSectionResult originResult, + MicrostabilityFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/PipingStructureFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r7fcbba731afc00e5d40614b8fda9f3e4b82d5bba -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/PipingStructureFailureMechanismSectionResultUpdateStrategyTest.cs (.../PipingStructureFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 7fcbba731afc00e5d40614b8fda9f3e4b82d5bba) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/PipingStructureFailureMechanismSectionResultUpdateStrategyTest.cs (.../PipingStructureFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -19,87 +19,44 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Plugin.FileImporters; namespace Ringtoets.Integration.Plugin.Test.FileImporters { [TestFixture] - public class PipingStructureFailureMechanismSectionResultUpdateStrategyTest + public class PipingStructureFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + PipingStructureFailureMechanismSectionResultUpdateStrategy, PipingStructureFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override PipingStructureFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new PipingStructureFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new PipingStructureFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override PipingStructureFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new PipingStructureFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new PipingStructureFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new PipingStructureFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new PipingStructureFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup - var random = new Random(39); - var strategy = new PipingStructureFailureMechanismSectionResultUpdateStrategy(); - var originResult = new PipingStructureFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new PipingStructureFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, DetailedAssessmentResult = DetailedAssessmentResultType.Sufficient, TailorMadeAssessmentResult = TailorMadeAssessmentResultType.ProbabilityNegligible, UseManualAssemblyCategoryGroup = true, - ManualAssemblyCategoryGroup = random.NextEnumValue() + ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv }; - var targetResult = new PipingStructureFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(PipingStructureFailureMechanismSectionResult originResult, + PipingStructureFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r7fcbba731afc00e5d40614b8fda9f3e4b82d5bba -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategyTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 7fcbba731afc00e5d40614b8fda9f3e4b82d5bba) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategyTest.cs (.../StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -19,85 +19,42 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Plugin.FileImporters; namespace Ringtoets.Integration.Plugin.Test.FileImporters { [TestFixture] - public class StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategyTest + public class StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategy, StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup - var random = new Random(39); - var strategy = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResultUpdateStrategy(); - var originResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, TailorMadeAssessmentResult = TailorMadeAssessmentResultType.ProbabilityNegligible, UseManualAssemblyCategoryGroup = true, - ManualAssemblyCategoryGroup = random.NextEnumValue() + ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv }; - var targetResult = new StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult originResult, + StrengthStabilityLengthwiseConstructionFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/TechnicalInnovationFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r7fcbba731afc00e5d40614b8fda9f3e4b82d5bba -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/TechnicalInnovationFailureMechanismSectionResultUpdateStrategyTest.cs (.../TechnicalInnovationFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 7fcbba731afc00e5d40614b8fda9f3e4b82d5bba) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/TechnicalInnovationFailureMechanismSectionResultUpdateStrategyTest.cs (.../TechnicalInnovationFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -19,85 +19,42 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Plugin.FileImporters; namespace Ringtoets.Integration.Plugin.Test.FileImporters { [TestFixture] - public class TechnicalInnovationFailureMechanismSectionResultUpdateStrategyTest + public class TechnicalInnovationFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + TechnicalInnovationFailureMechanismSectionResultUpdateStrategy, TechnicalInnovationFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override TechnicalInnovationFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new TechnicalInnovationFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new TechnicalInnovationFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override TechnicalInnovationFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new TechnicalInnovationFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new TechnicalInnovationFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new TechnicalInnovationFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new TechnicalInnovationFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup - var random = new Random(39); - var strategy = new TechnicalInnovationFailureMechanismSectionResultUpdateStrategy(); - var originResult = new TechnicalInnovationFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new TechnicalInnovationFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, TailorMadeAssessmentResult = TailorMadeAssessmentResultType.ProbabilityNegligible, UseManualAssemblyCategoryGroup = true, - ManualAssemblyCategoryGroup = random.NextEnumValue() + ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv }; - var targetResult = new TechnicalInnovationFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(TechnicalInnovationFailureMechanismSectionResult originResult, + TechnicalInnovationFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r7fcbba731afc00e5d40614b8fda9f3e4b82d5bba -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 7fcbba731afc00e5d40614b8fda9f3e4b82d5bba) +++ Ringtoets/Integration/test/Ringtoets.Integration.Plugin.Test/FileImporters/WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest.cs (.../WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -19,85 +19,42 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; -using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.Integration.Data.StandAlone.SectionResults; using Ringtoets.Integration.Plugin.FileImporters; namespace Ringtoets.Integration.Plugin.Test.FileImporters { [TestFixture] - public class WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest + public class WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategy, WaterPressureAsphaltCoverFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override WaterPressureAsphaltCoverFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new WaterPressureAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override WaterPressureAsphaltCoverFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new WaterPressureAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new WaterPressureAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup - var random = new Random(39); - var strategy = new WaterPressureAsphaltCoverFailureMechanismSectionResultUpdateStrategy(); - var originResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new WaterPressureAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, TailorMadeAssessmentResult = TailorMadeAssessmentResultType.ProbabilityNegligible, UseManualAssemblyCategoryGroup = true, - ManualAssemblyCategoryGroup = random.NextEnumValue() + ManualAssemblyCategoryGroup = ManualFailureMechanismSectionAssemblyCategoryGroup.VIIv }; - var targetResult = new WaterPressureAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(WaterPressureAsphaltCoverFailureMechanismSectionResult originResult, + WaterPressureAsphaltCoverFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r4c178ececfa6753ab565a7d123c075f854ad88ec -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 4c178ececfa6753ab565a7d123c075f854ad88ec) +++ Ringtoets/MacroStabilityInwards/test/Ringtoets.MacroStabilityInwards.Plugin.Test/FileImporter/MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategyTest.cs (.../MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -22,84 +22,45 @@ using System; using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.MacroStabilityInwards.Data; using Ringtoets.MacroStabilityInwards.Plugin.FileImporter; namespace Ringtoets.MacroStabilityInwards.Plugin.Test.FileImporter { [TestFixture] - public class MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategyTest + public class MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategy, MacroStabilityInwardsFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override MacroStabilityInwardsFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override MacroStabilityInwardsFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup var random = new Random(39); - var strategy = new MacroStabilityInwardsFailureMechanismSectionResultUpdateStrategy(); - var originResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.NotAssessed, TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.Probability, TailorMadeAssessmentProbability = random.NextDouble(), UseManualAssemblyProbability = true, ManualAssemblyProbability = random.NextDouble() }; - var targetResult = new MacroStabilityInwardsFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(MacroStabilityInwardsFailureMechanismSectionResult originResult, + MacroStabilityInwardsFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentProbability, targetResult.TailorMadeAssessmentProbability); Assert.AreEqual(originResult.UseManualAssemblyProbability, targetResult.UseManualAssemblyProbability); Assert.AreEqual(originResult.ManualAssemblyProbability, targetResult.ManualAssemblyProbability); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r1a0da0d93e61ca3053f7ad34fe15e2131df69346 -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingFailureMechanismSectionResultUpdateStrategyTest.cs (.../PipingFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1a0da0d93e61ca3053f7ad34fe15e2131df69346) +++ Ringtoets/Piping/test/Ringtoets.Piping.Plugin.Test/FileImporter/PipingFailureMechanismSectionResultUpdateStrategyTest.cs (.../PipingFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -22,84 +22,45 @@ using System; using NUnit.Framework; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.Piping.Data; using Ringtoets.Piping.Plugin.FileImporter; namespace Ringtoets.Piping.Plugin.Test.FileImporter { [TestFixture] - public class PipingFailureMechanismSectionResultUpdateStrategyTest + public class PipingFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + PipingFailureMechanismSectionResultUpdateStrategy, PipingFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override PipingFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new PipingFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override PipingFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new PipingFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new PipingFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup var random = new Random(39); - var strategy = new PipingFailureMechanismSectionResultUpdateStrategy(); - var originResult = new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { - SimpleAssessmentResult = SimpleAssessmentResultType.AssessFurther, + SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, DetailedAssessmentResult = DetailedAssessmentProbabilityOnlyResultType.NotAssessed, TailorMadeAssessmentResult = TailorMadeAssessmentProbabilityCalculationResultType.Probability, TailorMadeAssessmentProbability = random.NextDouble(), UseManualAssemblyProbability = true, ManualAssemblyProbability = random.NextDouble() }; - var targetResult = new PipingFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(PipingFailureMechanismSectionResult originResult, + PipingFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentProbability, targetResult.TailorMadeAssessmentProbability); Assert.AreEqual(originResult.UseManualAssemblyProbability, targetResult.UseManualAssemblyProbability); Assert.AreEqual(originResult.ManualAssemblyProbability, targetResult.ManualAssemblyProbability); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r2ffe3ee440555e5328219abfe2bcc6fac5b68930 -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresFailureMechanismSectionResultUpdateStrategyTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 2ffe3ee440555e5328219abfe2bcc6fac5b68930) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/FileImporters/StabilityPointStructuresFailureMechanismSectionResultUpdateStrategyTest.cs (.../StabilityPointStructuresFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -23,63 +23,26 @@ using NUnit.Framework; using Ringtoets.Common.Data.Structures; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.StabilityPointStructures.Data; using Ringtoets.StabilityPointStructures.Plugin.FileImporters; namespace Ringtoets.StabilityPointStructures.Plugin.Test.FileImporters { [TestFixture] - public class StabilityPointStructuresFailureMechanismSectionResultUpdateStrategyTest + public class StabilityPointStructuresFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + StabilityPointStructuresFailureMechanismSectionResultUpdateStrategy, StabilityPointStructuresFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override StabilityPointStructuresFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new StabilityPointStructuresFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override StabilityPointStructuresFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new StabilityPointStructuresFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new StabilityPointStructuresFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup var random = new Random(39); - var strategy = new StabilityPointStructuresFailureMechanismSectionResultUpdateStrategy(); - var originResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { Calculation = new StructuresCalculation(), SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable, @@ -89,20 +52,18 @@ UseManualAssemblyProbability = true, ManualAssemblyProbability = random.NextDouble() }; - var targetResult = new StabilityPointStructuresFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(StabilityPointStructuresFailureMechanismSectionResult originResult, + StabilityPointStructuresFailureMechanismSectionResult targetResult) + { Assert.AreSame(originResult.Calculation, targetResult.Calculation); Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResult, targetResult.DetailedAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.TailorMadeAssessmentProbability, targetResult.TailorMadeAssessmentProbability); Assert.AreEqual(originResult.UseManualAssemblyProbability, targetResult.UseManualAssemblyProbability); Assert.AreEqual(originResult.ManualAssemblyProbability, targetResult.ManualAssemblyProbability); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/Ringtoets.StabilityPointStructures.Plugin.Test.csproj =================================================================== diff -u -r2ffe3ee440555e5328219abfe2bcc6fac5b68930 -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/Ringtoets.StabilityPointStructures.Plugin.Test.csproj (.../Ringtoets.StabilityPointStructures.Plugin.Test.csproj) (revision 2ffe3ee440555e5328219abfe2bcc6fac5b68930) +++ Ringtoets/StabilityPointStructures/test/Ringtoets.StabilityPointStructures.Plugin.Test/Ringtoets.StabilityPointStructures.Plugin.Test.csproj (.../Ringtoets.StabilityPointStructures.Plugin.Test.csproj) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -123,6 +123,10 @@ {4843d6e5-066f-4795-94f5-1d53932dd03c} Ringtoets.Common.Data.TestUtil + + {6346BADF-D331-4948-9772-08E8CD1E1FC9} + Ringtoets.Common.Plugin.TestUtil + {52093DA6-D545-476A-ADFD-12F56625E36B} Ringtoets.Common.Service.TestUtil Index: Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/FileImporters/StabilityStoneCoverFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -rd7ee65107ab167be11bedb03745684bb0960dc98 -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/FileImporters/StabilityStoneCoverFailureMechanismSectionResultUpdateStrategyTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultUpdateStrategyTest.cs) (revision d7ee65107ab167be11bedb03745684bb0960dc98) +++ Ringtoets/StabilityStoneCover/test/Ringtoets.StabilityStoneCover.Plugin.Test/FileImporters/StabilityStoneCoverFailureMechanismSectionResultUpdateStrategyTest.cs (.../StabilityStoneCoverFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -19,66 +19,28 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using NUnit.Framework; using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.StabilityStoneCover.Data; using Ringtoets.StabilityStoneCover.Plugin.FileImporters; namespace Ringtoets.StabilityStoneCover.Plugin.Test.FileImporters { [TestFixture] - public class StabilityStoneCoverFailureMechanismSectionResultUpdateStrategyTest + public class StabilityStoneCoverFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + StabilityStoneCoverFailureMechanismSectionResultUpdateStrategy, StabilityStoneCoverFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override StabilityStoneCoverFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new StabilityStoneCoverFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override StabilityStoneCoverFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new StabilityStoneCoverFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new StabilityStoneCoverFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup - var strategy = new StabilityStoneCoverFailureMechanismSectionResultUpdateStrategy(); - var originResult = new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { SimpleAssessmentResult = SimpleAssessmentValidityOnlyResultType.NotApplicable, DetailedAssessmentResultForFactorizedSignalingNorm = DetailedAssessmentResultType.Sufficient, @@ -90,12 +52,11 @@ UseManualAssemblyCategoryGroup = true, ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.VIv }; - var targetResult = new StabilityStoneCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(StabilityStoneCoverFailureMechanismSectionResult originResult, + StabilityStoneCoverFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResultForFactorizedSignalingNorm, targetResult.DetailedAssessmentResultForFactorizedSignalingNorm); Assert.AreEqual(originResult.DetailedAssessmentResultForSignalingNorm, targetResult.DetailedAssessmentResultForSignalingNorm); @@ -105,7 +66,6 @@ Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file Index: Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/FileImporters/WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest.cs =================================================================== diff -u -r4ea1061d06a72069439ac6a7cf81e7ab3345902a -r1b06b4edc3ec9567e5550e6f66efcae7ce51a97f --- Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/FileImporters/WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 4ea1061d06a72069439ac6a7cf81e7ab3345902a) +++ Ringtoets/WaveImpactAsphaltCover/test/Ringtoets.WaveImpactAsphaltCover.Plugin.Test/FileImporters/WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest.cs (.../WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest.cs) (revision 1b06b4edc3ec9567e5550e6f66efcae7ce51a97f) @@ -19,66 +19,28 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. -using System; using NUnit.Framework; using Ringtoets.AssemblyTool.Data; using Ringtoets.Common.Data.TestUtil; -using Ringtoets.Common.IO.FileImporters; +using Ringtoets.Common.Plugin.TestUtil.FileImporters; using Ringtoets.Common.Primitives; using Ringtoets.WaveImpactAsphaltCover.Data; using Ringtoets.WaveImpactAsphaltCover.Plugin.FileImporters; namespace Ringtoets.WaveImpactAsphaltCover.Plugin.Test.FileImporters { [TestFixture] - public class WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest + public class WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateStrategyTest : FailureMechanismSectionResultUpdateStrategyTestFixture< + WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateStrategy, WaveImpactAsphaltCoverFailureMechanismSectionResult> { - [Test] - public void Constructor_ExpectedValues() + protected override WaveImpactAsphaltCoverFailureMechanismSectionResult CreateEmptySectionResult() { - // Call - var strategy = new WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateStrategy(); - - // Assert - Assert.IsInstanceOf>(strategy); + return new WaveImpactAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); } - [Test] - public void UpdateSectionResult_OriginNull_ThrowsArgumentNullException() + protected override WaveImpactAsphaltCoverFailureMechanismSectionResult CreateConfiguredSectionResult() { - // Setup - var strategy = new WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - null, new WaveImpactAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection())); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("origin", paramName); - } - - [Test] - public void UpdateSectionResult_TargetNull_ThrowsArgumentNullException() - { - // Setup - var strategy = new WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateStrategy(); - - // Call - TestDelegate test = () => strategy.UpdateSectionResult( - new WaveImpactAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()), null); - - // Assert - string paramName = Assert.Throws(test).ParamName; - Assert.AreEqual("target", paramName); - } - - [Test] - public void UpdateSectionResult_WithData_UpdatesTargetSectionResult() - { - // Setup - var strategy = new WaveImpactAsphaltCoverFailureMechanismSectionResultUpdateStrategy(); - var originResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) + return new WaveImpactAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()) { SimpleAssessmentResult = SimpleAssessmentResultType.NotApplicable, DetailedAssessmentResultForFactorizedSignalingNorm = DetailedAssessmentResultType.Sufficient, @@ -90,12 +52,11 @@ UseManualAssemblyCategoryGroup = true, ManualAssemblyCategoryGroup = FailureMechanismSectionAssemblyCategoryGroup.VIv }; - var targetResult = new WaveImpactAsphaltCoverFailureMechanismSectionResult(FailureMechanismSectionTestFactory.CreateFailureMechanismSection()); + } - // Call - strategy.UpdateSectionResult(originResult, targetResult); - - // Assert + protected override void AssertSectionResult(WaveImpactAsphaltCoverFailureMechanismSectionResult originResult, + WaveImpactAsphaltCoverFailureMechanismSectionResult targetResult) + { Assert.AreEqual(originResult.SimpleAssessmentResult, targetResult.SimpleAssessmentResult); Assert.AreEqual(originResult.DetailedAssessmentResultForFactorizedSignalingNorm, targetResult.DetailedAssessmentResultForFactorizedSignalingNorm); Assert.AreEqual(originResult.DetailedAssessmentResultForSignalingNorm, targetResult.DetailedAssessmentResultForSignalingNorm); @@ -105,7 +66,6 @@ Assert.AreEqual(originResult.TailorMadeAssessmentResult, targetResult.TailorMadeAssessmentResult); Assert.AreEqual(originResult.UseManualAssemblyCategoryGroup, targetResult.UseManualAssemblyCategoryGroup); Assert.AreEqual(originResult.ManualAssemblyCategoryGroup, targetResult.ManualAssemblyCategoryGroup); - Assert.AreNotSame(originResult.Section, targetResult.Section); } } } \ No newline at end of file