Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/Ringtoets.DuneErosion.Data.TestUtil.Test.csproj =================================================================== diff -u -r1e3de334f82be7cffe88d7e80dc336fcdec81086 -rac90331e9c1ff9217f04027127082f75a10e8c0a --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/Ringtoets.DuneErosion.Data.TestUtil.Test.csproj (.../Ringtoets.DuneErosion.Data.TestUtil.Test.csproj) (revision 1e3de334f82be7cffe88d7e80dc336fcdec81086) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/Ringtoets.DuneErosion.Data.TestUtil.Test.csproj (.../Ringtoets.DuneErosion.Data.TestUtil.Test.csproj) (revision ac90331e9c1ff9217f04027127082f75a10e8c0a) @@ -68,6 +68,10 @@ {D4200F43-3F72-4F42-AF0A-8CED416A38EC} Ringtoets.Common.Data + + {4843d6e5-066f-4795-94f5-1d53932dd03c} + Ringtoets.Common.Data.TestUtil + {d1068432-c172-4aa6-847b-d9deb4c6de26} Ringtoets.DuneErosion.Data Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationOutputTest.cs =================================================================== diff -u -r1e3de334f82be7cffe88d7e80dc336fcdec81086 -rac90331e9c1ff9217f04027127082f75a10e8c0a --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationOutputTest.cs (.../TestDuneLocationOutputTest.cs) (revision 1e3de334f82be7cffe88d7e80dc336fcdec81086) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationOutputTest.cs (.../TestDuneLocationOutputTest.cs) (revision ac90331e9c1ff9217f04027127082f75a10e8c0a) @@ -19,8 +19,10 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.DuneErosion.Data.TestUtil.Test { @@ -44,5 +46,29 @@ Assert.AreEqual(0, output.CalculatedProbability); Assert.AreEqual(CalculationConvergence.CalculatedConverged, output.CalculationConvergence); } + + [Test] + public void CreateTestDuneLocationOutputForExport_WithParameters_ReturnsWithCorrectValues() + { + // Setup + var random = new Random(21); + var waterLevel = random.NextDouble(); + var wavePeriod = random.NextDouble(); + var waveHeight = random.NextDouble(); + + // Call + TestDuneLocationOutput output = TestDuneLocationOutput.CreateTestDuneLocationOutputForExport(waterLevel, wavePeriod, waveHeight); + + // Assert + Assert.AreEqual(waterLevel, output.WaterLevel, output.WaterLevel.GetAccuracy()); + Assert.AreEqual(wavePeriod, output.WavePeriod, output.WavePeriod.GetAccuracy()); + Assert.AreEqual(waveHeight, output.WaveHeight, output.WaveHeight.GetAccuracy()); + + Assert.AreEqual(0, output.TargetReliability.Value); + Assert.AreEqual(0, output.TargetProbability); + Assert.AreEqual(0, output.CalculatedReliability.Value); + Assert.AreEqual(0, output.CalculatedProbability); + Assert.AreEqual(CalculationConvergence.CalculatedConverged, output.CalculationConvergence); + } } } \ No newline at end of file Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationTest.cs =================================================================== diff -u -rb887e0d83a9ce38d959cc7d3ebbb4407a6bec416 -rac90331e9c1ff9217f04027127082f75a10e8c0a --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationTest.cs (.../TestDuneLocationTest.cs) (revision b887e0d83a9ce38d959cc7d3ebbb4407a6bec416) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil.Test/TestDuneLocationTest.cs (.../TestDuneLocationTest.cs) (revision ac90331e9c1ff9217f04027127082f75a10e8c0a) @@ -19,7 +19,9 @@ // Stichting Deltares and remain full property of Stichting Deltares at all times. // All rights reserved. +using System; using NUnit.Framework; +using Ringtoets.Common.Data.TestUtil; namespace Ringtoets.DuneErosion.Data.TestUtil.Test { @@ -40,6 +42,33 @@ Assert.AreEqual(0, testLocation.Orientation.Value); Assert.AreEqual(0, testLocation.CoastalAreaId); Assert.AreEqual(0, testLocation.D50.Value); + + Assert.IsNull(testLocation.Output); } + + [Test] + public void CreateTestDuneLocationForExport_WithParameters_ReturnsWithExpectedValues() + { + // Setup + var random = new Random(21); + int coastalAreaId = random.Next(); + double offset = random.NextDouble(); + double d50 = random.NextDouble(); + + // Call + TestDuneLocation location = TestDuneLocation.CreateDuneLocationForExport(coastalAreaId, offset, d50); + + // Assert + Assert.AreEqual(coastalAreaId, location.CoastalAreaId); + Assert.AreEqual(offset, location.Offset, location.Offset.GetAccuracy()); + Assert.AreEqual(d50, location.D50, location.D50.GetAccuracy()); + + Assert.AreEqual(string.Empty, location.Name); + Assert.AreEqual(0, location.Location.X); + Assert.AreEqual(0, location.Location.Y); + Assert.AreEqual(0, location.Orientation.Value); + + Assert.IsNull(location.Output); + } } } \ No newline at end of file Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocation.cs =================================================================== diff -u -rc60e4a04488fbe3a60d9c2c67c8a687093100775 -rac90331e9c1ff9217f04027127082f75a10e8c0a --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocation.cs (.../TestDuneLocation.cs) (revision c60e4a04488fbe3a60d9c2c67c8a687093100775) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocation.cs (.../TestDuneLocation.cs) (revision ac90331e9c1ff9217f04027127082f75a10e8c0a) @@ -32,13 +32,29 @@ /// /// Creates a new instance of . /// - public TestDuneLocation() + public TestDuneLocation(): this(0, 0, 0) {} + + private TestDuneLocation(int coastalAreaId, double offset, double d50) : base(0, string.Empty, new Point2D(0.0, 0.0), new ConstructionProperties - { - Offset = 0, - Orientation = 0, - CoastalAreaId = 0, - D50 = 0 - }) {} + { + CoastalAreaId = coastalAreaId, + Offset = offset, + D50 = d50, + Orientation = 0 + }) {} + + /// + /// Creates a with desired values + /// that are relevant when exporting a . + /// + /// The coastal area id. + /// The offset. + /// The D50. + /// A with values + /// that are relevant when exporting. + public static TestDuneLocation CreateDuneLocationForExport(int coastalAreaId, double offset, double d50) + { + return new TestDuneLocation(coastalAreaId, offset, d50); + } } } \ No newline at end of file Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationOutput.cs =================================================================== diff -u -recf982879e1178c758dcaa7c5a0ed9346b755a4c -rac90331e9c1ff9217f04027127082f75a10e8c0a --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationOutput.cs (.../TestDuneLocationOutput.cs) (revision ecf982879e1178c758dcaa7c5a0ed9346b755a4c) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.Data.TestUtil/TestDuneLocationOutput.cs (.../TestDuneLocationOutput.cs) (revision ac90331e9c1ff9217f04027127082f75a10e8c0a) @@ -32,16 +32,32 @@ /// /// Creates a new instance of . /// - public TestDuneLocationOutput() + public TestDuneLocationOutput() : this(0, 0, 0) {} + + private TestDuneLocationOutput(double waterLevel, double wavePeriod, double waveHeight) : base(CalculationConvergence.CalculatedConverged, new ConstructionProperties - { - WaterLevel = 0, - WavePeriod = 0, - WaveHeight = 0, - TargetProbability = 0, - CalculatedReliability = 0, - TargetReliability = 0, - CalculatedProbability = 0 - }) {} + { + WaterLevel = waterLevel, + WavePeriod = wavePeriod, + WaveHeight = waveHeight, + TargetProbability = 0, + TargetReliability = 0, + CalculatedProbability = 0, + CalculatedReliability = 0 + }) {} + + /// + /// Creates a with desired values + /// that are relevant when exporting a . + /// + /// The water level. + /// The wave period. + /// The wave height. + /// A + /// with values that are relevant for the export. + public static TestDuneLocationOutput CreateTestDuneLocationOutputForExport(double waterLevel, double wavePeriod, double waveHeight) + { + return new TestDuneLocationOutput(waterLevel, wavePeriod, waveHeight); + } } } \ No newline at end of file Index: Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs =================================================================== diff -u -recf982879e1178c758dcaa7c5a0ed9346b755a4c -rac90331e9c1ff9217f04027127082f75a10e8c0a --- Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs (.../DuneLocationsExporterTest.cs) (revision ecf982879e1178c758dcaa7c5a0ed9346b755a4c) +++ Ringtoets/DuneErosion/test/Ringtoets.DuneErosion.IO.Test/DuneLocationsExporterTest.cs (.../DuneLocationsExporterTest.cs) (revision ac90331e9c1ff9217f04027127082f75a10e8c0a) @@ -29,6 +29,7 @@ using NUnit.Framework; using Ringtoets.Common.Data.Hydraulics; using Ringtoets.DuneErosion.Data; +using Ringtoets.DuneErosion.Data.TestUtil; namespace Ringtoets.DuneErosion.IO.Test { @@ -156,43 +157,13 @@ // Setup DuneLocation[] duneLocations = { - new DuneLocation(1, string.Empty, new Point2D(0, 0), new DuneLocation.ConstructionProperties - { - CoastalAreaId = 9, - Offset = 9740, - Orientation = 0, - D50 = 1.9583e-4 - }) + new TestDuneLocation { - Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties - { - WaterLevel = 5.89, - WaveHeight = 8.54, - WavePeriod = 14.11, - TargetProbability = 0, - TargetReliability = 0, - CalculatedProbability = 0, - CalculatedReliability = 0 - }) + Output = null }, - new DuneLocation(2, string.Empty, new Point2D(0, 0), new DuneLocation.ConstructionProperties - { - CoastalAreaId = 9, - Offset = 9770, - Orientation = 0, - D50 = 1.9583e-4 - }) + new TestDuneLocation { - Output = new DuneLocationOutput(CalculationConvergence.CalculatedConverged, new DuneLocationOutput.ConstructionProperties - { - WaterLevel = 5.89, - WaveHeight = 8.53, - WavePeriod = 14.09, - TargetProbability = 0, - TargetReliability = 0, - CalculatedProbability = 0, - CalculatedReliability = 0 - }) + Output = new TestDuneLocationOutput() } };