Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationCreateExtensions.cs =================================================================== diff -u -r649b0974fb71df7368d19682bc255618f44d49c1 -rc7ef5f92b11bf6bd26ce6580c8bbfbadb1431b6c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationCreateExtensions.cs (.../DuneLocationCreateExtensions.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/DuneErosion/DuneLocationCreateExtensions.cs (.../DuneLocationCreateExtensions.cs) (revision c7ef5f92b11bf6bd26ce6580c8bbfbadb1431b6c) @@ -38,9 +38,14 @@ /// The object keeping track of create operations. /// Index at which this instance resides inside its parent container. /// A new . - /// Thrown when is null. + /// Thrown when any parameter is null. internal static DuneLocationEntity Create(this DuneLocation location, PersistenceRegistry registry, int order) { + if (location == null) + { + throw new ArgumentNullException(nameof(location)); + } + if (registry == null) { throw new ArgumentNullException(nameof(registry)); @@ -63,18 +68,8 @@ Order = order }; - CreateDuneLocationCalculationOutput(entity, location.Calculation.Output); - registry.Register(entity, location); return entity; } - - private static void CreateDuneLocationCalculationOutput(DuneLocationEntity entity, DuneLocationCalculationOutput output) - { - if (output != null) - { - entity.DuneLocationOutputEntities.Add(output.Create()); - } - } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneLocationEntityReadExtensions.cs =================================================================== diff -u -r397eafbec8987f6aa2e31318745c4e07ed575981 -rc7ef5f92b11bf6bd26ce6580c8bbfbadb1431b6c --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneLocationEntityReadExtensions.cs (.../DuneLocationEntityReadExtensions.cs) (revision 397eafbec8987f6aa2e31318745c4e07ed575981) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/DuneErosion/DuneLocationEntityReadExtensions.cs (.../DuneLocationEntityReadExtensions.cs) (revision c7ef5f92b11bf6bd26ce6580c8bbfbadb1431b6c) @@ -65,14 +65,7 @@ D50 = entity.D50.ToNullAsNaN() }); - DuneLocationOutputEntity duneLocationOutputEntity = entity.DuneLocationOutputEntities.SingleOrDefault(); - if (duneLocationOutputEntity != null) - { - duneLocation.Calculation.Output = duneLocationOutputEntity.Read(); - } - collector.Read(entity, duneLocation); - return duneLocation; } } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs =================================================================== diff -u -r649b0974fb71df7368d19682bc255618f44d49c1 -rc7ef5f92b11bf6bd26ce6580c8bbfbadb1431b6c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs (.../DuneLocationCreateExtensionsTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs (.../DuneLocationCreateExtensionsTest.cs) (revision c7ef5f92b11bf6bd26ce6580c8bbfbadb1431b6c) @@ -20,14 +20,11 @@ // All rights reserved. using System; -using System.Linq; using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.Create.DuneErosion; using Application.Ringtoets.Storage.DbContext; using Core.Common.Base.Geometry; -using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.DuneErosion.Data; using Ringtoets.DuneErosion.Data.TestUtil; @@ -38,6 +35,17 @@ public class DuneLocationCreateExtensionsTest { [Test] + public void Create_DuneLocationNull_ThrowsArgumentNullException() + { + // Call + TestDelegate call = () => ((DuneLocation)null).Create(new PersistenceRegistry(), 0); + + // Assert + var exception = Assert.Throws(call); + Assert.AreEqual("location", exception.ParamName); + } + + [Test] public void Create_WithoutPersistenceRegistry_ThrowsArgumentNullException() { // Setup @@ -85,7 +93,6 @@ Assert.AreEqual(location.Offset, entity.Offset, location.Offset.GetAccuracy()); Assert.AreEqual(location.Orientation, entity.Orientation, location.Orientation.GetAccuracy()); Assert.AreEqual(location.D50, entity.D50, location.D50.GetAccuracy()); - CollectionAssert.IsEmpty(entity.DuneLocationOutputEntities); Assert.AreEqual(order, entity.Order); } @@ -118,7 +125,6 @@ Assert.IsNull(entity.Offset); Assert.IsNull(entity.Orientation); Assert.IsNull(entity.D50); - CollectionAssert.IsEmpty(entity.DuneLocationOutputEntities); Assert.AreEqual(order, entity.Order); } @@ -141,44 +147,6 @@ } [Test] - public void Create_WithPersistenceRegistryAndInitializer_ReturnsDuneLocationEntityWithOutputSet() - { - // Setup - var random = new Random(21); - var output = new DuneLocationCalculationOutput(random.NextEnumValue(), - new DuneLocationCalculationOutput.ConstructionProperties - { - WaterLevel = random.NextDouble(), - WaveHeight = random.NextDouble(), - WavePeriod = random.NextDouble(), - TargetProbability = random.NextDouble(), - TargetReliability = random.NextDouble(), - CalculatedProbability = random.NextDouble(), - CalculatedReliability = random.NextDouble() - }); - - var location = new TestDuneLocation - { - Calculation = - { - Output = output - } - }; - - var registry = new PersistenceRegistry(); - - // Call - DuneLocationEntity entity = location.Create(registry, 0); - - // Assert - Assert.IsNotNull(entity); - - DuneLocationOutputEntity duneLocationOutputEntity = entity.DuneLocationOutputEntities.SingleOrDefault(); - Assert.IsNotNull(duneLocationOutputEntity); - AssertDuneLocationCalculationOutput(output, duneLocationOutputEntity); - } - - [Test] public void Create_DuneLocationSavedMultipleTimes_ReturnSameEntity() { // Setup @@ -193,17 +161,5 @@ // Assert Assert.AreSame(entity1, entity2); } - - private static void AssertDuneLocationCalculationOutput(DuneLocationCalculationOutput output, DuneLocationOutputEntity entity) - { - Assert.AreEqual(output.WaterLevel, entity.WaterLevel, output.WaterLevel.GetAccuracy()); - Assert.AreEqual(output.WaveHeight, entity.WaveHeight, output.WaveHeight.GetAccuracy()); - Assert.AreEqual(output.WavePeriod, entity.WavePeriod, output.WavePeriod.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/Read/DuneErosion/DuneLocationEntityReadExtensionsTest.cs =================================================================== diff -u -r649b0974fb71df7368d19682bc255618f44d49c1 -rc7ef5f92b11bf6bd26ce6580c8bbfbadb1431b6c --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneLocationEntityReadExtensionsTest.cs (.../DuneLocationEntityReadExtensionsTest.cs) (revision 649b0974fb71df7368d19682bc255618f44d49c1) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosion/DuneLocationEntityReadExtensionsTest.cs (.../DuneLocationEntityReadExtensionsTest.cs) (revision c7ef5f92b11bf6bd26ce6580c8bbfbadb1431b6c) @@ -23,9 +23,7 @@ using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Read; using Application.Ringtoets.Storage.Read.DuneErosion; -using Core.Common.TestUtil; using NUnit.Framework; -using Ringtoets.Common.Data.Hydraulics; using Ringtoets.Common.Data.TestUtil; using Ringtoets.DuneErosion.Data; @@ -99,7 +97,6 @@ Assert.AreEqual(offset, location.Offset, location.Offset.GetAccuracy()); Assert.AreEqual(orientation, location.Orientation, location.Orientation.GetAccuracy()); Assert.AreEqual(d50, location.D50, location.D50.GetAccuracy()); - Assert.IsNull(location.Calculation.Output); Assert.IsTrue(collector.Contains(entity)); } @@ -139,51 +136,11 @@ Assert.IsNaN(location.Offset); Assert.IsNaN(location.Orientation); Assert.IsNaN(location.D50); - Assert.IsNull(location.Calculation.Output); Assert.IsTrue(collector.Contains(entity)); } [Test] - public void Read_WithOutput_ReturnDuneLocationWithExpectedOutput() - { - // Setup - var random = new Random(21); - double waterLevel = random.NextDouble(); - double waveHeight = random.NextDouble(); - double waterPeriod = random.NextDouble(); - var convergence = random.NextEnumValue(); - var duneLocationOutputEntity = new DuneLocationOutputEntity - { - WaterLevel = waterLevel, - WaveHeight = waveHeight, - WavePeriod = waterPeriod, - TargetProbability = random.NextDouble(), - TargetReliability = random.NextDouble(), - CalculatedProbability = random.NextDouble(), - CalculatedReliability = random.NextDouble(), - CalculationConvergence = (byte) convergence - }; - var entity = new DuneLocationEntity - { - Name = "someName", - DuneLocationOutputEntities = - { - duneLocationOutputEntity - } - }; - - var collector = new ReadConversionCollector(); - - // Call - DuneLocation location = entity.Read(collector); - - // Assert - Assert.IsNotNull(location); - AssertDuneLocationCalculationOutput(duneLocationOutputEntity, location.Calculation.Output); - } - - [Test] public void Read_SameDuneLocationEntityTwice_ReturnSameDuneLocation() { // Setup @@ -201,25 +158,5 @@ // Assert Assert.AreSame(location1, location2); } - - private static void AssertDuneLocationCalculationOutput(DuneLocationOutputEntity expected, DuneLocationCalculationOutput actual) - { - if (expected == null) - { - Assert.IsNull(actual); - return; - } - - Assert.AreEqual(expected.WaterLevel.ToNullAsNaN(), actual.WaterLevel, actual.WaterLevel.GetAccuracy()); - Assert.AreEqual(expected.WaveHeight.ToNullAsNaN(), actual.WaveHeight, actual.WaveHeight.GetAccuracy()); - Assert.AreEqual(expected.WavePeriod.ToNullAsNaN(), actual.WavePeriod, actual.WavePeriod.GetAccuracy()); - Assert.AreEqual(expected.TargetReliability.ToNullAsNaN(), actual.TargetReliability, - actual.TargetReliability.GetAccuracy()); - Assert.AreEqual(expected.TargetProbability.ToNullAsNaN(), actual.TargetProbability); - Assert.AreEqual(expected.CalculatedReliability.ToNullAsNaN(), actual.CalculatedReliability, - actual.CalculatedReliability.GetAccuracy()); - Assert.AreEqual(expected.CalculatedProbability.ToNullAsNaN(), actual.CalculatedProbability); - Assert.AreEqual((CalculationConvergence) expected.CalculationConvergence, actual.CalculationConvergence); - } } } \ No newline at end of file