Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql
===================================================================
diff -u -r1c167e8adf4521008ed654b807a875df32e96244 -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 1c167e8adf4521008ed654b807a875df32e96244)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 21-Nov-2017 08:50:44 */
+/* Created On : 24-jan-2018 10:25:03 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -489,6 +489,7 @@
'StabilityStoneCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
'ForeshoreProfileCollectionSourcePath' TEXT,
+ 'N' REAL NOT NULL,
CONSTRAINT 'FK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql
===================================================================
diff -u -r1c167e8adf4521008ed654b807a875df32e96244 -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 1c167e8adf4521008ed654b807a875df32e96244)
+++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/Migration_17.3_18.1.sql (.../Migration_17.3_18.1.sql) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -150,7 +150,16 @@
INSERT INTO StabilityPointStructuresFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].StabilityPointStructuresFailureMechanismMetaEntity;
INSERT INTO StabilityPointStructuresOutputEntity SELECT * FROM [SOURCEPROJECT].StabilityPointStructuresOutputEntity;
INSERT INTO StabilityPointStructuresSectionResultEntity SELECT * FROM [SOURCEPROJECT].StabilityPointStructuresSectionResultEntity;
-INSERT INTO StabilityStoneCoverFailureMechanismMetaEntity SELECT * FROM [SOURCEPROJECT].StabilityStoneCoverFailureMechanismMetaEntity;
+INSERT INTO StabilityStoneCoverFailureMechanismMetaEntity (
+ [StabilityStoneCoverFailureMechanismMetaEntityId],
+ [FailureMechanismEntityId],
+ [ForeshoreProfileCollectionSourcePath],
+ [N])
+SELECT [StabilityStoneCoverFailureMechanismMetaEntityId],
+ [FailureMechanismEntityId],
+ [ForeshoreProfileCollectionSourcePath],
+ "4"
+FROM [SOURCEPROJECT].StabilityStoneCoverFailureMechanismMetaEntity;
INSERT INTO StabilityStoneCoverSectionResultEntity SELECT * FROM [SOURCEPROJECT].StabilityStoneCoverSectionResultEntity;
INSERT INTO StabilityStoneCoverWaveConditionsCalculationEntity SELECT * FROM [SOURCEPROJECT].StabilityStoneCoverWaveConditionsCalculationEntity;
INSERT INTO StabilityStoneCoverWaveConditionsOutputEntity SELECT * FROM [SOURCEPROJECT].StabilityStoneCoverWaveConditionsOutputEntity;
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51 -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -404,6 +404,7 @@
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensions.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensions.cs (.../StabilityStoneCoverFailureMechanismCreateExtensions.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensions.cs (.../StabilityStoneCoverFailureMechanismCreateExtensions.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -69,7 +69,8 @@
{
var metaEntity = new StabilityStoneCoverFailureMechanismMetaEntity
{
- ForeshoreProfileCollectionSourcePath = failureMechanism.ForeshoreProfiles.SourcePath.DeepClone()
+ ForeshoreProfileCollectionSourcePath = failureMechanism.ForeshoreProfiles.SourcePath.DeepClone(),
+ N = failureMechanism.GeneralInput.N
};
entity.StabilityStoneCoverFailureMechanismMetaEntities.Add(metaEntity);
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs
===================================================================
diff -u -ra25ab906f08e5e263ebb35920acc3ee1bdd928df -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision a25ab906f08e5e263ebb35920acc3ee1bdd928df)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -19,7 +19,7 @@
// Stichting Deltares and remain full property of Stichting Deltares at all times.
// All rights reserved.
-// T4 code generation is enabled for model 'D:\Ringtoets\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'.
+// T4 code generation is enabled for model 'C:\RingtoetsGIT\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'.
// To enable legacy code generation, change the value of the 'Code Generation Strategy' designer
// property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model
// is open in the designer.
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx
===================================================================
diff -u -rcdfce95c2082bd20d00cc92bd2828f73aad3a15a -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision cdfce95c2082bd20d00cc92bd2828f73aad3a15a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -4,7 +4,7 @@
-
+
@@ -1270,6 +1270,7 @@
+
@@ -5796,6 +5797,7 @@
+
@@ -8864,6 +8866,7 @@
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram
===================================================================
diff -u -rcdfce95c2082bd20d00cc92bd2828f73aad3a15a -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision cdfce95c2082bd20d00cc92bd2828f73aad3a15a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx.diagram (.../RingtoetsEntities.edmx.diagram) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -5,98 +5,98 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverFailureMechanismMetaEntity.cs
===================================================================
diff -u -r755360927a67d206d503b10e0d4c40d5426c4a3b -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverFailureMechanismMetaEntity.cs (.../StabilityStoneCoverFailureMechanismMetaEntity.cs) (revision 755360927a67d206d503b10e0d4c40d5426c4a3b)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/StabilityStoneCoverFailureMechanismMetaEntity.cs (.../StabilityStoneCoverFailureMechanismMetaEntity.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -35,6 +35,7 @@
public long StabilityStoneCoverFailureMechanismMetaEntityId { get; set; }
public long FailureMechanismEntityId { get; set; }
public string ForeshoreProfileCollectionSourcePath { get; set; }
+ public double N { get; set; }
public virtual FailureMechanismEntity FailureMechanismEntity { get; set; }
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -rd75a6c0c39a582f42b7a05b705aaa1f703a47d89 -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision d75a6c0c39a582f42b7a05b705aaa1f703a47d89)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -121,10 +121,12 @@
{
throw new ArgumentNullException(nameof(entity));
}
+
if (failureMechanism == null)
{
throw new ArgumentNullException(nameof(failureMechanism));
}
+
if (collector == null)
{
throw new ArgumentNullException(nameof(collector));
@@ -513,10 +515,12 @@
{
throw new ArgumentNullException(nameof(entity));
}
+
if (failureMechanism == null)
{
throw new ArgumentNullException(nameof(failureMechanism));
}
+
if (collector == null)
{
throw new ArgumentNullException(nameof(collector));
@@ -925,6 +929,7 @@
ReadStabilityStoneCoverWaveConditionsRootCalculationGroup(entity.CalculationGroupEntity,
failureMechanism.WaveConditionsCalculationGroup,
collector);
+ entity.ReadGeneralInput(failureMechanism.GeneralInput);
}
private static void ReadStabilityStoneCoverMechanismSectionResults(this FailureMechanismEntity entity,
@@ -951,6 +956,12 @@
}
}
+ private static void ReadGeneralInput(this FailureMechanismEntity entity, GeneralStabilityStoneCoverWaveConditionsInput generalInput)
+ {
+ GeneralStabilityStoneCoverWaveConditionsInput generalStabilityPointStructuresInput = entity.StabilityStoneCoverFailureMechanismMetaEntities.First().Read();
+ generalInput.N = generalStabilityPointStructuresInput.N;
+ }
+
#endregion
#region Stability Point Structures
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensions.cs
===================================================================
diff -u
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensions.cs (revision 0)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensions.cs (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -0,0 +1,49 @@
+// 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 Application.Ringtoets.Storage.DbContext;
+using Core.Common.Base.Data;
+using Ringtoets.StabilityStoneCover.Data;
+
+namespace Application.Ringtoets.Storage.Read.StabilityStoneCover
+{
+ ///
+ /// This class defines extension methods for read operations for a
+ /// based on the .
+ ///
+ internal static class StabilityStoneCoverFailureMechanismMetaEntityReadExtensions
+ {
+ ///
+ /// Read the and use the
+ /// information to construct a .
+ ///
+ /// The
+ /// to create for.
+ /// A new .
+ internal static GeneralStabilityStoneCoverWaveConditionsInput Read(this StabilityStoneCoverFailureMechanismMetaEntity entity)
+ {
+ return new GeneralStabilityStoneCoverWaveConditionsInput
+ {
+ N = (RoundedDouble) entity.N
+ };
+ }
+ }
+}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Ringtoets.rtd
===================================================================
diff -u -r1c167e8adf4521008ed654b807a875df32e96244 -r7d89262d3b971dceec1e987e22d0027bf675c196
Binary files differ
Index: Application/Ringtoets/test/Application.Ringtoets.Migration.Core.Test/test-data/FullTestProject181.rtd
===================================================================
diff -u -r1c167e8adf4521008ed654b807a875df32e96244 -r7d89262d3b971dceec1e987e22d0027bf675c196
Binary files differ
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51 -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -126,6 +126,7 @@
+
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -r49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6 -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs (.../StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs) (revision 49621ecdce5a2a8f7c8bb689e8cfd6759dfb8fc6)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/StabilityStoneCover/StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs (.../StabilityStoneCoverFailureMechanismCreateExtensionsTest.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -25,6 +25,7 @@
using Application.Ringtoets.Storage.Create.StabilityStoneCover;
using Application.Ringtoets.Storage.DbContext;
using Application.Ringtoets.Storage.TestUtil;
+using Core.Common.Base.Data;
using NUnit.Framework;
using Ringtoets.Common.Data.Calculation;
using Ringtoets.Common.Data.TestUtil;
@@ -69,6 +70,10 @@
NotRelevantComments =
{
Body = "Really not relevant"
+ },
+ GeneralInput =
+ {
+ N = (RoundedDouble) 12.345
}
};
var registry = new PersistenceRegistry();
@@ -83,6 +88,7 @@
Assert.AreEqual(failureMechanism.InputComments.Body, entity.InputComments);
Assert.AreEqual(failureMechanism.OutputComments.Body, entity.OutputComments);
Assert.AreEqual(failureMechanism.NotRelevantComments.Body, entity.NotRelevantComments);
+ Assert.AreEqual(failureMechanism.GeneralInput.N, entity.StabilityStoneCoverFailureMechanismMetaEntities.Single().N);
}
[Test]
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs
===================================================================
diff -u -ra17197220f9fe2b039dc7ccdea1a63ed37384018 -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision a17197220f9fe2b039dc7ccdea1a63ed37384018)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/MigrationTo181IntegrationTest.cs (.../MigrationTo181IntegrationTest.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -61,8 +61,8 @@
AssertDatabase(reader);
AssertPipingSoilLayers(reader);
-
AssertHydraRingPreprocessor(reader);
+ AssertStabilityStoneCoverFailureMechanism(reader);
}
AssertLogDatabase(logFilePath);
@@ -151,7 +151,6 @@
"StabilityPointStructuresFailureMechanismMetaEntity",
"StabilityPointStructuresOutputEntity",
"StabilityPointStructuresSectionResultEntity",
- "StabilityStoneCoverFailureMechanismMetaEntity",
"StabilityStoneCoverSectionResultEntity",
"StabilityStoneCoverWaveConditionsCalculationEntity",
"StabilityStoneCoverWaveConditionsOutputEntity",
@@ -272,5 +271,14 @@
"OR [PermeabilityCoefficientOfVariation] < 0;";
reader.AssertReturnedDataIsValid(validatePermeability);
}
+
+ private static void AssertStabilityStoneCoverFailureMechanism(MigratedDatabaseReader reader)
+ {
+ const string validatePreprocessorSettings =
+ "SELECT COUNT() = 0 " +
+ "FROM [StabilityStoneCoverFailureMechanismMetaEntity]" +
+ "WHERE [N] IS NOT 4;";
+ reader.AssertReturnedDataIsValid(validatePreprocessorSettings);
+ }
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs
===================================================================
diff -u -rd1519950f365a9a8d3f4f75186f73e98a6ac6b51 -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision d1519950f365a9a8d3f4f75186f73e98a6ac6b51)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -1886,6 +1886,8 @@
private static void AssertStabilityStoneCoverFailureMechanism(StabilityStoneCoverFailureMechanism expectedFailureMechanism,
StabilityStoneCoverFailureMechanism actualFailureMechanism)
{
+ Assert.AreEqual(expectedFailureMechanism.GeneralInput.N, actualFailureMechanism.GeneralInput.N);
+
AssertForeshoreProfiles(expectedFailureMechanism.ForeshoreProfiles, actualFailureMechanism.ForeshoreProfiles);
AssertCalculationGroup(expectedFailureMechanism.WaveConditionsCalculationGroup, actualFailureMechanism.WaveConditionsCalculationGroup);
AssertComments(expectedFailureMechanism.InputComments, actualFailureMechanism.InputComments);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs
===================================================================
diff -u -r039896ccc137efe3fe850d2cc062ba65ad69024c -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 039896ccc137efe3fe850d2cc062ba65ad69024c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -982,7 +982,10 @@
NotRelevantComments = notRelevantComments,
StabilityStoneCoverFailureMechanismMetaEntities =
{
- new StabilityStoneCoverFailureMechanismMetaEntity()
+ new StabilityStoneCoverFailureMechanismMetaEntity
+ {
+ N = 3.9
+ }
}
};
entity.FailureMechanismEntities.Add(failureMechanismEntity);
@@ -1025,7 +1028,10 @@
},
StabilityStoneCoverFailureMechanismMetaEntities =
{
- new StabilityStoneCoverFailureMechanismMetaEntity()
+ new StabilityStoneCoverFailureMechanismMetaEntity
+ {
+ N = 3.9
+ }
}
};
entity.FailureMechanismEntities.Add(failureMechanismEntity);
@@ -1076,7 +1082,8 @@
{
new StabilityStoneCoverFailureMechanismMetaEntity
{
- ForeshoreProfileCollectionSourcePath = fileLocation
+ ForeshoreProfileCollectionSourcePath = fileLocation,
+ N = 3.9
}
},
IsRelevant = Convert.ToByte(isRelevant)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -r11f07beedffdae5eee71141830eb73827dd3ae94 -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 11f07beedffdae5eee71141830eb73827dd3ae94)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -1376,7 +1376,10 @@
CalculationGroupEntity = new CalculationGroupEntity(),
StabilityStoneCoverFailureMechanismMetaEntities =
{
- new StabilityStoneCoverFailureMechanismMetaEntity()
+ new StabilityStoneCoverFailureMechanismMetaEntity
+ {
+ N = 12.34
+ }
}
};
var collector = new ReadConversionCollector();
@@ -1422,7 +1425,10 @@
},
StabilityStoneCoverFailureMechanismMetaEntities =
{
- new StabilityStoneCoverFailureMechanismMetaEntity()
+ new StabilityStoneCoverFailureMechanismMetaEntity
+ {
+ N = 4.2
+ }
}
};
var collector = new ReadConversionCollector();
@@ -1454,7 +1460,8 @@
{
new StabilityStoneCoverFailureMechanismMetaEntity
{
- ForeshoreProfileCollectionSourcePath = fileLocation
+ ForeshoreProfileCollectionSourcePath = fileLocation,
+ N = 1.2
}
}
};
@@ -1497,7 +1504,8 @@
{
new StabilityStoneCoverFailureMechanismMetaEntity
{
- ForeshoreProfileCollectionSourcePath = fileLocation
+ ForeshoreProfileCollectionSourcePath = fileLocation,
+ N = 8.123
}
}
};
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensionsTest.cs
===================================================================
diff -u -r3fb0df0ed6e64657154700ee7706e035d5bf99f5 -r7d89262d3b971dceec1e987e22d0027bf675c196
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensionsTest.cs (.../StabilityPointStructureFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 3fb0df0ed6e64657154700ee7706e035d5bf99f5)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityPointStructures/StabilityPointStructureFailureMechanismMetaEntityReadExtensionsTest.cs (.../StabilityPointStructureFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -30,7 +30,7 @@
public class StabilityPointStructureFailureMechanismMetaEntityReadExtensionsTest
{
[Test]
- public void Read_Always_ReturnHeightStructuresGeneralInput()
+ public void Read_Always_ReturnStabilityPointStructuresGeneralInput()
{
// Setup
var entity = new StabilityPointStructuresFailureMechanismMetaEntity
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensionsTest.cs
===================================================================
diff -u
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensionsTest.cs (revision 0)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCover/StabilityStoneCoverFailureMechanismMetaEntityReadExtensionsTest.cs (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -0,0 +1,49 @@
+// 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 Application.Ringtoets.Storage.DbContext;
+using Application.Ringtoets.Storage.Read.StabilityStoneCover;
+using NUnit.Framework;
+using Ringtoets.Common.Data.TestUtil;
+using Ringtoets.StabilityStoneCover.Data;
+
+namespace Application.Ringtoets.Storage.Test.Read.StabilityStoneCover
+{
+ [TestFixture]
+ public class StabilityStoneCoverFailureMechanismMetaEntityReadExtensionsTest
+ {
+ [Test]
+ public void Read_Always_ReturnGeneralStabilityStoneCoverWaveConditionsInput()
+ {
+ // Setup
+ var entity = new StabilityStoneCoverFailureMechanismMetaEntity
+ {
+ N = 3.1415
+ };
+
+ // Call
+ GeneralStabilityStoneCoverWaveConditionsInput generalInput = entity.Read();
+
+ // Assert
+ Assert.AreEqual(entity.N, generalInput.N, generalInput.N.GetAccuracy());
+ }
+ }
+}
\ No newline at end of file
Index: build/DatabaseStructure.sql
===================================================================
diff -u -rcdfce95c2082bd20d00cc92bd2828f73aad3a15a -r7d89262d3b971dceec1e987e22d0027bf675c196
--- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision cdfce95c2082bd20d00cc92bd2828f73aad3a15a)
+++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 7d89262d3b971dceec1e987e22d0027bf675c196)
@@ -1,6 +1,6 @@
/* ---------------------------------------------------- */
/* Generated by Enterprise Architect Version 12.0 */
-/* Created On : 21-Nov-2017 08:50:44 */
+/* Created On : 24-jan-2018 10:25:03 */
/* DBMS : SQLite */
/* ---------------------------------------------------- */
@@ -489,6 +489,7 @@
'StabilityStoneCoverFailureMechanismMetaEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT,
'FailureMechanismEntityId' INTEGER NOT NULL,
'ForeshoreProfileCollectionSourcePath' TEXT,
+ 'N' REAL NOT NULL,
CONSTRAINT 'FK_StabilityStoneCoverFailureMechanismMetaEntity_FailureMechanismEntity' FOREIGN KEY ('FailureMechanismEntityId') REFERENCES 'FailureMechanismEntity' ('FailureMechanismEntityId') ON DELETE Cascade ON UPDATE Cascade
)
;
Index: design/DatabaseDesign.eap
===================================================================
diff -u -rc1cd435d4f02f034f67c4d8aceffea9b6c30136c -r7d89262d3b971dceec1e987e22d0027bf675c196
Binary files differ