Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssembly.cs =================================================================== diff -u -r7deb19aedd02c79cf6ce19e629fec1a6c0ee4e1e -rb50aa5c330d5c514ef0727cb9b732094c228eb46 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssembly.cs (.../SerializableAssembly.cs) (revision 7deb19aedd02c79cf6ce19e629fec1a6c0ee4e1e) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableAssembly.cs (.../SerializableAssembly.cs) (revision b50aa5c330d5c514ef0727cb9b732094c228eb46) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections.Generic; using System.Xml.Serialization; using Core.Common.Base.Geometry; using Ringtoets.AssemblyTool.IO.Model.Gml; @@ -48,7 +47,7 @@ /// The collection of that /// belong to the assembly. /// Thrown when any parameter is null. - public SerializableAssembly(string id, Point2D lowerCorner, Point2D upperCorner, List featureMembers) + public SerializableAssembly(string id, Point2D lowerCorner, Point2D upperCorner, SerializableFeatureMember[] featureMembers) { if (id == null) { @@ -96,6 +95,6 @@ [XmlArrayItem(typeof(SerializableTotalAssemblyResult))] [XmlArrayItem(typeof(SerializableFailureMechanism))] [XmlArrayItem(typeof(SerializableFailureMechanismSectionAssembly))] - public List FeatureMembers { get; set; } + public SerializableFeatureMember[] FeatureMembers { get; set; } } } \ No newline at end of file Index: Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableFailureMechanismSectionAssembly.cs =================================================================== diff -u -r7deb19aedd02c79cf6ce19e629fec1a6c0ee4e1e -rb50aa5c330d5c514ef0727cb9b732094c228eb46 --- Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableFailureMechanismSectionAssembly.cs (.../SerializableFailureMechanismSectionAssembly.cs) (revision 7deb19aedd02c79cf6ce19e629fec1a6c0ee4e1e) +++ Ringtoets/AssemblyTool/src/Ringtoets.AssemblyTool.IO/Model/SerializableFailureMechanismSectionAssembly.cs (.../SerializableFailureMechanismSectionAssembly.cs) (revision b50aa5c330d5c514ef0727cb9b732094c228eb46) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections.Generic; using System.Xml.Serialization; using Ringtoets.AssemblyTool.IO.Model.DataTypes; @@ -47,7 +46,7 @@ /// Thrown when any parameter is null. public SerializableFailureMechanismSectionAssembly(string id, SerializableFailureMechanism failureMechanism, - List sectionResults, + SerializableFailureMechanismSectionAssemblyResult[] sectionResults, SerializableFailureMechanismSectionAssemblyResult combinedSectionResult) : this() { if (id == null) @@ -95,10 +94,9 @@ public SerializableFailureMechanismSectionAssemblyResult CombinedSectionResult { get; set; } /// - /// Gets or sets the list of results for this section. + /// Gets or sets the array of results for this section. /// [XmlElement(AssemblyXmlIdentifiers.SectionResults)] - public List SectionResults { get; set; } - + public SerializableFailureMechanismSectionAssemblyResult[] SectionResults { get; set; } } } \ No newline at end of file Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssemblyTest.cs =================================================================== diff -u -r7deb19aedd02c79cf6ce19e629fec1a6c0ee4e1e -rb50aa5c330d5c514ef0727cb9b732094c228eb46 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssemblyTest.cs (.../SerializableAssemblyTest.cs) (revision 7deb19aedd02c79cf6ce19e629fec1a6c0ee4e1e) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableAssemblyTest.cs (.../SerializableAssemblyTest.cs) (revision b50aa5c330d5c514ef0727cb9b732094c228eb46) @@ -56,7 +56,7 @@ Assert.AreEqual("Assemblage", xmlRootAttribute.ElementName); Assert.AreEqual("http://localhost/standaarden/assemblage", xmlRootAttribute.Namespace); - var gmlNamespace = "http://www.opengis.net/gml/3.2"; + const string gmlNamespace = "http://www.opengis.net/gml/3.2"; SerializableAttributeTestHelper.AssertXmlAttributeAttribute( nameof(SerializableAssembly.Id), "id", gmlNamespace); SerializableAttributeTestHelper.AssertXmlElementAttribute( @@ -84,7 +84,7 @@ TestDelegate call = () => new SerializableAssembly(null, new Point2D(random.NextDouble(), random.NextDouble()), new Point2D(random.NextDouble(), random.NextDouble()), - new List()); + new SerializableFeatureMember[0]); // Assert var exception = Assert.Throws(call); @@ -101,7 +101,7 @@ TestDelegate call = () => new SerializableAssembly(string.Empty, null, new Point2D(random.NextDouble(), random.NextDouble()), - new List()); + new SerializableFeatureMember[0]); // Assert var exception = Assert.Throws(call); @@ -118,7 +118,7 @@ TestDelegate call = () => new SerializableAssembly(string.Empty, new Point2D(random.NextDouble(), random.NextDouble()), null, - new List()); + new SerializableFeatureMember[0]); // Assert var exception = Assert.Throws(call); Assert.AreEqual("upperCorner", exception.ParamName); @@ -155,7 +155,7 @@ var assembly = new SerializableAssembly(id, lowerCorner, upperCorner, - new List + new[] { featureMember }); @@ -206,22 +206,22 @@ new SerializableFailureMechanismAssemblyResult(SerializableAssemblyMethod.WBI3C1, SerializableFailureMechanismCategoryGroup.NotApplicable, 0.000124)); var failureMechanism1 = new SerializableFailureMechanism("fm1", - totalAssemblyResult, - SerializableFailureMechanismType.GABI, - SerializableAssemblyGroup.Group4, - new SerializableFailureMechanismAssemblyResult(SerializableAssemblyMethod.WBI1A1, SerializableFailureMechanismCategoryGroup.IIt)); + totalAssemblyResult, + SerializableFailureMechanismType.GABI, + SerializableAssemblyGroup.Group4, + new SerializableFailureMechanismAssemblyResult(SerializableAssemblyMethod.WBI1A1, SerializableFailureMechanismCategoryGroup.IIt)); var result1 = new SerializableFailureMechanismSectionAssembly("sr1", failureMechanism1, - new List - { - new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethod.WBI0E1, SerializableAssessmentLevel.SimpleAssessment, SerializableFailureMechanismSectionCategoryGroup.IIv, 0.5), - new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethod.WBI0T5, SerializableAssessmentLevel.TailorMadeAssessment, SerializableFailureMechanismSectionCategoryGroup.IIIv) - }, - new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethod.WBI0A1, SerializableAssessmentLevel.CombinedAssessment, SerializableFailureMechanismSectionCategoryGroup.IIIv)); + new[] + { + new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethod.WBI0E1, SerializableAssessmentLevel.SimpleAssessment, SerializableFailureMechanismSectionCategoryGroup.IIv, 0.5), + new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethod.WBI0T5, SerializableAssessmentLevel.TailorMadeAssessment, SerializableFailureMechanismSectionCategoryGroup.IIIv) + }, + new SerializableFailureMechanismSectionAssemblyResult(SerializableAssemblyMethod.WBI0A1, SerializableAssessmentLevel.CombinedAssessment, SerializableFailureMechanismSectionCategoryGroup.IIIv)); var assembly = new SerializableAssembly("assembly_1", new Point2D(12.0, 34.0), new Point2D(56.053, 78.0002345), - new List + new SerializableFeatureMember[] { assessmentSection, assessmentProcess, Index: Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs =================================================================== diff -u -r7deb19aedd02c79cf6ce19e629fec1a6c0ee4e1e -rb50aa5c330d5c514ef0727cb9b732094c228eb46 --- Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs (.../SerializableFailureMechanismSectionAssemblyTest.cs) (revision 7deb19aedd02c79cf6ce19e629fec1a6c0ee4e1e) +++ Ringtoets/AssemblyTool/test/Ringtoets.AssemblyTool.IO.Test/Model/SerializableFailureMechanismSectionAssemblyTest.cs (.../SerializableFailureMechanismSectionAssemblyTest.cs) (revision b50aa5c330d5c514ef0727cb9b732094c228eb46) @@ -20,7 +20,6 @@ // All rights reserved. using System; -using System.Collections.Generic; using NUnit.Framework; using Ringtoets.AssemblyTool.IO.Model; using Ringtoets.AssemblyTool.IO.Model.DataTypes; @@ -61,7 +60,7 @@ // Call TestDelegate call = () => new SerializableFailureMechanismSectionAssembly(null, new SerializableFailureMechanism(), - new List(), + new SerializableFailureMechanismSectionAssemblyResult[0], new SerializableFailureMechanismSectionAssemblyResult()); // Assert @@ -75,7 +74,7 @@ // Call TestDelegate call = () => new SerializableFailureMechanismSectionAssembly("id", null, - new List(), + new SerializableFailureMechanismSectionAssemblyResult[0], new SerializableFailureMechanismSectionAssemblyResult()); // Assert @@ -103,7 +102,7 @@ // Call TestDelegate call = () => new SerializableFailureMechanismSectionAssembly("id", new SerializableFailureMechanism(), - new List(), + new SerializableFailureMechanismSectionAssemblyResult[0], null); // Assert @@ -118,7 +117,7 @@ const string id = "id"; var failureMechanism = new SerializableFailureMechanism(); - var sectionResults = new List(); + var sectionResults = new SerializableFailureMechanismSectionAssemblyResult[0]; var combinedSectionResult = new SerializableFailureMechanismSectionAssemblyResult(); // Call