Index: Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql =================================================================== diff -u -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 -r22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5 --- Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision c020cda27aa3558aee28cce5cd2ec537ee6a9af4) +++ Application/Ringtoets/src/Application.Ringtoets.Migration.Core/EmbeddedResources/DatabaseStructure18.1.sql (.../DatabaseStructure18.1.sql) (revision 22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 21-Mar-2018 16:44:30 */ +/* Created On : 22-Mar-2018 09:53:11 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -356,14 +356,14 @@ ( 'AssessmentSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'ProjectEntityId' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity1Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity2Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity3Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity4Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity5Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity6Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity7Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity8Id' INTEGER NOT NULL, + 'HydraulicLocationCalculationCollectionEntity1Id' INTEGER NOT NULL, -- Represents the wave height factorized lower limit norm + 'HydraulicLocationCalculationCollectionEntity2Id' INTEGER NOT NULL, -- Represents the waveheight lower limit norm + 'HydraulicLocationCalculationCollectionEntity3Id' INTEGER NOT NULL, -- Represents the waveheight signaling norm + 'HydraulicLocationCalculationCollectionEntity4Id' INTEGER NOT NULL, -- Represents the waveheight factorized signaling norm + 'HydraulicLocationCalculationCollectionEntity5Id' INTEGER NOT NULL, -- Represents the design water level factorized lower limit norm + 'HydraulicLocationCalculationCollectionEntity6Id' INTEGER NOT NULL, -- Represents the design water level lower limit norm + 'HydraulicLocationCalculationCollectionEntity7Id' INTEGER NOT NULL, -- Represents the design water level signaling norm + 'HydraulicLocationCalculationCollectionEntity8Id' INTEGER NOT NULL, -- Represents the design water level factorized signalling norm 'Id' TEXT, 'Name' VARCHAR (260), 'Comments' TEXT, Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -r2f82ce7b8dbc9f0c6b3f34898a97f0a3d7a05baa -r22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 2f82ce7b8dbc9f0c6b3f34898a97f0a3d7a05baa) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision 22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5) @@ -142,15 +142,15 @@ private static void AddHydraulicLocationCalculationEntities(AssessmentSection assessmentSection, AssessmentSectionEntity entity, PersistenceRegistry registry) { - // TODO: WIT-1606 Finalize the ordering of where to map which calculation - entity.HydraulicLocationCalculationCollectionEntity = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Create(registry); - entity.HydraulicLocationCalculationCollectionEntity1 = assessmentSection.WaterLevelCalculationsForSignalingNorm.Create(registry); - entity.HydraulicLocationCalculationCollectionEntity2 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Create(registry); - entity.HydraulicLocationCalculationCollectionEntity3 = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.Create(registry); - entity.HydraulicLocationCalculationCollectionEntity4 = assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.Create(registry); - entity.HydraulicLocationCalculationCollectionEntity5 = assessmentSection.WaveHeightCalculationsForSignalingNorm.Create(registry); - entity.HydraulicLocationCalculationCollectionEntity6 = assessmentSection.WaveHeightCalculationsForLowerLimitNorm.Create(registry); - entity.HydraulicLocationCalculationCollectionEntity7 = assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.Create(registry); + entity.HydraulicLocationCalculationCollectionEntity7 = assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm.Create(registry); + entity.HydraulicLocationCalculationCollectionEntity6 = assessmentSection.WaterLevelCalculationsForSignalingNorm.Create(registry); + entity.HydraulicLocationCalculationCollectionEntity5 = assessmentSection.WaterLevelCalculationsForLowerLimitNorm.Create(registry); + entity.HydraulicLocationCalculationCollectionEntity4 = assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm.Create(registry); + + entity.HydraulicLocationCalculationCollectionEntity3 = assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm.Create(registry); + entity.HydraulicLocationCalculationCollectionEntity2 = assessmentSection.WaveHeightCalculationsForSignalingNorm.Create(registry); + entity.HydraulicLocationCalculationCollectionEntity1 = assessmentSection.WaveHeightCalculationsForLowerLimitNorm.Create(registry); + entity.HydraulicLocationCalculationCollectionEntity = assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm.Create(registry); } } } \ No newline at end of file Index: Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs =================================================================== diff -u -r140b2cf264e61bdac873cc7ed2b04c32feda1f53 -r22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5 --- Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 140b2cf264e61bdac873cc7ed2b04c32feda1f53) +++ Application/Ringtoets/src/Application.Ringtoets.Storage/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision 22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5) @@ -151,16 +151,15 @@ IAssessmentSection assessmentSection, ReadConversionCollector collector) { - // TODO: WIT-1606 Finalize the ordering of where to map which calculation - entity.HydraulicLocationCalculationCollectionEntity.Read(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, collector); - entity.HydraulicLocationCalculationCollectionEntity1.Read(assessmentSection.WaterLevelCalculationsForSignalingNorm, collector); - entity.HydraulicLocationCalculationCollectionEntity2.Read(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, collector); - entity.HydraulicLocationCalculationCollectionEntity3.Read(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, collector); + entity.HydraulicLocationCalculationCollectionEntity7.Read(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, collector); + entity.HydraulicLocationCalculationCollectionEntity6.Read(assessmentSection.WaterLevelCalculationsForSignalingNorm, collector); + entity.HydraulicLocationCalculationCollectionEntity5.Read(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, collector); + entity.HydraulicLocationCalculationCollectionEntity4.Read(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, collector); - entity.HydraulicLocationCalculationCollectionEntity4.Read(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, collector); - entity.HydraulicLocationCalculationCollectionEntity5.Read(assessmentSection.WaveHeightCalculationsForSignalingNorm, collector); - entity.HydraulicLocationCalculationCollectionEntity6.Read(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, collector); - entity.HydraulicLocationCalculationCollectionEntity7.Read(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, collector); + entity.HydraulicLocationCalculationCollectionEntity3.Read(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, collector); + entity.HydraulicLocationCalculationCollectionEntity2.Read(assessmentSection.WaveHeightCalculationsForSignalingNorm, collector); + entity.HydraulicLocationCalculationCollectionEntity1.Read(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, collector); + entity.HydraulicLocationCalculationCollectionEntity.Read(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, collector); } private static void ReadPipingFailureMechanism(this AssessmentSectionEntity entity, AssessmentSection assessmentSection, ReadConversionCollector collector) Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs =================================================================== diff -u -r2f82ce7b8dbc9f0c6b3f34898a97f0a3d7a05baa -r22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 2f82ce7b8dbc9f0c6b3f34898a97f0a3d7a05baa) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision 22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5) @@ -20,6 +20,7 @@ // All rights reserved. using System; +using System.Collections.Generic; using System.Linq; using Application.Ringtoets.Storage.Create; using Application.Ringtoets.Storage.DbContext; @@ -197,19 +198,27 @@ CollectionAssert.IsEmpty(entity.HydraulicLocationEntities); CollectionAssert.IsEmpty(entity.HydraRingPreprocessorEntities); - int expectedNrOfCalculations = assessmentSection.HydraulicBoundaryDatabase.Locations.Count; - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity, expectedNrOfCalculations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity1, expectedNrOfCalculations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity2, expectedNrOfCalculations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity3, expectedNrOfCalculations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity4, expectedNrOfCalculations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity5, expectedNrOfCalculations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity6, expectedNrOfCalculations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity7, expectedNrOfCalculations); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, + entity.HydraulicLocationCalculationCollectionEntity); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, + entity.HydraulicLocationCalculationCollectionEntity1); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForSignalingNorm, + entity.HydraulicLocationCalculationCollectionEntity2); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, + entity.HydraulicLocationCalculationCollectionEntity3); + + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, + entity.HydraulicLocationCalculationCollectionEntity4); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + entity.HydraulicLocationCalculationCollectionEntity5); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForSignalingNorm, + entity.HydraulicLocationCalculationCollectionEntity6); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, + entity.HydraulicLocationCalculationCollectionEntity7); } [Test] - public void Create_HydraulicBoundaryDatabaseLinkedWithCanUsePreprocessorFalse_SetsExpectedPropertiesToEntity() + public void Create_HydraulicBoundaryDatabaseLinked_SetsExpectedPropertiesToEntity() { // Setup const string testFilePath = "path"; @@ -228,30 +237,69 @@ } }; assessmentSection.SetHydraulicBoundaryLocationCalculations(assessmentSection.HydraulicBoundaryDatabase.Locations); + SetHydraulicBoundaryLocationCalculationInputsOfAssessmentSection(assessmentSection); var registry = new PersistenceRegistry(); // Call AssessmentSectionEntity entity = assessmentSection.Create(registry, 0); // Assert - Assert.AreEqual(testFilePath, entity.HydraulicDatabaseLocation); - Assert.AreEqual(testVersion, entity.HydraulicDatabaseVersion); - CollectionAssert.IsEmpty(entity.HydraRingPreprocessorEntities); + TestHelper.AssertAreEqualButNotSame(testFilePath, entity.HydraulicDatabaseLocation); + TestHelper.AssertAreEqualButNotSame(testVersion, entity.HydraulicDatabaseVersion); int expectedNrOfHydraulicBoundaryLocations = assessmentSection.HydraulicBoundaryDatabase.Locations.Count; Assert.AreEqual(expectedNrOfHydraulicBoundaryLocations, entity.HydraulicLocationEntities.Count); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity1, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity2, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity3, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity4, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity5, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity6, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity7, expectedNrOfHydraulicBoundaryLocations); + + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, + entity.HydraulicLocationCalculationCollectionEntity); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, + entity.HydraulicLocationCalculationCollectionEntity1); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForSignalingNorm, + entity.HydraulicLocationCalculationCollectionEntity2); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, + entity.HydraulicLocationCalculationCollectionEntity3); + + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, + entity.HydraulicLocationCalculationCollectionEntity4); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, + entity.HydraulicLocationCalculationCollectionEntity5); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForSignalingNorm, + entity.HydraulicLocationCalculationCollectionEntity6); + AssertHydraulicLocationCalculationCollectionEntity(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, + entity.HydraulicLocationCalculationCollectionEntity7); } [Test] + public void Create_HydraulicBoundaryDatabaseLinkedWithCanUsePreprocessorFalse_SetsExpectedPropertiesToEntity() + { + // Setup + const string testFilePath = "path"; + const string testVersion = "1"; + + var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) + { + HydraulicBoundaryDatabase = + { + FilePath = testFilePath, + Version = testVersion, + Locations = + { + new HydraulicBoundaryLocation(-1, "name", 1, 2) + } + } + }; + + var registry = new PersistenceRegistry(); + + // Call + AssessmentSectionEntity entity = assessmentSection.Create(registry, 0); + + // Assert + CollectionAssert.IsEmpty(entity.HydraRingPreprocessorEntities); + } + + [Test] public void Create_HydraulicBoundaryDatabaseLinkedWithCanUsePreprocessorTrue_SetsExpectedPropertiesToEntity() { // Setup @@ -275,31 +323,17 @@ PreprocessorDirectory = preprocessorDirectory } }; - assessmentSection.SetHydraulicBoundaryLocationCalculations(assessmentSection.HydraulicBoundaryDatabase.Locations); var registry = new PersistenceRegistry(); // Call AssessmentSectionEntity entity = assessmentSection.Create(registry, 0); // Assert - Assert.AreEqual(testFilePath, entity.HydraulicDatabaseLocation); - Assert.AreEqual(testVersion, entity.HydraulicDatabaseVersion); Assert.AreEqual(1, entity.HydraRingPreprocessorEntities.Count); HydraRingPreprocessorEntity preprocessorEntity = entity.HydraRingPreprocessorEntities.First(); Assert.AreEqual(Convert.ToByte(usePreprocessor), preprocessorEntity.UsePreprocessor); Assert.AreEqual(preprocessorDirectory, preprocessorEntity.PreprocessorDirectory); - - int expectedNrOfHydraulicBoundaryLocations = assessmentSection.HydraulicBoundaryDatabase.Locations.Count; - Assert.AreEqual(expectedNrOfHydraulicBoundaryLocations, entity.HydraulicLocationEntities.Count); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity1, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity2, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity3, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity4, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity5, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity6, expectedNrOfHydraulicBoundaryLocations); - AssertHydraulicLocationCalculationCollectionEntity(entity.HydraulicLocationCalculationCollectionEntity7, expectedNrOfHydraulicBoundaryLocations); } [Test] @@ -329,11 +363,46 @@ Assert.AreEqual(expectedXml, entity.ReferenceLinePointXml); } - private static void AssertHydraulicLocationCalculationCollectionEntity(HydraulicLocationCalculationCollectionEntity collectionEntity, - int expectedNrOfCalculationEntities) + private static void SetHydraulicBoundaryLocationCalculationInputsOfAssessmentSection(AssessmentSection assessmentSection) { - Assert.IsNotNull(collectionEntity); - Assert.AreEqual(expectedNrOfCalculationEntities, collectionEntity.HydraulicLocationCalculationEntities.Count); + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForFactorizedSignalingNorm, 1); + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForSignalingNorm, 2); + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForLowerLimitNorm, 3); + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForFactorizedLowerLimitNorm, 4); + + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaveHeightCalculationsForFactorizedSignalingNorm, 5); + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaterLevelCalculationsForSignalingNorm, 6); + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaveHeightCalculationsForLowerLimitNorm, 7); + SetHydraulicBoundaryLocationCalculationInputs(assessmentSection.WaveHeightCalculationsForFactorizedLowerLimitNorm, 8); } + + private static void SetHydraulicBoundaryLocationCalculationInputs(IEnumerable calculations, + int seed) + { + var random = new Random(seed); + foreach (HydraulicBoundaryLocationCalculation calculation in calculations) + { + calculation.InputParameters.ShouldIllustrationPointsBeCalculated = random.NextBoolean(); + } + } + + private static void AssertHydraulicLocationCalculationCollectionEntity(IEnumerable expectedCalculations, + HydraulicLocationCalculationCollectionEntity actualCollectionEntity) + { + Assert.IsNotNull(actualCollectionEntity); + + HydraulicBoundaryLocationCalculation[] expectedCalculationsArray = expectedCalculations.ToArray(); + ICollection hydraulicLocationCalculationEntities = actualCollectionEntity.HydraulicLocationCalculationEntities; + Assert.AreEqual(expectedCalculationsArray.Length, hydraulicLocationCalculationEntities.Count); + + var i = 0; + foreach (HydraulicLocationCalculationEntity actualCalculationEntity in hydraulicLocationCalculationEntities) + { + HydraulicBoundaryLocationCalculation expectedCalculation = expectedCalculationsArray[i]; + Assert.AreEqual(Convert.ToByte(expectedCalculation.InputParameters.ShouldIllustrationPointsBeCalculated), + actualCalculationEntity.ShouldIllustrationPointsBeCalculated); + i++; + } + } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -r140b2cf264e61bdac873cc7ed2b04c32feda1f53 -r22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5 --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 140b2cf264e61bdac873cc7ed2b04c32feda1f53) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision 22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5) @@ -229,63 +229,63 @@ HydraulicBoundaryLocation hydraulicBoundaryLocation = section.HydraulicBoundaryDatabase.Locations.Single(); HydraulicBoundaryLocationCalculation calculation = section.WaterLevelCalculationsForFactorizedSignalingNorm.Single(); - HydraulicLocationCalculationEntity hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity + HydraulicLocationCalculationEntity hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity7 .HydraulicLocationCalculationEntities .Single(); AssertHydraulicBoundaryLocationCalculation(hydraulicLocationCalculationEntity, hydraulicBoundaryLocation, calculation); calculation = section.WaterLevelCalculationsForSignalingNorm.Single(); - hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity1 + hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity6 .HydraulicLocationCalculationEntities .Single(); AssertHydraulicBoundaryLocationCalculation(hydraulicLocationCalculationEntity, hydraulicBoundaryLocation, calculation); calculation = section.WaterLevelCalculationsForLowerLimitNorm.Single(); - hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity2 + hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity5 .HydraulicLocationCalculationEntities .Single(); AssertHydraulicBoundaryLocationCalculation(hydraulicLocationCalculationEntity, hydraulicBoundaryLocation, calculation); calculation = section.WaterLevelCalculationsForFactorizedLowerLimitNorm.Single(); - hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity3 + hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity4 .HydraulicLocationCalculationEntities .Single(); AssertHydraulicBoundaryLocationCalculation(hydraulicLocationCalculationEntity, hydraulicBoundaryLocation, calculation); calculation = section.WaveHeightCalculationsForFactorizedSignalingNorm.Single(); - hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity4 + hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity3 .HydraulicLocationCalculationEntities .Single(); AssertHydraulicBoundaryLocationCalculation(hydraulicLocationCalculationEntity, hydraulicBoundaryLocation, calculation); calculation = section.WaveHeightCalculationsForSignalingNorm.Single(); - hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity5 + hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity2 .HydraulicLocationCalculationEntities .Single(); AssertHydraulicBoundaryLocationCalculation(hydraulicLocationCalculationEntity, hydraulicBoundaryLocation, calculation); calculation = section.WaveHeightCalculationsForLowerLimitNorm.Single(); - hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity6 + hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity1 .HydraulicLocationCalculationEntities .Single(); AssertHydraulicBoundaryLocationCalculation(hydraulicLocationCalculationEntity, hydraulicBoundaryLocation, calculation); calculation = section.WaveHeightCalculationsForFactorizedLowerLimitNorm.Single(); - hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity7 + hydraulicLocationCalculationEntity = entity.HydraulicLocationCalculationCollectionEntity .HydraulicLocationCalculationEntities .Single(); AssertHydraulicBoundaryLocationCalculation(hydraulicLocationCalculationEntity, Index: build/DatabaseStructure.sql =================================================================== diff -u -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 -r22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5 --- build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision c020cda27aa3558aee28cce5cd2ec537ee6a9af4) +++ build/DatabaseStructure.sql (.../DatabaseStructure.sql) (revision 22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5) @@ -1,6 +1,6 @@ /* ---------------------------------------------------- */ /* Generated by Enterprise Architect Version 12.0 */ -/* Created On : 21-Mar-2018 16:44:30 */ +/* Created On : 22-Mar-2018 11:36:08 */ /* DBMS : SQLite */ /* ---------------------------------------------------- */ @@ -356,14 +356,14 @@ ( 'AssessmentSectionEntityId' INTEGER NOT NULL PRIMARY KEY AUTOINCREMENT, 'ProjectEntityId' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity1Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity2Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity3Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity4Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity5Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity6Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity7Id' INTEGER NOT NULL, - 'HydraulicLocationCalculationCollectionEntity8Id' INTEGER NOT NULL, + 'HydraulicLocationCalculationCollectionEntity1Id' INTEGER NOT NULL, -- Represents the design water level factorized signaling norm + 'HydraulicLocationCalculationCollectionEntity2Id' INTEGER NOT NULL, -- Represents the design water level signaling norm + 'HydraulicLocationCalculationCollectionEntity3Id' INTEGER NOT NULL, -- Represents the design water level lower limit norm + 'HydraulicLocationCalculationCollectionEntity4Id' INTEGER NOT NULL, -- Represents the design water level factorized lower limit norm + 'HydraulicLocationCalculationCollectionEntity5Id' INTEGER NOT NULL, -- Represents the wave height factorized signaling norm + 'HydraulicLocationCalculationCollectionEntity6Id' INTEGER NOT NULL, -- Represents the wave height signaling norm + 'HydraulicLocationCalculationCollectionEntity7Id' INTEGER NOT NULL, -- Represents the wave height lower limit norm + 'HydraulicLocationCalculationCollectionEntity8Id' INTEGER NOT NULL, -- Represents the wave height factorized lower limit norm 'Id' TEXT, 'Name' VARCHAR (260), 'Comments' TEXT, Index: design/DatabaseDesign.eap =================================================================== diff -u -rc020cda27aa3558aee28cce5cd2ec537ee6a9af4 -r22b6b1b34a6c769ffa7d16b7b8eef922bd7290f5 Binary files differ