From 2b6c02d1a3ecb6bcc719c155d8d920b1fcab096b Mon Sep 17 00:00:00 2001
From: Steven Hahn <hahnse@ornl.gov>
Date: Tue, 31 Mar 2015 15:24:36 -0400
Subject: [PATCH] Refs #11458. Rename files with the same name.
---
.../Framework/DataHandling/test/LoadFullprofResolutionTest.h | 4 ++--
.../Framework/DataHandling/test/LoadGSASInstrumentFileTest.h | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Code/Mantid/Framework/DataHandling/test/LoadFullprofResolutionTest.h b/Code/Mantid/Framework/DataHandling/test/LoadFullprofResolutionTest.h
index 878ab8807fe..b8d36d13bb2 100644
--- a/Code/Mantid/Framework/DataHandling/test/LoadFullprofResolutionTest.h
+++ b/Code/Mantid/Framework/DataHandling/test/LoadFullprofResolutionTest.h
@@ -328,7 +328,7 @@ public:
void test_workspace()
{
// Generate file
- string filename("TestWorskpace.irf");
+ string filename("FullprofResolutionTest_TestWorkspace.irf");
generate1BankIrfFile(filename);
// Load workspace group wsName with one workspace
@@ -412,7 +412,7 @@ public:
}
// Clean
- Poco::File("TestWorskpace.irf").remove();
+ Poco::File(filename).remove();
}
//----------------------------------------------------------------------------------------------
diff --git a/Code/Mantid/Framework/DataHandling/test/LoadGSASInstrumentFileTest.h b/Code/Mantid/Framework/DataHandling/test/LoadGSASInstrumentFileTest.h
index 0ae94946fa5..65d102d5c49 100644
--- a/Code/Mantid/Framework/DataHandling/test/LoadGSASInstrumentFileTest.h
+++ b/Code/Mantid/Framework/DataHandling/test/LoadGSASInstrumentFileTest.h
@@ -208,7 +208,7 @@ public:
void test_workspace()
{
// Generate file with two banks
- string filename("TestWorskpace.irf");
+ string filename("GSASInstrumentFileTest_TestWorkspace.irf");
generate2BankPrmFile(filename);
// Create workspace group to put parameters into
@@ -308,7 +308,7 @@ public:
TS_ASSERT_EQUALS( fitParam.getValue( 0.0 ), 0.0);
// Clean
- Poco::File("TestWorskpace.irf").remove();
+ Poco::File(filename).remove();
AnalysisDataService::Instance().remove("loadGSASInstrumentFileWorkspace");
}
--
GitLab