Index: DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs =================================================================== diff -u -r2140 -r2141 --- DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2140) +++ DamClients/DamUI/trunk/src/Dam/Tests/LoadCompatiblityTest.cs (.../LoadCompatiblityTest.cs) (revision 2141) @@ -60,7 +60,10 @@ compare.Config.DoublePrecision = 0.000000001; compare.Config.MembersToIgnore = new List { - "SheetPilePoint", + "SurfaceLineId", + "LevelReductionInside", // Never used + "LevelReductionOutside", // Never used + "SheetPilePoint", "SheetPilePointX", "SheetPilePointY", "SheetPilePointZ", @@ -226,15 +229,16 @@ private static void CheckHempolderSurfaceline(Location actualLocation) { + const double accuracy = 0.01; // quick check for surfaceline2 conversion Assert.NotNull(actualLocation.SurfaceLine2); Assert.AreEqual("TPL_Hempolder_0100", actualLocation.SurfaceLine2.Name); Assert.AreEqual(true, actualLocation.SurfaceLine2.CharacteristicPoints.GeometryMustContainPoint); Assert.AreEqual(true, actualLocation.SurfaceLine2.HasDike()); var dikeToeAtRiver = actualLocation.SurfaceLine2.CharacteristicPoints.FirstOrDefault(p => p.CharacteristicPointType == CharacteristicPointType.DikeToeAtRiver); Assert.NotNull(dikeToeAtRiver); - Assert.AreEqual(111222.28, dikeToeAtRiver.X, GeometryConstants.Accuracy); - Assert.AreEqual(507206.24, dikeToeAtRiver.Y, GeometryConstants.Accuracy); + Assert.AreEqual(111222.28, dikeToeAtRiver.X, accuracy); + Assert.AreEqual(507206.24, dikeToeAtRiver.Y, accuracy); } /// @@ -495,7 +499,6 @@ [Test] [Category("Integration")] - [Category("Work_In_Progress")] [TestCase(@"HHNK\TPL_Hempolder.damx", @"HHNK\TPL_Hempolder0.soilmaterials.mdb", "TPL_Hempolder_0100")] [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")] public void CanLoadVersion_15_1_1_3(string projectFilename, string expectedSoilbaseName, string locationName) @@ -522,7 +525,6 @@ [Test] [Category("Integration")] - [Category("Work_In_Progress")] [TestCase(@"HHNK\TPL_Hempolder.damx", @"HHNK\TPL_Hempolder0.soilmaterials.mdb", "TPL_Hempolder_0100")] [TestCase(@"HHNKRegionalDesign\HHNK HemPolder Regional Design.damx", @"HHNKRegionalDesign\HHNK HemPolder Regional Design0.soilmaterials.mdb", "TPL_Hempolder_0100")] public void CanLoadVersion_18_1_3(string projectFilename, string expectedSoilbaseName, string locationName)