Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs =================================================================== diff -u -r8dd82160956f1d2f4a727f4d903e31db3f265678 -r9fe037a986d45f1936bed2088bc70832f803b129 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs (.../CalculationGroupCreateExtensionsTest.cs) (revision 8dd82160956f1d2f4a727f4d903e31db3f265678) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/CalculationGroupCreateExtensionsTest.cs (.../CalculationGroupCreateExtensionsTest.cs) (revision 9fe037a986d45f1936bed2088bc70832f803b129) @@ -187,13 +187,13 @@ CalculationGroupEntity entity = group.Create(registry, 0); // Assert - PipingCalculationEntity[] childCalculationEntities = entity.PipingCalculationEntities.ToArray(); + SemiProbabilisticPipingCalculationEntity[] childCalculationEntities = entity.SemiProbabilisticPipingCalculationEntities.ToArray(); Assert.AreEqual(2, childCalculationEntities.Length); - PipingCalculationEntity childEntity1 = childCalculationEntities[0]; + SemiProbabilisticPipingCalculationEntity childEntity1 = childCalculationEntities[0]; Assert.AreEqual("A", childEntity1.Name); Assert.AreEqual(0, childEntity1.Order); - PipingCalculationEntity childEntity2 = childCalculationEntities[1]; + SemiProbabilisticPipingCalculationEntity childEntity2 = childCalculationEntities[1]; Assert.AreEqual("B", childEntity2.Name); Assert.AreEqual(1, childEntity2.Order); } @@ -232,7 +232,7 @@ // Assert CalculationGroupEntity[] childGroupEntities = entity.CalculationGroupEntity1.ToArray(); - PipingCalculationEntity[] childCalculationEntities = entity.PipingCalculationEntities.ToArray(); + SemiProbabilisticPipingCalculationEntity[] childCalculationEntities = entity.SemiProbabilisticPipingCalculationEntities.ToArray(); Assert.AreEqual(2, childGroupEntities.Length); Assert.AreEqual(2, childCalculationEntities.Length); @@ -241,7 +241,7 @@ Assert.AreEqual(0, childEntity1.Order); CollectionAssert.IsEmpty(childEntity1.CalculationGroupEntity1); - PipingCalculationEntity childEntity2 = childCalculationEntities[0]; + SemiProbabilisticPipingCalculationEntity childEntity2 = childCalculationEntities[0]; Assert.AreEqual("B", childEntity2.Name); Assert.AreEqual(1, childEntity2.Order); @@ -250,7 +250,7 @@ Assert.AreEqual(2, childEntity3.Order); CollectionAssert.IsEmpty(childEntity3.CalculationGroupEntity1); - PipingCalculationEntity childEntity4 = childCalculationEntities[1]; + SemiProbabilisticPipingCalculationEntity childEntity4 = childCalculationEntities[1]; Assert.AreEqual("D", childEntity4.Name); Assert.AreEqual(3, childEntity4.Order); } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs =================================================================== diff -u -r8dd82160956f1d2f4a727f4d903e31db3f265678 -r9fe037a986d45f1936bed2088bc70832f803b129 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision 8dd82160956f1d2f4a727f4d903e31db3f265678) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/PipingFailureMechanismCreateExtensionsTest.cs (.../PipingFailureMechanismCreateExtensionsTest.cs) (revision 9fe037a986d45f1936bed2088bc70832f803b129) @@ -47,11 +47,11 @@ var failureMechanism = new PipingFailureMechanism(); // Call - TestDelegate test = () => failureMechanism.Create(null); + void Call() => failureMechanism.Create(null); // Assert - string parameterName = Assert.Throws(test).ParamName; - Assert.AreEqual("registry", parameterName); + var exception = Assert.Throws(Call); + Assert.AreEqual("registry", exception.ParamName); } [Test] @@ -263,11 +263,12 @@ Assert.AreEqual(calculationGroup.Name, childGroupEntity.Name); Assert.AreEqual(0, childGroupEntity.Order); - PipingCalculationEntity[] calculationEntities = entity.CalculationGroupEntity.PipingCalculationEntities - .OrderBy(ce => ce.Order) - .ToArray(); + SemiProbabilisticPipingCalculationEntity[] calculationEntities = entity.CalculationGroupEntity + .SemiProbabilisticPipingCalculationEntities + .OrderBy(ce => ce.Order) + .ToArray(); Assert.AreEqual(1, calculationEntities.Length); - PipingCalculationEntity calculationEntity = calculationEntities[0]; + SemiProbabilisticPipingCalculationEntity calculationEntity = calculationEntities[0]; Assert.AreEqual(calculation.Name, calculationEntity.Name); Assert.AreEqual(1, calculationEntity.Order); } Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs =================================================================== diff -u -r8dd82160956f1d2f4a727f4d903e31db3f265678 -r9fe037a986d45f1936bed2088bc70832f803b129 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs (.../SemiProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs) (revision 8dd82160956f1d2f4a727f4d903e31db3f265678) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs (.../SemiProbabilisticPipingCalculationScenarioCreateExtensionsTest.cs) (revision 9fe037a986d45f1936bed2088bc70832f803b129) @@ -97,7 +97,7 @@ var registry = new PersistenceRegistry(); // Call - PipingCalculationEntity entity = calculation.Create(registry, order); + SemiProbabilisticPipingCalculationEntity entity = calculation.Create(registry, order); // Assert Assert.AreEqual(Convert.ToByte(isRelevant), entity.RelevantForScenario); @@ -118,7 +118,7 @@ Assert.AreEqual(input.AssessmentLevel.ToNaNAsNull(), entity.AssessmentLevel); Assert.AreEqual(order, entity.Order); - Assert.AreEqual(0, entity.PipingCalculationEntityId); + Assert.AreEqual(0, entity.SemiProbabilisticPipingCalculationEntityId); Assert.IsNull(entity.CalculationGroupEntity); Assert.IsNull(entity.SurfaceLineEntity); @@ -144,7 +144,7 @@ var registry = new PersistenceRegistry(); // Call - PipingCalculationEntity entity = calculation.Create(registry, 0); + SemiProbabilisticPipingCalculationEntity entity = calculation.Create(registry, 0); // Assert TestHelper.AssertAreEqualButNotSame(name, entity.Name); @@ -177,7 +177,7 @@ }; // Call - PipingCalculationEntity entity = calculation.Create(registry, 0); + SemiProbabilisticPipingCalculationEntity entity = calculation.Create(registry, 0); // Assert Assert.AreSame(surfaceLineEntity, entity.SurfaceLineEntity); @@ -201,7 +201,7 @@ }; // Call - PipingCalculationEntity entity = calculation.Create(registry, 0); + SemiProbabilisticPipingCalculationEntity entity = calculation.Create(registry, 0); // Assert Assert.AreSame(hydraulicLocationEntity, entity.HydraulicLocationEntity); @@ -232,7 +232,7 @@ }; // Call - PipingCalculationEntity entity = calculation.Create(registry, 0); + SemiProbabilisticPipingCalculationEntity entity = calculation.Create(registry, 0); // Assert PipingStochasticSoilProfileEntity expectedStochasticSoilProfileEntity = soilModelEntity.PipingStochasticSoilProfileEntities.First(); @@ -253,10 +253,10 @@ }; // Call - PipingCalculationEntity entity = calculation.Create(registry, 0); + SemiProbabilisticPipingCalculationEntity entity = calculation.Create(registry, 0); // Assert - PipingCalculationOutputEntity outputEntity = entity.PipingCalculationOutputEntities.FirstOrDefault(); + SemiProbabilisticPipingCalculationOutputEntity outputEntity = entity.SemiProbabilisticPipingCalculationOutputEntities.FirstOrDefault(); Assert.IsNotNull(outputEntity); Assert.AreEqual(newOutput.HeaveFactorOfSafety, outputEntity.HeaveFactorOfSafety); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/SemiProbabilistic/SemiProbabilisticPipingOutputCreateExtensionsTest.cs =================================================================== diff -u -r1eb9ed53b927cff7ee19afe65f9d6cd2431e08ce -r9fe037a986d45f1936bed2088bc70832f803b129 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/SemiProbabilistic/SemiProbabilisticPipingOutputCreateExtensionsTest.cs (.../SemiProbabilisticPipingOutputCreateExtensionsTest.cs) (revision 1eb9ed53b927cff7ee19afe65f9d6cd2431e08ce) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Create/Piping/SemiProbabilistic/SemiProbabilisticPipingOutputCreateExtensionsTest.cs (.../SemiProbabilisticPipingOutputCreateExtensionsTest.cs) (revision 9fe037a986d45f1936bed2088bc70832f803b129) @@ -59,7 +59,7 @@ }); // Call - PipingCalculationOutputEntity entity = pipingOutput.Create(); + SemiProbabilisticPipingCalculationOutputEntity entity = pipingOutput.Create(); // Assert Assert.AreEqual(pipingOutput.HeaveFactorOfSafety, entity.HeaveFactorOfSafety); @@ -79,7 +79,7 @@ var pipingOutput = new SemiProbabilisticPipingOutput(new SemiProbabilisticPipingOutput.ConstructionProperties()); // Call - PipingCalculationOutputEntity entity = pipingOutput.Create(); + SemiProbabilisticPipingCalculationOutputEntity entity = pipingOutput.Create(); // Assert Assert.IsNull(entity.HeaveFactorOfSafety); Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs =================================================================== diff -u -re62028d62e04e0f4bcf3b19dfb69b64e9329419b -r9fe037a986d45f1936bed2088bc70832f803b129 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs (.../CalculationGroupEntityReadExtensionsTest.cs) (revision e62028d62e04e0f4bcf3b19dfb69b64e9329419b) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/CalculationGroupEntityReadExtensionsTest.cs (.../CalculationGroupEntityReadExtensionsTest.cs) (revision 9fe037a986d45f1936bed2088bc70832f803b129) @@ -50,11 +50,11 @@ var entity = new CalculationGroupEntity(); // Call - TestDelegate call = () => entity.ReadAsPipingCalculationGroup(null); + void Call() => entity.ReadAsPipingCalculationGroup(null); // Assert - string paramName = Assert.Throws(call).ParamName; - Assert.AreEqual("collector", paramName); + var exception = Assert.Throws(Call); + Assert.AreEqual("collector", exception.ParamName); } [Test] @@ -136,21 +136,21 @@ } [Test] - public void ReadAsPipingCalculationGroup_EntityWithChildPipingCalculations_CreateCalculationGroupWithChildCalculations() + public void ReadAsPipingCalculationGroup_EntityWithChildSemiProbabilisticPipingCalculations_CreateCalculationGroupWithChildCalculations() { // Setup var rootGroupEntity = new CalculationGroupEntity { Name = "A", - PipingCalculationEntities = + SemiProbabilisticPipingCalculationEntities = { - new PipingCalculationEntity + new SemiProbabilisticPipingCalculationEntity { Order = 1, Name = "2", DampingFactorExitMean = 2 }, - new PipingCalculationEntity + new SemiProbabilisticPipingCalculationEntity { Order = 0, Name = "1", @@ -176,21 +176,21 @@ } [Test] - public void ReadAsPipingCalculationGroup_EntityWithChildPipingCalculationsAndGroups_CreateCalculationGroupWithChildCalculationsAndGroups() + public void ReadAsPipingCalculationGroup_EntityWithChildSemiProbabilisticPipingCalculationsAndGroups_CreateCalculationGroupWithChildCalculationsAndGroups() { // Setup var rootGroupEntity = new CalculationGroupEntity { Name = "A", - PipingCalculationEntities = + SemiProbabilisticPipingCalculationEntities = { - new PipingCalculationEntity + new SemiProbabilisticPipingCalculationEntity { Order = 0, Name = "calculation1", DampingFactorExitMean = 1 }, - new PipingCalculationEntity + new SemiProbabilisticPipingCalculationEntity { Order = 2, Name = "calculation2", Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -re62028d62e04e0f4bcf3b19dfb69b64e9329419b -r9fe037a986d45f1936bed2088bc70832f803b129 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationEntityReadExtensionsTest.cs (.../SemiProbabilisticPipingCalculationEntityReadExtensionsTest.cs) (revision e62028d62e04e0f4bcf3b19dfb69b64e9329419b) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationEntityReadExtensionsTest.cs (.../SemiProbabilisticPipingCalculationEntityReadExtensionsTest.cs) (revision 9fe037a986d45f1936bed2088bc70832f803b129) @@ -45,7 +45,7 @@ public void Read_CollectorIsNull_ThrowArgumentNullException() { // Setup - var entity = new PipingCalculationEntity(); + var entity = new SemiProbabilisticPipingCalculationEntity(); // Call void Call() => entity.Read(null); @@ -58,14 +58,15 @@ [Test] [TestCase(true, false, 0.98, "haha", "hihi", 0.0, 3.4, 5.8, 123)] [TestCase(false, true, 0.0, null, null, double.NaN, double.NaN, double.NaN, 321)] - public void Read_ValidEntity_ReturnPipingCalculationScenario(bool isRelevant, bool useAssessmentLevelManualInput, double contribution, - string name, string comments, double entryPoint, double exitPoint, - double assessmentLevel, int seed) + public void Read_ValidEntity_ReturnSemiProbabilisticPipingCalculationScenario( + bool isRelevant, bool useAssessmentLevelManualInput, double contribution, + string name, string comments, double entryPoint, double exitPoint, + double assessmentLevel, int seed) { // Setup var random = new Random(seed); - var entity = new PipingCalculationEntity + var entity = new SemiProbabilisticPipingCalculationEntity { RelevantForScenario = Convert.ToByte(isRelevant), ScenarioContribution = contribution.ToNaNAsNull(), @@ -120,7 +121,7 @@ new Point3D(4, 5, 6) }); var surfaceLineEntity = new SurfaceLineEntity(); - var entity = new PipingCalculationEntity + var entity = new SemiProbabilisticPipingCalculationEntity { SurfaceLineEntity = surfaceLineEntity, EntryPointL = 1, @@ -156,7 +157,7 @@ PointsXml = new Point3DCollectionXmlSerializer().ToXml(points) }; - var entity = new PipingCalculationEntity + var entity = new SemiProbabilisticPipingCalculationEntity { SurfaceLineEntity = surfaceLineEntity, EntryPointL = 1, @@ -180,7 +181,7 @@ // Setup var hydraulicBoundaryLocation = new TestHydraulicBoundaryLocation(); var hydraulicLocationEntity = new HydraulicLocationEntity(); - var entity = new PipingCalculationEntity + var entity = new SemiProbabilisticPipingCalculationEntity { HydraulicLocationEntity = hydraulicLocationEntity, EntryPointL = 1, @@ -205,7 +206,7 @@ { // Setup HydraulicLocationEntity hydraulicLocationEntity = HydraulicLocationEntityTestFactory.CreateHydraulicLocationEntity(); - var entity = new PipingCalculationEntity + var entity = new SemiProbabilisticPipingCalculationEntity { HydraulicLocationEntity = hydraulicLocationEntity, EntryPointL = 1, @@ -236,7 +237,7 @@ StochasticSoilModelEntity = stochasticSoilModelEntity }; - var entity = new PipingCalculationEntity + var entity = new SemiProbabilisticPipingCalculationEntity { PipingStochasticSoilProfileEntity = stochasticSoilProfileEntity, EntryPointL = 1, @@ -288,7 +289,7 @@ }; stochasticSoilProfileEntity.StochasticSoilModelEntity = stochasticSoilModelEntity; - var entity = new PipingCalculationEntity + var entity = new SemiProbabilisticPipingCalculationEntity { PipingStochasticSoilProfileEntity = stochasticSoilProfileEntity, EntryPointL = 1, @@ -307,17 +308,17 @@ } [Test] - public void Read_EntityWithPipingCalculationOutputEntity_CalculationWithPipingOutput() + public void Read_EntityWithSemiProbabilisticPipingCalculationOutputEntity_CalculationWithSemiProbabilisticPipingOutput() { // Setup - var entity = new PipingCalculationEntity + var entity = new SemiProbabilisticPipingCalculationEntity { EntryPointL = 1, ExitPointL = 2, DampingFactorExitMean = 1, - PipingCalculationOutputEntities = + SemiProbabilisticPipingCalculationOutputEntities = { - new PipingCalculationOutputEntity() + new SemiProbabilisticPipingCalculationOutputEntity() } }; Index: Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r1eb9ed53b927cff7ee19afe65f9d6cd2431e08ce -r9fe037a986d45f1936bed2088bc70832f803b129 --- Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs (.../SemiProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs) (revision 1eb9ed53b927cff7ee19afe65f9d6cd2431e08ce) +++ Riskeer/Storage/test/Riskeer.Storage.Core.Test/Read/Piping/SemiProbabilistic/SemiProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs (.../SemiProbabilisticPipingCalculationOutputEntityReadExtensionsTest.cs) (revision 9fe037a986d45f1936bed2088bc70832f803b129) @@ -34,18 +34,18 @@ public void Read_EntityNull_ThrowsArgumentNullException() { // Call - void Call() => ((PipingCalculationOutputEntity) null).Read(); + void Call() => ((SemiProbabilisticPipingCalculationOutputEntity) null).Read(); // Assert var exception = Assert.Throws(Call); Assert.AreEqual("entity", exception.ParamName); } [Test] - public void Read_ValidEntity_ReturnPipingOutput() + public void Read_ValidEntity_ReturnSemiProbabilisticPipingOutput() { // Setup - var entity = new PipingCalculationOutputEntity + var entity = new SemiProbabilisticPipingCalculationOutputEntity { HeaveFactorOfSafety = 9.8, UpliftFactorOfSafety = 3.2, @@ -72,10 +72,10 @@ } [Test] - public void Read_ValidEntityWithNullParameterValues_ReturnPipingOutput() + public void Read_ValidEntityWithNullParameterValues_ReturnSemiProbabilisticPipingOutput() { // Setup - var entity = new PipingCalculationOutputEntity + var entity = new SemiProbabilisticPipingCalculationOutputEntity { HeaveFactorOfSafety = null, UpliftFactorOfSafety = null,