Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/AssessmentSectionCreateExtensions.cs =================================================================== diff -u -rba834431b63ea0985c60a0987ca8fb720f801ab6 -rdcec45815c8f82a7331bb0e83e33d46f227d8324 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Create/AssessmentSectionCreateExtensions.cs (.../AssessmentSectionCreateExtensions.cs) (revision dcec45815c8f82a7331bb0e83e33d46f227d8324) @@ -123,15 +123,6 @@ entity.HydraulicDatabaseLocation = hydraulicBoundaryDatabase.FilePath.DeepClone(); entity.HydraulicDatabaseVersion = hydraulicBoundaryDatabase.Version.DeepClone(); - if (hydraulicBoundaryDatabase.CanUsePreprocessor) - { - entity.HydraRingPreprocessorEntities.Add(new HydraRingPreprocessorEntity - { - UsePreprocessor = Convert.ToByte(hydraulicBoundaryDatabase.UsePreprocessor), - PreprocessorDirectory = hydraulicBoundaryDatabase.PreprocessorDirectory.DeepClone() - }); - } - for (var i = 0; i < hydraulicBoundaryDatabase.Locations.Count; i++) { HydraulicBoundaryLocation hydraulicBoundaryLocation = hydraulicBoundaryDatabase.Locations[i]; Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/DbContext/PartialRingtoetsEntities.cs =================================================================== diff -u -r92a7d5fbc462aa16be6eba11ba9e7b54fcd38622 -rdcec45815c8f82a7331bb0e83e33d46f227d8324 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision 92a7d5fbc462aa16be6eba11ba9e7b54fcd38622) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/DbContext/PartialRingtoetsEntities.cs (.../PartialRingtoetsEntities.cs) (revision dcec45815c8f82a7331bb0e83e33d46f227d8324) @@ -85,7 +85,6 @@ .Load(); HydraulicLocationCalculationEntities.Load(); HydraulicLocationOutputEntities.Load(); - HydraRingPreprocessorEntities.Load(); MacroStabilityInwardsCharacteristicPointEntities.Load(); MacroStabilityInwardsSectionResultEntities.Load(); MacroStabilityInwardsFailureMechanismMetaEntities.Load(); Index: Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs =================================================================== diff -u -rba834431b63ea0985c60a0987ca8fb720f801ab6 -rdcec45815c8f82a7331bb0e83e33d46f227d8324 --- Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6) +++ Ringtoets/Storage/src/Ringtoets.Storage.Core/Read/AssessmentSectionEntityReadExtensions.cs (.../AssessmentSectionEntityReadExtensions.cs) (revision dcec45815c8f82a7331bb0e83e33d46f227d8324) @@ -122,20 +122,10 @@ { if (entity.HydraulicDatabaseLocation != null) { - HydraRingPreprocessorEntity preprocessorEntity = entity.HydraRingPreprocessorEntities.FirstOrDefault(); - HydraulicBoundaryDatabase hydraulicBoundaryDatabase = assessmentSection.HydraulicBoundaryDatabase; - hydraulicBoundaryDatabase.FilePath = entity.HydraulicDatabaseLocation; hydraulicBoundaryDatabase.Version = entity.HydraulicDatabaseVersion; - if (preprocessorEntity != null) - { - hydraulicBoundaryDatabase.CanUsePreprocessor = true; - hydraulicBoundaryDatabase.UsePreprocessor = Convert.ToBoolean(preprocessorEntity.UsePreprocessor); - hydraulicBoundaryDatabase.PreprocessorDirectory = preprocessorEntity.PreprocessorDirectory; - } - HydraulicBoundaryLocation[] readHydraulicBoundaryLocations = entity.HydraulicLocationEntities .OrderBy(hl => hl.Order) .Select(hle => hle.Read(collector)) Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs =================================================================== diff -u -rba834431b63ea0985c60a0987ca8fb720f801ab6 -rdcec45815c8f82a7331bb0e83e33d46f227d8324 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Create/AssessmentSectionCreateExtensionsTest.cs (.../AssessmentSectionCreateExtensionsTest.cs) (revision dcec45815c8f82a7331bb0e83e33d46f227d8324) @@ -196,7 +196,6 @@ Assert.IsNull(entity.HydraulicDatabaseLocation); Assert.IsNull(entity.HydraulicDatabaseVersion); CollectionAssert.IsEmpty(entity.HydraulicLocationEntities); - CollectionAssert.IsEmpty(entity.HydraRingPreprocessorEntities); AssertHydraulicLocationCalculationCollectionEntities(assessmentSection, entity); } @@ -239,72 +238,6 @@ } [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 - const string testFilePath = "path"; - const string testVersion = "1"; - const bool usePreprocessor = true; - const string preprocessorDirectory = "directory"; - - var assessmentSection = new AssessmentSection(AssessmentSectionComposition.Dike) - { - HydraulicBoundaryDatabase = - { - FilePath = testFilePath, - Version = testVersion, - Locations = - { - new HydraulicBoundaryLocation(-1, "name", 1, 2) - }, - CanUsePreprocessor = true, - UsePreprocessor = usePreprocessor, - PreprocessorDirectory = preprocessorDirectory - } - }; - - var registry = new PersistenceRegistry(); - - // Call - AssessmentSectionEntity entity = assessmentSection.Create(registry, 0); - - // Assert - Assert.AreEqual(1, entity.HydraRingPreprocessorEntities.Count); - HydraRingPreprocessorEntity preprocessorEntity = entity.HydraRingPreprocessorEntities.First(); - Assert.AreEqual(Convert.ToByte(usePreprocessor), preprocessorEntity.UsePreprocessor); - Assert.AreEqual(preprocessorDirectory, preprocessorEntity.PreprocessorDirectory); - } - - [Test] public void Create_WithReferenceLine_AddsReferenceLinePointEntities() { // Setup Index: Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs =================================================================== diff -u -rba834431b63ea0985c60a0987ca8fb720f801ab6 -rdcec45815c8f82a7331bb0e83e33d46f227d8324 --- Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision ba834431b63ea0985c60a0987ca8fb720f801ab6) +++ Ringtoets/Storage/test/Ringtoets.Storage.Core.Test/Read/AssessmentSectionEntityReadExtensionsTest.cs (.../AssessmentSectionEntityReadExtensionsTest.cs) (revision dcec45815c8f82a7331bb0e83e33d46f227d8324) @@ -387,7 +387,7 @@ } [Test] - public void Read_WithHydraulicDatabaseLocationWithoutPreprocessor_ReturnsNewAssessmentSectionWithHydraulicDatabaseSet() + public void Read_WithHydraulicBoundaryLocationDatabase_ReturnsNewAssessmentSectionWithHydraulicDatabaseSet() { // Setup AssessmentSectionEntity entity = CreateAssessmentSectionEntity(); @@ -420,46 +420,6 @@ } [Test] - public void Read_WithHydraulicDatabaseLocationAndPreprocessor_ReturnsNewAssessmentSectionWithHydraulicDatabaseSet() - { - // Setup - AssessmentSectionEntity entity = CreateAssessmentSectionEntity(); - - const string testLocation = "testLocation"; - const string testVersion = "testVersion"; - const byte usePreprocessor = 1; - const string preprocessorDirectory = "preprocessorLocation"; - entity.HydraulicDatabaseLocation = testLocation; - entity.HydraulicDatabaseVersion = testVersion; - entity.BackgroundDataEntities.Add(CreateBackgroundDataEntity()); - entity.HydraRingPreprocessorEntities.Add(new HydraRingPreprocessorEntity - { - UsePreprocessor = usePreprocessor, - PreprocessorDirectory = preprocessorDirectory - }); - entity.HydraulicLocationCalculationCollectionEntity = new HydraulicLocationCalculationCollectionEntity(); - entity.HydraulicLocationCalculationCollectionEntity1 = new HydraulicLocationCalculationCollectionEntity(); - entity.HydraulicLocationCalculationCollectionEntity2 = new HydraulicLocationCalculationCollectionEntity(); - entity.HydraulicLocationCalculationCollectionEntity3 = new HydraulicLocationCalculationCollectionEntity(); - entity.HydraulicLocationCalculationCollectionEntity4 = new HydraulicLocationCalculationCollectionEntity(); - entity.HydraulicLocationCalculationCollectionEntity5 = new HydraulicLocationCalculationCollectionEntity(); - entity.HydraulicLocationCalculationCollectionEntity6 = new HydraulicLocationCalculationCollectionEntity(); - entity.HydraulicLocationCalculationCollectionEntity7 = new HydraulicLocationCalculationCollectionEntity(); - - var collector = new ReadConversionCollector(); - - // Call - AssessmentSection section = entity.Read(collector); - - // Assert - Assert.AreEqual(testLocation, section.HydraulicBoundaryDatabase.FilePath); - Assert.AreEqual(testVersion, section.HydraulicBoundaryDatabase.Version); - Assert.IsTrue(section.HydraulicBoundaryDatabase.CanUsePreprocessor); - Assert.AreEqual(Convert.ToBoolean(usePreprocessor), section.HydraulicBoundaryDatabase.UsePreprocessor); - Assert.AreEqual(preprocessorDirectory, section.HydraulicBoundaryDatabase.PreprocessorDirectory); - } - - [Test] public void Read_WithPipingFailureMechanismProperties_ReturnsNewAssessmentSectionWithPropertiesInPipingFailureMechanism() { // Setup