Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs =================================================================== diff -u -r3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514 -rc995ceb78c561abd09a7b6ff18440653cab4b1e3 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs (.../CalculationGroupEntityReadExtensionsTest.cs) (revision 3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs (.../CalculationGroupEntityReadExtensionsTest.cs) (revision c995ceb78c561abd09a7b6ff18440653cab4b1e3) @@ -828,12 +828,14 @@ new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { Order = 0, - Name = "1" + Name = "1", + StepSize = 0.5 }, new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { Order = 1, - Name = "2" + Name = "2", + StepSize = 0.5 } } }; @@ -866,12 +868,14 @@ new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { Order = 0, - Name = "calculation1" + Name = "calculation1", + StepSize = 0.5 }, new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { Order = 2, - Name = "calculation2" + Name = "calculation2", + StepSize = 0.5 } }, CalculationGroupEntity1 = @@ -1608,12 +1612,14 @@ new StabilityStoneCoverWaveConditionsCalculationEntity { Order = 1, - Name = "2" + Name = "2", + StepSize = 0.5 }, new StabilityStoneCoverWaveConditionsCalculationEntity { Order = 0, - Name = "1" + Name = "1", + StepSize = 0.5 } } }; @@ -1646,12 +1652,14 @@ new StabilityStoneCoverWaveConditionsCalculationEntity { Order = 0, - Name = "calculation1" + Name = "calculation1", + StepSize = 0.5 }, new StabilityStoneCoverWaveConditionsCalculationEntity { Order = 2, - Name = "calculation2" + Name = "calculation2", + StepSize = 0.5 } }, CalculationGroupEntity1 = @@ -1799,12 +1807,14 @@ new WaveImpactAsphaltCoverWaveConditionsCalculationEntity { Order = 1, - Name = "2" + Name = "2", + StepSize = 0.5 }, new WaveImpactAsphaltCoverWaveConditionsCalculationEntity { Order = 0, - Name = "1" + Name = "1", + StepSize = 0.5 } } }; @@ -1837,12 +1847,14 @@ new WaveImpactAsphaltCoverWaveConditionsCalculationEntity { Order = 0, - Name = "calculation1" + Name = "calculation1", + StepSize = 0.5 }, new WaveImpactAsphaltCoverWaveConditionsCalculationEntity { Order = 2, - Name = "calculation2" + Name = "calculation2", + StepSize = 0.5 } }, CalculationGroupEntity1 = Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514 -rc995ceb78c561abd09a7b6ff18440653cab4b1e3 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision 3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/GrassCoverErosionOutwards/GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision c995ceb78c561abd09a7b6ff18440653cab4b1e3) @@ -44,10 +44,10 @@ public void Read_EntityNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((GrassCoverErosionOutwardsWaveConditionsCalculationEntity) null).Read(new ReadConversionCollector()); + void Call() => ((GrassCoverErosionOutwardsWaveConditionsCalculationEntity) null).Read(new ReadConversionCollector()); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("entity", exception.ParamName); } @@ -58,10 +58,10 @@ var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity(); // Call - TestDelegate call = () => entity.Read(null); + void Call() => entity.Read(null); // Assert - string paramName = Assert.Throws(call).ParamName; + string paramName = Assert.Throws(Call).ParamName; Assert.AreEqual("collector", paramName); } @@ -82,7 +82,7 @@ const double upperBoundaryRevetment = 6.10; const double lowerBoundaryWaterLevels = 3.40; const double upperBoundaryWaterLevels = 5.88; - var stepSize = random.NextEnumValue(); + double stepSize = random.NextDouble(0.01, 2); var calculationType = random.NextEnumValue(); var waterLevelType = random.NextEnumValue(); @@ -99,7 +99,7 @@ LowerBoundaryRevetment = lowerBoundaryRevetment, UpperBoundaryWaterLevels = upperBoundaryWaterLevels, LowerBoundaryWaterLevels = lowerBoundaryWaterLevels, - StepSize = Convert.ToByte(stepSize), + StepSize = stepSize, CalculationType = Convert.ToByte(calculationType), WaterLevelType = Convert.ToByte(waterLevelType) }; @@ -123,7 +123,7 @@ RoundedDoubleTestHelper.AssertRoundedDouble(lowerBoundaryRevetment, calculationInput.LowerBoundaryRevetment); RoundedDoubleTestHelper.AssertRoundedDouble(upperBoundaryWaterLevels, calculationInput.UpperBoundaryWaterLevels); RoundedDoubleTestHelper.AssertRoundedDouble(lowerBoundaryWaterLevels, calculationInput.LowerBoundaryWaterLevels); - Assert.AreEqual(stepSize, calculationInput.StepSize); + RoundedDoubleTestHelper.AssertRoundedDouble(stepSize, calculationInput.StepSize); Assert.AreEqual(calculationType, calculationInput.CalculationType); Assert.AreEqual(waterLevelType, calculationInput.WaterLevelType); @@ -137,7 +137,10 @@ public void Read_EntityWithNullValues_ReturnCalculationWithNaNValues() { // Setup - var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity(); + var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity + { + StepSize = 0.5 + }; var collector = new ReadConversionCollector(); // Call @@ -171,6 +174,7 @@ }; var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { + StepSize = 0.5, ForeshoreProfileEntity = foreshoreProfileEntity }; @@ -197,6 +201,7 @@ var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { + StepSize = 0.5, ForeshoreProfileEntity = foreshoreProfileEntity }; @@ -218,6 +223,7 @@ HydraulicLocationEntity hydraulicLocationEntity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity(); var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { + StepSize = 0.5, HydraulicLocationEntity = hydraulicLocationEntity }; @@ -238,6 +244,7 @@ HydraulicLocationEntity hydraulicLocationEntity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity(); var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { + StepSize = 0.5, HydraulicLocationEntity = hydraulicLocationEntity }; @@ -259,6 +266,7 @@ HydraulicLocationCalculationForTargetProbabilityCollectionEntityTestFactory.CreateHydraulicLocationCalculationForTargetProbabilityCollectionEntity(); var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { + StepSize = 0.5, HydraulicLocationCalculationForTargetProbabilityCollectionEntity = calculationForTargetProbabilityCollectionEntity }; @@ -280,6 +288,7 @@ HydraulicLocationCalculationForTargetProbabilityCollectionEntityTestFactory.CreateHydraulicLocationCalculationForTargetProbabilityCollectionEntity(); var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { + StepSize = 0.5, HydraulicLocationCalculationForTargetProbabilityCollectionEntity = calculationForTargetProbabilityCollectionEntity }; @@ -301,6 +310,7 @@ const double outputCLevel = 2.2; var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { + StepSize = 0.5, GrassCoverErosionOutwardsWaveConditionsOutputEntities = { new GrassCoverErosionOutwardsWaveConditionsOutputEntity @@ -353,6 +363,7 @@ const double outputCLevel = 2.2; var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { + StepSize = 0.5, GrassCoverErosionOutwardsWaveConditionsOutputEntities = { new GrassCoverErosionOutwardsWaveConditionsOutputEntity @@ -405,6 +416,7 @@ const double outputCLevel = 2.2; var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { + StepSize = 0.5, GrassCoverErosionOutwardsWaveConditionsOutputEntities = { new GrassCoverErosionOutwardsWaveConditionsOutputEntity @@ -482,6 +494,7 @@ const double outputBLevel = 1.1; var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { + StepSize = 0.5, GrassCoverErosionOutwardsWaveConditionsOutputEntities = { new GrassCoverErosionOutwardsWaveConditionsOutputEntity @@ -525,6 +538,7 @@ const double outputBLevel = 1.1; var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { + StepSize = 0.5, GrassCoverErosionOutwardsWaveConditionsOutputEntities = { new GrassCoverErosionOutwardsWaveConditionsOutputEntity @@ -568,6 +582,7 @@ const double outputBLevel = 1.1; var entity = new GrassCoverErosionOutwardsWaveConditionsCalculationEntity { + StepSize = 0.5, GrassCoverErosionOutwardsWaveConditionsOutputEntities = { new GrassCoverErosionOutwardsWaveConditionsOutputEntity Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514 -rc995ceb78c561abd09a7b6ff18440653cab4b1e3 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs (.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision 3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/StabilityStoneCover/StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs (.../StabilityStoneCoverWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision c995ceb78c561abd09a7b6ff18440653cab4b1e3) @@ -21,6 +21,7 @@ using System; using System.Linq; +using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; @@ -44,10 +45,10 @@ public void Read_EntityNull_ThrowsArgumentNullException() { // Call - TestDelegate call = () => ((StabilityStoneCoverWaveConditionsCalculationEntity) null).Read(new ReadConversionCollector()); + void Call() => ((StabilityStoneCoverWaveConditionsCalculationEntity) null).Read(new ReadConversionCollector()); // Assert - var exception = Assert.Throws(call); + var exception = Assert.Throws(Call); Assert.AreEqual("entity", exception.ParamName); } @@ -58,10 +59,10 @@ var entity = new StabilityStoneCoverWaveConditionsCalculationEntity(); // Call - TestDelegate call = () => entity.Read(null); + void Call() => entity.Read(null); // Assert - string paramName = Assert.Throws(call).ParamName; + string paramName = Assert.Throws(Call).ParamName; Assert.AreEqual("collector", paramName); } @@ -82,7 +83,7 @@ const double upperBoundaryRevetment = 6.10; const double lowerBoundaryWaterLevels = 3.40; const double upperBoundaryWaterLevels = 5.88; - var stepSize = random.NextEnumValue(); + RoundedDouble stepSize = random.NextRoundedDouble(0.01, 2); var calculationType = random.NextEnumValue(); var waterLevelType = random.NextEnumValue(); @@ -99,7 +100,7 @@ LowerBoundaryRevetment = lowerBoundaryRevetment, UpperBoundaryWaterLevels = upperBoundaryWaterLevels, LowerBoundaryWaterLevels = lowerBoundaryWaterLevels, - StepSize = Convert.ToByte(stepSize), + StepSize = stepSize, CalculationType = Convert.ToByte(calculationType), WaterLevelType = Convert.ToByte(waterLevelType) }; @@ -123,7 +124,7 @@ RoundedDoubleTestHelper.AssertRoundedDouble(lowerBoundaryRevetment, calculationInput.LowerBoundaryRevetment); RoundedDoubleTestHelper.AssertRoundedDouble(upperBoundaryWaterLevels, calculationInput.UpperBoundaryWaterLevels); RoundedDoubleTestHelper.AssertRoundedDouble(lowerBoundaryWaterLevels, calculationInput.LowerBoundaryWaterLevels); - Assert.AreEqual(stepSize, calculationInput.StepSize); + RoundedDoubleTestHelper.AssertRoundedDouble(stepSize, calculationInput.StepSize); Assert.AreEqual(calculationType, calculationInput.CalculationType); Assert.AreEqual(waterLevelType, calculationInput.WaterLevelType); @@ -137,7 +138,10 @@ public void Read_EntityWithNullValues_ReturnCalculationWithNaNValues() { // Setup - var entity = new StabilityStoneCoverWaveConditionsCalculationEntity(); + var entity = new StabilityStoneCoverWaveConditionsCalculationEntity + { + StepSize = 0.5 + }; var collector = new ReadConversionCollector(); // Call @@ -171,6 +175,7 @@ }; var entity = new StabilityStoneCoverWaveConditionsCalculationEntity { + StepSize = 0.5, ForeshoreProfileEntity = foreshoreProfileEntity }; @@ -197,6 +202,7 @@ var entity = new StabilityStoneCoverWaveConditionsCalculationEntity { + StepSize = 0.5, ForeshoreProfileEntity = foreshoreProfileEntity }; @@ -218,6 +224,7 @@ var hydraulicLocationEntity = new HydraulicLocationEntity(); var entity = new StabilityStoneCoverWaveConditionsCalculationEntity { + StepSize = 0.5, HydraulicLocationEntity = hydraulicLocationEntity }; @@ -238,6 +245,7 @@ HydraulicLocationEntity hydraulicLocationEntity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity(); var entity = new StabilityStoneCoverWaveConditionsCalculationEntity { + StepSize = 0.5, HydraulicLocationEntity = hydraulicLocationEntity }; @@ -259,6 +267,7 @@ HydraulicLocationCalculationForTargetProbabilityCollectionEntityTestFactory.CreateHydraulicLocationCalculationForTargetProbabilityCollectionEntity(); var entity = new StabilityStoneCoverWaveConditionsCalculationEntity { + StepSize = 0.5, HydraulicLocationCalculationForTargetProbabilityCollectionEntity = calculationForTargetProbabilityCollectionEntity }; @@ -280,6 +289,7 @@ HydraulicLocationCalculationForTargetProbabilityCollectionEntityTestFactory.CreateHydraulicLocationCalculationForTargetProbabilityCollectionEntity(); var entity = new StabilityStoneCoverWaveConditionsCalculationEntity { + StepSize = 0.5, HydraulicLocationCalculationForTargetProbabilityCollectionEntity = calculationForTargetProbabilityCollectionEntity }; @@ -301,6 +311,7 @@ const double outputCLevel = 13.2; var entity = new StabilityStoneCoverWaveConditionsCalculationEntity { + StepSize = 0.5, StabilityStoneCoverWaveConditionsOutputEntities = { new StabilityStoneCoverWaveConditionsOutputEntity @@ -352,6 +363,7 @@ const double outputBLevel = 2.3; var entity = new StabilityStoneCoverWaveConditionsCalculationEntity { + StepSize = 0.5, StabilityStoneCoverWaveConditionsOutputEntities = { new StabilityStoneCoverWaveConditionsOutputEntity @@ -395,6 +407,7 @@ const double outputBLevel = 2.3; var entity = new StabilityStoneCoverWaveConditionsCalculationEntity { + StepSize = 0.5, StabilityStoneCoverWaveConditionsOutputEntities = { new StabilityStoneCoverWaveConditionsOutputEntity Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514 -rc995ceb78c561abd09a7b6ff18440653cab4b1e3 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision 3a3d79a9d7d62bd6f77ffc7f839acbb79d6f7514) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/WaveImpactAsphaltCover/WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs (.../WaveImpactAsphaltCoverWaveConditionsCalculationEntityReadExtensionsTest.cs) (revision c995ceb78c561abd09a7b6ff18440653cab4b1e3) @@ -21,6 +21,7 @@ using System; using System.Linq; +using Core.Common.Base.Data; using Core.Common.Base.Geometry; using Core.Common.TestUtil; using NUnit.Framework; @@ -82,7 +83,7 @@ const double upperBoundaryRevetment = 6.10; const double lowerBoundaryWaterLevels = 3.40; const double upperBoundaryWaterLevels = 5.88; - var stepSize = random.NextEnumValue(); + RoundedDouble stepSize = random.NextRoundedDouble(0.01, 2.0); var waterLevelType = random.NextEnumValue(); var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity @@ -98,7 +99,7 @@ LowerBoundaryRevetment = lowerBoundaryRevetment, UpperBoundaryWaterLevels = upperBoundaryWaterLevels, LowerBoundaryWaterLevels = lowerBoundaryWaterLevels, - StepSize = Convert.ToByte(stepSize), + StepSize = stepSize, WaterLevelType = Convert.ToByte(waterLevelType) }; @@ -121,7 +122,7 @@ RoundedDoubleTestHelper.AssertRoundedDouble(lowerBoundaryRevetment, calculationInput.LowerBoundaryRevetment); RoundedDoubleTestHelper.AssertRoundedDouble(upperBoundaryWaterLevels, calculationInput.UpperBoundaryWaterLevels); RoundedDoubleTestHelper.AssertRoundedDouble(lowerBoundaryWaterLevels, calculationInput.LowerBoundaryWaterLevels); - Assert.AreEqual(stepSize, calculationInput.StepSize); + RoundedDoubleTestHelper.AssertRoundedDouble(stepSize, calculationInput.StepSize); Assert.AreEqual(waterLevelType, calculationInput.WaterLevelType); Assert.IsNull(calculationInput.HydraulicBoundaryLocation); @@ -134,7 +135,10 @@ public void Read_EntityWithNullValues_ReturnCalculationWithNaNValues() { // Setup - var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity(); + var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity + { + StepSize = 0.5 + }; var collector = new ReadConversionCollector(); // Call @@ -168,6 +172,7 @@ }; var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity { + StepSize = 0.5, ForeshoreProfileEntity = foreshoreProfileEntity }; @@ -194,6 +199,7 @@ var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity { + StepSize = 0.5, ForeshoreProfileEntity = foreshoreProfileEntity }; @@ -215,6 +221,7 @@ var hydraulicLocationEntity = new HydraulicLocationEntity(); var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity { + StepSize = 0.5, HydraulicLocationEntity = hydraulicLocationEntity }; @@ -235,6 +242,7 @@ HydraulicLocationEntity hydraulicLocationEntity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity(); var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity { + StepSize = 0.5, HydraulicLocationEntity = hydraulicLocationEntity }; @@ -256,6 +264,7 @@ HydraulicLocationCalculationForTargetProbabilityCollectionEntityTestFactory.CreateHydraulicLocationCalculationForTargetProbabilityCollectionEntity(); var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity { + StepSize = 0.5, HydraulicLocationCalculationForTargetProbabilityCollectionEntity = calculationForTargetProbabilityCollectionEntity }; @@ -277,6 +286,7 @@ HydraulicLocationCalculationForTargetProbabilityCollectionEntityTestFactory.CreateHydraulicLocationCalculationForTargetProbabilityCollectionEntity(); var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity { + StepSize = 0.5, HydraulicLocationCalculationForTargetProbabilityCollectionEntity = calculationForTargetProbabilityCollectionEntity }; @@ -297,6 +307,7 @@ const double outputBLevel = 2.3; var entity = new WaveImpactAsphaltCoverWaveConditionsCalculationEntity { + StepSize = 0.5, WaveImpactAsphaltCoverWaveConditionsOutputEntities = { new WaveImpactAsphaltCoverWaveConditionsOutputEntity