Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs
===================================================================
diff -u -r5360 -r5370
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5360)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/IntegrationTests/MacroStabilityInwardsTests.cs (.../MacroStabilityInwardsTests.cs) (revision 5370)
@@ -46,54 +46,6 @@
private const string mapTestFiles = @"TestFiles\";
private const double tol2Digits = 0.005;
- [TearDown]
- public void TearDown()
- {
- // Ensure clearing directories at end.
- RemoveUsedDirectoryAfterTests("2DGeometryNoFittingSurfaceLine");
- RemoveUsedDirectoryAfterTests("TestStabInwardsBishop2DStix");
- RemoveUsedDirectoryAfterTests("TestStabInwardsBishop");
- RemoveUsedDirectoryAfterTests("TestStabInwardsUpliftVan");
- RemoveUsedDirectoryAfterTests("TestStabInwardsBishopUpliftVan_UpliftVanLowest");
- RemoveUsedDirectoryAfterTests("TestStabInwardsBishopUpliftVan_BishopLowest");
- RemoveUsedDirectoryAfterTests("TestStabInwardsBishopUpliftVan_NoUplift");
- RemoveUsedDirectoryAfterTests("TestStabInwardsForbiddenZoneBishop");
- RemoveUsedDirectoryAfterTests("TestStabInwardsWithErrorUpliftVan");
- RemoveUsedDirectoryAfterTests("TestStabInwardsWithErrorBishopUpliftVan");
- RemoveUsedDirectoryAfterTests("TestRunFailedExpectCalculationMessageInOptimizedSlopeAndShoulderAdaption");
- RemoveUsedDirectoryAfterTests("TestRunFailedExpectCalculationMessageInSlopeAdaptionBeforeShoulderAdaption");
- RemoveUsedDirectoryAfterTests("TestGiveFeedBackWhenNoProfilesAreAvailable");
- RemoveUsedDirectoryAfterTests("TestStabInwardsBishopWithStixFiles");
- RemoveUsedDirectoryAfterTests("TestStabInwardsUpliftVanWithStixFiles");
- RemoveUsedDirectoryAfterTests("TestStabInwardsBishopUpliftVanWithUpliftWithStixFiles");
- RemoveUsedDirectoryAfterTests("TestStabInwardsBishopUpliftVanWithoutUpliftWithStixFiles");
- }
-
- [Test, Category("Slow"), Ignore("This test is not yet implemented, waits on stix implementation")]
- //ToDo bka: The profiles that are mentioned in the xml are not available
- [Category(Categories.WorkInProgress)]
- public void TestBishopNoAdaptionWith2DGeometriesBasedOnStixFiles()
- {
- const string calcDir = "TestStabInwardsBishop2DStix";
- if (Directory.Exists(calcDir))
- {
- Directory.Delete(calcDir, true); // delete previous results
- }
-
- Directory.CreateDirectory(calcDir);
-
- const string fileName = @"TestFiles\Test2DGeometryBasedOnStixFiles.xml";
- string inputString = File.ReadAllText(fileName);
- inputString = XmlAdapter.ChangeValueInXml(inputString, "ProjectPath", ""); // Current directory will be used
- inputString = XmlAdapter.ChangeValueInXml(inputString, "CalculationMap", calcDir); // Current directory will be used
- var engineInterface = new EngineInterface(inputString);
- Assert.That(engineInterface.DamProjectData, Is.Not.Null);
-
- Output output = GeneralHelper.RunAfterInputValidation(inputString);
-
- Assert.That(output.Results.CalculationResults[0].StabilityDesignResults.SafetyFactor, Is.EqualTo(1.282).Within(tolerance));
- }
-
/// Test for different segmentFailureMechanismType
/// The soil probabilities are set tot the specified segmentFailureMechanismType
[Test, Category(Categories.Slow)]
@@ -956,14 +908,6 @@
}
}
- private void RemoveUsedDirectoryAfterTests(string directory)
- {
- if (Directory.Exists(directory))
- {
- //Directory.Delete(directory, true);
- }
- }
-
private static Output GetOutputStringForProject(string analysisType)
{
const string calcDir = "TestStabInwardsBishop";
Index: DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj
===================================================================
diff -u -r5359 -r5370
--- DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5359)
+++ DamEngine/trunk/src/Deltares.DamEngine.IntegrationTests/Deltares.DamEngine.IntegrationTests.csproj (.../Deltares.DamEngine.IntegrationTests.csproj) (revision 5370)
@@ -233,9 +233,6 @@
PreserveNewest
-
- PreserveNewest
-
PreserveNewest