Index: DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs =================================================================== diff -u -r2151 -r2159 --- DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2151) +++ DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2159) @@ -202,28 +202,11 @@ public void CanLoadVersion_1_3_3_1() { const string projectFilenameHhnk = @"..\..\..\data\Dam\Versions\V 1.3.3.1\HHNK\TPL_Hempolder.damx"; - - // HHNK (Hollands Noorderkwartier) using (var projectData = ProjectLoader.LoadProjectData(projectFilenameHhnk)) { - // Check data - using (Location expectedLocation = CreateHhnkTplHempolder100()) - { - expectedLocation.SoildatabaseName = @"..\..\..\data\Dam\Versions\V 1.3.3.1\HHNK\TPL_Hempolder0.soilmaterials.mdb"; - Location actualLocation = projectData.Locations.Single(s => s.Name == "TPL_Hempolder_0100"); - CompareSegments(expectedLocation, actualLocation); - var result = compare.Compare(expectedLocation, actualLocation); - Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); - - CheckHempolderSurfaceline(actualLocation); - - // Check the surfaceline - - // TODO Implement for Delfland - - // TODO: Implement for HD (Hollandse Delta) - } - } + Assert.AreEqual(DamProjectType.AssessOld, projectData.DamProjectType); + Assert.AreEqual(0, projectData.Locations.Count); + } } @@ -317,25 +300,10 @@ public void CanLoadVersion_1_5_2_1() { const string fullProjectFilename = @"..\..\..\data\Dam\Versions\V 1.5.2.1\HHNK\TPL_Hempolder.damx"; - - // HHNK (Hollands Noorderkwartier) using (var projectData = ProjectLoader.LoadProjectData(fullProjectFilename)) { - // Check data - using (Location expectedLocation = CreateHhnkTplHempolder100()) - { - expectedLocation.SoildatabaseName = @"..\..\..\data\Dam\Versions\V 1.5.2.1\HHNK\TPL_Hempolder0.soilmaterials.mdb"; - Location actualLocation = projectData.Locations.Single(s => s.Name == "TPL_Hempolder_0100"); - CompareSegments(expectedLocation, actualLocation); - var result = compare.Compare(expectedLocation, actualLocation); - Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); - - CheckHempolderSurfaceline(actualLocation); - - // TODO Implement for Delfland - - // TODO: Implement for HD (Hollandse Delta) - } + Assert.AreEqual(DamProjectType.AssessOld, projectData.DamProjectType); + Assert.AreEqual(0, projectData.Locations.Count); } } @@ -349,151 +317,25 @@ using (var projectData = ProjectLoader.LoadProjectData(fullProjectFilename)) { - // Check data - using (Location expectedLocation = CreateHhnkTplHempolder100()) + if (projectData.DamProjectType == DamProjectType.AssessOld) { - expectedLocation.SoildatabaseName = Path.Combine(dataFolder, expectedSoilbaseName); - Location actualLocation = projectData.Locations.Single(s => s.Name == locationName); - CompareSegments(expectedLocation, actualLocation); - var result = compare.Compare(expectedLocation, actualLocation); - Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); - - CheckHempolderSurfaceline(actualLocation); - + Assert.AreEqual(0, projectData.Locations.Count); } - } - } - - [Test] - [Category("Integration")] - public void CanLoadVersion_14_1_1_14_SurfaceLine() - { - // Setup - const string projectFilenameHhnk = @"..\..\..\data\Dam\Versions\V 14.1.1.14\HHNK\TPL_Hempolder.damx"; - // call - using (var projectData = ProjectLoader.LoadProjectData(projectFilenameHhnk)) - { - // assert - Assert.AreEqual(1, projectData.WaterBoard.Dikes.Count); - var dike = projectData.WaterBoard.Dikes[0]; - Assert.AreEqual(43, dike.Locations.Count); - Assert.AreEqual(43, dike.SurfaceLines2.Count); - - var firstLocation = dike.Locations[0]; - var firstSurfaceLine = dike.SurfaceLines2[0]; - - var localXzSurfaceLine = firstLocation.LocalXZSurfaceLine2; - Assert.AreNotSame(firstSurfaceLine, localXzSurfaceLine); - Assert.AreSame(firstSurfaceLine, firstLocation.SurfaceLine2); - Assert.AreEqual(firstSurfaceLine.Name, firstLocation.SurfaceLine2.Name); - foreach (var geometryPoint in localXzSurfaceLine.Geometry.Points) + else { - CollectionAssert.DoesNotContain(firstSurfaceLine.Geometry.Points, geometryPoint, - "No reference should be shared between these two surfacelines."); - } - foreach (var geometryPoint in localXzSurfaceLine.CharacteristicPoints) - { - CollectionAssert.DoesNotContain(firstSurfaceLine.Geometry.Points, geometryPoint, - "No reference should be shared between these two surfacelines."); - } + // Check data + using (Location expectedLocation = CreateHhnkTplHempolder100()) + { + expectedLocation.SoildatabaseName = Path.Combine(dataFolder, expectedSoilbaseName); + Location actualLocation = projectData.Locations.Single(s => s.Name == locationName); + CompareSegments(expectedLocation, actualLocation); + var result = compare.Compare(expectedLocation, actualLocation); + Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); - #region Test variable 'localXzSurfaceLine' + CheckHempolderSurfaceline(actualLocation); - Assert.AreEqual(0, localXzSurfaceLine.Geometry.LatitudeAngle); - Assert.AreEqual(0, localXzSurfaceLine.Geometry.Offset); - Assert.AreEqual(DikeSideType.Outside, localXzSurfaceLine.Geometry.LeftDikeSideType); - Assert.AreEqual(new DateTime(2000, 1, 1), localXzSurfaceLine.Geometry.FromTime); - Assert.AreEqual(new DateTime(2000, 1, 1), localXzSurfaceLine.Geometry.UntilTime); - Assert.AreEqual("TPL_Hempolder_0010", localXzSurfaceLine.Name); - Assert.AreEqual(0, localXzSurfaceLine.Geometry.OriginalXy.X); - Assert.AreEqual(0, localXzSurfaceLine.Geometry.OriginalXy.Y); - - Assert.AreEqual(13, localXzSurfaceLine.CharacteristicPoints.Count(cp => cp.CharacteristicPointType != CharacteristicPointType.None)); - Assert.AreEqual(129, localXzSurfaceLine.Geometry.Points.Count); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[0], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside)); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[16], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver)); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[16], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseOutside)); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[25], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver)); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[22], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside)); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[28], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside)); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[29], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder)); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[37], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[40], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide)); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[41], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide)); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[42], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide)); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[43], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide)); - Assert.AreSame(localXzSurfaceLine.Geometry.Points[128], localXzSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside)); - - foreach (var geometryPoint in localXzSurfaceLine.Geometry.Points) - { - Assert.AreEqual(0, geometryPoint.Y); - Assert.AreEqual(" ", geometryPoint.Name); - Assert.AreEqual("", geometryPoint.Description); + } } - - // Check some geometry points: - Assert.AreEqual(39.056, localXzSurfaceLine.Geometry.Points[22].X, 1e-3); - Assert.AreEqual(0.0, localXzSurfaceLine.Geometry.Points[22].Z); - - Assert.AreEqual(48.5778, localXzSurfaceLine.Geometry.Points[42].X, 1e-3); - Assert.AreEqual(-2.1, localXzSurfaceLine.Geometry.Points[42].Z); - - Assert.AreEqual(130.0578, localXzSurfaceLine.Geometry.Points[127].X, 1e-3); - Assert.AreEqual(-1.18, localXzSurfaceLine.Geometry.Points[127].Z); - - #endregion - - #region Test variable 'firstSurfaceLine' - - Assert.AreEqual(0, firstSurfaceLine.Geometry.LatitudeAngle); - Assert.AreEqual(0, firstSurfaceLine.Geometry.Offset); - Assert.AreEqual(DikeSideType.Outside, firstSurfaceLine.Geometry.LeftDikeSideType); - Assert.AreEqual(new DateTime(2000, 1, 1), firstSurfaceLine.Geometry.FromTime); - Assert.AreEqual(new DateTime(2000, 1, 1), firstSurfaceLine.Geometry.UntilTime); - Assert.AreEqual("TPL_Hempolder_0010", firstSurfaceLine.Name); - Assert.AreEqual(0, firstSurfaceLine.Geometry.OriginalXy.X); - Assert.AreEqual(0, firstSurfaceLine.Geometry.OriginalXy.Y); - - Assert.AreEqual(13, firstSurfaceLine.CharacteristicPoints.Count(cp => cp.CharacteristicPointType != CharacteristicPointType.None)); - Assert.AreEqual(129, firstSurfaceLine.Geometry.Points.Count); - Assert.AreSame(firstSurfaceLine.Geometry.Points[0], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelOutside)); - Assert.AreSame(firstSurfaceLine.Geometry.Points[16], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtRiver)); - Assert.AreSame(firstSurfaceLine.Geometry.Points[16], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.ShoulderBaseOutside)); - Assert.AreSame(firstSurfaceLine.Geometry.Points[25], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtRiver)); - Assert.AreSame(firstSurfaceLine.Geometry.Points[22], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadOutside)); - Assert.AreSame(firstSurfaceLine.Geometry.Points[28], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.TrafficLoadInside)); - Assert.AreSame(firstSurfaceLine.Geometry.Points[29], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeTopAtPolder)); - Assert.AreSame(firstSurfaceLine.Geometry.Points[37], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DikeToeAtPolder)); - Assert.AreSame(firstSurfaceLine.Geometry.Points[40], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchDikeSide)); - Assert.AreSame(firstSurfaceLine.Geometry.Points[41], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchDikeSide)); - Assert.AreSame(firstSurfaceLine.Geometry.Points[42], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.BottomDitchPolderSide)); - Assert.AreSame(firstSurfaceLine.Geometry.Points[43], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.DitchPolderSide)); - Assert.AreSame(firstSurfaceLine.Geometry.Points[128], firstSurfaceLine.CharacteristicPoints.GetGeometryPoint(CharacteristicPointType.SurfaceLevelInside)); - - foreach (var geometryPoint in firstSurfaceLine.Geometry.Points) - { - Assert.AreEqual(" ", geometryPoint.Name); - Assert.AreEqual("", geometryPoint.Description); - } - - // Check some geometry points: - Assert.AreEqual(110615.85, firstSurfaceLine.Geometry.Points[5].X, 1e-6); - Assert.AreEqual(506911.84, firstSurfaceLine.Geometry.Points[5].Y, 1e-6); - Assert.AreEqual(-0.19, firstSurfaceLine.Geometry.Points[5].Z); - - Assert.AreEqual(110620.75, firstSurfaceLine.Geometry.Points[15].X, 1e-6); - Assert.AreEqual(506910.84, firstSurfaceLine.Geometry.Points[15].Y, 1e-6); - Assert.AreEqual(-0.16, firstSurfaceLine.Geometry.Points[15].Z); - - Assert.AreEqual(110713.35, firstSurfaceLine.Geometry.Points[127].X, 1e-3); - Assert.AreEqual(506891.99, firstSurfaceLine.Geometry.Points[127].Y, 1e-3); - Assert.AreEqual(-1.18, firstSurfaceLine.Geometry.Points[127].Z); - - #endregion - - var dikeJob = ((CompositeJob)projectData.WaterBoardJob).Jobs[0]; - Assert.AreSame(dike, dikeJob.Subject); - Assert.AreSame(firstLocation, ((CompositeJob)dikeJob).Jobs[0].Subject); } } @@ -508,17 +350,24 @@ using (var projectData = ProjectLoader.LoadProjectData(fullProjectFilename)) { - // Check data - using (Location expectedLocation = CreateHhnkTplHempolder100()) + if (projectData.DamProjectType == DamProjectType.AssessOld) { - expectedLocation.SoildatabaseName = Path.Combine(dataFolder, expectedSoilbaseName); - Location actualLocation = projectData.Locations.Single(s => s.Name == locationName); - CompareSegments(expectedLocation, actualLocation); - var result = compare.Compare(expectedLocation, actualLocation); - Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); + Assert.AreEqual(0, projectData.Locations.Count); + } + else + { + // Check data + using (Location expectedLocation = CreateHhnkTplHempolder100()) + { + expectedLocation.SoildatabaseName = Path.Combine(dataFolder, expectedSoilbaseName); + Location actualLocation = projectData.Locations.Single(s => s.Name == locationName); + CompareSegments(expectedLocation, actualLocation); + var result = compare.Compare(expectedLocation, actualLocation); + Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); - CheckHempolderSurfaceline(actualLocation); + CheckHempolderSurfaceline(actualLocation); + } } } } @@ -534,18 +383,26 @@ using (var projectData = ProjectLoader.LoadProjectData(fullProjectFilename)) { - // Check data - using (Location expectedLocation = CreateHhnkTplHempolder100()) + if (projectData.DamProjectType == DamProjectType.AssessOld) { - expectedLocation.SoildatabaseName = Path.Combine(dataFolder, expectedSoilbaseName); - Location actualLocation = projectData.Locations.Single(s => s.Name == locationName); - CompareSegments(expectedLocation, actualLocation); - var result = compare.Compare(expectedLocation, actualLocation); - Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); + Assert.AreEqual(0, projectData.Locations.Count); + } + else + { + using (Location expectedLocation = CreateHhnkTplHempolder100()) + { + expectedLocation.SoildatabaseName = Path.Combine(dataFolder, expectedSoilbaseName); + Location actualLocation = projectData.Locations.Single(s => s.Name == locationName); + CompareSegments(expectedLocation, actualLocation); + var result = compare.Compare(expectedLocation, actualLocation); + Assert.AreEqual(0, result.Differences.Count, result.DifferencesString); - CheckHempolderSurfaceline(actualLocation); + CheckHempolderSurfaceline(actualLocation); + } } + // Check data + } } @@ -572,13 +429,13 @@ /// - save this project /// - load this project /// - compare for a specific location if the data is correct - /// This test is based on the same data as in CanLoadVersion_1_3_3_1() + /// This test is based on the same data as in CanLoadVersion_15_1_1_3() /// [Test] [Category(Categories.Slow)] public void CanSaveAndLoadCurrentVersion() { - const string projectFilenameHhnk = @"..\..\..\data\Dam\Versions\V 1.3.3.1\HHNK\TPL_Hempolder.damx"; + const string projectFilenameHhnk = @"..\..\..\data\Dam\Versions\V 15.1.1.3\HHNKRegionalDesign\HHNK HemPolder Regional Design.damx"; const string projectFilenameCurrentVersion = @".\TPL_HempolderCurrent.damx"; // HHNK (Hollands Noorderkwartier)