Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -rae6f0c6b534ca650e160ae6d9c0bc90369d25c68 -rea14c73fc9ac706d48a5af7125bb570a5d07dd28 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision ae6f0c6b534ca650e160ae6d9c0bc90369d25c68) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision ea14c73fc9ac706d48a5af7125bb570a5d07dd28) @@ -47,7 +47,9 @@ var entity = new AssessmentSectionEntity { Name = section.Name, - Composition = (short) section.Composition + Composition = (short) section.Composition, + Comments = section.Comments, + Norm = section.FailureMechanismContribution.Norm }; AddEntityForPipingFailureMechanism(section, entity, registry); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs =================================================================== diff -u -r6059a4af5c28390c79efa4e808e28cc93eeddac1 -rea14c73fc9ac706d48a5af7125bb570a5d07dd28 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision 6059a4af5c28390c79efa4e808e28cc93eeddac1) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/AssessmentSectionEntity.cs (.../AssessmentSectionEntity.cs) (revision ea14c73fc9ac706d48a5af7125bb570a5d07dd28) @@ -48,7 +48,6 @@ public string Name { get; set; } public string Comments { get; set; } public int Norm { get; set; } - public int Order { get; set; } public string HydraulicDatabaseVersion { get; set; } public string HydraulicDatabaseLocation { get; set; } public short Composition { get; set; } Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql =================================================================== diff -u -r5f1e64c97c72ebffee680a97eb567696a9972c65 -rea14c73fc9ac706d48a5af7125bb570a5d07dd28 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 5f1e64c97c72ebffee680a97eb567696a9972c65) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision ea14c73fc9ac706d48a5af7125bb570a5d07dd28) @@ -97,7 +97,6 @@ 'Name' VARCHAR (260), 'Comments' TEXT, 'Norm' INT (4) NOT NULL, - 'Order' INT (4) NOT NULL, 'HydraulicDatabaseVersion' TEXT, 'HydraulicDatabaseLocation' TEXT, 'Composition' SMALLINT NOT NULL, -- Enum: Dike = 0, Dune = 1, DikeAndDune = 2 Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs =================================================================== diff -u -rb8608381d59d881400d27aad3026c13bf6078a44 -rea14c73fc9ac706d48a5af7125bb570a5d07dd28 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision b8608381d59d881400d27aad3026c13bf6078a44) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.Designer.cs (.../RingtoetsEntities.Designer.cs) (revision ea14c73fc9ac706d48a5af7125bb570a5d07dd28) @@ -1,4 +1,4 @@ -// T4 code generation is enabled for model 'D:\Repos\Ringtoets\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. +// T4 code generation is enabled for model 'D:\Projects\WTI\trunk\Application\Ringtoets\src\Application.Ringtoets.Storage\DbContext\RingtoetsEntities.edmx'. // To enable legacy code generation, change the value of the 'Code Generation Strategy' designer // property to 'Legacy ObjectContext'. This property is available in the Properties Window when the model // is open in the designer. Index: Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx =================================================================== diff -u -r5f1e64c97c72ebffee680a97eb567696a9972c65 -rea14c73fc9ac706d48a5af7125bb570a5d07dd28 --- Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision 5f1e64c97c72ebffee680a97eb567696a9972c65) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/DbContext/RingtoetsEntities.edmx (.../RingtoetsEntities.edmx) (revision ea14c73fc9ac706d48a5af7125bb570a5d07dd28) @@ -4,7 +4,7 @@ - + @@ -14,7 +14,6 @@ - @@ -680,7 +679,6 @@ - @@ -1177,7 +1175,6 @@ - Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs =================================================================== diff -u -r32d32b83fc8e0c9b4849361af987da0170549146 -rea14c73fc9ac706d48a5af7125bb570a5d07dd28 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 32d32b83fc8e0c9b4849361af987da0170549146) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision ea14c73fc9ac706d48a5af7125bb570a5d07dd28) @@ -54,7 +54,12 @@ var assessmentSection = new AssessmentSection((AssessmentSectionComposition) entity.Composition) { StorageId = entity.AssessmentSectionEntityId, - Name = entity.Name + Name = entity.Name, + Comments = entity.Comments, + FailureMechanismContribution = + { + Norm = entity.Norm + } }; entity.ReadPipingFailureMechanism(assessmentSection, collector); Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs =================================================================== diff -u -rd86b1c6e4ebde1570bec162a9043bbb437de5d9c -rea14c73fc9ac706d48a5af7125bb570a5d07dd28 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs (.../AssessmentSectionUpdateExtensions.cs) (revision d86b1c6e4ebde1570bec162a9043bbb437de5d9c) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Update/AssessmentSectionUpdateExtensions.cs (.../AssessmentSectionUpdateExtensions.cs) (revision ea14c73fc9ac706d48a5af7125bb570a5d07dd28) @@ -65,6 +65,8 @@ AssessmentSectionEntity entity = GetCorrespondingAssessmentSectionEntity(section, context); entity.Name = section.Name; entity.Composition = (short) section.Composition; + entity.Comments = section.Comments; + entity.Norm = section.FailureMechanismContribution.Norm; UpdatePipingFailureMechanism(section, registry, context); UpdateGrassCoverErosionInwardsFailureMechanism(section, registry, context); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs =================================================================== diff -u -rae6f0c6b534ca650e160ae6d9c0bc90369d25c68 -rea14c73fc9ac706d48a5af7125bb570a5d07dd28 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision ae6f0c6b534ca650e160ae6d9c0bc90369d25c68) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision ea14c73fc9ac706d48a5af7125bb570a5d07dd28) @@ -55,13 +55,20 @@ [TestCase(AssessmentSectionComposition.Dike)] [TestCase(AssessmentSectionComposition.DikeAndDune)] [TestCase(AssessmentSectionComposition.Dune)] - public void Create_WithCollector_ReturnsAssessmentSectionEntityWithCompositionAndFailureMechanismForPiping(AssessmentSectionComposition assessmentSectionComposition) + public void Create_WithCollector_ReturnsAssessmentSectionEntityWithCompositionAndFailureMechanisms(AssessmentSectionComposition assessmentSectionComposition) { // Setup - string testName = "testName"; + const string testName = "testName"; + const string comments = "Some text"; + const int norm = int.MaxValue; var assessmentSection = new AssessmentSection(assessmentSectionComposition) { - Name = testName + Name = testName, + Comments = comments, + FailureMechanismContribution = + { + Norm = norm + } }; var registry = new PersistenceRegistry(); @@ -70,27 +77,29 @@ // Assert Assert.IsNotNull(entity); - Assert.AreEqual((short)assessmentSectionComposition, entity.Composition); + Assert.AreEqual((short) assessmentSectionComposition, entity.Composition); Assert.AreEqual(testName, entity.Name); + Assert.AreEqual(comments, entity.Comments); + Assert.AreEqual(norm, entity.Norm); Assert.AreEqual(18, entity.FailureMechanismEntities.Count); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.Piping)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.GrassRevetmentTopErosionAndInwards)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.MacrostabilityInwards)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.MacrostabilityOutwards)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.Microstability)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.StabilityStoneRevetment)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.WaveImpactOnAsphaltRevetment)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.WaterOverpressureAsphaltRevetment)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.GrassRevetmentErosionOutwards)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.GrassRevetmentSlidingOutwards)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.GrassRevetmentSlidingInwards)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.StructureHeight)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.ReliabilityClosingOfStructure)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.PipingAtStructure)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.StrengthAndStabilityPointConstruction)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.StrengthAndStabilityParallelConstruction)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.DuneErosion)); - Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short)FailureMechanismType.TechnicalInnovations)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.Piping)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.GrassRevetmentTopErosionAndInwards)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.MacrostabilityInwards)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.MacrostabilityOutwards)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.Microstability)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.StabilityStoneRevetment)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.WaveImpactOnAsphaltRevetment)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.WaterOverpressureAsphaltRevetment)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.GrassRevetmentErosionOutwards)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.GrassRevetmentSlidingOutwards)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.GrassRevetmentSlidingInwards)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.StructureHeight)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.ReliabilityClosingOfStructure)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.PipingAtStructure)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.StrengthAndStabilityPointConstruction)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.StrengthAndStabilityParallelConstruction)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.DuneErosion)); + Assert.IsNotNull(entity.FailureMechanismEntities.SingleOrDefault(fme => fme.FailureMechanismType == (short) FailureMechanismType.TechnicalInnovations)); Assert.IsNull(entity.HydraulicDatabaseLocation); Assert.IsNull(entity.HydraulicDatabaseVersion); @@ -125,19 +134,19 @@ Assert.AreEqual(testFilePath, entity.HydraulicDatabaseLocation); Assert.AreEqual(testVersion, entity.HydraulicDatabaseVersion); Assert.AreEqual(1, entity.HydraulicLocationEntities.Count); - } + } [Test] public void Create_WithReferenceLine_AddsReferenceLinePointEntities() { // Setup var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike); assessmentSection.ReferenceLine = new ReferenceLine(); - assessmentSection.ReferenceLine.SetGeometry(new [] + assessmentSection.ReferenceLine.SetGeometry(new[] { - new Point2D(1,0), - new Point2D(2,3), - new Point2D(5,3) + new Point2D(1, 0), + new Point2D(2, 3), + new Point2D(5, 3) }); var registry = new PersistenceRegistry(); @@ -146,7 +155,12 @@ // Assert Assert.AreEqual(3, entity.ReferenceLinePointEntities.Count); - Assert.AreEqual(new []{0,1,2}, entity.ReferenceLinePointEntities.Select(rpe => rpe.Order)); - } + Assert.AreEqual(new[] + { + 0, + 1, + 2 + }, entity.ReferenceLinePointEntities.Select(rpe => rpe.Order)); + } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -rfe68c3f7cae5946b93d9e27eb532b176a6b26b84 -rea14c73fc9ac706d48a5af7125bb570a5d07dd28 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision fe68c3f7cae5946b93d9e27eb532b176a6b26b84) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision ea14c73fc9ac706d48a5af7125bb570a5d07dd28) @@ -55,13 +55,17 @@ public void Read_WithCollector_ReturnsNewAssessmentSection(AssessmentSectionComposition assessmentSectionComposition) { // Setup - var testName = "testName"; + 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, Name = testName, - Composition = (short) assessmentSectionComposition + Composition = (short) assessmentSectionComposition, + Comments = comments, + Norm = norm }; var collector = new ReadConversionCollector(); @@ -72,6 +76,8 @@ Assert.IsNotNull(section); Assert.AreEqual(entityId, section.StorageId); Assert.AreEqual(testName, section.Name); + Assert.AreEqual(comments, section.Comments); + Assert.AreEqual(norm, section.FailureMechanismContribution.Norm); Assert.AreEqual(assessmentSectionComposition, section.Composition); Assert.IsNull(section.HydraulicBoundaryDatabase); Assert.IsNull(section.ReferenceLine); @@ -81,7 +87,7 @@ public void Read_WithReferenceLineEntities_ReturnsNewAssessmentSectionWithReferenceLineSet() { // Setup - var entity = new AssessmentSectionEntity(); + var entity = CreateAssessmentSectionEntity(); var random = new Random(21); double firstX = random.NextDouble(); @@ -114,7 +120,7 @@ public void Read_WithHydraulicDatabaseLocationSet_ReturnsNewAssessmentSectionWithHydraulicDatabaseSet() { // Setup - var entity = new AssessmentSectionEntity(); + var entity = CreateAssessmentSectionEntity(); var testLocation = "testLocation"; var testVersion = "testVersion"; @@ -146,7 +152,7 @@ public void Read_WithFailureMechanismWithStochasticSoilModelsSet_ReturnsNewAssessmentSectionWithStochasticSoilModelsInPipingFailureMechanism(bool isRelevant) { // Setup - var entity = new AssessmentSectionEntity(); + var entity = CreateAssessmentSectionEntity(); var entityId = new Random(21).Next(1, 502); var failureMechanismEntity = new FailureMechanismEntity @@ -183,13 +189,13 @@ public void Read_WithFailureMechanismWithSurfaceLinesSet_ReturnsNewAssessmentSectionWithSurfaceLinesInPipingFailureMechanism(bool isRelevant) { // Setup - var entity = new AssessmentSectionEntity(); + var entity = CreateAssessmentSectionEntity(); var entityId = new Random(21).Next(1, 502); var failureMechanismEntity = new FailureMechanismEntity { FailureMechanismEntityId = entityId, - FailureMechanismType = (int)FailureMechanismType.Piping, + FailureMechanismType = (int) FailureMechanismType.Piping, CalculationGroupEntity = new CalculationGroupEntity { CalculationGroupEntityId = 1 @@ -220,7 +226,7 @@ public void Read_WithPipingFailureMechanismWithCalculationGroupsSet_ReturnsNewAssessmentSectionWithCalculationGroupsInPipingFailureMechanism(bool isRelevant) { // Setup - var entity = new AssessmentSectionEntity(); + var entity = CreateAssessmentSectionEntity(); var entityId = new Random(21).Next(1, 502); const int rootGroupEntityId = 1; @@ -230,7 +236,7 @@ var failureMechanismEntity = new FailureMechanismEntity { FailureMechanismEntityId = entityId, - FailureMechanismType = (int)FailureMechanismType.Piping, + FailureMechanismType = (int) FailureMechanismType.Piping, CalculationGroupEntity = new CalculationGroupEntity { CalculationGroupEntityId = rootGroupEntityId, @@ -261,15 +267,15 @@ Assert.AreEqual(rootGroupEntityId, section.PipingFailureMechanism.CalculationsGroup.StorageId); IList childCalculationGroups = section.PipingFailureMechanism.CalculationsGroup.Children; Assert.AreEqual(2, childCalculationGroups.Count); - Assert.AreEqual(childGroupEntity1Id, ((CalculationGroup)childCalculationGroups[0]).StorageId); - Assert.AreEqual(childGroupEntity2Id, ((CalculationGroup)childCalculationGroups[1]).StorageId); + Assert.AreEqual(childGroupEntity1Id, ((CalculationGroup) childCalculationGroups[0]).StorageId); + Assert.AreEqual(childGroupEntity2Id, ((CalculationGroup) childCalculationGroups[1]).StorageId); } [Test] public void Read_WithPipingFailureMechanismWithFailureMechanismSectionsSet_ReturnsNewAssessmentSectionWithFailureMechanismSectionsInPipingFailureMechanism() { // Setup - var entity = new AssessmentSectionEntity(); + var entity = CreateAssessmentSectionEntity(); var entityId = new Random(21).Next(1, 502); var failureMechanismEntity = new FailureMechanismEntity @@ -297,7 +303,7 @@ public void Read_WithGrassCoverErosionInwardsFailureMechanismWithFailureMechanismSectionsSet_ReturnsNewAssessmentSectionWithFailureMechanismSectionsInGrassCoverErosionInwardsFailureMechanism() { // Setup - var entity = new AssessmentSectionEntity(); + var entity = CreateAssessmentSectionEntity(); var entityId = new Random(21).Next(1, 502); var failureMechanismEntity = new FailureMechanismEntity @@ -323,7 +329,7 @@ public void Read_WithStandAloneFailureMechanismsSet_ReturnsNewAssessmentSectionWithFailureMechanismsSet(bool isRelevant) { // Setup - var entity = new AssessmentSectionEntity(); + var entity = CreateAssessmentSectionEntity(); var macrostabilityInwardsEntityId = 2; var macrostabilityOutwardsEntityId = 3; var microstabilityEntityId = 4; @@ -379,6 +385,14 @@ AssertFailureMechanismEqual(isRelevant, technicalInnovationsEntityId, 2, section.TechnicalInnovation); } + private static AssessmentSectionEntity CreateAssessmentSectionEntity() + { + return new AssessmentSectionEntity + { + Norm = 30000 + }; + } + private static FailureMechanismEntity CreateFailureMechanismEntity(bool isRelevant, int entityId, FailureMechanismType failureMechanismType) { return new FailureMechanismEntity Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs =================================================================== diff -u -rfe68c3f7cae5946b93d9e27eb532b176a6b26b84 -rea14c73fc9ac706d48a5af7125bb570a5d07dd28 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision fe68c3f7cae5946b93d9e27eb532b176a6b26b84) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/ProjectEntityReadExtensionsTest.cs (.../ProjectEntityReadExtensionsTest.cs) (revision ea14c73fc9ac706d48a5af7125bb570a5d07dd28) @@ -48,7 +48,7 @@ { // Setup var testDescription = "testName"; - var entityId = new Random(21).Next(1,502); + var entityId = new Random(21).Next(1, 502); var entity = new ProjectEntity { ProjectEntityId = entityId, @@ -62,19 +62,26 @@ Assert.IsNotNull(project); Assert.AreEqual(entityId, project.StorageId); Assert.AreEqual(testDescription, project.Description); - } + } [Test] public void Read_WithAssessmentSection_ReturnsNewProjectWithAssessmentSections() { // Setup + const int norm = 10000; var entity = new ProjectEntity { Description = "testName", AssessmentSectionEntities = { - new AssessmentSectionEntity(), - new AssessmentSectionEntity() + new AssessmentSectionEntity + { + Norm = norm + }, + new AssessmentSectionEntity + { + Norm = norm + } } }; @@ -83,6 +90,6 @@ // Assert Assert.AreEqual(2, project.Items.Count); - } + } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs =================================================================== diff -u -rfe68c3f7cae5946b93d9e27eb532b176a6b26b84 -rea14c73fc9ac706d48a5af7125bb570a5d07dd28 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs (.../AssessmentSectionUpdateExtensionsTest.cs) (revision fe68c3f7cae5946b93d9e27eb532b176a6b26b84) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Update/AssessmentSectionUpdateExtensionsTest.cs (.../AssessmentSectionUpdateExtensionsTest.cs) (revision ea14c73fc9ac706d48a5af7125bb570a5d07dd28) @@ -22,7 +22,6 @@ using System; using System.Data.Entity; using System.Linq; - using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.DbContext; using Application.Ringtoets.Storage.Exceptions; @@ -41,7 +40,7 @@ [TestFixture] public class AssessmentSectionUpdateExtensionsTest { - private int totalAmountOfFailureMechanismsInAssessmentSection = 18; + private readonly int totalAmountOfFailureMechanismsInAssessmentSection = 18; [Test] public void Update_WithoutContext_ThrowsArgumentNullException() @@ -138,10 +137,14 @@ mocks.ReplayAll(); - var newName = "newName"; + const string newName = "newName"; + const string comments = "Some text"; + const int norm = int.MaxValue; var composition = AssessmentSectionComposition.Dune; var section = InitializeCreatedDikeAssessmentSection(AssessmentSectionComposition.Dune); section.Name = newName; + section.Comments = comments; + section.FailureMechanismContribution.Norm = norm; var entity = new AssessmentSectionEntity { @@ -161,6 +164,8 @@ // Assert Assert.AreEqual(newName, entity.Name); + Assert.AreEqual(comments, entity.Comments); + Assert.AreEqual(norm, entity.Norm); Assert.AreEqual((short) composition, entity.Composition); Assert.IsEmpty(entity.ReferenceLinePointEntities); Assert.IsEmpty(entity.HydraulicLocationEntities); @@ -588,11 +593,11 @@ { StorageId = failureMechanismId++ }, - MacrostabilityOutwards = + MacrostabilityOutwards = { StorageId = failureMechanismId++ }, - Microstability = + Microstability = { StorageId = failureMechanismId++ }, @@ -608,7 +613,7 @@ { StorageId = failureMechanismId++ }, - StrengthStabilityLengthwiseConstruction = + StrengthStabilityLengthwiseConstruction = { StorageId = failureMechanismId++ }, @@ -620,7 +625,7 @@ { StorageId = failureMechanismId++ }, - WaterPressureAsphaltCover = + WaterPressureAsphaltCover = { StorageId = failureMechanismId++ }, @@ -632,7 +637,7 @@ { StorageId = failureMechanismId++ }, - GrassCoverSlipOffInwards = + GrassCoverSlipOffInwards = { StorageId = failureMechanismId++ }, @@ -644,7 +649,7 @@ { StorageId = failureMechanismId++ }, - TechnicalInnovation = + TechnicalInnovation = { StorageId = failureMechanismId++ }