Index: DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs =================================================================== diff -u -r3624 -r3635 --- DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3624) +++ DamEngine/trunk/src/Deltares.DamEngine.Calculators.Tests/KernelWrappers/MacroStabilityInwards/MacroStabilityInwardsKernelWrapperTests.cs (.../MacroStabilityInwardsKernelWrapperTests.cs) (revision 3635) @@ -113,7 +113,7 @@ messages.Clear(); errorCount = kernelWrapper.Validate(kernelDataInput, kernelDataOutput, out messages); Assert.IsTrue(errorCount == 0); - Assert.AreEqual(CalculationResult.NoRun, (kernelDataOutput as MacroStabilityOutput).CalculationResult); + Assert.AreEqual(CalculationResult.NoRun, ((MacroStabilityOutput)kernelDataOutput).CalculationResult); } [Test] @@ -482,30 +482,6 @@ } [Test] - [Ignore("Test disabled implementation of Bishop model in Engine. Investigate if the test is still usefull")] - public void CalculationBishopBasedOnDamEngineXmlFailsForWrongType() - { - const string calcDir = "TestStabInwardsBishop"; - if (Directory.Exists(calcDir)) - { - Directory.Delete(calcDir, true); // delete previous results - } - - Directory.CreateDirectory(calcDir); - string inputString = File.ReadAllText(inputXmlForDamEngine); - inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used - inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used - EngineInterface engineInterface = new EngineInterface(inputString); - Assert.IsNotNull(engineInterface.DamProjectData); - - string outputString = engineInterface.Run(); - - Assert.IsNotNull(outputString); - var output = DamXmlSerialization.LoadOutputFromXmlString(outputString); - Assert.AreEqual(3, output.Results.CalculationMessages.Length, "No results available"); - } - - [Test] public void CalculationUpliftBasedOnDamEngineXmlWorks() { const string calcDir = "TestStabInwardsBishop";