Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -r560910bfaf8e8288710e0f91a0688f9e736b3edc
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure17.2.sql (.../DatabaseStructure17.2.sql) (revision 560910bfaf8e8288710e0f91a0688f9e736b3edc)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 03-Jul-2017 13:29:29 */
+/* Created On : 03-Jul-2017 17:31:16 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -1503,7 +1503,6 @@
'ClosingSituation' TEXT NOT NULL,
'WindDirectionName' TEXT NOT NULL,
'WindDirectionAngle' REAL NOT NULL,
- 'Beta' REAL NOT NULL,
'Order' INT (4) NOT NULL,
CONSTRAINT 'FK_TopLevelSubMechanismIllustrationPointEntity_GeneralResultSubMechanismIllustrationPointEntity' FOREIGN KEY ('GeneralResultSubMechanismIllustrationPointEntityId') REFERENCES 'GeneralResultSubMechanismIllustrationPointEntity' ('GeneralResultSubMechanismIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_TopLevelSubMechanismIllustrationPointEntity_SubMechanismIllustrationPointEntity' FOREIGN KEY ('SubMechanismIllustrationPointEntityId') REFERENCES 'SubMechanismIllustrationPointEntity' ('SubMechanismIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensions.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -r560910bfaf8e8288710e0f91a0688f9e736b3edc
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensions.cs (.../SubMechanismIllustrationPointCreateExtensions.cs) (revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensions.cs (.../SubMechanismIllustrationPointCreateExtensions.cs) (revision 560910bfaf8e8288710e0f91a0688f9e736b3edc)
@@ -22,6 +22,7 @@
using System;
using System.Collections.Generic;
using Application.Ringtoets.Storage.DbContext;
+using Core.Common.Utils.Extensions;
using Ringtoets.Common.Data.Hydraulics.IllustrationPoints;
namespace Application.Ringtoets.Storage.Create.IllustrationPoints
@@ -52,7 +53,7 @@
var entity = new SubMechanismIllustrationPointEntity
{
Beta = subMechanismIllustrationPoint.Beta,
- Name = subMechanismIllustrationPoint.Name
+ Name = subMechanismIllustrationPoint.Name.DeepClone()
};
AddEntitiesForSubMechanismIllustrationPoints(subMechanismIllustrationPoint.Stochasts, entity);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/TopLevelSubMechanismIllustrationPointCreateExtensions.cs
===================================================================
diff -u -r69586fc2b854c415c0472d56da2f7f6e0888c184 -r560910bfaf8e8288710e0f91a0688f9e736b3edc
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/TopLevelSubMechanismIllustrationPointCreateExtensions.cs (.../TopLevelSubMechanismIllustrationPointCreateExtensions.cs) (revision 69586fc2b854c415c0472d56da2f7f6e0888c184)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/IllustrationPoints/TopLevelSubMechanismIllustrationPointCreateExtensions.cs (.../TopLevelSubMechanismIllustrationPointCreateExtensions.cs) (revision 560910bfaf8e8288710e0f91a0688f9e736b3edc)
@@ -21,6 +21,7 @@
using System;
using Application.Ringtoets.Storage.DbContext;
+using Core.Common.Utils.Extensions;
using Ringtoets.Common.Data.Hydraulics.IllustrationPoints;
namespace Application.Ringtoets.Storage.Create.IllustrationPoints
@@ -53,8 +54,8 @@
WindDirection windDirection = topLevelSubMechanismIllustrationPoint.WindDirection;
return new TopLevelSubMechanismIllustrationPointEntity
{
- ClosingSituation = topLevelSubMechanismIllustrationPoint.ClosingSituation,
- WindDirectionName = windDirection.Name,
+ ClosingSituation = topLevelSubMechanismIllustrationPoint.ClosingSituation.DeepClone(),
+ WindDirectionName = windDirection.Name.DeepClone(),
WindDirectionAngle = windDirection.Angle,
SubMechanismIllustrationPointEntity =
topLevelSubMechanismIllustrationPoint.SubMechanismIllustrationPoint
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -r560910bfaf8e8288710e0f91a0688f9e736b3edc
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 560910bfaf8e8288710e0f91a0688f9e736b3edc)
@@ -1086,7 +1086,6 @@
-
@@ -4629,7 +4628,6 @@
-
@@ -7065,7 +7063,6 @@
-
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -r560910bfaf8e8288710e0f91a0688f9e736b3edc
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 560910bfaf8e8288710e0f91a0688f9e736b3edc)
@@ -6,82 +6,82 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
-
-
-
-
-
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/TopLevelSubMechanismIllustrationPointEntity.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -r560910bfaf8e8288710e0f91a0688f9e736b3edc
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/TopLevelSubMechanismIllustrationPointEntity.cs (.../TopLevelSubMechanismIllustrationPointEntity.cs) (revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/TopLevelSubMechanismIllustrationPointEntity.cs (.../TopLevelSubMechanismIllustrationPointEntity.cs) (revision 560910bfaf8e8288710e0f91a0688f9e736b3edc)
@@ -38,7 +38,6 @@
public string ClosingSituation { get; set; }
public string WindDirectionName { get; set; }
public double WindDirectionAngle { get; set; }
- public double Beta { get; set; }
public int Order { get; set; }
public virtual GeneralResultSubMechanismIllustrationPointEntity GeneralResultSubMechanismIllustrationPointEntity { get; set; }
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensionsTest.cs
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -r560910bfaf8e8288710e0f91a0688f9e736b3edc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensionsTest.cs (.../SubMechanismIllustrationPointCreateExtensionsTest.cs) (revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/SubMechanismIllustrationPointCreateExtensionsTest.cs (.../SubMechanismIllustrationPointCreateExtensionsTest.cs) (revision 560910bfaf8e8288710e0f91a0688f9e736b3edc)
@@ -25,6 +25,7 @@
using Ringtoets.Common.Data.Hydraulics.IllustrationPoints;
using Application.Ringtoets.Storage.Create.IllustrationPoints;
using Application.Ringtoets.Storage.DbContext;
+using Core.Common.TestUtil;
using Ringtoets.Common.Data.TestUtil;
namespace Application.Ringtoets.Storage.Test.Create.IllustrationPoints
@@ -60,7 +61,7 @@
SubMechanismIllustrationPointEntity entity = illustrationPoint.CreateSubMechanismIllustrationPointEntity();
// Assert
- Assert.AreEqual(illustrationPoint.Name, entity.Name);
+ TestHelper.AssertAreEqualButNotSame(illustrationPoint.Name, entity.Name);
Assert.AreEqual(illustrationPoint.Beta, entity.Beta, illustrationPoint.Beta.GetAccuracy());
CollectionAssert.IsEmpty(entity.IllustrationPointResultEntities);
@@ -102,7 +103,7 @@
SubMechanismIllustrationPointEntity entity = illustrationPoint.CreateSubMechanismIllustrationPointEntity();
// Assert
- Assert.AreEqual(illustrationPoint.Name, entity.Name);
+ TestHelper.AssertAreEqualButNotSame(illustrationPoint.Name, entity.Name);
Assert.AreEqual(illustrationPoint.Beta, entity.Beta, illustrationPoint.Beta.GetAccuracy());
CollectionAssert.IsEmpty(entity.IllustrationPointResultEntities);
@@ -114,7 +115,7 @@
SubMechanismIllustrationPointStochast stochast = stochasts[i];
SubMechanismIllustrationPointStochastEntity stochastEntity = stochastEntities[i];
- Assert.AreEqual(stochast.Name, stochastEntity.Name);
+ TestHelper.AssertAreEqualButNotSame(stochast.Name, stochastEntity.Name);
Assert.AreEqual(stochast.Duration, stochastEntity.Duration, stochast.Duration.GetAccuracy());
Assert.AreEqual(stochast.Alpha, stochastEntity.Alpha, stochast.Alpha.GetAccuracy());
Assert.AreEqual(stochast.Realization, stochastEntity.Realization, stochast.Realization.GetAccuracy());
@@ -149,7 +150,7 @@
SubMechanismIllustrationPointEntity entity = illustrationPoint.CreateSubMechanismIllustrationPointEntity();
// Assert
- Assert.AreEqual(illustrationPoint.Name, entity.Name);
+ TestHelper.AssertAreEqualButNotSame(illustrationPoint.Name, entity.Name);
Assert.AreEqual(illustrationPoint.Beta, entity.Beta, illustrationPoint.Beta.GetAccuracy());
CollectionAssert.IsEmpty(entity.SubMechanismIllustrationPointStochastEntities);
@@ -161,7 +162,7 @@
IllustrationPointResult illustrationPointResult = illustrationPointResults[i];
IllustrationPointResultEntity illustrationPointResultEntity = resultEntities[i];
- Assert.AreEqual(illustrationPointResult.Description, illustrationPointResultEntity.Description);
+ TestHelper.AssertAreEqualButNotSame(illustrationPointResult.Description, illustrationPointResultEntity.Description);
Assert.AreEqual(illustrationPointResult.Value, illustrationPointResultEntity.Value,
illustrationPointResult.Value.GetAccuracy());
}
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/TopLevelSubMechanismIllustrationPointTest.cs
===================================================================
diff -u -r69586fc2b854c415c0472d56da2f7f6e0888c184 -r560910bfaf8e8288710e0f91a0688f9e736b3edc
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/TopLevelSubMechanismIllustrationPointTest.cs (.../TopLevelSubMechanismIllustrationPointTest.cs) (revision 69586fc2b854c415c0472d56da2f7f6e0888c184)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/IllustrationPoints/TopLevelSubMechanismIllustrationPointTest.cs (.../TopLevelSubMechanismIllustrationPointTest.cs) (revision 560910bfaf8e8288710e0f91a0688f9e736b3edc)
@@ -24,6 +24,7 @@
using NUnit.Framework;
using Application.Ringtoets.Storage.Create.IllustrationPoints;
using Application.Ringtoets.Storage.DbContext;
+using Core.Common.TestUtil;
using Ringtoets.Common.Data.Hydraulics.IllustrationPoints;
using Ringtoets.Common.Data.TestUtil;
@@ -71,14 +72,14 @@
topLevelSubMechanismIllustrationPoint.CreateTopLevelSubMechanismIllustrationPointEntity(order);
// Assert
- Assert.AreEqual(topLevelSubMechanismIllustrationPoint.ClosingSituation, entity.ClosingSituation);
+ TestHelper.AssertAreEqualButNotSame(topLevelSubMechanismIllustrationPoint.ClosingSituation, entity.ClosingSituation);
Assert.AreEqual(order, entity.Order);
- Assert.AreEqual(windDirection.Name, entity.WindDirectionName);
+ TestHelper.AssertAreEqualButNotSame(windDirection.Name, entity.WindDirectionName);
Assert.AreEqual(windDirection.Angle, entity.WindDirectionAngle, windDirection.Angle.GetAccuracy());
SubMechanismIllustrationPointEntity subMechanismIllustrationPointEntity = entity.SubMechanismIllustrationPointEntity;
- Assert.AreEqual(illustrationPoint.Name, subMechanismIllustrationPointEntity.Name);
+ TestHelper.AssertAreEqualButNotSame(illustrationPoint.Name, subMechanismIllustrationPointEntity.Name);
Assert.AreEqual(illustrationPoint.Beta, subMechanismIllustrationPointEntity.Beta, illustrationPoint.Beta.GetAccuracy());
CollectionAssert.IsEmpty(subMechanismIllustrationPointEntity.IllustrationPointResultEntities);
CollectionAssert.IsEmpty(subMechanismIllustrationPointEntity.SubMechanismIllustrationPointStochastEntities);
Index: build/DatabaseStructure.sql
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -r560910bfaf8e8288710e0f91a0688f9e736b3edc
--- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 6a60e0e3f676c71e253ad41839519c18dd641e9e)
+++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 560910bfaf8e8288710e0f91a0688f9e736b3edc)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 03-Jul-2017 13:29:29 */
+/* Created On : 03-Jul-2017 17:31:16 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -1503,7 +1503,6 @@
'ClosingSituation' TEXT NOT NULL,
'WindDirectionName' TEXT NOT NULL,
'WindDirectionAngle' REAL NOT NULL,
- 'Beta' REAL NOT NULL,
'Order' INT (4) NOT NULL,
CONSTRAINT 'FK_TopLevelSubMechanismIllustrationPointEntity_GeneralResultSubMechanismIllustrationPointEntity' FOREIGN KEY ('GeneralResultSubMechanismIllustrationPointEntityId') REFERENCES 'GeneralResultSubMechanismIllustrationPointEntity' ('GeneralResultSubMechanismIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade,
CONSTRAINT 'FK_TopLevelSubMechanismIllustrationPointEntity_SubMechanismIllustrationPointEntity' FOREIGN KEY ('SubMechanismIllustrationPointEntityId') REFERENCES 'SubMechanismIllustrationPointEntity' ('SubMechanismIllustrationPointEntityId') ON DELETE Cascade ON UPDATE Cascade
Index: design/DatabaseDesign.eap
===================================================================
diff -u -r6a60e0e3f676c71e253ad41839519c18dd641e9e -r560910bfaf8e8288710e0f91a0688f9e736b3edc
Binary files differ