Index: Riskeer/Storage/src/Riskeer.Storage.Core/Create/DuneErosion/DuneLocationCreateExtensions.cs =================================================================== diff -u -r9bd3e6cb6ab12a81e7820d03d544e7b7e532b72b -r02d6deee1040fa84caf03159e42a64b50a2fd712 --- Riskeer/Storage/src/Riskeer.Storage.Core/Create/DuneErosion/DuneLocationCreateExtensions.cs (.../DuneLocationCreateExtensions.cs) (revision 9bd3e6cb6ab12a81e7820d03d544e7b7e532b72b) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Create/DuneErosion/DuneLocationCreateExtensions.cs (.../DuneLocationCreateExtensions.cs) (revision 02d6deee1040fa84caf03159e42a64b50a2fd712) @@ -58,7 +58,7 @@ var entity = new DuneLocationEntity { - LocationId = location.HydraulicBoundaryLocation.Id, + HydraulicLocationEntity = registry.Get(location.HydraulicBoundaryLocation), Name = location.Name.DeepClone(), LocationX = location.Location.X.ToNaNAsNull(), LocationY = location.Location.Y.ToNaNAsNull(), Index: Riskeer/Storage/src/Riskeer.Storage.Core/Read/DuneErosion/DuneLocationEntityReadExtensions.cs =================================================================== diff -u -rfde90cce622c32b4d9d2f14906832a41fd3a4028 -r02d6deee1040fa84caf03159e42a64b50a2fd712 --- Riskeer/Storage/src/Riskeer.Storage.Core/Read/DuneErosion/DuneLocationEntityReadExtensions.cs (.../DuneLocationEntityReadExtensions.cs) (revision fde90cce622c32b4d9d2f14906832a41fd3a4028) +++ Riskeer/Storage/src/Riskeer.Storage.Core/Read/DuneErosion/DuneLocationEntityReadExtensions.cs (.../DuneLocationEntityReadExtensions.cs) (revision 02d6deee1040fa84caf03159e42a64b50a2fd712) @@ -57,7 +57,7 @@ return collector.Get(entity); } - var duneLocation = new DuneLocation(new HydraulicBoundaryLocation(entity.LocationId, "temporary", 1, 1), + var duneLocation = new DuneLocation(entity.HydraulicLocationEntity.Read(collector), entity.Name, new Point2D(entity.LocationX.ToNullAsNaN(), entity.LocationY.ToNullAsNaN()), new DuneLocation.ConstructionProperties Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs =================================================================== diff -u -rb01d54e7545de1ce27f2658757d500bfc36d526d -r02d6deee1040fa84caf03159e42a64b50a2fd712 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs (.../DuneLocationCreateExtensionsTest.cs) (revision b01d54e7545de1ce27f2658757d500bfc36d526d) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/DuneErosion/DuneLocationCreateExtensionsTest.cs (.../DuneLocationCreateExtensionsTest.cs) (revision 02d6deee1040fa84caf03159e42a64b50a2fd712) @@ -39,10 +39,10 @@ public void Create_DuneLocationNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((DuneLocation) null).Create(new PersistenceRegistry(), 0); + void Call() => ((DuneLocation) null).Create(new PersistenceRegistry(), 0); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("location", exception.ParamName); } @@ -53,11 +53,11 @@ var location = new TestDuneLocation(); // Call - TestDelegate test = () => location.Create(null, 0); + void Call() => location.Create(null, 0); // Assert - string parameterName = Assert.Throws(test).ParamName; - Assert.AreEqual("registry", parameterName); + var exception = Assert.Throws(Call); + Assert.AreEqual("registry", exception.ParamName); } [Test] @@ -68,11 +68,15 @@ var random = new Random(21); double coordinateX = random.NextDouble(); double coordinateY = random.NextDouble(); - int id = random.Next(0, 150); int order = random.Next(); + + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(1, "A", 1, 1); + var hydraulicLocationEntity = new HydraulicLocationEntity(); var registry = new PersistenceRegistry(); + registry.Register(hydraulicLocationEntity, hydraulicBoundaryLocation); - var location = new DuneLocation(new HydraulicBoundaryLocation(id, "", 0, 0), + + var location = new DuneLocation(hydraulicBoundaryLocation, testName, new Point2D(coordinateX, coordinateY), new DuneLocation.ConstructionProperties @@ -88,7 +92,7 @@ // Assert Assert.IsNotNull(entity); - Assert.AreEqual(id, entity.LocationId); + Assert.AreSame(hydraulicLocationEntity, entity.HydraulicLocationEntity); Assert.AreEqual(testName, entity.Name); Assert.AreEqual(coordinateX, entity.LocationX); Assert.AreEqual(coordinateY, entity.LocationY); @@ -106,7 +110,6 @@ var random = new Random(28); int id = random.Next(0, 150); int order = random.Next(); - var registry = new PersistenceRegistry(); var location = new DuneLocation(new HydraulicBoundaryLocation(id, "", 0, 0), string.Empty, @@ -118,12 +121,15 @@ D50 = double.NaN }); + var hydraulicLocationEntity = new HydraulicLocationEntity(); + var registry = new PersistenceRegistry(); + registry.Register(hydraulicLocationEntity, location.HydraulicBoundaryLocation); + // Call DuneLocationEntity entity = location.Create(registry, order); // Assert Assert.IsNotNull(entity); - Assert.AreEqual(id, entity.LocationId); Assert.IsEmpty(entity.Name); Assert.IsNull(entity.LocationX); Assert.IsNull(entity.LocationY); @@ -142,7 +148,9 @@ testName, new Point2D(0, 0), new DuneLocation.ConstructionProperties()); + var hydraulicLocationEntity = new HydraulicLocationEntity(); var registry = new PersistenceRegistry(); + registry.Register(hydraulicLocationEntity, location.HydraulicBoundaryLocation); // Call DuneLocationEntity entity = location.Create(registry, 0); @@ -160,7 +168,9 @@ // Setup var location = new TestDuneLocation(); + var hydraulicLocationEntity = new HydraulicLocationEntity(); var registry = new PersistenceRegistry(); + registry.Register(hydraulicLocationEntity, location.HydraulicBoundaryLocation); // Call DuneLocationEntity entity1 = location.Create(registry, 0); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/DuneErosion/DuneLocationCalculationCollectionEntityReadExtensionsTest.cs =================================================================== diff -u -r86594ccd7329d320872573a1d066fe18959d3cea -r02d6deee1040fa84caf03159e42a64b50a2fd712 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/DuneErosion/DuneLocationCalculationCollectionEntityReadExtensionsTest.cs (.../DuneLocationCalculationCollectionEntityReadExtensionsTest.cs) (revision 86594ccd7329d320872573a1d066fe18959d3cea) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/DuneErosion/DuneLocationCalculationCollectionEntityReadExtensionsTest.cs (.../DuneLocationCalculationCollectionEntityReadExtensionsTest.cs) (revision 02d6deee1040fa84caf03159e42a64b50a2fd712) @@ -37,12 +37,10 @@ public void Read_EntityNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => - ((DuneLocationCalculationCollectionEntity) null).Read(Enumerable.Empty(), - new ReadConversionCollector()); + void Call() => ((DuneLocationCalculationCollectionEntity) null).Read(Enumerable.Empty(), new ReadConversionCollector()); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("entity", exception.ParamName); } @@ -53,10 +51,10 @@ var entity = new DuneLocationCalculationCollectionEntity(); // Call - TestDelegate call = () => entity.Read(null, new ReadConversionCollector()); + void Call() => entity.Read(null, new ReadConversionCollector()); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("calculations", exception.ParamName); } @@ -67,11 +65,10 @@ var entity = new DuneLocationCalculationCollectionEntity(); // Call - TestDelegate call = () => entity.Read(Enumerable.Empty(), - null); + void Call() => entity.Read(Enumerable.Empty(), null); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("collector", exception.ParamName); } @@ -129,7 +126,10 @@ { return new DuneLocationEntity { - LocationId = 1, + HydraulicLocationEntity = new HydraulicLocationEntity + { + Name = "Hydraulic Location" + }, Name = "Dune Location", LocationX = 1, LocationY = 2 Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/DuneErosion/DuneLocationEntityReadExtensionsTest.cs =================================================================== diff -u -r7d4f4e713f4d474beb1abd156110c167d53f5882 -r02d6deee1040fa84caf03159e42a64b50a2fd712 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/DuneErosion/DuneLocationEntityReadExtensionsTest.cs (.../DuneLocationEntityReadExtensionsTest.cs) (revision 7d4f4e713f4d474beb1abd156110c167d53f5882) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/DuneErosion/DuneLocationEntityReadExtensionsTest.cs (.../DuneLocationEntityReadExtensionsTest.cs) (revision 02d6deee1040fa84caf03159e42a64b50a2fd712) @@ -21,6 +21,7 @@ using System; using NUnit.Framework; +using Riskeer.Common.Data.Hydraulics; using Riskeer.Common.Data.TestUtil; using Riskeer.DuneErosion.Data; using Riskeer.Storage.Core.DbContext; @@ -36,11 +37,11 @@ public void Read_EntityIsNull_ThrowArgumentNullException() { // Call - TestDelegate call = () => ((DuneLocationEntity) null).Read(new ReadConversionCollector()); + void Call() => ((DuneLocationEntity) null).Read(new ReadConversionCollector()); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("entity", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("entity", exception.ParamName); } [Test] @@ -50,11 +51,11 @@ var entity = new DuneLocationEntity(); // Call - TestDelegate call = () => entity.Read(null); + void Call() => entity.Read(null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("collector", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("collector", exception.ParamName); } [Test] @@ -63,16 +64,19 @@ // Setup const string testName = "testName"; var random = new Random(21); - long locationId = random.Next(0, 400); double x = random.NextDouble(); double y = random.NextDouble(); int coastalAreaId = random.Next(); double offset = random.NextDouble(); double orientation = random.NextDouble(); double d50 = random.NextDouble(); + + var hydraulicBoundaryLocation = new HydraulicBoundaryLocation(0, "A", 0, 0); + var hydraulicLocationEntity = new HydraulicLocationEntity(); + var entity = new DuneLocationEntity { - LocationId = locationId, + HydraulicLocationEntity = hydraulicLocationEntity, Name = testName, LocationX = x, LocationY = y, @@ -83,13 +87,14 @@ }; var collector = new ReadConversionCollector(); + collector.Read(hydraulicLocationEntity, hydraulicBoundaryLocation); // Call DuneLocation location = entity.Read(collector); // Assert Assert.IsNotNull(location); - Assert.AreEqual(locationId, location.HydraulicBoundaryLocation.Id); + Assert.AreSame(hydraulicBoundaryLocation, location.HydraulicBoundaryLocation); Assert.AreEqual(testName, location.Name); Assert.AreEqual(x, location.Location.X, 1e-6); Assert.AreEqual(y, location.Location.Y, 1e-6); @@ -107,11 +112,13 @@ // Setup const string testName = "testName"; var random = new Random(22); - long locationId = random.Next(0, 400); int coastalAreaId = random.Next(); var entity = new DuneLocationEntity { - LocationId = locationId, + HydraulicLocationEntity = new HydraulicLocationEntity + { + Name = "location" + }, Name = testName, LocationX = null, LocationY = null, @@ -128,7 +135,6 @@ // Assert Assert.IsNotNull(location); - Assert.AreEqual(locationId, location.HydraulicBoundaryLocation.Id); Assert.AreEqual(testName, location.Name); Assert.IsNaN(location.Location.X); Assert.IsNaN(location.Location.Y); @@ -146,7 +152,11 @@ // Setup var entity = new DuneLocationEntity { - Name = "A" + Name = "A", + HydraulicLocationEntity = new HydraulicLocationEntity + { + Name = "location" + } }; var collector = new ReadConversionCollector();