Index: Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableCombinedSectionAssembly.cs
===================================================================
diff -u -r6db3f84335e15d1baac7829c7f10d44d5bae08b7 -rc69a8c2d2d053a44ba18d18a1222dca660c274b6
--- Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableCombinedSectionAssembly.cs (.../ExportableCombinedSectionAssembly.cs) (revision 6db3f84335e15d1baac7829c7f10d44d5bae08b7)
+++ Ringtoets/Integration/src/Ringtoets.Integration.IO/Assembly/ExportableCombinedSectionAssembly.cs (.../ExportableCombinedSectionAssembly.cs) (revision c69a8c2d2d053a44ba18d18a1222dca660c274b6)
@@ -12,21 +12,21 @@
/// Creates a new instance of .
///
/// The section that belongs to the assembly result.
- /// The combined assembly result of this section.
+ /// The combined assembly result of this section.
/// The assembly results per failure mechanism.
/// Thrown when any parameter is null.
public ExportableCombinedSectionAssembly(ExportableCombinedFailureMechanismSection section,
- ExportableFailureMechanismAssemblyResult combinedAssemblyResult,
+ ExportableSectionAssemblyResult combinedSectionAssemblyResult,
IEnumerable failureMechanismResults)
{
if (section == null)
{
throw new ArgumentNullException(nameof(section));
}
- if (combinedAssemblyResult == null)
+ if (combinedSectionAssemblyResult == null)
{
- throw new ArgumentNullException(nameof(combinedAssemblyResult));
+ throw new ArgumentNullException(nameof(combinedSectionAssemblyResult));
}
if (failureMechanismResults == null)
@@ -35,7 +35,7 @@
}
Section = section;
- CombinedAssemblyResult = combinedAssemblyResult;
+ CombinedSectionAssemblyResult = combinedSectionAssemblyResult;
FailureMechanismResults = failureMechanismResults;
}
@@ -47,7 +47,7 @@
///
/// Gets the assembly result of this section.
///
- public ExportableFailureMechanismAssemblyResult CombinedAssemblyResult { get; }
+ public ExportableSectionAssemblyResult CombinedSectionAssemblyResult { get; }
///
/// Gets the assembly results per failure mechanism.
Index: Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableCombinedSectionAssemblyTest.cs
===================================================================
diff -u -r6db3f84335e15d1baac7829c7f10d44d5bae08b7 -rc69a8c2d2d053a44ba18d18a1222dca660c274b6
--- Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableCombinedSectionAssemblyTest.cs (.../ExportableCombinedSectionAssemblyTest.cs) (revision 6db3f84335e15d1baac7829c7f10d44d5bae08b7)
+++ Ringtoets/Integration/test/Ringtoets.Integration.IO.Test/Assembly/ExportableCombinedSectionAssemblyTest.cs (.../ExportableCombinedSectionAssemblyTest.cs) (revision c69a8c2d2d053a44ba18d18a1222dca660c274b6)
@@ -4,8 +4,8 @@
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 +16,7 @@
public void Constructor_SectionNull_ThrowsArgumentNullException()
{
// Setup
- ExportableFailureMechanismAssemblyResult combinedAssemblyResult = CreateFailureMechanismAssemblyResult();
+ ExportableSectionAssemblyResult combinedAssemblyResult = ExportableSectionAssemblyResultTestFactory.CreateSectionAssemblyResult();
IEnumerable failureMechanismResults = Enumerable.Empty();
// Call
@@ -28,7 +28,7 @@
}
[Test]
- public void Constructor_CombinedAssemblyResultNull_ThrowsArgumentNullException()
+ public void Constructor_CombinedSectionAssemblyResultNull_ThrowsArgumentNullException()
{
// Setup
var random = new Random(21);
@@ -43,7 +43,7 @@
// Assert
var exception = Assert.Throws(call);
- Assert.AreEqual("combinedAssemblyResult", exception.ParamName);
+ Assert.AreEqual("combinedSectionAssemblyResult", exception.ParamName);
}
[Test]
@@ -55,7 +55,7 @@
random.NextDouble(),
random.NextDouble(),
random.NextEnumValue());
- ExportableFailureMechanismAssemblyResult combinedAssemblyResult = CreateFailureMechanismAssemblyResult();
+ ExportableSectionAssemblyResult combinedAssemblyResult = ExportableSectionAssemblyResultTestFactory.CreateSectionAssemblyResult();
// Call
TestDelegate call = () => new ExportableCombinedSectionAssembly(section, combinedAssemblyResult, null);
@@ -74,23 +74,16 @@
random.NextDouble(),
random.NextDouble(),
random.NextEnumValue());
- ExportableFailureMechanismAssemblyResult combinedAssemblyResult = CreateFailureMechanismAssemblyResult();
+ ExportableSectionAssemblyResult combinedAssemblyResult = ExportableSectionAssemblyResultTestFactory.CreateSectionAssemblyResult();
IEnumerable failureMechanismResults = Enumerable.Empty();
// Call
var result = new ExportableCombinedSectionAssembly(section, combinedAssemblyResult, failureMechanismResults);
// Assert
Assert.AreSame(section, result.Section);
- Assert.AreSame(combinedAssemblyResult, result.CombinedAssemblyResult);
+ Assert.AreSame(combinedAssemblyResult, result.CombinedSectionAssemblyResult);
Assert.AreSame(failureMechanismResults, result.FailureMechanismResults);
}
-
- private static ExportableFailureMechanismAssemblyResult CreateFailureMechanismAssemblyResult()
- {
- var random = new Random(21);
- return new ExportableFailureMechanismAssemblyResult(random.NextEnumValue(),
- random.NextEnumValue());
- }
}
}
\ No newline at end of file