refs #6362 All failing tests trying to delete files before and after

mantidproject · Jan 22, 2013 · 78bd02d · 78bd02d
1 parent 84c4c2d
commit 78bd02d
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 1 deletion.
diff --git a/Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h b/Code/Mantid/Framework/MDAlgorithms/test/CreateMDWorkspaceTest.h
@@ -79,6 +79,12 @@ class CreateMDWorkspaceTest : public CxxTest::TestSuite
 
   void do_test_exec(std::string Filename, bool lean, int MinRecursionDepth=0, int expectedNumMDBoxes=216)
   {
+    if (Filename != "")
+    {
+       if (Poco::File(Filename).exists()) Poco::File(Filename).remove();
+    }
+
+
     std::string wsName = "CreateMDWorkspaceTest_out";
     CreateMDWorkspace alg;
     TS_ASSERT_THROWS_NOTHING( alg.initialize() )

diff --git a/Code/Mantid/Framework/MDAlgorithms/test/MergeMDFilesTest.h b/Code/Mantid/Framework/MDAlgorithms/test/MergeMDFilesTest.h
@@ -40,6 +40,12 @@ class MergeMDFilesTest : public CxxTest::TestSuite
 
   void do_test_exec(std::string OutputFilename)
   {
+    if (OutputFilename != "")
+    {
+       if (Poco::File(OutputFilename).exists()) Poco::File(OutputFilename).remove();
+    }
+
+
     // Create a bunch of input files
     std::vector<std::vector<std::string> > filenames;
     std::vector<MDEventWorkspace3Lean::sptr> inWorkspaces;
@@ -96,6 +102,12 @@ class MergeMDFilesTest : public CxxTest::TestSuite
 
     // Remove workspace from the data service.
     AnalysisDataService::Instance().remove(outWSName);
+
+    if (OutputFilename != "")
+    {
+       if (Poco::File(OutputFilename).exists()) Poco::File(OutputFilename).remove();
+    }
+
   }
 
 

diff --git a/Code/Mantid/Framework/MDAlgorithms/test/SliceMDTest.h b/Code/Mantid/Framework/MDAlgorithms/test/SliceMDTest.h
@@ -130,6 +130,11 @@ class SliceMDTest : public CxxTest::TestSuite
       bool willFail = false,
       std::string OutputFilename = "")
   {
+    if (OutputFilename != "")
+    {
+       if (Poco::File(OutputFilename).exists()) Poco::File(OutputFilename).remove();
+    }
+
     SliceMD alg;
     TS_ASSERT_THROWS_NOTHING( alg.initialize() )
     TS_ASSERT( alg.isInitialized() )
@@ -171,7 +176,13 @@ class SliceMDTest : public CxxTest::TestSuite
     AnalysisDataService::Instance().remove("SliceMDTest_ws");
     AnalysisDataService::Instance().remove("SliceMDTest_outWS");
     // Clean up file
-  out->getBoxController()->closeFile(true);
+    out->getBoxController()->closeFile(true);
+
+    if (OutputFilename != "")
+    {
+       if (Poco::File(OutputFilename).exists()) Poco::File(OutputFilename).remove();
+    }
+
   }