Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -61,10 +61,8 @@ const string testName = "testName"; const string comments = "Some text"; const int norm = int.MaxValue; - var entityId = new Random(21).Next(1, 502); var entity = new AssessmentSectionEntity { - AssessmentSectionEntityId = entityId, Id = testId, Name = testName, Composition = (short) assessmentSectionComposition, @@ -161,19 +159,14 @@ // Setup var entity = CreateAssessmentSectionEntity(); var random = new Random(21); - var entityId = random.Next(1, 502); var parameterA = random.NextDouble()/10; var parameterUpliftCriticalSafetyFactor = random.NextDouble() + 0.1; const string comments = "Some text"; var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, FailureMechanismType = (int) FailureMechanismType.Piping, - CalculationGroupEntity = new CalculationGroupEntity - { - CalculationGroupEntityId = 1 - }, + CalculationGroupEntity = new CalculationGroupEntity(), IsRelevant = Convert.ToByte(isRelevant), Comments = comments, PipingFailureMechanismMetaEntities = @@ -205,17 +198,12 @@ { // Setup var entity = CreateAssessmentSectionEntity(); - var entityId = new Random(21).Next(1, 502); string emptySegmentPointsXml = new Point2DXmlSerializer().ToXml(new Point2D[0]); var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, FailureMechanismType = (int) FailureMechanismType.Piping, - CalculationGroupEntity = new CalculationGroupEntity - { - CalculationGroupEntityId = 1 - }, + CalculationGroupEntity = new CalculationGroupEntity(), IsRelevant = Convert.ToByte(isRelevant), StochasticSoilModelEntities = { @@ -248,17 +236,12 @@ { // Setup var entity = CreateAssessmentSectionEntity(); - var entityId = new Random(21).Next(1, 502); string emptyPointsXml = new Point3DXmlSerializer().ToXml(new Point3D[0]); var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, FailureMechanismType = (int) FailureMechanismType.Piping, - CalculationGroupEntity = new CalculationGroupEntity - { - CalculationGroupEntityId = 1 - }, + CalculationGroupEntity = new CalculationGroupEntity(), IsRelevant = Convert.ToByte(isRelevant), SurfaceLineEntities = { @@ -291,29 +274,20 @@ { // Setup var entity = CreateAssessmentSectionEntity(); - var entityId = new Random(21).Next(1, 502); - const int rootGroupEntityId = 1; - const int childGroupEntity1Id = 2; - const int childGroupEntity2Id = 3; - var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, FailureMechanismType = (int) FailureMechanismType.Piping, CalculationGroupEntity = new CalculationGroupEntity { - CalculationGroupEntityId = rootGroupEntityId, CalculationGroupEntity1 = { new CalculationGroupEntity { - CalculationGroupEntityId = childGroupEntity1Id, Order = 0 }, new CalculationGroupEntity { - CalculationGroupEntityId = childGroupEntity2Id, Order = 1 } } @@ -338,30 +312,21 @@ // Setup var random = new Random(21); var entity = CreateAssessmentSectionEntity(); - var entityId = random.Next(1, 502); var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, FailureMechanismType = (int) FailureMechanismType.Piping, - CalculationGroupEntity = new CalculationGroupEntity - { - CalculationGroupEntityId = 1 - }, + CalculationGroupEntity = new CalculationGroupEntity(), FailureMechanismSectionEntities = CreateFailureMechanismSectionEntities() }; var sectionA = failureMechanismEntity.FailureMechanismSectionEntities.ElementAt(0); var sectionB = failureMechanismEntity.FailureMechanismSectionEntities.ElementAt(1); - long pipingSectionIdA = random.Next(1, 502); - long pipingSectionIdB = random.Next(1, 502); sectionA.PipingSectionResultEntities.Add(new PipingSectionResultEntity { - PipingSectionResultEntityId = pipingSectionIdA, FailureMechanismSectionEntity = sectionA }); sectionB.PipingSectionResultEntities.Add(new PipingSectionResultEntity { - PipingSectionResultEntityId = pipingSectionIdB, FailureMechanismSectionEntity = sectionB }); @@ -383,24 +348,18 @@ { // Setup var entity = CreateAssessmentSectionEntity(); - var entityId = new Random(21).Next(1, 502); const string comments = "Some text"; var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, FailureMechanismType = (int) FailureMechanismType.GrassRevetmentTopErosionAndInwards, - CalculationGroupEntity = new CalculationGroupEntity - { - CalculationGroupEntityId = 1 - }, + CalculationGroupEntity = new CalculationGroupEntity(), IsRelevant = Convert.ToByte(isRelevant), Comments = comments, GrassCoverErosionInwardsFailureMechanismMetaEntities = { new GrassCoverErosionInwardsFailureMechanismMetaEntity { - GrassCoverErosionInwardsFailureMechanismMetaEntityId = 2, N = 1 } } @@ -422,19 +381,16 @@ { // Setup var entity = CreateAssessmentSectionEntity(); - var entityId = new Random(21).Next(1, 502); var rootGroupEntity = new CalculationGroupEntity(); var failureMechanismEntity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, FailureMechanismType = (int) FailureMechanismType.GrassRevetmentTopErosionAndInwards, FailureMechanismSectionEntities = CreateFailureMechanismSectionEntities(), GrassCoverErosionInwardsFailureMechanismMetaEntities = { new GrassCoverErosionInwardsFailureMechanismMetaEntity { - GrassCoverErosionInwardsFailureMechanismMetaEntityId = 2, N = 1 } }, @@ -458,59 +414,59 @@ { // Setup var entity = CreateAssessmentSectionEntity(); - var macrostabilityInwardsEntityId = 2; - var macrostabilityOutwardsEntityId = 3; - var microstabilityEntityId = 4; - var structureHeightEntityId = 5; - var closingEntityId = 16; - var failingOfConstructionPointEntityId = 22; - var failingOfConstructionLengthwiseEntityId = 23; - var stoneRevetmentEntityId = 36; - var waveImpactEntityId = 77; - var waterPressureEntityId = 78; - var grassCoverErosionOutwardsEntityId = 133; - var grassCoverSlipoffOutwardsEntityId = 134; - var grassCoverSlipoffInwardsEntityId = 135; - var duneErosionEntityId = 256; - var technicalInnovationsEntityId = 257; + var macrostabilityInwardsEntityComment = "2"; + var macrostabilityOutwardsEntityComment = "3"; + var microstabilityEntityComment = "4"; + var structureHeightEntityComment = "5"; + var closingEntityComment = "16"; + var failingOfConstructionPointEntityComment = "22"; + var failingOfConstructionLengthwiseEntityComment = "23"; + var stoneRevetmentEntityComment = "36"; + var waveImpactEntityComment = "77"; + var waterPressureEntityComment = "78"; + var grassCoverErosionOutwardsEntityComment = "133"; + var grassCoverSlipoffOutwardsEntityComment = "134"; + var grassCoverSlipoffInwardsEntityComment = "135"; + var duneErosionEntityComment = "256"; + var technicalInnovationsEntityComment = "257"; - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, macrostabilityInwardsEntityId, FailureMechanismType.MacrostabilityInwards)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, macrostabilityOutwardsEntityId, FailureMechanismType.MacrostabilityOutwards)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, microstabilityEntityId, FailureMechanismType.Microstability)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, structureHeightEntityId, FailureMechanismType.StructureHeight)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, closingEntityId, FailureMechanismType.ReliabilityClosingOfStructure)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, failingOfConstructionPointEntityId, FailureMechanismType.StrengthAndStabilityPointConstruction)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, failingOfConstructionLengthwiseEntityId, FailureMechanismType.StrengthAndStabilityParallelConstruction)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, stoneRevetmentEntityId, FailureMechanismType.StabilityStoneRevetment)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, waveImpactEntityId, FailureMechanismType.WaveImpactOnAsphaltRevetment)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, waterPressureEntityId, FailureMechanismType.WaterOverpressureAsphaltRevetment)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, grassCoverErosionOutwardsEntityId, FailureMechanismType.GrassRevetmentErosionOutwards)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, grassCoverSlipoffOutwardsEntityId, FailureMechanismType.GrassRevetmentSlidingOutwards)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, grassCoverSlipoffInwardsEntityId, FailureMechanismType.GrassRevetmentSlidingInwards)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, duneErosionEntityId, FailureMechanismType.DuneErosion)); - entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, technicalInnovationsEntityId, FailureMechanismType.TechnicalInnovations)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, macrostabilityInwardsEntityComment, FailureMechanismType.MacrostabilityInwards)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, macrostabilityOutwardsEntityComment, FailureMechanismType.MacrostabilityOutwards)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, microstabilityEntityComment, FailureMechanismType.Microstability)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, structureHeightEntityComment, FailureMechanismType.StructureHeight)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, closingEntityComment, FailureMechanismType.ReliabilityClosingOfStructure)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, failingOfConstructionPointEntityComment, FailureMechanismType.StrengthAndStabilityPointConstruction)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, failingOfConstructionLengthwiseEntityComment, FailureMechanismType.StrengthAndStabilityParallelConstruction)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, stoneRevetmentEntityComment, FailureMechanismType.StabilityStoneRevetment)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, waveImpactEntityComment, FailureMechanismType.WaveImpactOnAsphaltRevetment)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, waterPressureEntityComment, FailureMechanismType.WaterOverpressureAsphaltRevetment)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, grassCoverErosionOutwardsEntityComment, FailureMechanismType.GrassRevetmentErosionOutwards)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, grassCoverSlipoffOutwardsEntityComment, FailureMechanismType.GrassRevetmentSlidingOutwards)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, grassCoverSlipoffInwardsEntityComment, FailureMechanismType.GrassRevetmentSlidingInwards)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, duneErosionEntityComment, FailureMechanismType.DuneErosion)); + entity.FailureMechanismEntities.Add(CreateFailureMechanismEntity(isRelevant, technicalInnovationsEntityComment, FailureMechanismType.TechnicalInnovations)); var collector = new ReadConversionCollector(); // Call var section = entity.Read(collector); // Assert - AssertFailureMechanismEqual(isRelevant, macrostabilityInwardsEntityId, 2, section.MacrostabilityInwards); - AssertFailureMechanismEqual(isRelevant, macrostabilityOutwardsEntityId, 2, section.MacrostabilityOutwards); - AssertFailureMechanismEqual(isRelevant, microstabilityEntityId, 2, section.Microstability); - AssertFailureMechanismEqual(isRelevant, structureHeightEntityId, 2, section.HeightStructures); - AssertFailureMechanismEqual(isRelevant, closingEntityId, 2, section.ClosingStructure); - AssertFailureMechanismEqual(isRelevant, failingOfConstructionPointEntityId, 2, section.StrengthStabilityPointConstruction); - AssertFailureMechanismEqual(isRelevant, failingOfConstructionLengthwiseEntityId, 2, section.StrengthStabilityLengthwiseConstruction); - AssertFailureMechanismEqual(isRelevant, stoneRevetmentEntityId, 2, section.StabilityStoneCover); - AssertFailureMechanismEqual(isRelevant, waveImpactEntityId, 2, section.WaveImpactAsphaltCover); - AssertFailureMechanismEqual(isRelevant, waterPressureEntityId, 2, section.WaterPressureAsphaltCover); - AssertFailureMechanismEqual(isRelevant, grassCoverErosionOutwardsEntityId, 2, section.GrassCoverErosionOutwards); - AssertFailureMechanismEqual(isRelevant, grassCoverSlipoffOutwardsEntityId, 2, section.GrassCoverSlipOffOutwards); - AssertFailureMechanismEqual(isRelevant, grassCoverSlipoffInwardsEntityId, 2, section.GrassCoverSlipOffInwards); - AssertFailureMechanismEqual(isRelevant, duneErosionEntityId, 2, section.DuneErosion); - AssertFailureMechanismEqual(isRelevant, technicalInnovationsEntityId, 2, section.TechnicalInnovation); + AssertFailureMechanismEqual(isRelevant, macrostabilityInwardsEntityComment, 2, section.MacrostabilityInwards); + AssertFailureMechanismEqual(isRelevant, macrostabilityOutwardsEntityComment, 2, section.MacrostabilityOutwards); + AssertFailureMechanismEqual(isRelevant, microstabilityEntityComment, 2, section.Microstability); + AssertFailureMechanismEqual(isRelevant, structureHeightEntityComment, 2, section.HeightStructures); + AssertFailureMechanismEqual(isRelevant, closingEntityComment, 2, section.ClosingStructure); + AssertFailureMechanismEqual(isRelevant, failingOfConstructionPointEntityComment, 2, section.StrengthStabilityPointConstruction); + AssertFailureMechanismEqual(isRelevant, failingOfConstructionLengthwiseEntityComment, 2, section.StrengthStabilityLengthwiseConstruction); + AssertFailureMechanismEqual(isRelevant, stoneRevetmentEntityComment, 2, section.StabilityStoneCover); + AssertFailureMechanismEqual(isRelevant, waveImpactEntityComment, 2, section.WaveImpactAsphaltCover); + AssertFailureMechanismEqual(isRelevant, waterPressureEntityComment, 2, section.WaterPressureAsphaltCover); + AssertFailureMechanismEqual(isRelevant, grassCoverErosionOutwardsEntityComment, 2, section.GrassCoverErosionOutwards); + AssertFailureMechanismEqual(isRelevant, grassCoverSlipoffOutwardsEntityComment, 2, section.GrassCoverSlipOffOutwards); + AssertFailureMechanismEqual(isRelevant, grassCoverSlipoffInwardsEntityComment, 2, section.GrassCoverSlipOffInwards); + AssertFailureMechanismEqual(isRelevant, duneErosionEntityComment, 2, section.DuneErosion); + AssertFailureMechanismEqual(isRelevant, technicalInnovationsEntityComment, 2, section.TechnicalInnovation); } private static AssessmentSectionEntity CreateAssessmentSectionEntity() @@ -521,23 +477,21 @@ }; } - private static FailureMechanismEntity CreateFailureMechanismEntity(bool isRelevant, int entityId, FailureMechanismType failureMechanismType) + private static FailureMechanismEntity CreateFailureMechanismEntity(bool isRelevant, string comment, FailureMechanismType failureMechanismType) { return new FailureMechanismEntity { - FailureMechanismEntityId = entityId, FailureMechanismType = (short) failureMechanismType, IsRelevant = Convert.ToByte(isRelevant), - Comments = entityId.ToString(), + Comments = comment, FailureMechanismSectionEntities = CreateFailureMechanismSectionEntities() }; } - private static void AssertFailureMechanismEqual(bool expectedIsRelevant, int expectedEntityId, + private static void AssertFailureMechanismEqual(bool expectedIsRelevant, string expectedComments, int expectedSectionCount, IFailureMechanism failureMechanism) { Assert.AreEqual(expectedIsRelevant, failureMechanism.IsRelevant); - var expectedComments = expectedEntityId.ToString(); Assert.AreEqual(expectedComments, failureMechanism.Comments); Assert.AreEqual(expectedSectionCount, failureMechanism.Sections.Count()); } @@ -553,13 +507,11 @@ { new FailureMechanismSectionEntity { - FailureMechanismSectionEntityId = 1, Name = "", FailureMechanismSectionPointXml = dummyPointXml }, new FailureMechanismSectionEntity { - FailureMechanismSectionEntityId = 2, Name = "", FailureMechanismSectionPointXml = dummyPointXml } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs (.../CalculationGroupEntityReadExtentionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/CalculationGroupEntityReadExtentionsTest.cs (.../CalculationGroupEntityReadExtentionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -64,15 +64,14 @@ } [Test] - [TestCase(123, "A", 1)] - [TestCase(1, "b", 0)] + [TestCase("A", 1)] + [TestCase("b", 0)] public void ReadPipingCalculationGroup_EntityWithoutChildren_CreateCalculationGroupWithoutChildren( - long id, string name, byte isEditable) + string name, byte isEditable) { // Setup var entity = new CalculationGroupEntity { - CalculationGroupEntityId = id, Name = name, IsEditable = isEditable }; @@ -95,34 +94,29 @@ // Setup var rootGroupEntity = new CalculationGroupEntity { - CalculationGroupEntityId = 1, Name = "A", CalculationGroupEntity1 = { new CalculationGroupEntity { - CalculationGroupEntityId = 2, Name = "AA", IsEditable = 1, Order = 0 }, new CalculationGroupEntity { - CalculationGroupEntityId = 3, Name = "AB", IsEditable = 0, CalculationGroupEntity1 = { new CalculationGroupEntity { - CalculationGroupEntityId = 4, Name = "ABA", IsEditable = 0, Order = 0 }, new CalculationGroupEntity { - CalculationGroupEntityId = 5, Name = "ABB", IsEditable = 1, Order = 1 @@ -169,20 +163,17 @@ // Setup var rootGroupEntity = new CalculationGroupEntity { - CalculationGroupEntityId = 1, Name = "A", PipingCalculationEntities = { new PipingCalculationEntity { - PipingCalculationEntityId = 3, Order = 0, Name = "1", DampingFactorExitMean = 1, }, new PipingCalculationEntity { - PipingCalculationEntityId = 6, Order = 1, Name = "2", DampingFactorExitMean = 2, @@ -213,20 +204,17 @@ // Setup var rootGroupEntity = new CalculationGroupEntity { - CalculationGroupEntityId = 1, Name = "A", PipingCalculationEntities = { new PipingCalculationEntity { - PipingCalculationEntityId = 3, Order = 0, Name = "calculation1", DampingFactorExitMean = 1, }, new PipingCalculationEntity { - PipingCalculationEntityId = 6, Order = 2, Name = "calculation2", DampingFactorExitMean = 2, @@ -236,13 +224,11 @@ { new CalculationGroupEntity { - CalculationGroupEntityId = 2, Order = 1, Name = "group1" }, new CalculationGroupEntity { - CalculationGroupEntityId = 4, Order = 3, Name = "group2" } @@ -287,15 +273,14 @@ } [Test] - [TestCase(345, "HAbba", 1)] - [TestCase(45, "Dooeis", 0)] + [TestCase("HAbba", 1)] + [TestCase("Dooeis", 0)] public void ReadAsGrassCoverErosionInwardsCalculationGroup_EntityWithoutChildren_CreateCalculationGroupWithoutChildren( - long id, string name, byte isEditable) + string name, byte isEditable) { // Setup var entity = new CalculationGroupEntity { - CalculationGroupEntityId = id, Name = name, IsEditable = isEditable }; @@ -317,34 +302,29 @@ // Setup var rootGroupEntity = new CalculationGroupEntity { - CalculationGroupEntityId = 1, Name = "A", CalculationGroupEntity1 = { new CalculationGroupEntity { - CalculationGroupEntityId = 2, Name = "AA", IsEditable = 1, Order = 0 }, new CalculationGroupEntity { - CalculationGroupEntityId = 3, Name = "AB", IsEditable = 0, CalculationGroupEntity1 = { new CalculationGroupEntity { - CalculationGroupEntityId = 4, Name = "ABA", IsEditable = 0, Order = 0 }, new CalculationGroupEntity { - CalculationGroupEntityId = 5, Name = "ABB", IsEditable = 1, Order = 1 @@ -390,19 +370,16 @@ // Setup var rootGroupEntity = new CalculationGroupEntity { - CalculationGroupEntityId = 1, Name = "A", GrassCoverErosionInwardsCalculationEntities = { new GrassCoverErosionInwardsCalculationEntity { - GrassCoverErosionInwardsCalculationEntityId = 3, Order = 0, Name = "1" }, new GrassCoverErosionInwardsCalculationEntity { - GrassCoverErosionInwardsCalculationEntityId = 6, Order = 1, Name = "2" } @@ -431,19 +408,16 @@ // Setup var rootGroupEntity = new CalculationGroupEntity { - CalculationGroupEntityId = 1, Name = "A", GrassCoverErosionInwardsCalculationEntities = { new GrassCoverErosionInwardsCalculationEntity { - GrassCoverErosionInwardsCalculationEntityId = 3, Order = 0, Name = "calculation1" }, new GrassCoverErosionInwardsCalculationEntity { - GrassCoverErosionInwardsCalculationEntityId = 6, Order = 2, Name = "calculation2" } @@ -452,13 +426,11 @@ { new CalculationGroupEntity { - CalculationGroupEntityId = 2, Order = 1, Name = "group1" }, new CalculationGroupEntity { - CalculationGroupEntityId = 4, Order = 3, Name = "group2" } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructureSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructureSectionResultEntityReadExtensionsTest.cs (.../ClosingStructureSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ClosingStructureSectionResultEntityReadExtensionsTest.cs (.../ClosingStructureSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -52,7 +52,6 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); double layerTwoA = random.NextDouble(); var collector = new ReadConversionCollector(); @@ -61,7 +60,6 @@ collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new ClosingStructureSectionResultEntity { - ClosingStructureSectionResultEntityId = entityId, LayerThree = layerThree, LayerTwoA = layerTwoA, LayerOne = Convert.ToByte(layerOne), Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosionSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosionSectionResultEntityReadExtensionsTest.cs (.../DuneErosionSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/DuneErosionSectionResultEntityReadExtensionsTest.cs (.../DuneErosionSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -54,15 +54,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new DuneErosionSectionResultEntity { - DuneErosionSectionResultEntityId = entityId, LayerThree = layerThree, LayerTwoA = Convert.ToByte(layerTwoA), FailureMechanismSectionEntity = failureMechanismSectionEntity Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismEntityReadExtensionsTest.cs (.../FailureMechanismEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -43,10 +43,8 @@ public void ReadAsStandAloneFailureMechanism_WithoutSectionsSet_ReturnsNewStandAloneFailureMechanism(bool isRelevant) { // Setup - var entityId = new Random(21).Next(1, 502); var entity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, IsRelevant = Convert.ToByte(isRelevant), Comments = "Some comment" }; @@ -67,10 +65,8 @@ public void ReadAsStandAloneFailureMechanism_WithSectionsSet_ReturnsNewStandAloneFailureMechanismWithFailureMechanismSections() { // Setup - var entityId = new Random(21).Next(1, 502); var entity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, FailureMechanismSectionEntities = { CreateSimpleFailureMechanismSectionEntity() @@ -137,21 +133,15 @@ public void ReadAsPipingFailureMechanism_WithCollector_ReturnsNewPipingFailureMechanismWithPropertiesSet(bool isRelevant) { // Setup - var entityId = new Random(21).Next(1, 502); var entity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, IsRelevant = Convert.ToByte(isRelevant), Comments = "Some comment", - CalculationGroupEntity = new CalculationGroupEntity - { - CalculationGroupEntityId = 2 - }, + CalculationGroupEntity = new CalculationGroupEntity(), PipingFailureMechanismMetaEntities = new[] { new PipingFailureMechanismMetaEntity { - PipingFailureMechanismMetaEntityId = 3, A = 0.95, UpliftCriticalSafetyFactor = 1.2 } @@ -183,10 +173,7 @@ string emptySegmentPointsXml = new Point2DXmlSerializer().ToXml(new Point2D[0]); var entity = new FailureMechanismEntity { - CalculationGroupEntity = new CalculationGroupEntity - { - CalculationGroupEntityId = 3 - }, + CalculationGroupEntity = new CalculationGroupEntity(), StochasticSoilModelEntities = { new StochasticSoilModelEntity @@ -225,10 +212,7 @@ string emptyPointsXml = new Point3DXmlSerializer().ToXml(new Point3D[0]); var entity = new FailureMechanismEntity { - CalculationGroupEntity = new CalculationGroupEntity - { - CalculationGroupEntityId = 6 - }, + CalculationGroupEntity = new CalculationGroupEntity(), SurfaceLineEntities = { new SurfaceLineEntity @@ -264,21 +248,15 @@ public void ReadAsPipingFailureMechanism_WithSectionsSet_ReturnsNewPipingFailureMechanismWithFailureMechanismSectionsSet() { // Setup - var entityId = new Random(21).Next(1, 502); FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity(); var pipingSectionResultEntity = new PipingSectionResultEntity { - PipingSectionResultEntityId = entityId, FailureMechanismSectionEntity = failureMechanismSectionEntity }; failureMechanismSectionEntity.PipingSectionResultEntities.Add(pipingSectionResultEntity); var entity = new FailureMechanismEntity { - FailureMechanismEntityId = 1, - CalculationGroupEntity = new CalculationGroupEntity - { - CalculationGroupEntityId = 1 - }, + CalculationGroupEntity = new CalculationGroupEntity(), FailureMechanismSectionEntities = { failureMechanismSectionEntity @@ -298,32 +276,23 @@ public void ReadAsPipingFailureMechanism_WithCalculationGroup_ReturnsNewPipingFailureMechanismWithCalculationGroupSet() { // Setup - var entityId = new Random(1328).Next(1, 502); - const int rootGroupId = 5; - const int childGroup1Id = 7; - const int childGroup2Id = 9; - var entity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, CalculationGroupEntity = new CalculationGroupEntity { - CalculationGroupEntityId = rootGroupId, IsEditable = 0, Name = "Berekeningen", Order = 0, CalculationGroupEntity1 = { new CalculationGroupEntity { - CalculationGroupEntityId = childGroup1Id, IsEditable = 1, Name = "Child1", Order = 0 }, new CalculationGroupEntity { - CalculationGroupEntityId = childGroup2Id, IsEditable = 1, Name = "Child2", Order = 1 @@ -357,26 +326,18 @@ public void ReadAsGrassCoverErosionInwardsFailureMechanism_WithCollector_ReturnsNewGrassCoverErosionInwardsFailureMechanismWithPropertiesSet(bool isRelevant) { // Setup - var random = new Random(21); - var entityId = random.Next(1, 502); - var inputId = random.Next(1, 57893); var entity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, IsRelevant = Convert.ToByte(isRelevant), Comments = "Some comment", GrassCoverErosionInwardsFailureMechanismMetaEntities = { new GrassCoverErosionInwardsFailureMechanismMetaEntity { - GrassCoverErosionInwardsFailureMechanismMetaEntityId = inputId, N = 3 } }, - CalculationGroupEntity = new CalculationGroupEntity - { - CalculationGroupEntityId = 456 - } + CalculationGroupEntity = new CalculationGroupEntity() }; var collector = new ReadConversionCollector(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); @@ -397,40 +358,31 @@ public void ReadAsGrassCoverErosionInwardsFailureMechanism_WithDikeProfilesSet_ReturnsGrassCoverErosionInwardsFailureMechanismWithDikeProfilesAdded() { // Setup - const int id1 = 4578; - const int id2 = 384729847; string emptyDikeGeometryXml = new RoughnessPointXmlSerializer().ToXml(new RoughnessPoint[0]); string emptyForeshoreBinaryXml = new Point2DXmlSerializer().ToXml(new Point2D[0]); var entity = new FailureMechanismEntity { - FailureMechanismEntityId = 1, GrassCoverErosionInwardsFailureMechanismMetaEntities = { new GrassCoverErosionInwardsFailureMechanismMetaEntity { - GrassCoverErosionInwardsFailureMechanismMetaEntityId = 2, N = 3 } }, DikeProfileEntities = { new DikeProfileEntity { - DikeProfileEntityId = id1, DikeGeometryXml = emptyDikeGeometryXml, ForeShoreXml = emptyForeshoreBinaryXml }, new DikeProfileEntity { - DikeProfileEntityId = id2, DikeGeometryXml = emptyDikeGeometryXml, ForeShoreXml = emptyForeshoreBinaryXml } }, - CalculationGroupEntity = new CalculationGroupEntity - { - CalculationGroupEntityId = 567 - } + CalculationGroupEntity = new CalculationGroupEntity() }; GrassCoverErosionInwardsFailureMechanism failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); ReadConversionCollector collector = new ReadConversionCollector(); @@ -446,17 +398,14 @@ public void ReadAsGrassCoverErosionInwardsFailureMechanism_WithSectionsSet_ReturnsNewGrassCoverErosionInwardsFailureMechanismWithFailureMechanismSectionsAdded() { // Setup - var entityId = new Random(21).Next(1, 502); FailureMechanismSectionEntity failureMechanismSectionEntity = CreateSimpleFailureMechanismSectionEntity(); var grassCoverErosionInwardsSectionResultEntity = new GrassCoverErosionInwardsSectionResultEntity { - GrassCoverErosionInwardsSectionResultEntityId = entityId, FailureMechanismSectionEntity = failureMechanismSectionEntity }; failureMechanismSectionEntity.GrassCoverErosionInwardsSectionResultEntities.Add(grassCoverErosionInwardsSectionResultEntity); var entity = new FailureMechanismEntity { - FailureMechanismEntityId = 1, FailureMechanismSectionEntities = { failureMechanismSectionEntity @@ -465,14 +414,10 @@ { new GrassCoverErosionInwardsFailureMechanismMetaEntity { - GrassCoverErosionInwardsFailureMechanismMetaEntityId = 2, N = 1 } }, - CalculationGroupEntity = new CalculationGroupEntity - { - CalculationGroupEntityId = 9867 - } + CalculationGroupEntity = new CalculationGroupEntity() }; var collector = new ReadConversionCollector(); var failureMechanism = new GrassCoverErosionInwardsFailureMechanism(); @@ -488,32 +433,23 @@ public void ReadAsGrassCoverErosionInwardsFailureMechanism_WithCalculationGroup_ReturnsNewGrassCoverErosionInwardsFailureMechanismWithCalculationGroupSet() { // Setup - var entityId = new Random(984356).Next(1, 502); - const int rootGroupId = 1; - const int childGroup1Id = 2; - const int childGroup2Id = 3; - var entity = new FailureMechanismEntity { - FailureMechanismEntityId = entityId, CalculationGroupEntity = new CalculationGroupEntity { - CalculationGroupEntityId = rootGroupId, IsEditable = 0, Name = "Berekeningen", Order = 0, CalculationGroupEntity1 = { new CalculationGroupEntity { - CalculationGroupEntityId = childGroup1Id, IsEditable = 1, Name = "Child1", Order = 0 }, new CalculationGroupEntity { - CalculationGroupEntityId = childGroup2Id, IsEditable = 1, Name = "Child2", Order = 1 @@ -524,7 +460,6 @@ { new GrassCoverErosionInwardsFailureMechanismMetaEntity { - GrassCoverErosionInwardsFailureMechanismMetaEntityId = 3456, N = 1 } } Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismSectionEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismSectionEntityReadExtensionsTest.cs (.../FailureMechanismSectionEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/FailureMechanismSectionEntityReadExtensionsTest.cs (.../FailureMechanismSectionEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -46,8 +46,6 @@ public void Read_Always_NewPoint() { // Setup - var random = new Random(21); - var entityId = random.Next(1, 502); string name = "testName"; var points = new[] { @@ -56,7 +54,6 @@ string pointXml = new Point2DXmlSerializer().ToXml(points); var entity = new FailureMechanismSectionEntity { - FailureMechanismSectionEntityId = entityId, Name = name, FailureMechanismSectionPointXml = pointXml }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensionsTest.cs (.../DikeProfileEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/DikeProfileEntityReadExtensionsTest.cs (.../DikeProfileEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -64,7 +64,6 @@ }; var entity = new DikeProfileEntity { - DikeProfileEntityId = 9842, Name = "Just saved", Orientation = 45.67, BreakWaterHeight = null, @@ -111,7 +110,6 @@ }; var entity = new DikeProfileEntity { - DikeProfileEntityId = 8678, Name = "I have a Breakwater!", Orientation = 360.0, BreakWaterHeight = height, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsCalculationEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -57,7 +57,6 @@ // Setup var entity = new GrassCoverErosionInwardsCalculationEntity { - GrassCoverErosionInwardsCalculationEntityId = 457, Name = "sodhfksn", Comments = "s;ohfgwjo5p09u", GrassCoverErosionInwardsOutputEntity = null, @@ -103,10 +102,7 @@ public void Read_EntityNotReadBefore_RegisterEntity() { // Setup - var entity = new GrassCoverErosionInwardsCalculationEntity - { - GrassCoverErosionInwardsCalculationEntityId = 457, - }; + var entity = new GrassCoverErosionInwardsCalculationEntity(); var collector = new ReadConversionCollector(); @@ -127,7 +123,6 @@ // Setup var entity = new GrassCoverErosionInwardsCalculationEntity { - GrassCoverErosionInwardsCalculationEntityId = 123456, Name = null, Comments = null, Orientation = null, @@ -164,10 +159,7 @@ // Setup var dikeProfile = new DikeProfile(new Point2D(0, 0), new RoughnessPoint[0], new Point2D[0], null, new DikeProfile.ConstructionProperties()); - var dikeProfileEntity = new DikeProfileEntity - { - DikeProfileEntityId = 7465 - }; + var dikeProfileEntity = new DikeProfileEntity(); var entity = new GrassCoverErosionInwardsCalculationEntity { DikeProfileEntity = dikeProfileEntity @@ -189,7 +181,6 @@ // Setup var dikeProfileEntity = new DikeProfileEntity { - DikeProfileEntityId = 7465, DikeGeometryXml = new RoughnessPointXmlSerializer().ToXml(new RoughnessPoint[0]), ForeShoreXml = new Point2DXmlSerializer().ToXml(new Point2D[0]) }; @@ -258,14 +249,9 @@ // Setup var entity = new GrassCoverErosionInwardsCalculationEntity { - GrassCoverErosionInwardsCalculationEntityId = 456, GrassCoverErosionInwardsOutputEntity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputEntityId = 9745, - ProbabilisticOutputEntity = new ProbabilisticOutputEntity - { - ProbabilisticOutputEntityId = 3245 - } + ProbabilisticOutputEntity = new ProbabilisticOutputEntity() } }; @@ -284,14 +270,9 @@ // Setup var entity = new GrassCoverErosionInwardsCalculationEntity { - GrassCoverErosionInwardsCalculationEntityId = 456, GrassCoverErosionInwardsOutputEntity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputEntityId = 9745, - ProbabilisticOutputEntity = new ProbabilisticOutputEntity - { - ProbabilisticOutputEntityId = 3245 - } + ProbabilisticOutputEntity = new ProbabilisticOutputEntity() } }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -50,11 +50,9 @@ // Setup var random = new Random(21); var n = random.Next(1, 20); - var id = random.Next(1, 56); var entity = new GrassCoverErosionInwardsFailureMechanismMetaEntity { - GrassCoverErosionInwardsFailureMechanismMetaEntityId = id, N = n }; var inputToUpdate = new GeneralGrassCoverErosionInwardsInput(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsOutputEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -36,7 +36,6 @@ // Setup var probabilisticOutputEntity = new ProbabilisticOutputEntity { - ProbabilisticOutputEntityId = 95876, Probability = 0.7, RequiredProbability = 0.4, RequiredReliability = 0.5, @@ -45,7 +44,6 @@ }; var entity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputEntityId = 495876, WaveHeight = 1.1, IsOvertoppingDominant = Convert.ToByte(false), ProbabilisticOutputEntity = probabilisticOutputEntity, @@ -75,7 +73,6 @@ // Setup var probabilisticOutputEntity = new ProbabilisticOutputEntity { - ProbabilisticOutputEntityId = 3456, Probability = null, RequiredProbability = null, RequiredReliability = null, @@ -84,7 +81,6 @@ }; var entity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputEntityId = 7536, WaveHeight = null, IsOvertoppingDominant = Convert.ToByte(true), ProbabilisticOutputEntity = probabilisticOutputEntity, @@ -112,13 +108,9 @@ public void Read_DikeHeightNotCalculated_ReturnGrassCoverErosionInwardsOutputWithNotCalculatedDikeHeight() { // Setup - var probabilisticOutputEntity = new ProbabilisticOutputEntity - { - ProbabilisticOutputEntityId = 3456 - }; + var probabilisticOutputEntity = new ProbabilisticOutputEntity(); var entity = new GrassCoverErosionInwardsOutputEntity { - GrassCoverErosionInwardsOutputEntityId = 7536, ProbabilisticOutputEntity = probabilisticOutputEntity, DikeHeight = null, IsDikeHeightCalculated = Convert.ToByte(false) Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionInwards/GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverErosionInwardsSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -67,15 +67,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new GrassCoverErosionInwardsSectionResultEntity { - GrassCoverErosionInwardsSectionResultEntityId = entityId, LayerThree = layerThree, LayerOne = Convert.ToByte(layerOne), FailureMechanismSectionEntity = failureMechanismSectionEntity @@ -121,9 +119,6 @@ public void Read_CalculationEntitySet_ReturnGrassCoverErosionInwardsSectionResultWithCalculation() { // Setup - var random = new Random(21); - var entityId = random.Next(1, 502); - var calculation = new GrassCoverErosionInwardsCalculation(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); @@ -135,7 +130,6 @@ var entity = new GrassCoverErosionInwardsSectionResultEntity { - GrassCoverErosionInwardsSectionResultEntityId = entityId, FailureMechanismSectionEntity = failureMechanismSectionEntity, GrassCoverErosionInwardsCalculationEntity = calculationEntity }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverErosionOutwardsSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -54,15 +54,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new GrassCoverErosionOutwardsSectionResultEntity { - GrassCoverErosionOutwardsSectionResultEntityId = entityId, LayerThree = layerThree, LayerTwoA = Convert.ToByte(layerTwoA), LayerOne = Convert.ToByte(layerOne), Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverSlipOffInwardsSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -54,15 +54,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new GrassCoverSlipOffInwardsSectionResultEntity { - GrassCoverSlipOffInwardsSectionResultEntityId = entityId, LayerThree = layerThree, LayerTwoA = Convert.ToByte(layerTwoA), LayerOne = Convert.ToByte(layerOne), Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs (.../GrassCoverSlipOffOutwardsSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -54,15 +54,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new GrassCoverSlipOffOutwardsSectionResultEntity { - GrassCoverSlipOffOutwardsSectionResultEntityId = entityId, LayerThree = layerThree, LayerTwoA = Convert.ToByte(layerTwoA), LayerOne = Convert.ToByte(layerOne), Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructuresSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructuresSectionResultEntityReadExtensionsTest.cs (.../HeightStructuresSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HeightStructuresSectionResultEntityReadExtensionsTest.cs (.../HeightStructuresSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -52,15 +52,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new HeightStructuresSectionResultEntity { - HeightStructuresSectionResultEntityId = entityId, LayerThree = layerThree, LayerOne = Convert.ToByte(layerOne), FailureMechanismSectionEntity = failureMechanismSectionEntity Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs (.../HydraulicLocationEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/HydraulicLocationEntityReadExtensionsTest.cs (.../HydraulicLocationEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -52,13 +52,11 @@ // Setup var random = new Random(21); long testId = random.Next(0, 400); - var entityId = new Random(21).Next(1, 502); var testName = "testName"; double x = random.NextDouble(); double y = random.NextDouble(); var entity = new HydraulicLocationEntity { - HydraulicLocationEntityId = entityId, LocationId = testId, Name = testName, LocationX = x, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacrostabilityInwardsSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacrostabilityInwardsSectionResultEntityReadExtensionsTest.cs (.../MacrostabilityInwardsSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacrostabilityInwardsSectionResultEntityReadExtensionsTest.cs (.../MacrostabilityInwardsSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -52,7 +52,6 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); double layerTwoA = random.NextDouble(); var collector = new ReadConversionCollector(); @@ -61,7 +60,6 @@ collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new MacrostabilityInwardsSectionResultEntity { - MacrostabilityInwardsSectionResultEntityId = entityId, LayerThree = layerThree, LayerTwoA = layerTwoA, LayerOne = Convert.ToByte(layerOne), Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacrostabilityOutwardsSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacrostabilityOutwardsSectionResultEntityReadExtensionsTest.cs (.../MacrostabilityOutwardsSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MacrostabilityOutwardsSectionResultEntityReadExtensionsTest.cs (.../MacrostabilityOutwardsSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -52,7 +52,6 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); double layerTwoA = random.NextDouble(); var collector = new ReadConversionCollector(); @@ -61,7 +60,6 @@ collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new MacrostabilityOutwardsSectionResultEntity { - MacrostabilityOutwardsSectionResultEntityId = entityId, LayerThree = layerThree, LayerTwoA = layerTwoA, LayerOne = Convert.ToByte(layerOne), Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs (.../MicrostabilitySectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/MicrostabilitySectionResultEntityReadExtensionsTest.cs (.../MicrostabilitySectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -54,15 +54,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new MicrostabilitySectionResultEntity { - MicrostabilitySectionResultEntityId = entityId, LayerThree = layerThree, LayerTwoA = Convert.ToByte(layerTwoA), LayerOne = Convert.ToByte(layerOne), Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationEntityReadExtensionsTest.cs (.../PipingCalculationEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -52,17 +52,16 @@ } [Test] - [TestCase(3456789, true, 0.98, "haha", "hihi", 0.0, 3.4, 123)] - [TestCase(234, false, 0.0, null, null, double.NaN, double.NaN, 321)] - public void Read_ValidEntity_ReturnPipingCalculationScenario(long id, bool isRelevant, double contribution, + [TestCase(true, 0.98, "haha", "hihi", 0.0, 3.4, 123)] + [TestCase(false, 0.0, null, null, double.NaN, double.NaN, 321)] + public void Read_ValidEntity_ReturnPipingCalculationScenario(bool isRelevant, double contribution, string name, string comments, double entryPoint, double exitPoint, int seed) { // Setup var random = new Random(seed); var entity = new PipingCalculationEntity { - PipingCalculationEntityId = id, RelevantForScenario = Convert.ToByte(isRelevant), ScenarioContribution = contribution.ToNaNAsNull(), Name = name, @@ -157,7 +156,6 @@ var surfaceLineEntity = new SurfaceLineEntity { - SurfaceLineEntityId = 123, PointsXml = new Point3DXmlSerializer().ToXml(points) }; @@ -209,7 +207,6 @@ // Setup var hydraulicLocationEntity = new HydraulicLocationEntity { - HydraulicLocationEntityId = 123, Name = "A" }; @@ -224,7 +221,7 @@ var collector = new ReadConversionCollector(); // Call - PipingCalculationScenario calculation = entity.Read(collector, new GeneralPipingInput()); + entity.Read(collector, new GeneralPipingInput()); // Assert Assert.IsTrue(collector.Contains(hydraulicLocationEntity)); @@ -269,7 +266,6 @@ // Setup var stochasticSoilProfileEntity = new StochasticSoilProfileEntity { - StochasticSoilProfileEntityId = 546, SoilProfileEntity = new SoilProfileEntity { SoilLayerEntities = @@ -281,7 +277,6 @@ var stochasticSoilModelEntity = new StochasticSoilModelEntity { - StochasticSoilModelEntityId = 75, StochasticSoilModelSegmentPointXml = new Point2DXmlSerializer().ToXml(new Point2D[0]), StochasticSoilProfileEntities = { @@ -312,16 +307,12 @@ public void Read_EntityWithPipingCalculationOutputEntity_CalculationWithPipingOutput() { // Setup - const int outputId = 4578; var entity = new PipingCalculationEntity { EntryPointL = 1, ExitPointL = 2, DampingFactorExitMean = 1, - PipingCalculationOutputEntity = new PipingCalculationOutputEntity - { - PipingCalculationOutputEntityId = outputId - } + PipingCalculationOutputEntity = new PipingCalculationOutputEntity() }; var collector = new ReadConversionCollector(); @@ -337,16 +328,12 @@ public void Read_EntityWithPipingSemiProbabilisticOutputEntity_CalculationWithPipingSemiProbabilisticOutput() { // Setup - const int outputId = 675; var entity = new PipingCalculationEntity { EntryPointL = 1, ExitPointL = 2, DampingFactorExitMean = 1, - PipingSemiProbabilisticOutputEntity = new PipingSemiProbabilisticOutputEntity - { - PipingSemiProbabilisticOutputEntityId = outputId - } + PipingSemiProbabilisticOutputEntity = new PipingSemiProbabilisticOutputEntity() }; var collector = new ReadConversionCollector(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationOutputEntityReadExtensionsTest.cs (.../PipingCalculationOutputEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingCalculationOutputEntityReadExtensionsTest.cs (.../PipingCalculationOutputEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -35,7 +35,6 @@ // Setup var entity = new PipingCalculationOutputEntity { - PipingCalculationOutputEntityId = 123, HeaveFactorOfSafety = 9.8, HeaveZValue = 7.6, UpliftZValue = 5.4, @@ -62,7 +61,6 @@ // Setup var entity = new PipingCalculationOutputEntity { - PipingCalculationOutputEntityId = 645, HeaveFactorOfSafety = null, HeaveZValue = null, UpliftZValue = null, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs (.../PipingFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingFailureMechanismMetaEntityReadExtensionsTest.cs (.../PipingFailureMechanismMetaEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -35,10 +35,8 @@ public void ReadAsPipingProbabilityAssessmentInput_Always_ReturnsNewPipingProbabilityAssessmentInputWithPropertiesSet() { // Setup - var entityId = new Random(21).Next(1, 502); var entity = new PipingFailureMechanismMetaEntity { - PipingFailureMechanismMetaEntityId = entityId, A = 0.95, UpliftCriticalSafetyFactor = 2.6 }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSectionResultEntityReadExtensionsTest.cs (.../PipingSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSectionResultEntityReadExtensionsTest.cs (.../PipingSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -53,15 +53,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new PipingSectionResultEntity { - PipingSectionResultEntityId = entityId, LayerThree = layerThree, LayerOne = Convert.ToByte(layerOne), FailureMechanismSectionEntity = failureMechanismSectionEntity Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensionsTest.cs (.../PipingSemiProbabilisticOutputEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingSemiProbabilisticOutputEntityReadExtensionsTest.cs (.../PipingSemiProbabilisticOutputEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -37,7 +37,6 @@ // Setup var entity = new PipingSemiProbabilisticOutputEntity { - PipingSemiProbabilisticOutputEntityId = 5867, HeaveFactorOfSafety = 1.1, HeaveProbability = 0.2, HeaveReliability = 3.3, @@ -78,7 +77,6 @@ // Setup var entity = new PipingSemiProbabilisticOutputEntity { - PipingSemiProbabilisticOutputEntityId = 670, HeaveFactorOfSafety = null, HeaveProbability = null, HeaveReliability = null, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingStructureSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingStructureSectionResultEntityReadExtensionsTest.cs (.../PipingStructureSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/PipingStructureSectionResultEntityReadExtensionsTest.cs (.../PipingStructureSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -55,15 +55,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new PipingStructureSectionResultEntity { - PipingStructureSectionResultEntityId = entityId, LayerThree = layerThree, LayerTwoA = Convert.ToByte(layerTwoA), LayerOne = Convert.ToByte(layerOne), Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SoilLayerEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SoilLayerEntityReadExtensionsTest.cs (.../SoilLayerEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SoilLayerEntityReadExtensionsTest.cs (.../SoilLayerEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -38,7 +38,6 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double top = random.NextDouble(); int color = Color.AliceBlue.ToArgb(); string materialName = "sand"; @@ -53,7 +52,6 @@ var entity = new SoilLayerEntity { - SoilLayerEntityId = entityId, Top = top, IsAquifer = Convert.ToByte(isAquifer), Color = color, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SoilProfileEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SoilProfileEntityReadExtensionsTest.cs (.../SoilProfileEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SoilProfileEntityReadExtensionsTest.cs (.../SoilProfileEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -54,11 +54,9 @@ // Setup string testName = "testName"; var random = new Random(21); - var entityId = random.Next(1, 502); double bottom = random.NextDouble(); var entity = new SoilProfileEntity { - SoilProfileEntityId = entityId, Name = testName, Bottom = bottom, SoilLayerEntities = Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilModelEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilModelEntityReadExtensionsTest.cs (.../StochasticSoilModelEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilModelEntityReadExtensionsTest.cs (.../StochasticSoilModelEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -52,12 +52,10 @@ public void Read_WithCollector_ReturnsNewStochasticSoilModelWithPropertiesSet() { // Setup - var entityId = new Random(21).Next(1, 502); string testName = "testName"; string testSegmentName = "testSegmentName"; var entity = new StochasticSoilModelEntity { - StochasticSoilModelEntityId = entityId, Name = testName, SegmentName = testSegmentName, StochasticSoilModelSegmentPointXml = new Point2DXmlSerializer().ToXml(new Point2D[0]) Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilProfileEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilProfileEntityReadExtensionsTest.cs (.../StochasticSoilProfileEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/StochasticSoilProfileEntityReadExtensionsTest.cs (.../StochasticSoilProfileEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -51,10 +51,8 @@ // Setup var random = new Random(21); double probability = random.NextDouble(); - var entityId = random.Next(1, 502); var entity = new StochasticSoilProfileEntity { - StochasticSoilProfileEntityId = entityId, Probability = probability, SoilProfileEntity = new SoilProfileEntity { Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SurfaceLineEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SurfaceLineEntityReadExtensionsTest.cs (.../SurfaceLineEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/Piping/SurfaceLineEntityReadExtensionsTest.cs (.../SurfaceLineEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -53,14 +53,12 @@ // Setup var collector = new ReadConversionCollector(); - const long id = 5317846874; const string name = "nice name!"; const double intersectionX = 1.1; const double intersectionY = 2.2; var entity = new SurfaceLineEntity { - SurfaceLineEntityId = id, Name = name, ReferenceLineIntersectionX = intersectionX, ReferenceLineIntersectionY = intersectionY, @@ -91,7 +89,6 @@ // Setup var collector = new ReadConversionCollector(); - const long id = 489357; const string name = "Better name."; const double intersectionX = 3.4; const double intersectionY = 7.5; @@ -105,7 +102,6 @@ var entity = new SurfaceLineEntity { - SurfaceLineEntityId = id, Name = name, ReferenceLineIntersectionX = intersectionX, ReferenceLineIntersectionY = intersectionY, @@ -136,7 +132,6 @@ // Setup var collector = new ReadConversionCollector(); - const long id = 489357; const string name = "Better name."; const double intersectionX = 3.4; const double intersectionY = 7.5; @@ -155,7 +150,6 @@ var entity = new SurfaceLineEntity { - SurfaceLineEntityId = id, Name = name, ReferenceLineIntersectionX = intersectionX, ReferenceLineIntersectionY = intersectionY, @@ -192,7 +186,6 @@ // Setup var collector = new ReadConversionCollector(); - const long id = 489357; const string name = "Better name."; const double intersectionX = 3.4; const double intersectionY = 7.5; @@ -208,7 +201,6 @@ var entity = new SurfaceLineEntity { - SurfaceLineEntityId = id, Name = name, ReferenceLineIntersectionX = intersectionX, ReferenceLineIntersectionY = intersectionY, @@ -268,11 +260,8 @@ // Setup var collector = new ReadConversionCollector(); - const long id = 9348765; - var entity = new SurfaceLineEntity { - SurfaceLineEntityId = id, PointsXml = new Point3DXmlSerializer().ToXml(new Point3D[0]) }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProbabilisticOutputEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProbabilisticOutputEntityReadExtensionsTest.cs (.../ProbabilisticOutputEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProbabilisticOutputEntityReadExtensionsTest.cs (.../ProbabilisticOutputEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -35,7 +35,6 @@ // Setup var entity = new ProbabilisticOutputEntity { - ProbabilisticOutputEntityId = 567567, Probability = 0.1, RequiredProbability = 0.2, RequiredReliability = 0.3, @@ -60,7 +59,6 @@ // Setup var entity = new ProbabilisticOutputEntity { - ProbabilisticOutputEntityId = 87345, Probability = null, RequiredProbability = null, RequiredReliability = null, Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -49,10 +49,8 @@ { // Setup var testDescription = "testName"; - var entityId = new Random(21).Next(1, 502); var entity = new ProjectEntity { - ProjectEntityId = entityId, Description = testDescription }; Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs (.../StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs (.../StabilityStoneCoverSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -54,15 +54,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new StabilityStoneCoverSectionResultEntity { - StabilityStoneCoverSectionResultEntityId = entityId, LayerThree = layerThree, LayerTwoA = Convert.ToByte(layerTwoA), FailureMechanismSectionEntity = failureMechanismSectionEntity Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs (.../StrengthStabilityLengthwiseConstructionSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -52,15 +52,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new StrengthStabilityLengthwiseConstructionSectionResultEntity { - StrengthStabilityLengthwiseConstructionSectionResultEntityId = entityId, LayerThree = layerThree, LayerOne = Convert.ToByte(layerOne), FailureMechanismSectionEntity = failureMechanismSectionEntity Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StrengthStabilityPointConstructionSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StrengthStabilityPointConstructionSectionResultEntityReadExtensionsTest.cs (.../StrengthStabilityPointConstructionSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/StrengthStabilityPointConstructionSectionResultEntityReadExtensionsTest.cs (.../StrengthStabilityPointConstructionSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -50,7 +50,6 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); double layerTwoA = random.NextDouble(); var collector = new ReadConversionCollector(); @@ -59,7 +58,6 @@ collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new StrengthStabilityPointConstructionSectionResultEntity { - StrengthStabilityPointConstructionSectionResultEntityId = entityId, LayerThree = layerThree, LayerTwoA = layerTwoA, FailureMechanismSectionEntity = failureMechanismSectionEntity Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs (.../TechnicalInnovationSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/TechnicalInnovationSectionResultEntityReadExtensionsTest.cs (.../TechnicalInnovationSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -52,15 +52,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new TechnicalInnovationSectionResultEntity { - TechnicalInnovationSectionResultEntityId = entityId, LayerThree = layerThree, LayerOne = Convert.ToByte(layerOne), FailureMechanismSectionEntity = failureMechanismSectionEntity Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs (.../WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs (.../WaterPressureAsphaltCoverSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -52,15 +52,13 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); var collector = new ReadConversionCollector(); var failureMechanismSectionEntity = new FailureMechanismSectionEntity(); collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new WaterPressureAsphaltCoverSectionResultEntity { - WaterPressureAsphaltCoverSectionResultEntityId = entityId, LayerThree = layerThree, LayerOne = Convert.ToByte(layerOne), FailureMechanismSectionEntity = failureMechanismSectionEntity Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs =================================================================== diff -u -r11f0867b39150ae5fac83dc178a89fee46d27611 -r97018b4e8e9cd81438e8fd0d111d889e20946617 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs (.../WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs) (revision 11f0867b39150ae5fac83dc178a89fee46d27611) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs (.../WaveImpactAsphaltCoverSectionResultEntityReadExtensionsTest.cs) (revision 97018b4e8e9cd81438e8fd0d111d889e20946617) @@ -52,7 +52,6 @@ { // Setup var random = new Random(21); - var entityId = random.Next(1, 502); double layerThree = random.NextDouble(); double layerTwoA = random.NextDouble(); var collector = new ReadConversionCollector(); @@ -61,7 +60,6 @@ collector.Read(failureMechanismSectionEntity, new TestFailureMechanismSection()); var entity = new WaveImpactAsphaltCoverSectionResultEntity { - WaveImpactAsphaltCoverSectionResultEntityId = entityId, LayerThree = layerThree, LayerTwoA = layerTwoA, LayerOne = Convert.ToByte(layerOne),