Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensions.cs
===================================================================
diff -u -re5a3455795622291e3347d1f3a7f900d5bf62da7 -r4fc9392d79e72f0ef668f63fd2a086e1feb18cdd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensions.cs (.../MacroStabilityInwardsFailureMechanismCreateExtensions.cs) (revision e5a3455795622291e3347d1f3a7f900d5bf62da7)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensions.cs (.../MacroStabilityInwardsFailureMechanismCreateExtensions.cs) (revision 4fc9392d79e72f0ef668f63fd2a086e1feb18cdd)
@@ -51,8 +51,6 @@
AddEntitiesForSurfaceLines(mechanism, registry, entity);
AddEntitiesForSectionResults(mechanism.SectionResults, registry);
- entity.CalculationGroupEntity = mechanism.CalculationsGroup.Create(registry, 0);
-
return entity;
}
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs
===================================================================
diff -u -re5a3455795622291e3347d1f3a7f900d5bf62da7 -r4fc9392d79e72f0ef668f63fd2a086e1feb18cdd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision e5a3455795622291e3347d1f3a7f900d5bf62da7)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision 4fc9392d79e72f0ef668f63fd2a086e1feb18cdd)
@@ -92,9 +92,6 @@
MacroStabilityInwardsStochasticSoilProfileEntities.Load();
MacroStabilityInwardsPreconsolidationStressEntities.Load();
MacrostabilityOutwardsSectionResultEntities.Load();
- MacroStabilityInwardsCalculationEntities.Load();
- MacroStabilityInwardsCalculationOutputEntities.Load();
- MacroStabilityInwardsSemiProbabilisticOutputEntities.Load();
MicrostabilitySectionResultEntities.Load();
ProjectEntities.Load();
PipingCalculationEntities.Load();
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -re5a3455795622291e3347d1f3a7f900d5bf62da7 -r4fc9392d79e72f0ef668f63fd2a086e1feb18cdd
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision e5a3455795622291e3347d1f3a7f900d5bf62da7)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 4fc9392d79e72f0ef668f63fd2a086e1feb18cdd)
@@ -504,7 +504,6 @@
/// The target of the read operation.
/// The object keeping track of read operations.
/// Thrown when any input parameter is null.
- /// Thrown when expected table entries could not be found.
internal static void ReadAsMacroStabilityInwardsFailureMechanism(this FailureMechanismEntity entity,
MacroStabilityInwardsFailureMechanism failureMechanism,
ReadConversionCollector collector)
@@ -548,7 +547,6 @@
}
entity.ReadMacroStabilityInwardsMechanismSectionResults(failureMechanism, collector);
- ReadMacroStabilityInwardsRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.CalculationsGroup, collector);
}
private static void ReadMacroStabilityInwardsMechanismSectionResults(this FailureMechanismEntity entity,
@@ -564,17 +562,6 @@
}
}
- private static void ReadMacroStabilityInwardsRootCalculationGroup(CalculationGroupEntity rootCalculationGroupEntity,
- CalculationGroup targetRootCalculationGroup,
- ReadConversionCollector collector)
- {
- CalculationGroup rootCalculationGroup = rootCalculationGroupEntity.ReadAsMacroStabilityInwardsCalculationGroup(collector);
- foreach (ICalculationBase calculationBase in rootCalculationGroup.Children)
- {
- targetRootCalculationGroup.Children.Add(calculationBase);
- }
- }
-
#endregion
#region Macrostability Outwards
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs
===================================================================
diff -u -re5a3455795622291e3347d1f3a7f900d5bf62da7 -r4fc9392d79e72f0ef668f63fd2a086e1feb18cdd
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs) (revision e5a3455795622291e3347d1f3a7f900d5bf62da7)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs (.../MacroStabilityInwardsCalculationScenarioCreateExtensionsTest.cs) (revision 4fc9392d79e72f0ef668f63fd2a086e1feb18cdd)
@@ -74,8 +74,6 @@
MacroStabilityInwardsCalculationEntity entity = scenario.Create(registry, 0);
// Assert
- Assert.IsNotNull(entity);
-
Assert.IsNull(entity.AssessmentLevel);
Assert.IsNull(entity.SlipPlaneMinimumDepth);
Assert.IsNull(entity.SlipPlaneMinimumLength);
@@ -201,8 +199,6 @@
MacroStabilityInwardsCalculationEntity entity = scenario.Create(registry, order);
// Assert
- Assert.IsNotNull(entity);
-
MacroStabilityInwardsCalculationEntityTestHelper.AssertCalculationScenarioPropertyValues(scenario, entity);
Assert.IsNull(entity.SurfaceLineEntity);
Assert.IsNull(entity.MacroStabilityInwardsStochasticSoilProfileEntity);
@@ -230,7 +226,6 @@
MacroStabilityInwardsCalculationEntity entity = scenario.Create(registry, 0);
// Then
- Assert.IsNotNull(entity);
Assert.IsNull(entity.AssessmentLevel);
}
@@ -255,7 +250,6 @@
MacroStabilityInwardsCalculationEntity entity = scenario.Create(registry, 0);
// Assert
- Assert.IsNotNull(entity);
TestHelper.AssertAreEqualButNotSame(name, entity.Name);
TestHelper.AssertAreEqualButNotSame(comment, entity.Comment);
}
@@ -281,7 +275,6 @@
MacroStabilityInwardsCalculationEntity entity = scenario.Create(registry, 0);
// Assert
- Assert.IsNotNull(entity);
Assert.AreSame(hydraulicLocationEntity, entity.HydraulicLocationEntity);
}
@@ -306,7 +299,6 @@
MacroStabilityInwardsCalculationEntity entity = scenario.Create(registry, 0);
// Assert
- Assert.IsNotNull(entity);
Assert.AreSame(surfaceLineEntity, entity.SurfaceLineEntity);
}
@@ -333,7 +325,6 @@
MacroStabilityInwardsCalculationEntity entity = scenario.Create(registry, 0);
// Assert
- Assert.IsNotNull(entity);
MacroStabilityInwardsStochasticSoilProfileEntity expectedStochasticSoilProfileEntity = registry.Get(stochasticSoilProfile);
Assert.AreSame(expectedStochasticSoilProfileEntity, entity.MacroStabilityInwardsStochasticSoilProfileEntity);
}
@@ -353,7 +344,6 @@
MacroStabilityInwardsCalculationEntity entity = scenario.Create(registry, 0);
// Assert
- Assert.IsNotNull(entity);
MacroStabilityInwardsCalculationOutputEntity outputEntity = entity.MacroStabilityInwardsCalculationOutputEntities.FirstOrDefault();
Assert.IsNotNull(outputEntity);
MacroStabilityInwardsCalculationOutputEntityTestHelper.AssertOutputPropertyValues(scenario.Output, outputEntity);
@@ -374,7 +364,6 @@
MacroStabilityInwardsCalculationEntity entity = scenario.Create(registry, 0);
// Assert
- Assert.IsNotNull(entity);
MacroStabilityInwardsSemiProbabilisticOutputEntity outputEntity = entity.MacroStabilityInwardsSemiProbabilisticOutputEntities.FirstOrDefault();
Assert.IsNotNull(outputEntity);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -re5a3455795622291e3347d1f3a7f900d5bf62da7 -r4fc9392d79e72f0ef668f63fd2a086e1feb18cdd
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs) (revision e5a3455795622291e3347d1f3a7f900d5bf62da7)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs (.../MacroStabilityInwardsFailureMechanismCreateExtensionsTest.cs) (revision 4fc9392d79e72f0ef668f63fd2a086e1feb18cdd)
@@ -28,7 +28,6 @@
using Core.Common.Base.Geometry;
using Core.Common.TestUtil;
using NUnit.Framework;
-using Ringtoets.Common.Data.Calculation;
using Ringtoets.MacroStabilityInwards.Data;
using Ringtoets.MacroStabilityInwards.Data.SoilProfile;
using Ringtoets.MacroStabilityInwards.Data.TestUtil;
@@ -150,7 +149,6 @@
FailureMechanismEntity entity = failureMechanism.Create(registry);
// Assert
- Assert.IsNotNull(entity);
TestHelper.AssertAreEqualButNotSame(failureMechanism.InputComments.Body, entity.InputComments);
TestHelper.AssertAreEqualButNotSame(failureMechanism.OutputComments.Body, entity.OutputComments);
TestHelper.AssertAreEqualButNotSame(failureMechanism.NotRelevantComments.Body, entity.NotRelevantComments);
@@ -230,7 +228,6 @@
FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
// Assert
- Assert.IsNotNull(entity);
CollectionAssert.IsEmpty(entity.FailureMechanismSectionEntities);
}
@@ -246,7 +243,6 @@
FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
// Assert
- Assert.IsNotNull(entity);
Assert.AreEqual(1, entity.FailureMechanismSectionEntities.Count);
MacroStabilityInwardsFailureMechanismSectionResult sectionResult = failureMechanism.SectionResults.Single();
@@ -255,42 +251,6 @@
Assert.IsNull(resultEntity.LayerThree);
}
- [Test]
- public void Create_WithCalculationGroup_ReturnFailureMechanismWithCalculationGroupEntities()
- {
- // Setup
- var calculationGroup = new CalculationGroup("A", true);
- var calculation = new MacroStabilityInwardsCalculationScenario();
-
- var failureMechanism = new MacroStabilityInwardsFailureMechanism();
- failureMechanism.CalculationsGroup.Children.Add(calculationGroup);
- failureMechanism.CalculationsGroup.Children.Add(calculation);
-
- // Call
- FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
-
- // Assert
- Assert.IsNotNull(entity);
- Assert.AreEqual(failureMechanism.CalculationsGroup.Name, entity.CalculationGroupEntity.Name);
- Assert.AreEqual(0, entity.CalculationGroupEntity.Order);
-
- CalculationGroupEntity[] childGroupEntities = entity.CalculationGroupEntity.CalculationGroupEntity1
- .OrderBy(cge => cge.Order)
- .ToArray();
- Assert.AreEqual(1, childGroupEntities.Length);
- CalculationGroupEntity childGroupEntity = childGroupEntities[0];
- Assert.AreEqual(calculationGroup.Name, childGroupEntity.Name);
- Assert.AreEqual(0, childGroupEntity.Order);
-
- MacroStabilityInwardsCalculationEntity[] calculationEntities = entity.CalculationGroupEntity.MacroStabilityInwardsCalculationEntities
- .OrderBy(ce => ce.Order)
- .ToArray();
- Assert.AreEqual(1, calculationEntities.Length);
- MacroStabilityInwardsCalculationEntity calculationEntity = calculationEntities[0];
- Assert.AreEqual(calculation.Name, calculationEntity.Name);
- Assert.AreEqual(1, calculationEntity.Order);
- }
-
private static void AssertSurfaceLine(MacroStabilityInwardsSurfaceLine surfaceLine, SurfaceLineEntity entity)
{
Assert.AreEqual(surfaceLine.Name, entity.Name);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsOutputCreateExtensionsTest.cs
===================================================================
diff -u -re5a3455795622291e3347d1f3a7f900d5bf62da7 -r4fc9392d79e72f0ef668f63fd2a086e1feb18cdd
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsOutputCreateExtensionsTest.cs (.../MacroStabilityInwardsOutputCreateExtensionsTest.cs) (revision e5a3455795622291e3347d1f3a7f900d5bf62da7)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/MacroStabilityInwards/MacroStabilityInwardsOutputCreateExtensionsTest.cs (.../MacroStabilityInwardsOutputCreateExtensionsTest.cs) (revision 4fc9392d79e72f0ef668f63fd2a086e1feb18cdd)
@@ -84,7 +84,6 @@
MacroStabilityInwardsCalculationOutputEntity entity = output.Create();
// Assert
- Assert.IsNotNull(entity);
MacroStabilityInwardsCalculationOutputEntityTestHelper.AssertOutputPropertyValues(output, entity);
}
@@ -110,7 +109,6 @@
MacroStabilityInwardsCalculationOutputEntity entity = output.Create();
// Assert
- Assert.IsNotNull(entity);
Assert.IsNull(entity.FactorOfStability);
Assert.IsNull(entity.ForbiddenZonesXEntryMin);
Assert.IsNull(entity.ForbiddenZonesXEntryMax);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs
===================================================================
diff -u -re5a3455795622291e3347d1f3a7f900d5bf62da7 -r4fc9392d79e72f0ef668f63fd2a086e1feb18cdd
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision e5a3455795622291e3347d1f3a7f900d5bf62da7)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision 4fc9392d79e72f0ef668f63fd2a086e1feb18cdd)
@@ -221,15 +221,14 @@
public void Create_WithCalculationGroup_ReturnFailureMechanismEntityWithCalculationGroupEntities()
{
// Setup
- var calculationGroup = new CalculationGroup("A", true);
- var calculation = new PipingCalculationScenario(new GeneralPipingInput());
-
var failureMechanism = new PipingFailureMechanism();
- failureMechanism.CalculationsGroup.Children.Add(calculationGroup);
- failureMechanism.CalculationsGroup.Children.Add(calculation);
+ failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup("A", true));
+ failureMechanism.CalculationsGroup.Children.Add(new CalculationGroup("B", true));
+ var registry = new PersistenceRegistry();
+
// Call
- FailureMechanismEntity entity = failureMechanism.Create(new PersistenceRegistry());
+ FailureMechanismEntity entity = failureMechanism.Create(registry);
// Assert
Assert.IsNotNull(entity);
@@ -239,18 +238,11 @@
CalculationGroupEntity[] childGroupEntities = entity.CalculationGroupEntity.CalculationGroupEntity1
.OrderBy(cge => cge.Order)
.ToArray();
- Assert.AreEqual(1, childGroupEntities.Length);
- CalculationGroupEntity childGroupEntity = childGroupEntities[0];
- Assert.AreEqual(calculationGroup.Name, childGroupEntity.Name);
- Assert.AreEqual(0, childGroupEntity.Order);
-
- PipingCalculationEntity[] calculationEntities = entity.CalculationGroupEntity.PipingCalculationEntities
- .OrderBy(ce => ce.Order)
- .ToArray();
- Assert.AreEqual(1, calculationEntities.Length);
- PipingCalculationEntity calculationEntity = calculationEntities[0];
- Assert.AreEqual(calculation.Name, calculationEntity.Name);
- Assert.AreEqual(1, calculationEntity.Order);
+ Assert.AreEqual(2, childGroupEntities.Length);
+ Assert.AreEqual("A", childGroupEntities[0].Name);
+ Assert.AreEqual(0, childGroupEntities[0].Order);
+ Assert.AreEqual("B", childGroupEntities[1].Name);
+ Assert.AreEqual(1, childGroupEntities[1].Order);
}
private static void AssertSurfaceLine(PipingSurfaceLine surfaceLine, SurfaceLineEntity entity)
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs
===================================================================
diff -u -re5a3455795622291e3347d1f3a7f900d5bf62da7 -r4fc9392d79e72f0ef668f63fd2a086e1feb18cdd
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision e5a3455795622291e3347d1f3a7f900d5bf62da7)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 4fc9392d79e72f0ef668f63fd2a086e1feb18cdd)
@@ -883,54 +883,6 @@
failureMechanism.Sections.Count());
}
- [Test]
- public void ReadAsMacroStabilityInwardsFailureMechanism_WithCalculationsAndGroups_ReturnFailureMechanismWithCalculationAndGroups()
- {
- var entity = new FailureMechanismEntity
- {
- MacroStabilityInwardsFailureMechanismMetaEntities =
- {
- new MacroStabilityInwardsFailureMechanismMetaEntity()
- },
- CalculationGroupEntity = new CalculationGroupEntity
- {
- CalculationGroupEntity1 =
- {
- new CalculationGroupEntity
- {
- Name = "A",
- Order = 1
- }
- },
- MacroStabilityInwardsCalculationEntities =
- {
- new MacroStabilityInwardsCalculationEntity
- {
- Name = "B",
- TangentLineNumber = 1,
- Order = 0
- }
- }
- }
- };
- var collector = new ReadConversionCollector();
- var failureMechanism = new MacroStabilityInwardsFailureMechanism();
-
- // Call
- entity.ReadAsMacroStabilityInwardsFailureMechanism(failureMechanism, collector);
-
- // Assert
- Assert.AreEqual(2, failureMechanism.CalculationsGroup.Children.Count);
-
- ICalculationBase expectedCalculation = failureMechanism.CalculationsGroup.Children[0];
- Assert.AreEqual("B", expectedCalculation.Name);
- Assert.IsInstanceOf(expectedCalculation);
-
- ICalculationBase expectedCalculationGroup = failureMechanism.CalculationsGroup.Children[1];
- Assert.AreEqual("A", expectedCalculationGroup.Name);
- Assert.IsInstanceOf(expectedCalculationGroup);
- }
-
#endregion
#region Grass Cover Erosion Inwards