Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAssessmentSectionTest.cs =================================================================== diff -u -r3293cb26e7540dc2e61becd7eda453e234d30664 -r30c0356e486b018532e85b0dde94efe832cf445f --- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAssessmentSectionTest.cs (.../ExportableAssessmentSectionTest.cs) (revision 3293cb26e7540dc2e61becd7eda453e234d30664) +++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableAssessmentSectionTest.cs (.../ExportableAssessmentSectionTest.cs) (revision 30c0356e486b018532e85b0dde94efe832cf445f) @@ -23,9 +23,7 @@ using System.Collections.Generic; 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; @@ -47,7 +45,7 @@ // Call TestDelegate call = () => new ExportableAssessmentSection(null, geometry, - CreateAssessmentSectionAssembly(), + ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(), ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), failureMechanismsWithProbability, @@ -71,7 +69,7 @@ // Call TestDelegate call = () => new ExportableAssessmentSection(string.Empty, null, - CreateAssessmentSectionAssembly(), + ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(), ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), failureMechanismsWithProbability, @@ -97,7 +95,7 @@ TestDelegate call = () => new ExportableAssessmentSection(string.Empty, geometry, null, - ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), failureMechanismsWithProbability, failureMechanismsWithoutProbability, CreateCombinedSectionAssemblyCollection()); @@ -120,7 +118,7 @@ // Call TestDelegate call = () => new ExportableAssessmentSection(string.Empty, geometry, - CreateAssessmentSectionAssembly(), + ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(), null, ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), failureMechanismsWithProbability, @@ -145,7 +143,7 @@ // Call TestDelegate call = () => new ExportableAssessmentSection(string.Empty, geometry, - CreateAssessmentSectionAssembly(), + ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(), ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), null, failureMechanismsWithProbability, @@ -168,8 +166,8 @@ // Call TestDelegate call = () => new ExportableAssessmentSection(string.Empty, geometry, - CreateAssessmentSectionAssembly(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), + ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), null, failureMechanismsWithoutProbability, CreateCombinedSectionAssemblyCollection()); @@ -190,8 +188,8 @@ // Call TestDelegate call = () => new ExportableAssessmentSection(string.Empty, geometry, - CreateAssessmentSectionAssembly(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), + ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), failureMechanismsWithProbability, null, @@ -215,8 +213,8 @@ // Call TestDelegate call = () => new ExportableAssessmentSection(string.Empty, geometry, - CreateAssessmentSectionAssembly(), - ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), + ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(), + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(), ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(), failureMechanismsWithProbability, failureMechanismsWithoutProbability, @@ -234,9 +232,11 @@ { // Setup IEnumerable geometry = Enumerable.Empty(); - ExportableAssessmentSectionAssemblyResult assessmentSectionAssembly = CreateAssessmentSectionAssembly(); - ExportableFailureMechanismAssemblyResultWithProbability failureMechanismAssemblyResultWithProbability = ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(); - ExportableFailureMechanismAssemblyResult failureMechanismAssemblyResultWithoutProbability = ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(); + ExportableAssessmentSectionAssemblyResult assessmentSectionAssembly = ExportableAssessmentSectionAssemblyResultTestFactory.CreateResult(); + ExportableFailureMechanismAssemblyResultWithProbability failureMechanismAssemblyResultWithProbability = + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithProbability(); + ExportableFailureMechanismAssemblyResult failureMechanismAssemblyResultWithoutProbability = + ExportableFailureMechanismAssemblyResultTestFactory.CreateResultWithoutProbability(); IEnumerable> failureMechanismsWithProbability = Enumerable.Empty>(); IEnumerable> failureMechanismsWithoutProbability = @@ -269,12 +269,5 @@ return new ExportableCombinedSectionAssemblyCollection(Enumerable.Empty(), Enumerable.Empty()); } - - private static ExportableAssessmentSectionAssemblyResult CreateAssessmentSectionAssembly() - { - var random = new Random(21); - return new ExportableAssessmentSectionAssemblyResult(random.NextEnumValue(), - random.NextEnumValue()); - } } } \ No newline at end of file