Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/AssessmentSectionCreateExtensions.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -112,7 +112,7 @@
{
if (section.ReferenceLine != null)
{
- entity.ReferenceLinePointXml = new Point2DXmlSerializer().ToXml(section.ReferenceLine.Points);
+ entity.ReferenceLinePointXml = new Point2DCollectionXmlSerializer().ToXml(section.ReferenceLine.Points);
}
}
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/FailureMechanismSectionCreateExtensions.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/FailureMechanismSectionCreateExtensions.cs (.../FailureMechanismSectionCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/FailureMechanismSectionCreateExtensions.cs (.../FailureMechanismSectionCreateExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -49,7 +49,7 @@
var failureMechanismSectionEntity = new FailureMechanismSectionEntity
{
Name = section.Name.DeepClone(),
- FailureMechanismSectionPointXml = new Point2DXmlSerializer().ToXml(section.Points)
+ FailureMechanismSectionPointXml = new Point2DCollectionXmlSerializer().ToXml(section.Points)
};
registry.Register(failureMechanismSectionEntity, section);
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/ForeshoreProfileCreateExtensions.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/ForeshoreProfileCreateExtensions.cs (.../ForeshoreProfileCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/ForeshoreProfileCreateExtensions.cs (.../ForeshoreProfileCreateExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -56,7 +56,7 @@
{
Id = foreshoreProfile.Id.DeepClone(),
Name = foreshoreProfile.Name.DeepClone(),
- GeometryXml = new Point2DXmlSerializer().ToXml(foreshoreProfile.Geometry),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(foreshoreProfile.Geometry),
X = foreshoreProfile.WorldReferencePoint.X,
Y = foreshoreProfile.WorldReferencePoint.Y,
X0 = foreshoreProfile.X0,
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionInwards/DikeProfileCreateExtensions.cs
===================================================================
diff -u -r39a538cc9e60cd38cce11cc102384af799b75038 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionInwards/DikeProfileCreateExtensions.cs (.../DikeProfileCreateExtensions.cs) (revision 39a538cc9e60cd38cce11cc102384af799b75038)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/GrassCoverErosionInwards/DikeProfileCreateExtensions.cs (.../DikeProfileCreateExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -58,7 +58,7 @@
Y = dikeProfile.WorldReferencePoint.Y,
X0 = dikeProfile.X0,
DikeGeometryXml = new RoughnessPointCollectionXmlSerializer().ToXml(dikeProfile.DikeGeometry),
- ForeshoreXml = new Point2DXmlSerializer().ToXml(dikeProfile.ForeshoreGeometry),
+ ForeshoreXml = new Point2DCollectionXmlSerializer().ToXml(dikeProfile.ForeshoreGeometry),
Orientation = dikeProfile.Orientation,
DikeHeight = dikeProfile.DikeHeight,
Id = dikeProfile.Id.DeepClone(),
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensions.cs
===================================================================
diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensions.cs (.../MacroStabilityInwardsSoilLayer2DCreateExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensions.cs (.../MacroStabilityInwardsSoilLayer2DCreateExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -53,7 +53,7 @@
MacroStabilityInwardsSoilLayerData data = soilLayer.Data;
var entity = new MacroStabilityInwardsSoilLayerTwoDEntity
{
- OuterRingXml = new Point2DXmlSerializer().ToXml(soilLayer.OuterRing.Points),
+ OuterRingXml = new Point2DCollectionXmlSerializer().ToXml(soilLayer.OuterRing.Points),
IsAquifer = Convert.ToByte(data.IsAquifer),
MaterialName = data.MaterialName.DeepClone(),
Color = data.Color.ToInt64(),
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilModelCreateExtensions.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilModelCreateExtensions.cs (.../MacroStabilityInwardsStochasticSoilModelCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilModelCreateExtensions.cs (.../MacroStabilityInwardsStochasticSoilModelCreateExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -59,7 +59,7 @@
var entity = new StochasticSoilModelEntity
{
Name = model.Name.DeepClone(),
- StochasticSoilModelSegmentPointXml = new Point2DXmlSerializer().ToXml(model.Geometry),
+ StochasticSoilModelSegmentPointXml = new Point2DCollectionXmlSerializer().ToXml(model.Geometry),
Order = order
};
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/Piping/PipingStochasticSoilModelCreateExtensions.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/Piping/PipingStochasticSoilModelCreateExtensions.cs (.../PipingStochasticSoilModelCreateExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/Piping/PipingStochasticSoilModelCreateExtensions.cs (.../PipingStochasticSoilModelCreateExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -63,7 +63,7 @@
var entity = new StochasticSoilModelEntity
{
Name = model.Name.DeepClone(),
- StochasticSoilModelSegmentPointXml = new Point2DXmlSerializer().ToXml(model.Geometry),
+ StochasticSoilModelSegmentPointXml = new Point2DCollectionXmlSerializer().ToXml(model.Geometry),
Order = order
};
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs
===================================================================
diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -109,7 +109,7 @@
{
if (entity.ReferenceLinePointXml != null)
{
- Point2D[] points = new Point2DXmlSerializer().FromXml(entity.ReferenceLinePointXml);
+ Point2D[] points = new Point2DCollectionXmlSerializer().FromXml(entity.ReferenceLinePointXml);
var referenceLine = new ReferenceLine();
referenceLine.SetGeometry(points);
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/FailureMechanismSectionEntityReadExtensions.cs
===================================================================
diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/FailureMechanismSectionEntityReadExtensions.cs (.../FailureMechanismSectionEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/FailureMechanismSectionEntityReadExtensions.cs (.../FailureMechanismSectionEntityReadExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -49,7 +49,7 @@
throw new ArgumentNullException(nameof(collector));
}
- Point2D[] points = new Point2DXmlSerializer().FromXml(entity.FailureMechanismSectionPointXml);
+ Point2D[] points = new Point2DCollectionXmlSerializer().FromXml(entity.FailureMechanismSectionPointXml);
var mechanismSection = new FailureMechanismSection(entity.Name, points);
collector.Read(entity, mechanismSection);
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ForeshoreProfileEntityReadExtensions.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ForeshoreProfileEntityReadExtensions.cs (.../ForeshoreProfileEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/ForeshoreProfileEntityReadExtensions.cs (.../ForeshoreProfileEntityReadExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -55,7 +55,7 @@
return collector.Get(entity);
}
- Point2D[] points = new Point2DXmlSerializer().FromXml(entity.GeometryXml);
+ Point2D[] points = new Point2DCollectionXmlSerializer().FromXml(entity.GeometryXml);
var foreshoreProfile = new ForeshoreProfile(new Point2D(entity.X.ToNullAsNaN(), entity.Y.ToNullAsNaN()),
points,
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensions.cs
===================================================================
diff -u -r39a538cc9e60cd38cce11cc102384af799b75038 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensions.cs (.../DikeProfileEntityReadExtensions.cs) (revision 39a538cc9e60cd38cce11cc102384af799b75038)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensions.cs (.../DikeProfileEntityReadExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -57,7 +57,7 @@
var dikeProfile = new DikeProfile(new Point2D(entity.X.ToNullAsNaN(), entity.Y.ToNullAsNaN()),
new RoughnessPointCollectionXmlSerializer().FromXml(entity.DikeGeometryXml),
- new Point2DXmlSerializer().FromXml(entity.ForeshoreXml),
+ new Point2DCollectionXmlSerializer().FromXml(entity.ForeshoreXml),
CreateBreakWater(entity),
CreateProperties(entity));
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs
===================================================================
diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -50,7 +50,7 @@
throw new ArgumentNullException(nameof(entity));
}
- var outerRing = new Ring(new Point2DXmlSerializer().FromXml(entity.OuterRingXml));
+ var outerRing = new Ring(new Point2DCollectionXmlSerializer().FromXml(entity.OuterRingXml));
return new MacroStabilityInwardsSoilLayer2D(outerRing,
ReadData(entity),
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StochasticSoilModelEntityReadExtensions.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StochasticSoilModelEntityReadExtensions.cs (.../StochasticSoilModelEntityReadExtensions.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/StochasticSoilModelEntityReadExtensions.cs (.../StochasticSoilModelEntityReadExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -141,7 +141,7 @@
/// Thrown when is empty.
private static IEnumerable ReadSegmentPoints(string xml)
{
- return new Point2DXmlSerializer().FromXml(xml);
+ return new Point2DCollectionXmlSerializer().FromXml(xml);
}
}
}
\ No newline at end of file
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Ringtoets.Storage.Core.csproj
===================================================================
diff -u -rc7bccf3eec9c8a12124c3486a639906f27597ef5 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Ringtoets.Storage.Core.csproj (.../Ringtoets.Storage.Core.csproj) (revision c7bccf3eec9c8a12124c3486a639906f27597ef5)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Ringtoets.Storage.Core.csproj (.../Ringtoets.Storage.Core.csproj) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -425,7 +425,7 @@
-
+
Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Serializers/Point2DCollectionXmlSerializer.cs
===================================================================
diff -u
--- Ringtoets/Storage/src/Ringtoets.Storage.Core/Serializers/Point2DCollectionXmlSerializer.cs (revision 0)
+++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Serializers/Point2DCollectionXmlSerializer.cs (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -0,0 +1,68 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Runtime.Serialization;
+using Core.Common.Base.Geometry;
+
+namespace Ringtoets.Storage.Core.Serializers
+{
+ ///
+ /// Converter class that converts between a collection of and an
+ /// XML representation of that data.
+ ///
+ internal class Point2DCollectionXmlSerializer : DataCollectionSerializer
+ {
+ protected override SerializablePoint2D[] ToSerializableData(IEnumerable points)
+ {
+ return points.Select(p => new SerializablePoint2D(p)).ToArray();
+ }
+
+ protected override Point2D[] FromSerializableData(IEnumerable pointData)
+ {
+ return pointData.Select(pd => pd.ToPoint2D()).ToArray();
+ }
+
+ [Serializable]
+ [DataContract(Name = nameof(SerializablePoint2D), Namespace = "")]
+ internal class SerializablePoint2D
+ {
+ [DataMember]
+ private readonly double x;
+
+ [DataMember]
+ private readonly double y;
+
+ public SerializablePoint2D(Point2D point2D)
+ {
+ x = point2D.X;
+ y = point2D.Y;
+ }
+
+ public Point2D ToPoint2D()
+ {
+ return new Point2D(x, y);
+ }
+ }
+ }
+}
\ No newline at end of file
Fisheye: Tag ba834431b63ea0985c60a0987ca8fb720f801ab6 refers to a dead (removed) revision in file `Ringtoets/Storage/src/Ringtoets.Storage.Core/Serializers/Point2DXmlSerializer.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs
===================================================================
diff -u -r89e98516d0d77726bca56a95d649bb7a3e3333bc -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 89e98516d0d77726bca56a95d649bb7a3e3333bc)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -327,7 +327,7 @@
AssessmentSectionEntity entity = assessmentSection.Create(registry, 0);
// Assert
- string expectedXml = new Point2DXmlSerializer().ToXml(points);
+ string expectedXml = new Point2DCollectionXmlSerializer().ToXml(points);
Assert.AreEqual(expectedXml, entity.ReferenceLinePointXml);
}
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/FailureMechanismSectionCreateExtensionsTest.cs
===================================================================
diff -u -r96e0a1fd29dc37c5abe6c020ec64f8188acdab60 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/FailureMechanismSectionCreateExtensionsTest.cs (.../FailureMechanismSectionCreateExtensionsTest.cs) (revision 96e0a1fd29dc37c5abe6c020ec64f8188acdab60)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/FailureMechanismSectionCreateExtensionsTest.cs (.../FailureMechanismSectionCreateExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -66,7 +66,7 @@
// Assert
Assert.IsNotNull(entity);
Assert.AreEqual(testName, entity.Name);
- string expectedXml = new Point2DXmlSerializer().ToXml(geometryPoints);
+ string expectedXml = new Point2DCollectionXmlSerializer().ToXml(geometryPoints);
Assert.AreEqual(expectedXml, entity.FailureMechanismSectionPointXml);
}
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ForeshoreProfileCreateExtensionsTest.cs
===================================================================
diff -u -r72a430c1611547a48f7ef87c1d0cb99c6662765c -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ForeshoreProfileCreateExtensionsTest.cs (.../ForeshoreProfileCreateExtensionsTest.cs) (revision 72a430c1611547a48f7ef87c1d0cb99c6662765c)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/ForeshoreProfileCreateExtensionsTest.cs (.../ForeshoreProfileCreateExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -126,7 +126,7 @@
// Assert
Assert.IsNotNull(entity);
- string expectedXml = new Point2DXmlSerializer().ToXml(geometryPoints);
+ string expectedXml = new Point2DCollectionXmlSerializer().ToXml(geometryPoints);
Assert.AreEqual(expectedXml, entity.GeometryXml);
}
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/DikeProfileCreateExtensionsTest.cs
===================================================================
diff -u -r39a538cc9e60cd38cce11cc102384af799b75038 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/DikeProfileCreateExtensionsTest.cs (.../DikeProfileCreateExtensionsTest.cs) (revision 39a538cc9e60cd38cce11cc102384af799b75038)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/GrassCoverErosionInwards/DikeProfileCreateExtensionsTest.cs (.../DikeProfileCreateExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -85,7 +85,7 @@
Assert.AreEqual(order, entity.Order);
string convertedDikeGeometry = new RoughnessPointCollectionXmlSerializer().ToXml(dikeProfile.DikeGeometry);
Assert.AreEqual(convertedDikeGeometry, entity.DikeGeometryXml);
- string convertedForeshoreGeometry = new Point2DXmlSerializer().ToXml(dikeProfile.ForeshoreGeometry);
+ string convertedForeshoreGeometry = new Point2DCollectionXmlSerializer().ToXml(dikeProfile.ForeshoreGeometry);
Assert.AreEqual(convertedForeshoreGeometry, entity.ForeshoreXml);
Assert.AreEqual(dikeProfile.Orientation.Value, entity.Orientation);
Assert.AreEqual(dikeProfile.DikeHeight.Value, entity.DikeHeight);
@@ -165,7 +165,7 @@
Assert.AreEqual(order, entity.Order);
string convertedDikeGeometry = new RoughnessPointCollectionXmlSerializer().ToXml(dikeProfile.DikeGeometry);
Assert.AreEqual(convertedDikeGeometry, entity.DikeGeometryXml);
- string convertedForeshoreGeometry = new Point2DXmlSerializer().ToXml(dikeProfile.ForeshoreGeometry);
+ string convertedForeshoreGeometry = new Point2DCollectionXmlSerializer().ToXml(dikeProfile.ForeshoreGeometry);
Assert.AreEqual(convertedForeshoreGeometry, entity.ForeshoreXml);
Assert.AreEqual(dikeProfile.Orientation.Value, entity.Orientation);
Assert.AreEqual(dikeProfile.DikeHeight.Value, entity.DikeHeight);
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs
===================================================================
diff -u -r27972af2e4d2d6af87d60f67fcb8345607b974ab -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs (.../MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs) (revision 27972af2e4d2d6af87d60f67fcb8345607b974ab)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs (.../MacroStabilityInwardsSoilLayer2DCreateExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -299,7 +299,7 @@
private static void AssertOuterRing(Ring outerRing, MacroStabilityInwardsSoilLayerTwoDEntity entity)
{
- string expectedOuterRingXml = new Point2DXmlSerializer().ToXml(outerRing.Points);
+ string expectedOuterRingXml = new Point2DCollectionXmlSerializer().ToXml(outerRing.Points);
Assert.AreEqual(expectedOuterRingXml, entity.OuterRingXml);
}
}
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilModelCreateExtensionsTest.cs
===================================================================
diff -u -r27972af2e4d2d6af87d60f67fcb8345607b974ab -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilModelCreateExtensionsTest.cs (.../MacroStabilityInwardsStochasticSoilModelCreateExtensionsTest.cs) (revision 27972af2e4d2d6af87d60f67fcb8345607b974ab)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/MacroStabilityInwards/MacroStabilityInwardsStochasticSoilModelCreateExtensionsTest.cs (.../MacroStabilityInwardsStochasticSoilModelCreateExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -140,7 +140,7 @@
// Assert
Assert.IsNotNull(entity);
- string expectedXml = new Point2DXmlSerializer().ToXml(stochasticSoilModel.Geometry);
+ string expectedXml = new Point2DCollectionXmlSerializer().ToXml(stochasticSoilModel.Geometry);
Assert.AreEqual(expectedXml, entity.StochasticSoilModelSegmentPointXml);
}
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs
===================================================================
diff -u -r906ecf857f6fc95a33793d383493fb0201fe50fc -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs (.../PipingStochasticSoilModelCreateExtensionsTest.cs) (revision 906ecf857f6fc95a33793d383493fb0201fe50fc)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/Piping/PipingStochasticSoilModelCreateExtensionsTest.cs (.../PipingStochasticSoilModelCreateExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -143,7 +143,7 @@
// Assert
Assert.IsNotNull(entity);
- string expectedXml = new Point2DXmlSerializer().ToXml(stochasticSoilModel.Geometry);
+ string expectedXml = new Point2DCollectionXmlSerializer().ToXml(stochasticSoilModel.Geometry);
Assert.AreEqual(expectedXml, entity.StochasticSoilModelSegmentPointXml);
}
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r48ccf93f389ff657634f4dd1a1c6c3e414c88b7a -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 48ccf93f389ff657634f4dd1a1c6c3e414c88b7a)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -183,7 +183,7 @@
new Point2D(firstX, firstY),
new Point2D(secondX, secondY)
};
- entity.ReferenceLinePointXml = new Point2DXmlSerializer().ToXml(points);
+ entity.ReferenceLinePointXml = new Point2DCollectionXmlSerializer().ToXml(points);
entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity());
var collector = new ReadConversionCollector();
@@ -514,7 +514,7 @@
{
new Point2D(random.NextDouble(), random.NextDouble())
};
- string segmentPointXml = new Point2DXmlSerializer().ToXml(geometry);
+ string segmentPointXml = new Point2DCollectionXmlSerializer().ToXml(geometry);
const string stochasticSoilModelSourcePath = "path";
var failureMechanismEntity = new FailureMechanismEntity
{
@@ -742,7 +742,7 @@
AssessmentSectionEntity entity = CreateAssessmentSectionEntity();
var random = new Random(21);
- string segmentPointsXml = new Point2DXmlSerializer().ToXml(new[]
+ string segmentPointsXml = new Point2DCollectionXmlSerializer().ToXml(new[]
{
new Point2D(random.NextDouble(), random.NextDouble())
});
@@ -1181,13 +1181,13 @@
{
Order = 1,
Id = profileAId,
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty())
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty())
},
new ForeshoreProfileEntity
{
Order = 0,
Id = profileBId,
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty())
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty())
}
}
};
@@ -1321,13 +1321,13 @@
{
Order = 1,
Id = profileAId,
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty())
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty())
},
new ForeshoreProfileEntity
{
Order = 0,
Id = profileBId,
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty())
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty())
}
},
StabilityStoneCoverFailureMechanismMetaEntities =
@@ -1424,13 +1424,13 @@
{
Order = 1,
Id = profileAId,
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty())
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty())
},
new ForeshoreProfileEntity
{
Order = 0,
Id = profileBId,
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty())
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty())
}
},
WaveImpactAsphaltCoverFailureMechanismMetaEntities =
@@ -1954,7 +1954,7 @@
{
new Point2D(0.0, 0.0)
};
- string dummyPointXml = new Point2DXmlSerializer().ToXml(dummyPointData);
+ string dummyPointXml = new Point2DCollectionXmlSerializer().ToXml(dummyPointData);
return new[]
{
new FailureMechanismSectionEntity
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -r39a538cc9e60cd38cce11cc102384af799b75038 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 39a538cc9e60cd38cce11cc102384af799b75038)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -113,7 +113,7 @@
{
new Point2D(0, 0)
};
- string dummyPointXml = new Point2DXmlSerializer().ToXml(dummyPoints);
+ string dummyPointXml = new Point2DCollectionXmlSerializer().ToXml(dummyPoints);
var failureMechanismSectionEntity = new FailureMechanismSectionEntity
{
Name = "section",
@@ -489,7 +489,7 @@
{
new Point2D(random.NextDouble(), random.NextDouble())
};
- string segmentPointsXml = new Point2DXmlSerializer().ToXml(geometry);
+ string segmentPointsXml = new Point2DCollectionXmlSerializer().ToXml(geometry);
const string sourcePath = "some/Path";
var entity = new FailureMechanismEntity
{
@@ -850,7 +850,7 @@
{
// Setup
var random = new Random(21);
- string segmentPointsXml = new Point2DXmlSerializer().ToXml(new[]
+ string segmentPointsXml = new Point2DCollectionXmlSerializer().ToXml(new[]
{
new Point2D(random.NextDouble(), random.NextDouble())
});
@@ -1238,7 +1238,7 @@
{
// Setup
string emptyDikeGeometryXml = new RoughnessPointCollectionXmlSerializer().ToXml(new RoughnessPoint[0]);
- string emptyForeshoreBinaryXml = new Point2DXmlSerializer().ToXml(new Point2D[0]);
+ string emptyForeshoreBinaryXml = new Point2DCollectionXmlSerializer().ToXml(new Point2D[0]);
const string sourcePath = "some/path/to/my/dikeprofiles";
var entity = new FailureMechanismEntity
{
@@ -1543,13 +1543,13 @@
new ForeshoreProfileEntity
{
Id = "Child1",
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty()),
Order = 1
},
new ForeshoreProfileEntity
{
Id = "Child2",
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty()),
Order = 0
}
},
@@ -1844,13 +1844,13 @@
new ForeshoreProfileEntity
{
Id = "Child1",
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty()),
Order = 1
},
new ForeshoreProfileEntity
{
Id = "Child2",
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty()),
Order = 0
}
},
@@ -2018,13 +2018,13 @@
new ForeshoreProfileEntity
{
Id = "Child1",
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty()),
Order = 1
},
new ForeshoreProfileEntity
{
Id = "Child2",
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty()),
Order = 0
}
},
@@ -2145,13 +2145,13 @@
new ForeshoreProfileEntity
{
Id = "Child1",
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty()),
Order = 1
},
new ForeshoreProfileEntity
{
Id = "Child2",
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty()),
Order = 0
}
},
@@ -2377,13 +2377,13 @@
new ForeshoreProfileEntity
{
Id = "Child1",
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty()),
Order = 1
},
new ForeshoreProfileEntity
{
Id = "Child2",
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty()),
Order = 0
}
},
@@ -2631,13 +2631,13 @@
new ForeshoreProfileEntity
{
Id = "Child1",
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty()),
Order = 1
},
new ForeshoreProfileEntity
{
Id = "Child2",
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty()),
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty()),
Order = 0
}
},
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/FailureMechanismSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -rcc1e01b564db25f17599d16757d4bb336d023862 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/FailureMechanismSectionEntityReadExtensionsTest.cs (.../FailureMechanismSectionEntityReadExtensionsTest.cs) (revision cc1e01b564db25f17599d16757d4bb336d023862)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/FailureMechanismSectionEntityReadExtensionsTest.cs (.../FailureMechanismSectionEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -71,7 +71,7 @@
{
new Point2D(0, 0)
};
- string pointXml = new Point2DXmlSerializer().ToXml(points);
+ string pointXml = new Point2DCollectionXmlSerializer().ToXml(points);
var entity = new FailureMechanismSectionEntity
{
Name = name,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ForeshoreProfileReadExtensionsTest.cs
===================================================================
diff -u -rcc1e01b564db25f17599d16757d4bb336d023862 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ForeshoreProfileReadExtensionsTest.cs (.../ForeshoreProfileReadExtensionsTest.cs) (revision cc1e01b564db25f17599d16757d4bb336d023862)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/ForeshoreProfileReadExtensionsTest.cs (.../ForeshoreProfileReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -54,7 +54,7 @@
var entity = new ForeshoreProfileEntity
{
Id = "id",
- GeometryXml = new Point2DXmlSerializer().ToXml(new Point2D[0])
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(new Point2D[0])
};
// Precondition
@@ -92,7 +92,7 @@
// Setup
const string name = "testName";
const string id = "testId";
- string pointXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty());
+ string pointXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty());
var entity = new ForeshoreProfileEntity
{
Id = id,
@@ -133,7 +133,7 @@
{
new Point2D(0, 0)
};
- string pointXml = new Point2DXmlSerializer().ToXml(points);
+ string pointXml = new Point2DCollectionXmlSerializer().ToXml(points);
var entity = new ForeshoreProfileEntity
{
Order = order,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensionsTest.cs
===================================================================
diff -u -r39a538cc9e60cd38cce11cc102384af799b75038 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensionsTest.cs (.../DikeProfileEntityReadExtensionsTest.cs) (revision 39a538cc9e60cd38cce11cc102384af799b75038)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensionsTest.cs (.../DikeProfileEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -62,7 +62,7 @@
var entity = new DikeProfileEntity
{
Id = "id",
- ForeshoreXml = new Point2DXmlSerializer().ToXml(new Point2D[0]),
+ ForeshoreXml = new Point2DCollectionXmlSerializer().ToXml(new Point2D[0]),
DikeGeometryXml = new RoughnessPointCollectionXmlSerializer().ToXml(new RoughnessPoint[0])
};
@@ -137,7 +137,7 @@
Orientation = 45.67,
BreakWaterHeight = null,
BreakWaterType = null,
- ForeshoreXml = new Point2DXmlSerializer().ToXml(foreshorePoints),
+ ForeshoreXml = new Point2DCollectionXmlSerializer().ToXml(foreshorePoints),
DikeGeometryXml = new RoughnessPointCollectionXmlSerializer().ToXml(roughnessPoints),
DikeHeight = 1.2,
X = 3.4,
@@ -185,7 +185,7 @@
Orientation = 360.0,
BreakWaterHeight = height,
BreakWaterType = Convert.ToByte(type),
- ForeshoreXml = new Point2DXmlSerializer().ToXml(foreshorePoints),
+ ForeshoreXml = new Point2DCollectionXmlSerializer().ToXml(foreshorePoints),
DikeGeometryXml = new RoughnessPointCollectionXmlSerializer().ToXml(roughnessPoints),
DikeHeight = 4.5,
X = 93.0,
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r39a538cc9e60cd38cce11cc102384af799b75038 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision 39a538cc9e60cd38cce11cc102384af799b75038)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -197,7 +197,7 @@
{
Id = "a",
DikeGeometryXml = new RoughnessPointCollectionXmlSerializer().ToXml(new RoughnessPoint[0]),
- ForeshoreXml = new Point2DXmlSerializer().ToXml(new Point2D[0])
+ ForeshoreXml = new Point2DCollectionXmlSerializer().ToXml(new Point2D[0])
};
var entity = new GrassCoverErosionInwardsCalculationEntity
{
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -165,7 +165,7 @@
var foreshoreProfile = new TestForeshoreProfile();
var foreshoreProfileEntity = new ForeshoreProfileEntity
{
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty())
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty())
};
var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity
{
@@ -190,7 +190,7 @@
var foreshoreProfileEntity = new ForeshoreProfileEntity
{
Id = id,
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty())
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty())
};
var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r5e018b6557dd27d0ff02c1305988c32978d418a5 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs (.../HeightStructuresCalculationEntityReadExtensionsTest.cs) (revision 5e018b6557dd27d0ff02c1305988c32978d418a5)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/HeightStructures/HeightStructuresCalculationEntityReadExtensionsTest.cs (.../HeightStructuresCalculationEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -150,7 +150,7 @@
{
new Point2D(0, 0)
};
- string pointXml = new Point2DXmlSerializer().ToXml(points);
+ string pointXml = new Point2DCollectionXmlSerializer().ToXml(points);
var foreshoreEntity = new ForeshoreProfileEntity
{
Id = "id",
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -93,7 +93,7 @@
var entity = new MacroStabilityInwardsSoilLayerTwoDEntity
{
MaterialName = nameof(MacroStabilityInwardsSoilLayerTwoDEntity),
- OuterRingXml = new Point2DXmlSerializer().ToXml(RingTestFactory.CreateRandomRing().Points)
+ OuterRingXml = new Point2DCollectionXmlSerializer().ToXml(RingTestFactory.CreateRandomRing().Points)
};
// Call
@@ -175,7 +175,7 @@
Assert.AreEqual(entity.PopCoefficientOfVariation ?? double.NaN, data.Pop.CoefficientOfVariation,
data.Pop.GetAccuracy());
- CollectionAssert.AreEqual(new Point2DXmlSerializer().FromXml(entity.OuterRingXml),
+ CollectionAssert.AreEqual(new Point2DCollectionXmlSerializer().FromXml(entity.OuterRingXml),
layer.OuterRing.Points);
CollectionAssert.IsEmpty(layer.NestedLayers);
}
@@ -204,7 +204,7 @@
StrengthIncreaseExponentCoefficientOfVariation = random.NextDouble(),
PopMean = random.NextDouble(),
PopCoefficientOfVariation = random.NextDouble(),
- OuterRingXml = new Point2DXmlSerializer().ToXml(RingTestFactory.CreateRandomRing().Points)
+ OuterRingXml = new Point2DCollectionXmlSerializer().ToXml(RingTestFactory.CreateRandomRing().Points)
};
return entity;
}
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs) (revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/MacroStabilityInwards/MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs (.../MacroStabilityInwardsSoilProfileTwoDEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -85,7 +85,7 @@
Order = 1
};
- var point2DXmlSerializer = new Point2DXmlSerializer();
+ var point2DXmlSerializer = new Point2DCollectionXmlSerializer();
var entity = new MacroStabilityInwardsSoilProfileTwoDEntity
{
Name = nameof(MacroStabilityInwardsSoilProfileTwoDEntity),
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r48ccf93f389ff657634f4dd1a1c6c3e414c88b7a -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision 48ccf93f389ff657634f4dd1a1c6c3e414c88b7a)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -292,7 +292,7 @@
var stochasticSoilModelEntity = new StochasticSoilModelEntity
{
Name = "StochasticSoilModel",
- StochasticSoilModelSegmentPointXml = new Point2DXmlSerializer().ToXml(geometry),
+ StochasticSoilModelSegmentPointXml = new Point2DCollectionXmlSerializer().ToXml(geometry),
PipingStochasticSoilProfileEntities =
{
stochasticSoilProfileEntity
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs (.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs (.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -165,7 +165,7 @@
var foreshoreProfile = new TestForeshoreProfile();
var foreshoreProfileEntity = new ForeshoreProfileEntity
{
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty())
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty())
};
var entity = new StabilityStoneCoverWaveConditionsCalculationEntity
{
@@ -190,7 +190,7 @@
var foreshoreProfileEntity = new ForeshoreProfileEntity
{
Id = id,
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty())
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty())
};
var entity = new StabilityStoneCoverWaveConditionsCalculationEntity
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StochasticSoilModelEntityReadExtensionsTest.cs
===================================================================
diff -u -rff51075f9bb18ac60d0ab4de5aa50dc87fe73554 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StochasticSoilModelEntityReadExtensionsTest.cs (.../StochasticSoilModelEntityReadExtensionsTest.cs) (revision ff51075f9bb18ac60d0ab4de5aa50dc87fe73554)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/StochasticSoilModelEntityReadExtensionsTest.cs (.../StochasticSoilModelEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -96,7 +96,7 @@
var entity = new StochasticSoilModelEntity
{
Name = "StochasticSoilModel",
- StochasticSoilModelSegmentPointXml = new Point2DXmlSerializer().ToXml(geometry),
+ StochasticSoilModelSegmentPointXml = new Point2DCollectionXmlSerializer().ToXml(geometry),
PipingStochasticSoilProfileEntities =
{
new PipingStochasticSoilProfileEntity
@@ -155,7 +155,7 @@
var entity = new StochasticSoilModelEntity
{
Name = "StochasticSoilModel",
- StochasticSoilModelSegmentPointXml = new Point2DXmlSerializer().ToXml(geometry),
+ StochasticSoilModelSegmentPointXml = new Point2DCollectionXmlSerializer().ToXml(geometry),
PipingStochasticSoilProfileEntities =
{
PipingStochasticSoilProfileEntityTestFactory.CreateStochasticSoilProfileEntity()
@@ -232,7 +232,7 @@
var entity = new StochasticSoilModelEntity
{
Name = "testName",
- StochasticSoilModelSegmentPointXml = new Point2DXmlSerializer().ToXml(geometry),
+ StochasticSoilModelSegmentPointXml = new Point2DCollectionXmlSerializer().ToXml(geometry),
MacroStabilityInwardsStochasticSoilProfileEntities =
{
new MacroStabilityInwardsStochasticSoilProfileEntity
@@ -285,7 +285,7 @@
{
// Setup
var random = new Random(21);
- string segmentPointsXml = new Point2DXmlSerializer().ToXml(new[]
+ string segmentPointsXml = new Point2DCollectionXmlSerializer().ToXml(new[]
{
new Point2D(random.NextDouble(), random.NextDouble())
});
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs
===================================================================
diff -u -r5a1e32bf0ca1dbbc967a1f6168abb94869105a64 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision 5a1e32bf0ca1dbbc967a1f6168abb94869105a64)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -165,7 +165,7 @@
var foreshoreProfile = new TestForeshoreProfile();
var foreshoreProfileEntity = new ForeshoreProfileEntity
{
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty())
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty())
};
var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity
{
@@ -190,7 +190,7 @@
var foreshoreProfileEntity = new ForeshoreProfileEntity
{
Id = id,
- GeometryXml = new Point2DXmlSerializer().ToXml(Enumerable.Empty())
+ GeometryXml = new Point2DCollectionXmlSerializer().ToXml(Enumerable.Empty())
};
var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Ringtoets.Storage.Core.Test.csproj
===================================================================
diff -u -rc7bccf3eec9c8a12124c3486a639906f27597ef5 -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Ringtoets.Storage.Core.Test.csproj (.../Ringtoets.Storage.Core.Test.csproj) (revision c7bccf3eec9c8a12124c3486a639906f27597ef5)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Ringtoets.Storage.Core.Test.csproj (.../Ringtoets.Storage.Core.Test.csproj) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -139,7 +139,7 @@
-
+
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Serializers/Point2DCollectionXmlSerializerTest.cs
===================================================================
diff -u
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Serializers/Point2DCollectionXmlSerializerTest.cs (revision 0)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Serializers/Point2DCollectionXmlSerializerTest.cs (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -0,0 +1,69 @@
+// Copyright (C) Stichting Deltares 2017. All rights reserved.
+//
+// This file is part of Ringtoets.
+//
+// Ringtoets is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program. If not, see .
+//
+// All names, logos, and references to "Deltares" are registered trademarks of
+// Stichting Deltares and remain full property of Stichting Deltares at all times.
+// All rights reserved.
+
+using Core.Common.Base.Geometry;
+using NUnit.Framework;
+using Ringtoets.Storage.Core.Serializers;
+using Ringtoets.Storage.Core.TestUtil.Serializers;
+
+namespace Ringtoets.Storage.Core.Test.Serializers
+{
+ [TestFixture]
+ public class Point2DCollectionXmlSerializerTest
+ {
+ [Test]
+ public void Constructor_ExpectedValues()
+ {
+ // Call
+ var serializer = new Point2DCollectionXmlSerializer();
+
+ // Assert
+ Assert.IsInstanceOf>(serializer);
+ SerializerTestHelper.AssertSerializedData(typeof(Point2DCollectionXmlSerializer.SerializablePoint2D));
+ }
+
+ [Test]
+ public void GivenArrayWithPoint2D_WhenConvertingRoundTrip_ThenEqualArrayOfPoints2D()
+ {
+ // Given
+ var original = new[]
+ {
+ new Point2D(-7.7, -6.6),
+ new Point2D(-5.5, -4.4),
+ new Point2D(-3.3, -2.2),
+ new Point2D(-1.1, 0.0),
+ new Point2D(1.1, 2.2),
+ new Point2D(3.3, 4.4),
+ new Point2D(5.5, 6.6),
+ new Point2D(7.7, 8.8),
+ new Point2D(9.9, 10.10)
+ };
+ var serializer = new Point2DCollectionXmlSerializer();
+
+ // When
+ string xml = serializer.ToXml(original);
+ Point2D[] roundtripResult = serializer.FromXml(xml);
+
+ // Then
+ CollectionAssert.AreEqual(original, roundtripResult);
+ }
+ }
+}
\ No newline at end of file
Fisheye: Tag ba834431b63ea0985c60a0987ca8fb720f801ab6 refers to a dead (removed) revision in file `Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Serializers/Point2DXmlSerializerTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs
===================================================================
diff -u -ra00bb0bf540641a80d61bcdbb60f085715951e3e -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs) (revision a00bb0bf540641a80d61bcdbb60f085715951e3e)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil.Test/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityTestFactoryTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -37,7 +37,7 @@
MacroStabilityInwardsSoilLayerTwoDEntity entity = MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.CreateMacroStabilityInwardsSoilLayerTwoDEntity();
// Assert
- Point2D[] outerRing = new Point2DXmlSerializer().FromXml(entity.OuterRingXml);
+ Point2D[] outerRing = new Point2DCollectionXmlSerializer().FromXml(entity.OuterRingXml);
Assert.AreEqual(2, outerRing.Length);
}
}
Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs
===================================================================
diff -u -r9f9b2d503356070586ff78bdfb735d8730deaa6e -rba834431b63ea0985c60a0987ca8fb720f801ab6
--- Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs) (revision 9f9b2d503356070586ff78bdfb735d8730deaa6e)
+++ Ringtoets/Storage/test/Ringtoets.Storage.Core.TestUtil/MacroStabilityInwards/MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs (.../MacroStabilityInwardsSoilLayerTwoDEntityTestFactory.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6)
@@ -47,7 +47,7 @@
return new MacroStabilityInwardsSoilLayerTwoDEntity
{
- OuterRingXml = new Point2DXmlSerializer().ToXml(points)
+ OuterRingXml = new Point2DCollectionXmlSerializer().ToXml(points)
};
}
}