Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultBaseTest.cs =================================================================== diff -u -rb41667ee02ea1f2d7415e7f2f1fd29226d83d806 -rc92cbdd379cb7fccfd80a39507b064cbfba180a1 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultBaseTest.cs (.../ExportableAggregatedFailureMechanismSectionAssemblyResultBaseTest.cs) (revision b41667ee02ea1f2d7415e7f2f1fd29226d83d806) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultBaseTest.cs (.../ExportableAggregatedFailureMechanismSectionAssemblyResultBaseTest.cs) (revision c92cbdd379cb7fccfd80a39507b064cbfba180a1) @@ -1,8 +1,7 @@ using System; -using System.Linq; -using Core.Common.Base.Geometry; using NUnit.Framework; using Ringtoets.Integration.IO.Assembly; +using Ringtoets.Integration.IO.TestUtil; namespace Ringtoets.Integration.IO.Test.Assembly { @@ -24,7 +23,7 @@ public void Constructor_ExpectedValues() { // Setup - ExportableFailureMechanismSection failureMechanismSection = CreateSection(); + ExportableFailureMechanismSection failureMechanismSection = ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(); // Call var assemblyResult = new TestExportableAggregatedFailureMechanismSectionAssemblyResultBase(failureMechanismSection); @@ -33,12 +32,6 @@ Assert.AreSame(failureMechanismSection, assemblyResult.FailureMechanismSection); } - private static ExportableFailureMechanismSection CreateSection() - { - var random = new Random(21); - return new ExportableFailureMechanismSection(Enumerable.Empty(), random.NextDouble(), random.NextDouble()); - } - private class TestExportableAggregatedFailureMechanismSectionAssemblyResultBase : ExportableAggregatedFailureMechanismSectionAssemblyResultBase { Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultTest.cs =================================================================== diff -u -r81fe6be2b6010130cf7bee1af6e673781c275ce3 -rc92cbdd379cb7fccfd80a39507b064cbfba180a1 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultTest.cs (.../ExportableAggregatedFailureMechanismSectionAssemblyResultTest.cs) (revision 81fe6be2b6010130cf7bee1af6e673781c275ce3) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultTest.cs (.../ExportableAggregatedFailureMechanismSectionAssemblyResultTest.cs) (revision c92cbdd379cb7fccfd80a39507b064cbfba180a1) @@ -1,10 +1,9 @@ using System; -using System.Linq; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.AssemblyTool.Data; using Ringtoets.Integration.IO.Assembly; +using Ringtoets.Integration.IO.TestUtil; namespace Ringtoets.Integration.IO.Test.Assembly { @@ -16,7 +15,7 @@ { // Call TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResult( - CreateSection(), + ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(), null, CreateSectionResult(), CreateSectionResult(), @@ -32,7 +31,7 @@ { // Call TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResult( - CreateSection(), + ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(), CreateSectionResult(), null, CreateSectionResult(), @@ -48,7 +47,7 @@ { // Call TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResult( - CreateSection(), + ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(), CreateSectionResult(), CreateSectionResult(), null, @@ -64,7 +63,7 @@ { // Call TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResult( - CreateSection(), + ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(), CreateSectionResult(), CreateSectionResult(), CreateSectionResult(), @@ -79,7 +78,7 @@ public void Constructor_ExpectedValues() { // Setup - ExportableFailureMechanismSection failureMechanismSection = CreateSection(); + ExportableFailureMechanismSection failureMechanismSection = ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(); ExportableSectionAssemblyResult simpleAssembly = CreateSectionResult(); ExportableSectionAssemblyResult detailedAssembly = CreateSectionResult(); ExportableSectionAssemblyResult tailorMadeAssembly = CreateSectionResult(); @@ -102,12 +101,6 @@ Assert.AreSame(combinedAssembly, assemblyResult.CombinedAssembly); } - private static ExportableFailureMechanismSection CreateSection() - { - var random = new Random(21); - return new ExportableFailureMechanismSection(Enumerable.Empty(), random.NextDouble(), random.NextDouble()); - } - private static ExportableSectionAssemblyResult CreateSectionResult() { var random = new Random(21); Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbabilityTest.cs =================================================================== diff -u -r81fe6be2b6010130cf7bee1af6e673781c275ce3 -rc92cbdd379cb7fccfd80a39507b064cbfba180a1 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbabilityTest.cs (.../ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbabilityTest.cs) (revision 81fe6be2b6010130cf7bee1af6e673781c275ce3) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbabilityTest.cs (.../ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbabilityTest.cs) (revision c92cbdd379cb7fccfd80a39507b064cbfba180a1) @@ -1,10 +1,9 @@ using System; -using System.Linq; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.AssemblyTool.Data; using Ringtoets.Integration.IO.Assembly; +using Ringtoets.Integration.IO.TestUtil; namespace Ringtoets.Integration.IO.Test.Assembly { @@ -16,7 +15,7 @@ { // Call TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability( - CreateSection(), + ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(), null, CreateSectionResult(), CreateSectionResult(), @@ -32,7 +31,7 @@ { // Call TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability( - CreateSection(), + ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(), CreateSectionResult(), null, CreateSectionResult(), @@ -48,7 +47,7 @@ { // Call TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability( - CreateSection(), + ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(), CreateSectionResult(), CreateSectionResult(), null, @@ -64,7 +63,7 @@ { // Call TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResultWithProbability( - CreateSection(), + ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(), CreateSectionResult(), CreateSectionResult(), CreateSectionResult(), @@ -79,7 +78,7 @@ public void Constructor_ExpectedValues() { // Setup - ExportableFailureMechanismSection failureMechanismSection = CreateSection(); + ExportableFailureMechanismSection failureMechanismSection = ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(); ExportableSectionAssemblyResultWithProbability simpleAssembly = CreateSectionResult(); ExportableSectionAssemblyResultWithProbability detailedAssembly = CreateSectionResult(); ExportableSectionAssemblyResultWithProbability tailorMadeAssembly = CreateSectionResult(); @@ -109,11 +108,5 @@ random.NextEnumValue(), random.NextDouble()); } - - private static ExportableFailureMechanismSection CreateSection() - { - var random = new Random(21); - return new ExportableFailureMechanismSection(Enumerable.Empty(), random.NextDouble(), random.NextDouble()); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssemblyTest.cs =================================================================== diff -u -rb41667ee02ea1f2d7415e7f2f1fd29226d83d806 -rc92cbdd379cb7fccfd80a39507b064cbfba180a1 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssemblyTest.cs (.../ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssemblyTest.cs) (revision b41667ee02ea1f2d7415e7f2f1fd29226d83d806) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssemblyTest.cs (.../ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssemblyTest.cs) (revision c92cbdd379cb7fccfd80a39507b064cbfba180a1) @@ -1,10 +1,9 @@ using System; -using System.Linq; -using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; using Ringtoets.AssemblyTool.Data; using Ringtoets.Integration.IO.Assembly; +using Ringtoets.Integration.IO.TestUtil; namespace Ringtoets.Integration.IO.Test.Assembly { @@ -16,7 +15,7 @@ { // Call TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly( - CreateSection(), + ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(), null, CreateSectionResult(), CreateSectionResult()); @@ -31,7 +30,7 @@ { // Call TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly( - CreateSection(), + ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(), CreateSectionResult(), null, CreateSectionResult()); @@ -46,7 +45,7 @@ { // Call TestDelegate call = () => new ExportableAggregatedFailureMechanismSectionAssemblyResultWithoutDetailedAssembly( - CreateSection(), + ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(), CreateSectionResult(), CreateSectionResult(), null); @@ -56,12 +55,11 @@ Assert.AreEqual("combinedAssembly", exception.ParamName); } - [Test] public void Constructor_ExpectedValues() { // Setup - ExportableFailureMechanismSection failureMechanismSection = CreateSection(); + ExportableFailureMechanismSection failureMechanismSection = ExportableFailureMechanismSectionTestFactory.CreatExportableFailureMechanismSection(); ExportableSectionAssemblyResult simpleAssembly = CreateSectionResult(); ExportableSectionAssemblyResult tailorMadeAssembly = CreateSectionResult(); ExportableSectionAssemblyResult combinedAssembly = CreateSectionResult(); @@ -87,11 +85,5 @@ return new ExportableSectionAssemblyResult(random.NextEnumValue(), random.NextEnumValue()); } - - private static ExportableFailureMechanismSection CreateSection() - { - var random = new Random(21); - return new ExportableFailureMechanismSection(Enumerable.Empty(), random.NextDouble(), random.NextDouble()); - } } } \ No newline at end of file Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Ringtoets.Integration.IO.Test.csproj =================================================================== diff -u -r719d0e6a2b96f912e844a16cfc96c4f7c8da62b7 -rc92cbdd379cb7fccfd80a39507b064cbfba180a1 --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Ringtoets.Integration.IO.Test.csproj (.../Ringtoets.Integration.IO.Test.csproj) (revision 719d0e6a2b96f912e844a16cfc96c4f7c8da62b7) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Ringtoets.Integration.IO.Test.csproj (.../Ringtoets.Integration.IO.Test.csproj) (revision c92cbdd379cb7fccfd80a39507b064cbfba180a1) @@ -82,5 +82,9 @@ {D693D18E-C257-4FDE-96BC-F6E6FB043ECF} Ringtoets.Integration.IO + + {1C002B07-DDF6-4849-B8ED-551163AC9423} + Ringtoets.Integration.IO.TestUtil + \ No newline at end of file