Index: Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs =================================================================== diff -u -r2ae1c9433c3c28b32105b9778b682b5e512a0f00 -rcb5d2139148256919e697cc6b25011513ac8d6ad --- Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision 2ae1c9433c3c28b32105b9778b682b5e512a0f00) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.Test/IntegrationTests/StorageSqLiteIntegrationTest.cs (.../StorageSqLiteIntegrationTest.cs) (revision cb5d2139148256919e697cc6b25011513ac8d6ad) @@ -9,6 +9,7 @@ using Core.Common.Gui.Settings; using Core.Common.TestUtil; using NUnit.Framework; +using Ringtoets.Common.Data; using Ringtoets.Integration.Data; namespace Application.Ringtoets.Storage.Test.IntegrationTests @@ -67,6 +68,8 @@ { Assert.AreEqual(firstProjectDike[i].StorageId, secondProjectDike[i].StorageId); Assert.AreEqual(firstProjectDike[i].Name, secondProjectDike[i].Name); + + AssertHydraulicBoundaryDatabase(firstProjectDike[i], secondProjectDike[i]); } var firstProjectDune = firstProject.Items.OfType().ToList(); @@ -76,6 +79,8 @@ { Assert.AreEqual(firstProjectDune[i].StorageId, secondProjectDune[i].StorageId); Assert.AreEqual(firstProjectDune[i].Name, secondProjectDune[i].Name); + + AssertHydraulicBoundaryDatabase(firstProjectDune[i], secondProjectDune[i]); } } @@ -101,6 +106,10 @@ Assert.IsInstanceOf(loadedProject); Assert.AreNotSame(fullProject, loadedProject); Assert.AreEqual(fullProject.Items.Count, loadedProject.Items.Count); + + var assessmentSection = loadedProject.Items.OfType().FirstOrDefault(); + Assert.IsNotNull(assessmentSection); + AssertHydraulicBoundaryDatabase(fullProject.Items.OfType().FirstOrDefault(), assessmentSection); } [Test] @@ -132,6 +141,10 @@ Assert.NotNull(gui.Project); Assert.AreEqual(expectedProjectName, gui.Project.Name); Assert.AreEqual(expectedProjectDescritpion, gui.Project.Description); + + var assessmentSection = gui.Project.Items.OfType().FirstOrDefault(); + Assert.IsNotNull(assessmentSection); + AssertHydraulicBoundaryDatabase(fullProject.Items.OfType().FirstOrDefault(), assessmentSection); } // TearDown @@ -197,6 +210,23 @@ } } + private static void AssertHydraulicBoundaryDatabase(AssessmentSectionBase expectedProject, AssessmentSectionBase project) + { + Assert.IsNotNull(expectedProject.HydraulicBoundaryDatabase); + Assert.AreEqual(expectedProject.HydraulicBoundaryDatabase.Version, project.HydraulicBoundaryDatabase.Version); + Assert.AreEqual(expectedProject.HydraulicBoundaryDatabase.FilePath, project.HydraulicBoundaryDatabase.FilePath); + Assert.AreEqual(expectedProject.HydraulicBoundaryDatabase.Locations.Count, project.HydraulicBoundaryDatabase.Locations.Count); + + for (int i = 0; i < expectedProject.HydraulicBoundaryDatabase.Locations.Count; i++) + { + Assert.AreEqual(expectedProject.HydraulicBoundaryDatabase.Locations[i].Id, project.HydraulicBoundaryDatabase.Locations[i].Id); + Assert.AreEqual(expectedProject.HydraulicBoundaryDatabase.Locations[i].Name, project.HydraulicBoundaryDatabase.Locations[i].Name); + Assert.AreEqual(expectedProject.HydraulicBoundaryDatabase.Locations[i].DesignWaterLevel, project.HydraulicBoundaryDatabase.Locations[i].DesignWaterLevel); + Assert.AreEqual(expectedProject.HydraulicBoundaryDatabase.Locations[i].StorageId, project.HydraulicBoundaryDatabase.Locations[i].StorageId); + Assert.AreEqual(expectedProject.HydraulicBoundaryDatabase.Locations[i].Location, project.HydraulicBoundaryDatabase.Locations[i].Location); + } + } + private void TearDownTempRingtoetsFile(string filePath) { GC.Collect(); Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj =================================================================== diff -u -rfadb006ef0285eb3fdbdbfc805729b37c8dbc0e6 -rcb5d2139148256919e697cc6b25011513ac8d6ad --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj (.../Application.Ringtoets.Storage.TestUtil.Test.csproj) (revision fadb006ef0285eb3fdbdbfc805729b37c8dbc0e6) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/Application.Ringtoets.Storage.TestUtil.Test.csproj (.../Application.Ringtoets.Storage.TestUtil.Test.csproj) (revision cb5d2139148256919e697cc6b25011513ac8d6ad) @@ -93,6 +93,10 @@ {d4200f43-3f72-4f42-af0a-8ced416a38ec} Ringtoets.Common.Data + + {70f8cc9c-5bc8-4fb2-b201-eae7fa8088c2} + Ringtoets.HydraRing.Data + {11F1F874-45AF-43E4-8AE5-15A5C9593E28} Ringtoets.Integration.Data Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectHelperTest.cs =================================================================== diff -u -r2ae1c9433c3c28b32105b9778b682b5e512a0f00 -rcb5d2139148256919e697cc6b25011513ac8d6ad --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectHelperTest.cs (.../RingtoetsProjectHelperTest.cs) (revision 2ae1c9433c3c28b32105b9778b682b5e512a0f00) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil.Test/RingtoetsProjectHelperTest.cs (.../RingtoetsProjectHelperTest.cs) (revision cb5d2139148256919e697cc6b25011513ac8d6ad) @@ -22,6 +22,7 @@ using System.Linq; using Core.Common.Base.Data; using NUnit.Framework; +using Ringtoets.HydraRing.Data; using Ringtoets.Integration.Data; namespace Application.Ringtoets.Storage.TestUtil.Test @@ -37,6 +38,14 @@ string expectedDescription = "description"; string expectedDikeAssessmentSectionName = "dikeAssessmentSection"; + string hydraulicDatabaseFilePath = "/temp/test"; + string hydraulicDatabaseVersion = "1.0"; + + long locationId = 13001; + string locationName = "test"; + double locationX = 152.3; + double locationY = 2938.5; + double designWaterLevel = 12.4; // Call Project project = RingtoetsProjectHelper.GetFullTestProject(); @@ -47,6 +56,18 @@ DikeAssessmentSection dikeAssessmentSection = project.Items.OfType().FirstOrDefault(); Assert.NotNull(dikeAssessmentSection); Assert.AreEqual(expectedDikeAssessmentSectionName, dikeAssessmentSection.Name); + + Assert.NotNull(dikeAssessmentSection.HydraulicBoundaryDatabase); + Assert.AreEqual(hydraulicDatabaseVersion, dikeAssessmentSection.HydraulicBoundaryDatabase.Version); + Assert.AreEqual(hydraulicDatabaseFilePath, dikeAssessmentSection.HydraulicBoundaryDatabase.FilePath); + Assert.AreEqual(1, dikeAssessmentSection.HydraulicBoundaryDatabase.Locations.Count); + + HydraulicBoundaryLocation hydraulicBoundaryLocation = dikeAssessmentSection.HydraulicBoundaryDatabase.Locations.First(); + Assert.AreEqual(locationId, hydraulicBoundaryLocation.Id); + Assert.AreEqual(locationName, hydraulicBoundaryLocation.Name); + Assert.AreEqual(locationX, hydraulicBoundaryLocation.Location.X); + Assert.AreEqual(locationY, hydraulicBoundaryLocation.Location.Y); + Assert.AreEqual(designWaterLevel, hydraulicBoundaryLocation.DesignWaterLevel); } } } \ No newline at end of file Index: Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectHelper.cs =================================================================== diff -u -r1395d3e2c0a6df5b27da3a44c820ca90eab3492c -rcb5d2139148256919e697cc6b25011513ac8d6ad --- Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectHelper.cs (.../RingtoetsProjectHelper.cs) (revision 1395d3e2c0a6df5b27da3a44c820ca90eab3492c) +++ Application/Ringtoets/test/Application.Ringtoets.Storage.TestUtil/RingtoetsProjectHelper.cs (.../RingtoetsProjectHelper.cs) (revision cb5d2139148256919e697cc6b25011513ac8d6ad) @@ -59,7 +59,10 @@ FilePath = "/temp/test", Version = "1.0" }; - hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(13001, "test", 152.3, 2938.5)); + hydraulicBoundaryDatabase.Locations.Add(new HydraulicBoundaryLocation(13001, "test", 152.3, 2938.5) + { + DesignWaterLevel = 12.4 + }); return hydraulicBoundaryDatabase; }