Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj
===================================================================
diff -u -r1fa9ae637530f3c6914b83a1afa751a422ebda98 -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 1fa9ae637530f3c6914b83a1afa751a422ebda98)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Application.Ringtoets.Storage.csproj (.../Application.Ringtoets.Storage.csproj) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -153,12 +153,6 @@
RingtoetsEntities.tt
-
- RingtoetsEntities.tt
-
-
- RingtoetsEntities.tt
-
RingtoetsEntities.tt
@@ -370,7 +364,6 @@
RingtoetsEntities.tt
-
@@ -382,7 +375,6 @@
-
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs
===================================================================
diff -u -r49d7201ca48c40bac6e9fe5832d531d11b8c16fd -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs) (revision 49d7201ca48c40bac6e9fe5832d531d11b8c16fd)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/GrassCoverErosionOutwards/GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs (.../GrassCoverErosionOutwardsFailureMechanismCreateExtensions.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -48,24 +48,11 @@
AddEntitiesForSectionResults(mechanism.SectionResults, registry);
AddEntitiesForFailureMechanismMeta(mechanism, entity, registry);
AddEntitiesForForeshoreProfiles(mechanism.ForeshoreProfiles, entity, registry);
- AddEntitiesForHydraulicBoundaryLocations(mechanism.HydraulicBoundaryLocations, entity, registry);
entity.CalculationGroupEntity = mechanism.WaveConditionsCalculationGroup.Create(registry, 0);
return entity;
}
- private static void AddEntitiesForHydraulicBoundaryLocations(
- ObservableList hydraulicBoundaryLocations,
- FailureMechanismEntity entity,
- PersistenceRegistry registry)
- {
- var i = 0;
- foreach (HydraulicBoundaryLocation location in hydraulicBoundaryLocations)
- {
- entity.GrassCoverErosionOutwardsHydraulicLocationEntities.Add(location.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, i++));
- }
- }
-
private static void AddEntitiesForFailureMechanismMeta(GrassCoverErosionOutwardsFailureMechanism failureMechanism,
FailureMechanismEntity entity, PersistenceRegistry registry)
{
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs
===================================================================
diff -u -ra80af1a8fb7a87cd61648d481c8694bc22a763da -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs (.../HydraulicBoundaryLocationCreateExtensions.cs) (revision a80af1a8fb7a87cd61648d481c8694bc22a763da)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationCreateExtensions.cs (.../HydraulicBoundaryLocationCreateExtensions.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -69,74 +69,5 @@
registry.Register(entity, location);
return entity;
}
-
- #region Grass CoverErosion Outwards HydraulicLocation
-
- ///
- /// Creates a based on the information of the .
- ///
- /// The location to create a database entity for.
- /// The object keeping track of create operations.
- /// Index at which this instance resides inside its parent container.
- /// A new .
- /// Thrown when or
- /// is null.
- internal static GrassCoverErosionOutwardsHydraulicLocationEntity CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(
- this HydraulicBoundaryLocation location, PersistenceRegistry registry, int order)
- {
- if (location == null)
- {
- throw new ArgumentNullException(nameof(location));
- }
-
- if (registry == null)
- {
- throw new ArgumentNullException(nameof(registry));
- }
-
- if (registry.Contains(location))
- {
- return registry.Get(location);
- }
-
- var entity = new GrassCoverErosionOutwardsHydraulicLocationEntity
- {
- LocationId = location.Id,
- Name = location.Name.DeepClone(),
- LocationX = location.Location.X.ToNaNAsNull(),
- LocationY = location.Location.Y.ToNaNAsNull(),
- ShouldDesignWaterLevelIllustrationPointsBeCalculated = GetShouldIllustrationPointsBeCalculated(location.DesignWaterLevelCalculation1),
- ShouldWaveHeightIllustrationPointsBeCalculated = GetShouldIllustrationPointsBeCalculated(location.WaveHeightCalculation1),
- Order = order
- };
-
- CreateGrassCoverErosionOutwardsHydraulicLocationOutput(entity, location.DesignWaterLevelCalculation1.Output,
- HydraulicLocationOutputType.DesignWaterLevel);
- CreateGrassCoverErosionOutwardsHydraulicLocationOutput(entity, location.WaveHeightCalculation1.Output,
- HydraulicLocationOutputType.WaveHeight);
-
- registry.Register(entity, location);
- return entity;
- }
-
- private static void CreateGrassCoverErosionOutwardsHydraulicLocationOutput(GrassCoverErosionOutwardsHydraulicLocationEntity entity,
- HydraulicBoundaryLocationOutput output,
- HydraulicLocationOutputType outputType)
- {
- if (output != null)
- {
- GrassCoverErosionOutwardsHydraulicLocationOutputEntity grassCoverErosionOutwardsHydraulicLocationOutputEntity =
- output.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocationOutputEntity(outputType);
-
- entity.GrassCoverErosionOutwardsHydraulicLocationOutputEntities.Add(grassCoverErosionOutwardsHydraulicLocationOutputEntity);
- }
- }
-
- private static byte GetShouldIllustrationPointsBeCalculated(HydraulicBoundaryLocationCalculation calculation)
- {
- return Convert.ToByte(calculation.InputParameters.ShouldIllustrationPointsBeCalculated);
- }
-
- #endregion
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationOutputCreateExtensions.cs
===================================================================
diff -u -rf04bc7a1a7cac4b688ab59088e47f7e0a162c86a -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationOutputCreateExtensions.cs (.../HydraulicBoundaryLocationOutputCreateExtensions.cs) (revision f04bc7a1a7cac4b688ab59088e47f7e0a162c86a)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/HydraulicBoundaryLocationOutputCreateExtensions.cs (.../HydraulicBoundaryLocationOutputCreateExtensions.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -56,36 +56,5 @@
GeneralResultSubMechanismIllustrationPointEntity = output.GeneralResult?.CreateGeneralResultSubMechanismIllustrationPointEntity()
};
}
-
- ///
- /// Creates a based
- /// on the information of the .
- ///
- /// The output to create a database entity for.
- /// The calculation output type.
- /// A new .
- /// Thrown when is null.
- internal static GrassCoverErosionOutwardsHydraulicLocationOutputEntity CreateGrassCoverErosionOutwardsHydraulicBoundaryLocationOutputEntity(
- this HydraulicBoundaryLocationOutput output,
- HydraulicLocationOutputType outputType)
-
- {
- if (output == null)
- {
- throw new ArgumentNullException(nameof(output));
- }
-
- return new GrassCoverErosionOutwardsHydraulicLocationOutputEntity
- {
- HydraulicLocationOutputType = (byte) outputType,
- Result = output.Result.ToNaNAsNull(),
- TargetProbability = output.TargetProbability.ToNaNAsNull(),
- TargetReliability = output.TargetReliability.ToNaNAsNull(),
- CalculatedProbability = output.CalculatedProbability.ToNaNAsNull(),
- CalculatedReliability = output.CalculatedReliability.ToNaNAsNull(),
- CalculationConvergence = (byte) output.CalculationConvergence,
- GeneralResultSubMechanismIllustrationPointEntity = output.GeneralResult?.CreateGeneralResultSubMechanismIllustrationPointEntity()
- };
- }
}
}
\ No newline at end of file
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/PersistenceRegistry.cs (.../PersistenceRegistry.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -218,18 +218,6 @@
/// Registers a create operation for and the
/// that was constructed with the information.
///
- /// The to be registered.
- /// The to be registered.
- /// Thrown when any of the input parameters is null.
- internal void Register(GrassCoverErosionOutwardsHydraulicLocationEntity entity, HydraulicBoundaryLocation model)
- {
- Register(hydraulicLocations, entity, model);
- }
-
- ///
- /// Registers a create operation for and the
- /// that was constructed with the information.
- ///
/// The to be registered.
/// The to be registered.
/// Thrown when any of the input parameters is null.
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs
===================================================================
diff -u -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision c020cda27aa3558aee28cce5cd2ec537ee6a9af4)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -68,8 +68,6 @@
GrassCoverErosionInwardsOvertoppingRateOutputEntities.Load();
GrassCoverErosionInwardsSectionResultEntities.Load();
GrassCoverErosionOutwardsFailureMechanismMetaEntities.Load();
- GrassCoverErosionOutwardsHydraulicLocationEntities.Load();
- GrassCoverErosionOutwardsHydraulicLocationOutputEntities.Load();
GrassCoverErosionOutwardsSectionResultEntities.Load();
GrassCoverErosionOutwardsWaveConditionsCalculationEntities.Load();
GrassCoverErosionOutwardsWaveConditionsOutputEntities.Load();
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs
===================================================================
diff -u -re749ff5c1ebced7fc8ac52bfc26417f405aee728 -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision e749ff5c1ebced7fc8ac52bfc26417f405aee728)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/FailureMechanismEntityReadExtensions.cs (.../FailureMechanismEntityReadExtensions.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -709,7 +709,6 @@
metaEntity.ForeshoreProfileCollectionSourcePath,
collector);
- entity.ReadHydraulicBoundaryLocations(failureMechanism.HydraulicBoundaryLocations, collector);
entity.ReadHydraulicBoundaryLocationCalculations(failureMechanism, collector);
ReadGrassCoverErosionOutwardsWaveConditionsRootCalculationGroup(entity.CalculationGroupEntity, failureMechanism.WaveConditionsCalculationGroup, collector);
@@ -734,16 +733,6 @@
}
}
- private static void ReadHydraulicBoundaryLocations(this FailureMechanismEntity entity,
- List locations,
- ReadConversionCollector collector)
- {
- locations.AddRange(entity.GrassCoverErosionOutwardsHydraulicLocationEntities
- .OrderBy(location => location.Order)
- .Select(location => location.Read(collector))
- .ToArray());
- }
-
private static void ReadHydraulicBoundaryLocationCalculations(this FailureMechanismEntity entity,
GrassCoverErosionOutwardsFailureMechanism failureMechanism,
ReadConversionCollector collector)
Fisheye: Tag 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856 refers to a dead (removed) revision in file `Application/Ringtoets/src/Application.Ringtoets.Storage/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationOutputEntityReadExtensions.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ReadConversionCollector.cs
===================================================================
diff -u -rac96d7c315129af851634ed5a4a6800b59ede718 -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ReadConversionCollector.cs (.../ReadConversionCollector.cs) (revision ac96d7c315129af851634ed5a4a6800b59ede718)
+++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/ReadConversionCollector.cs (.../ReadConversionCollector.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -75,9 +75,6 @@
private readonly Dictionary hydraulicBoundaryLocations =
CreateDictionary();
- private readonly Dictionary grassCoverErosionOutwardsHydraulicBoundaryLocations =
- CreateDictionary();
-
private readonly Dictionary duneLocations =
CreateDictionary();
@@ -1129,74 +1126,6 @@
#endregion
- #region GrassCoverErosionOutwardsHydraulicLocationEntity: Read, Contains, Get
-
- ///
- /// Registers a read operation for and the
- /// that was constructed with the information.
- ///
- /// The that was read.
- /// The that was constructed.
- /// Thrown when any of the input parameters is null.
- internal void Read(GrassCoverErosionOutwardsHydraulicLocationEntity entity, HydraulicBoundaryLocation model)
- {
- if (entity == null)
- {
- throw new ArgumentNullException(nameof(entity));
- }
- if (model == null)
- {
- throw new ArgumentNullException(nameof(model));
- }
-
- grassCoverErosionOutwardsHydraulicBoundaryLocations[entity] = model;
- }
-
- ///
- /// Checks whether a read operation has been registered for a given .
- ///
- /// The to check for.
- /// true if the was read before, false otherwise.
- /// Thrown when is null.
- internal bool Contains(GrassCoverErosionOutwardsHydraulicLocationEntity entity)
- {
- if (entity == null)
- {
- throw new ArgumentNullException(nameof(entity));
- }
- return grassCoverErosionOutwardsHydraulicBoundaryLocations.ContainsKey(entity);
- }
-
- ///
- /// Obtains the which was read for the
- /// given .
- ///
- /// The for which a read
- /// operation has been registered.
- /// The constructed .
- /// Thrown when is null.
- /// Thrown when no read operation has
- /// been registered for .
- /// Use to find out whether a
- /// read operation has been registered for .
- internal HydraulicBoundaryLocation Get(GrassCoverErosionOutwardsHydraulicLocationEntity entity)
- {
- if (entity == null)
- {
- throw new ArgumentNullException(nameof(entity));
- }
- try
- {
- return grassCoverErosionOutwardsHydraulicBoundaryLocations[entity];
- }
- catch (KeyNotFoundException e)
- {
- throw new InvalidOperationException(e.Message, e);
- }
- }
-
- #endregion
-
#region HeightStructureEntity: Read, Contains, Get
///
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj
===================================================================
diff -u -r1fa9ae637530f3c6914b83a1afa751a422ebda98 -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 1fa9ae637530f3c6914b83a1afa751a422ebda98)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Application.Ringtoets.Storage.Test.csproj (.../Application.Ringtoets.Storage.Test.csproj) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -100,8 +100,6 @@
-
-
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs
===================================================================
diff -u -r7ce4c7b033f8983567620f4d1526b7247cf57682 -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs (.../HydraulicBoundaryLocationCreateExtensionsTest.cs) (revision 7ce4c7b033f8983567620f4d1526b7247cf57682)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationCreateExtensionsTest.cs (.../HydraulicBoundaryLocationCreateExtensionsTest.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -20,13 +20,10 @@
// All rights reserved.
using System;
-using System.Linq;
using Application.Ringtoets.Storage.Create;
using Application.Ringtoets.Storage.DbContext;
-using Core.Common.TestUtil;
using NUnit.Framework;
using Ringtoets.Common.Data.Hydraulics;
-using Ringtoets.Common.Data.TestUtil;
namespace Application.Ringtoets.Storage.Test.Create
{
@@ -120,178 +117,5 @@
// Assert
Assert.AreSame(entity1, entity2);
}
-
- [Test]
- public void CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation_WithoutPersistenceRegistry_ThrowsArgumentNullException()
- {
- // Setup
- var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "testName", 2, 3);
-
- // Call
- TestDelegate test = () => hydraulicBoundaryLocation.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(null, 0);
-
- // Assert
- string parameterName = Assert.Throws(test).ParamName;
- Assert.AreEqual("registry", parameterName);
- }
-
- [Test]
- public void CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation_HydraulicBoundaryLocationNull_ThrowsArgumentNullException()
- {
- // Setup
- var random = new Random(21);
-
- // Call
- TestDelegate call = () => ((HydraulicBoundaryLocation) null).CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(
- new PersistenceRegistry(), random.Next());
-
- // Assert
- var exception = Assert.Throws(call);
- Assert.AreEqual("location", exception.ParamName);
- }
-
- [Test]
- public void CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation_WithPersistenceRegistry_ReturnsGrassCoverErosionOutwardsHydraulicLocationEntityWithPropertiesSet()
- {
- // Setup
- const string testName = "testName";
- var random = new Random(21);
- double coordinateX = random.NextDouble();
- double coordinateY = random.NextDouble();
- int id = random.Next(0, 150);
- int order = random.Next();
- bool shouldDesignWaterLevelIllustrationPointsBeCalculated = random.NextBoolean();
- bool shouldWaveHeightIllustrationPointsBeCalculated = random.NextBoolean();
-
- var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(id, testName, coordinateX, coordinateY)
- {
- DesignWaterLevelCalculation1 =
- {
- InputParameters =
- {
- ShouldIllustrationPointsBeCalculated = shouldDesignWaterLevelIllustrationPointsBeCalculated
- }
- },
- WaveHeightCalculation1 =
- {
- InputParameters =
- {
- ShouldIllustrationPointsBeCalculated = shouldWaveHeightIllustrationPointsBeCalculated
- }
- }
- };
-
- var registry = new PersistenceRegistry();
-
- // Call
- GrassCoverErosionOutwardsHydraulicLocationEntity entity =
- hydraulicBoundaryLocation.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, order);
-
- // Assert
- Assert.IsNotNull(entity);
- Assert.AreEqual(id, entity.LocationId);
- Assert.AreEqual(testName, entity.Name);
- Assert.AreEqual(coordinateX, entity.LocationX);
- Assert.AreEqual(coordinateY, entity.LocationY);
- Assert.AreEqual(Convert.ToByte(shouldDesignWaterLevelIllustrationPointsBeCalculated), entity.ShouldDesignWaterLevelIllustrationPointsBeCalculated);
- Assert.AreEqual(Convert.ToByte(shouldWaveHeightIllustrationPointsBeCalculated), entity.ShouldWaveHeightIllustrationPointsBeCalculated);
- Assert.AreEqual(order, entity.Order);
- }
-
- [Test]
- public void CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation_StringPropertiesDoNotShareReferences()
- {
- // Setup
- const string testName = "original name";
- var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, testName, 0, 0);
- var registry = new PersistenceRegistry();
-
- // Call
- GrassCoverErosionOutwardsHydraulicLocationEntity entity =
- hydraulicBoundaryLocation.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, 0);
-
- // Assert
- Assert.IsNotNull(entity);
- Assert.AreNotSame(testName, entity.Name,
- "To create stable binary representations/fingerprints, it's really important that strings are not shared.");
- Assert.AreEqual(testName, entity.Name);
- }
-
- [Test]
- public void CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation_WithPersistenceRegistryAndInitializer_ReturnsGrassCoverErosionOutwardsHydraulicLocationEntityWithOutputSet()
- {
- // Setup
- var random = new Random(21);
- var hydraulicBoundaryLocationDesignWaterLevelOutput = new HydraulicBoundaryLocationOutput(
- random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(),
- random.NextDouble(), random.NextEnumValue(), null);
- var hydraulicBoundaryLocationWaveHeightOutput = new HydraulicBoundaryLocationOutput(
- random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(),
- random.NextDouble(), random.NextEnumValue(), null);
-
- var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(-1, "testName", random.NextDouble(), random.NextDouble())
- {
- DesignWaterLevelCalculation1 =
- {
- Output = hydraulicBoundaryLocationDesignWaterLevelOutput
- },
- WaveHeightCalculation1 =
- {
- Output = hydraulicBoundaryLocationWaveHeightOutput
- }
- };
- var registry = new PersistenceRegistry();
-
- // Call
- GrassCoverErosionOutwardsHydraulicLocationEntity entity =
- hydraulicBoundaryLocation.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, 0);
-
- // Assert
- Assert.IsNotNull(entity);
- GrassCoverErosionOutwardsHydraulicLocationOutputEntity designWaterLevelOutputEntity = GetHydraulicLocationOutputEntity(entity, HydraulicLocationOutputType.DesignWaterLevel);
- Assert.IsNotNull(designWaterLevelOutputEntity);
- AssertHydraulicBoundaryLocationOutput(hydraulicBoundaryLocationDesignWaterLevelOutput, designWaterLevelOutputEntity);
- Assert.IsNull(designWaterLevelOutputEntity.GeneralResultSubMechanismIllustrationPointEntity);
-
- GrassCoverErosionOutwardsHydraulicLocationOutputEntity waveHeightOutputEntity = GetHydraulicLocationOutputEntity(entity, HydraulicLocationOutputType.WaveHeight);
- Assert.IsNotNull(waveHeightOutputEntity);
- AssertHydraulicBoundaryLocationOutput(hydraulicBoundaryLocationWaveHeightOutput, waveHeightOutputEntity);
- Assert.IsNull(waveHeightOutputEntity.GeneralResultSubMechanismIllustrationPointEntity);
- }
-
- [Test]
- public void CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation_HydraulicBoundaryLocationSavedMultipleTimes_ReturnSameEntity()
- {
- // Setup
- var hydraulicBoundaryLocations = new HydraulicBoundaryLocation(1, "A", 1.1, 2.2);
-
- var registry = new PersistenceRegistry();
-
- // Call
- GrassCoverErosionOutwardsHydraulicLocationEntity entity1 =
- hydraulicBoundaryLocations.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, 0);
- GrassCoverErosionOutwardsHydraulicLocationEntity entity2 =
- hydraulicBoundaryLocations.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocation(registry, 1);
-
- // Assert
- Assert.AreSame(entity1, entity2);
- }
-
- private static GrassCoverErosionOutwardsHydraulicLocationOutputEntity GetHydraulicLocationOutputEntity(
- GrassCoverErosionOutwardsHydraulicLocationEntity entity, HydraulicLocationOutputType outputType)
- {
- return entity.GrassCoverErosionOutwardsHydraulicLocationOutputEntities.SingleOrDefault(
- e => e.HydraulicLocationOutputType == (byte) outputType);
- }
-
- private static void AssertHydraulicBoundaryLocationOutput(HydraulicBoundaryLocationOutput output, GrassCoverErosionOutwardsHydraulicLocationOutputEntity entity)
- {
- Assert.AreEqual(output.Result, entity.Result, output.Result.GetAccuracy());
- Assert.AreEqual(output.TargetProbability, entity.TargetProbability, output.TargetProbability);
- Assert.AreEqual(output.TargetReliability, entity.TargetReliability, output.TargetReliability.GetAccuracy());
- Assert.AreEqual(output.CalculatedProbability, entity.CalculatedProbability, output.CalculatedProbability);
- Assert.AreEqual(output.CalculatedReliability, entity.CalculatedReliability, output.CalculatedReliability.GetAccuracy());
- Assert.AreEqual(output.CalculationConvergence, (CalculationConvergence) entity.CalculationConvergence);
- }
}
}
\ No newline at end of file
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationOutputCreateExtensionsTest.cs
===================================================================
diff -u -r41644e20d80f5793adb5e9da8d8e1a359887eb00 -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationOutputCreateExtensionsTest.cs (.../HydraulicBoundaryLocationOutputCreateExtensionsTest.cs) (revision 41644e20d80f5793adb5e9da8d8e1a359887eb00)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/HydraulicBoundaryLocationOutputCreateExtensionsTest.cs (.../HydraulicBoundaryLocationOutputCreateExtensionsTest.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -109,95 +109,6 @@
AssertGeneralResult(output.GeneralResult, entity.GeneralResultSubMechanismIllustrationPointEntity);
}
- [Test]
- public void CreateGrassCoverErosionOutwardsHydraulicLocationOutputEntity_HydraulicBoundaryLocationOutputNull_ThrowsArgumentNullException()
- {
- // Setup
- var random = new Random(21);
-
- // Call
- TestDelegate call = () =>
- ((HydraulicBoundaryLocationOutput) null).CreateGrassCoverErosionOutwardsHydraulicBoundaryLocationOutputEntity(random.NextEnumValue());
-
- // Assert
- var exception = Assert.Throws(call);
- Assert.AreEqual("output", exception.ParamName);
- }
-
- [Test]
- public void CreateGrassCoverErosionOutwardsHydraulicLocationOutputEntity_WithValidParameters_ReturnsHydraulicLocationEntityWithOutputSet()
- {
- // Setup
- var random = new Random(21);
- var output = new HydraulicBoundaryLocationOutput(
- random.NextDouble(), random.NextDouble(), random.NextDouble(), random.NextDouble(),
- random.NextDouble(), random.NextEnumValue(), null);
-
- var outputType = random.NextEnumValue();
-
- // Call
- GrassCoverErosionOutwardsHydraulicLocationOutputEntity entity = output.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocationOutputEntity(outputType);
-
- // Assert
- Assert.IsNotNull(entity);
- Assert.AreEqual((byte) outputType, entity.HydraulicLocationOutputType);
- Assert.AreEqual(output.Result, entity.Result, output.Result.GetAccuracy());
- Assert.AreEqual(output.TargetProbability, entity.TargetProbability);
- Assert.AreEqual(output.TargetReliability, entity.TargetReliability, output.TargetReliability.GetAccuracy());
- Assert.AreEqual(output.CalculatedProbability, entity.CalculatedProbability);
- Assert.AreEqual(output.CalculatedReliability, entity.CalculatedReliability, output.CalculatedReliability.GetAccuracy());
- Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence);
-
- AssertGeneralResult(output.GeneralResult, entity.GeneralResultSubMechanismIllustrationPointEntity);
- }
-
- [Test]
- public void CreateGrassCoverErosionOutwardsHydraulicLocationOutputEntity_WithNaNParameters_ReturnsHydraulicLocationEntityWithOutputNaN()
- {
- // Setup
- var random = new Random(21);
- var output = new HydraulicBoundaryLocationOutput(double.NaN, double.NaN, double.NaN,
- double.NaN, double.NaN, random.NextEnumValue(), null);
-
- var outputType = random.NextEnumValue();
-
- // Call
- GrassCoverErosionOutwardsHydraulicLocationOutputEntity entity =
- output.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocationOutputEntity(outputType);
-
- // Assert
- Assert.IsNotNull(entity);
- Assert.AreEqual((byte) outputType, entity.HydraulicLocationOutputType);
- Assert.IsNull(entity.Result);
- Assert.IsNull(entity.TargetProbability);
- Assert.IsNull(entity.TargetReliability);
- Assert.IsNull(entity.CalculatedProbability);
- Assert.IsNull(entity.CalculatedReliability);
- Assert.AreEqual((byte) output.CalculationConvergence, entity.CalculationConvergence);
-
- AssertGeneralResult(output.GeneralResult,
- entity.GeneralResultSubMechanismIllustrationPointEntity);
- }
-
- [Test]
- public void CreateGrassCoverErosionOutwardsHydraulicLocationOutputEntity_WithGeneralResult_ReturnsHydraulicLocationEntityWithGeneralResult()
- {
- // Setup
- var random = new Random(21);
- var output = new HydraulicBoundaryLocationOutput(double.NaN, double.NaN, double.NaN,
- double.NaN, double.NaN, random.NextEnumValue(),
- GetGeneralResult());
-
- var outputType = random.NextEnumValue();
-
- // Call
- GrassCoverErosionOutwardsHydraulicLocationOutputEntity entity =
- output.CreateGrassCoverErosionOutwardsHydraulicBoundaryLocationOutputEntity(outputType);
-
- // Assert
- AssertGeneralResult(output.GeneralResult, entity.GeneralResultSubMechanismIllustrationPointEntity);
- }
-
private static GeneralResult GetGeneralResult()
{
var random = new Random(55);
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs
===================================================================
diff -u -r8900f570b33f0de1a512fc5b2509771e1201672c -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 8900f570b33f0de1a512fc5b2509771e1201672c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/PersistenceRegistryTest.cs (.../PersistenceRegistryTest.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -356,25 +356,6 @@
#endregion
- #region GrassCoverErosionOutwards
-
- [TestFixture]
- private class GrassCoverErosionOutwardsHydraulicBoundaryLocationRegistryTest : RegistryTest<
- HydraulicBoundaryLocation, GrassCoverErosionOutwardsHydraulicLocationEntity>
- {
- public GrassCoverErosionOutwardsHydraulicBoundaryLocationRegistryTest() : base(
- (r, e, m) => r.Register(e, m),
- (r, m) => r.Contains(m),
- (r, m) => r.Get(m)) {}
-
- protected override HydraulicBoundaryLocation CreateDataModel()
- {
- return new TestHydraulicBoundaryLocation(nameof(HydraulicBoundaryLocation));
- }
- }
-
- #endregion
-
#region Piping
[TestFixture]
Fisheye: Tag 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationEntityReadExtensionsTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Fisheye: Tag 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856 refers to a dead (removed) revision in file `Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsHydraulicLocationOutputEntityReadExtensionsTest.cs'.
Fisheye: No comparison available. Pass `N' to diff?
Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs
===================================================================
diff -u -r8900f570b33f0de1a512fc5b2509771e1201672c -r070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856
--- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs (.../ReadConversionCollectorTest.cs) (revision 8900f570b33f0de1a512fc5b2509771e1201672c)
+++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ReadConversionCollectorTest.cs (.../ReadConversionCollectorTest.cs) (revision 070c0400906eb4cfbd4fdcfbf1e49d4dfeec7856)
@@ -355,26 +355,6 @@
#endregion
- #region GrassCoverErosionOutwards
-
- [TestFixture]
- private class GrassCoverErosionOutwardsHydraulicLocationCollectorTest : CollectorTest<
- HydraulicBoundaryLocation,
- GrassCoverErosionOutwardsHydraulicLocationEntity>
- {
- public GrassCoverErosionOutwardsHydraulicLocationCollectorTest() : base(
- (c, e, m) => c.Read(e, m),
- (c, e) => c.Contains(e),
- (c, e) => c.Get(e)) {}
-
- protected override HydraulicBoundaryLocation CreateDataModel()
- {
- return new TestHydraulicBoundaryLocation();
- }
- }
-
- #endregion
-
#region HeightStructure
[TestFixture]