Skip to content

Commit

Permalink
Re #11508 Attempt to identify the reason for failure on MAC
Browse files Browse the repository at this point in the history
  • Loading branch information
abuts committed Apr 22, 2015
1 parent abe1cbd commit 91b4d6e
Showing 1 changed file with 12 additions and 9 deletions.
21 changes: 12 additions & 9 deletions Code/Mantid/Framework/DataHandling/test/LoadParameterFileTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
#define LOADPARAMETERFILETEST_H_

#include <cxxtest/TestSuite.h>

/*
#include "MantidDataHandling/LoadParameterFile.h"
#include "MantidDataHandling/LoadInstrument.h"
#include "MantidGeometry/Instrument/FitParameter.h"
Expand All @@ -15,6 +15,7 @@
#include "MantidAPI/Workspace.h"
#include "MantidAPI/Algorithm.h"
#include "MantidGeometry/Instrument/Component.h"
#include <vector>
#include <iostream>
Expand All @@ -23,13 +24,14 @@ using namespace Mantid::Kernel;
using namespace Mantid::Geometry;
using namespace Mantid::DataHandling;
using namespace Mantid::DataObjects;

*/
class LoadParameterFileTest : public CxxTest::TestSuite
{
public:

void testExecIDF_for_unit_testing2() // IDF stands for Instrument Definition File
{
/*
MatrixWorkspace_sptr output;
// Create workspace wsName
Expand Down Expand Up @@ -96,10 +98,10 @@ class LoadParameterFileTest : public CxxTest::TestSuite
TS_ASSERT_DELTA (dummy[0], 2000.0, 0.0001);
AnalysisDataService::Instance().remove(wsName);

*/
}

void testExec_withIDFString() // Test use of string instead of file
/*
void xestExec_withIDFString() // Test use of string instead of file
{
// Create workspace
Expand Down Expand Up @@ -166,11 +168,11 @@ class LoadParameterFileTest : public CxxTest::TestSuite
TS_ASSERT_DELTA (dummy[0], 2010.0, 0.0001);
AnalysisDataService::Instance().remove(wsName);

}
void test_failure_if_no_file_or_string()
void xest_failure_if_no_file_or_string()
{
// Create workspace
load_IDF2();
Expand Down Expand Up @@ -204,12 +206,13 @@ class LoadParameterFileTest : public CxxTest::TestSuite
TS_ASSERT( loaderIDF2.isExecuted() );
}

*/

private:
/*
std::string inputFile;
std::string wsName;

*/
};

#endif /*LOADPARAMETERFILETEST_H_*/

0 comments on commit 91b4d6e

Please sign in to comment.