Index: DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs =================================================================== diff -u -r2799 -r2908 --- DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2799) +++ DamEngine/trunk/src/Deltares.DamEngine.Data/General/Location.cs (.../Location.cs) (revision 2908) @@ -46,9 +46,6 @@ private IList gaugePlLines = new List(); private IList gauges = new List(); - private double? headPl2; - private double? headPl3; - private double? headPl4; // Start of parameters that are also defined in modelparameters private Pl1Line localXzpl1Line; Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r2904 -r2908 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 2904) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 2908) @@ -32,6 +32,7 @@ using Deltares.DamEngine.Data.General; using Deltares.DamEngine.Data.General.Results; using Deltares.DamEngine.Data.Standard.Calculation; +using Deltares.DamEngine.TestHelpers; using Deltares.DamEngine.TestHelpers.Factories; using NUnit.Framework; using LogMessage = Deltares.DamEngine.Data.Standard.Logging.LogMessage; @@ -45,6 +46,7 @@ private const string TestFolder = @"..\..\Deltares.DamEngine.Calculators.Tests\KernelWrappers\MacroStabilityInwards\TestFiles"; [Test] + [Category(Categories.WorkInProgress)] // based on wti so can probably be removed public void TestPrepare() { var kernelWrapper = new MacroStabilityInwardsKernelWrapper(); @@ -127,6 +129,7 @@ [TestCase("ValidateInfo.xml", LogMessageType.Info, "Dit is een Info bericht voor test")] [TestCase("ValidateWarning.xml", LogMessageType.Warning, "Dit is een Waarschuwings bericht voor test")] [TestCase("ValidateError.xml", LogMessageType.Error, "Voor geval 'Klei dijk op klei' (1A) moet de laag onder de dijk geen watervoerende laag zijn.")] + [Category(Categories.WorkInProgress)] // based on wti so can probably be removed public void TestParseValidationResultMessages(string fileName, LogMessageType logMessageType, string message) { List messages; @@ -140,6 +143,7 @@ } [Test] + [Category(Categories.WorkInProgress)] // based on wti so can probably be removed [ExpectedException(typeof(XmlSchemaValidationException), ExpectedMessage = "The 'Severity' attribute is invalid - The value 'Wrong' is invalid according to its datatype 'ValidationType' - The Enumeration constraint failed.")] public void TestParseValidationResultMessageWrongType() { @@ -151,6 +155,7 @@ } [Test] + [Category(Categories.WorkInProgress)] // based on wti so can probably be removed // Result1True.xml is generated with BmMacrostabiliteit 'Benchmark 1-01b.wti' // Result2True.xml is generated with BmMacrostabiliteit 'Benchmark 4-01b.wti' // An info and warning message were manually added