Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -rcbd9374834f6bd9adf1f9e62ea2bff91aa2457f9 -ref10fa5e330cbf2faf92223ea98b76eb0fe4be27
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision cbd9374834f6bd9adf1f9e62ea2bff91aa2457f9)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision ef10fa5e330cbf2faf92223ea98b76eb0fe4be27)
@@ -322,7 +322,6 @@
-
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r7ae9100ff4e61169edcefaeb01b72d492431742f -ref10fa5e330cbf2faf92223ea98b76eb0fe4be27
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision 7ae9100ff4e61169edcefaeb01b72d492431742f)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingFailureMechanismCreateExtensions.cs (.../PipingFailureMechanismCreateExtensions.cs) (revision ef10fa5e330cbf2faf92223ea98b76eb0fe4be27)
@@ -67,7 +67,13 @@
private static void AddEntitiesForFailureMechanismMeta(PipingFailureMechanism mechanism, FailureMechanismEntity entity)
{
- entity.PipingFailureMechanismMetaEntities.Add(mechanism.PipingProbabilityAssessmentInput.Create());
+ var metaEntity = new PipingFailureMechanismMetaEntity
+ {
+ A = mechanism.PipingProbabilityAssessmentInput.A,
+ WaterVolumetricWeight = mechanism.GeneralInput.WaterVolumetricWeight
+ };
+
+ entity.PipingFailureMechanismMetaEntities.Add(metaEntity);
}
private static void AddEntitiesForStochasticSoilModels(PipingFailureMechanism mechanism, PersistenceRegistry registry, FailureMechanismEntity entity)
Fisheye: Tag ef10fa5e330cbf2faf92223ea98b76eb0fe4be27 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Create/Piping/PipingProbabilityAssessmentInputCreateExtensions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -ref10fa5e330cbf2faf92223ea98b76eb0fe4be27
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision ef10fa5e330cbf2faf92223ea98b76eb0fe4be27)
@@ -115,6 +115,7 @@
if (entity.PipingFailureMechanismMetaEntities.Count > 0)
{
ReadProbabilityAssessmentInput(entity.PipingFailureMechanismMetaEntities, failureMechanism.PipingProbabilityAssessmentInput);
+ ReadGeneralPipingInput(entity.PipingFailureMechanismMetaEntities, failureMechanism.GeneralInput);
}
foreach (var stochasticSoilModelEntity in entity.StochasticSoilModelEntities.OrderBy(ssm => ssm.Order))
@@ -133,10 +134,18 @@
failureMechanism.GeneralInput, collector);
}
+ private static void ReadGeneralPipingInput(ICollection pipingFailureMechanismMetaEntities,
+ GeneralPipingInput generalPipingInput)
+ {
+ GeneralPipingInput generalInput = pipingFailureMechanismMetaEntities.ElementAt(0).ReadGeneralPipingInput();
+
+ generalPipingInput.WaterVolumetricWeight = generalInput.WaterVolumetricWeight;
+ }
+
private static void ReadProbabilityAssessmentInput(ICollection pipingFailureMechanismMetaEntities,
PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput)
{
- PipingProbabilityAssessmentInput probabilityAssessmentInput = pipingFailureMechanismMetaEntities.ElementAt(0).Read();
+ PipingProbabilityAssessmentInput probabilityAssessmentInput = pipingFailureMechanismMetaEntities.ElementAt(0).ReadPipingProbabilityAssessmentInput();
pipingProbabilityAssessmentInput.A = probabilityAssessmentInput.A;
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs
===================================================================
diff -u -rdd05f4bd0c583e119a7324a34ae5655a002f6a62 -ref10fa5e330cbf2faf92223ea98b76eb0fe4be27
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs (.../PipingFailureMechanismMetaEntityReadExtensions.cs) (revision dd05f4bd0c583e119a7324a34ae5655a002f6a62)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/Piping/PipingFailureMechanismMetaEntityReadExtensions.cs (.../PipingFailureMechanismMetaEntityReadExtensions.cs) (revision ef10fa5e330cbf2faf92223ea98b76eb0fe4be27)
@@ -35,12 +35,25 @@
///
/// The to create for.
/// A new .
- internal static PipingProbabilityAssessmentInput Read(this PipingFailureMechanismMetaEntity entity)
+ internal static PipingProbabilityAssessmentInput ReadPipingProbabilityAssessmentInput(this PipingFailureMechanismMetaEntity entity)
{
return new PipingProbabilityAssessmentInput
{
A = entity.A,
};
}
+
+ ///
+ /// Read the and use the information to construct a .
+ ///
+ /// The to create for.
+ /// A new .
+ internal static GeneralPipingInput ReadGeneralPipingInput(this PipingFailureMechanismMetaEntity entity)
+ {
+ return new GeneralPipingInput
+ {
+ WaterVolumetricWeight = entity.WaterVolumetricWeight
+ };
+ }
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -rc68b62821df129218cd8d89b8b59db8c37ce3065 -ref10fa5e330cbf2faf92223ea98b76eb0fe4be27
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision c68b62821df129218cd8d89b8b59db8c37ce3065)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision ef10fa5e330cbf2faf92223ea98b76eb0fe4be27)
@@ -150,7 +150,6 @@
-
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -ref10fa5e330cbf2faf92223ea98b76eb0fe4be27
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision ef10fa5e330cbf2faf92223ea98b76eb0fe4be27)
@@ -74,6 +74,10 @@
PipingProbabilityAssessmentInput =
{
A = 0.9876
+ },
+ GeneralInput =
+ {
+ WaterVolumetricWeight = 4.29
}
};
var registry = new PersistenceRegistry();
@@ -92,6 +96,7 @@
var failureMechanismMetaEntity = entity.PipingFailureMechanismMetaEntities.ToArray()[0];
Assert.AreEqual(failureMechanism.PipingProbabilityAssessmentInput.A, failureMechanismMetaEntity.A);
+ Assert.AreEqual(failureMechanism.GeneralInput.WaterVolumetricWeight, failureMechanismMetaEntity.WaterVolumetricWeight);
}
[Test]
Fisheye: Tag ef10fa5e330cbf2faf92223ea98b76eb0fe4be27 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingProbabilityAssessmentInputCreateExtensionsTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -rb4e3629ea2130359117dd403af8db3c8ae0c680b -ref10fa5e330cbf2faf92223ea98b76eb0fe4be27
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision b4e3629ea2130359117dd403af8db3c8ae0c680b)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision ef10fa5e330cbf2faf92223ea98b76eb0fe4be27)
@@ -156,6 +156,7 @@
new PipingFailureMechanismMetaEntity
{
A = 0.95,
+ WaterVolumetricWeight = 5.48
}
}
};
@@ -175,8 +176,9 @@
Assert.IsEmpty(failureMechanism.Sections);
var pipingFailureMechanismMetaEntities = entity.PipingFailureMechanismMetaEntities.ToArray();
- var probabilityAssessmentInput = pipingFailureMechanismMetaEntities[0];
- Assert.AreEqual(probabilityAssessmentInput.A, failureMechanism.PipingProbabilityAssessmentInput.A);
+ var pipingFailureMechanismMetaEntity = pipingFailureMechanismMetaEntities[0];
+ Assert.AreEqual(pipingFailureMechanismMetaEntity.A, failureMechanism.PipingProbabilityAssessmentInput.A);
+ Assert.AreEqual(pipingFailureMechanismMetaEntity.WaterVolumetricWeight, failureMechanism.GeneralInput.WaterVolumetricWeight);
}
[Test]
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs
===================================================================
diff -u -rb190a14336e0d8fe9aec34e81a68194081c76155 -ref10fa5e330cbf2faf92223ea98b76eb0fe4be27
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs (.../PipingFailureMechanismMetaEntityReadExtensionsTest.cs) (revision b190a14336e0d8fe9aec34e81a68194081c76155)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs (.../PipingFailureMechanismMetaEntityReadExtensionsTest.cs) (revision ef10fa5e330cbf2faf92223ea98b76eb0fe4be27)
@@ -30,7 +30,7 @@
public class PipingFailureMechanismMetaEntityReadExtensionsTest
{
[Test]
- public void ReadAsPipingProbabilityAssessmentInput_Always_ReturnsNewPipingProbabilityAssessmentInputWithPropertiesSet()
+ public void ReadPipingProbabilityAssessmentInput_Always_ReturnsNewPipingProbabilityAssessmentInputWithPropertiesSet()
{
// Setup
var entity = new PipingFailureMechanismMetaEntity
@@ -39,11 +39,28 @@
};
// Call
- PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput = entity.Read();
+ PipingProbabilityAssessmentInput pipingProbabilityAssessmentInput = entity.ReadPipingProbabilityAssessmentInput();
// Assert
Assert.IsNotNull(pipingProbabilityAssessmentInput);
Assert.AreEqual(entity.A, pipingProbabilityAssessmentInput.A);
}
+
+ [Test]
+ public void ReadGeneralPipingInput_Always_ReturnsNewGeneralPipingInputWithPropertiesSet()
+ {
+ // Setup
+ var entity = new PipingFailureMechanismMetaEntity
+ {
+ WaterVolumetricWeight = 5.39
+ };
+
+ // Call
+ GeneralPipingInput generalPipingInput = entity.ReadGeneralPipingInput();
+
+ // Assert
+ Assert.IsNotNull(generalPipingInput);
+ Assert.AreEqual(entity.WaterVolumetricWeight, generalPipingInput.WaterVolumetricWeight);
+ }
}
}
\ No newline at end of file