Skip to content

Commit

Permalink
Added the deprecation message parameters and the unit test. Re #6854.
Browse files Browse the repository at this point in the history
  • Loading branch information
@mantid-roman
mantid-roman committed Apr 22, 2013
1 parent b531566 commit 90cbfc8
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 172 deletions.
2 changes: 1 addition & 1 deletion Code/Mantid/Framework/DataHandling/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ set ( INC_FILES
)

set ( TEST_FILES
#LoadDAETest.h
LoadDAETest.h
#LoadSNSNexusTest.h # TODO has no active tests in it
#Needs fixing to not rely on network. SNSLiveEventDataListenerTest.h
ADARAPacketTest.h
Expand Down
5 changes: 4 additions & 1 deletion Code/Mantid/Framework/DataHandling/src/LoadDAE.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ namespace Mantid
LoadDAE::LoadDAE() :
Algorithm(), m_daename(""), m_numberOfSpectra(0), m_numberOfPeriods(0),
m_list(false), m_interval(false), m_spec_list(), m_spec_min(0), m_spec_max(Mantid::EMPTY_INT()),m_firstRun(true)
{}
{
this->useAlgorithm("StartLiveData");
this->deprecatedDate("2013-04-22");
}


/// load data from the DAE
Expand Down
177 changes: 7 additions & 170 deletions Code/Mantid/Framework/DataHandling/test/LoadDAETest.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,193 +4,30 @@
#include <cxxtest/TestSuite.h>

#include "MantidDataHandling/LoadDAE.h"
#include "MantidAPI/WorkspaceFactory.h"
#include "MantidDataObjects/ManagedWorkspace2D.h"
#include "MantidAPI/AnalysisDataService.h"
#include "MantidAPI/FrameworkManager.h"
#include "MantidKernel/ConfigService.h"
#include "MantidKernel/TimeSeriesProperty.h"

#ifdef _WIN32
#include <winsock2.h>
#else
#include <netdb.h>
#include <arpa/inet.h>
#endif

using namespace Mantid::API;
using namespace Mantid::Kernel;
using namespace Mantid::DataHandling;
using namespace Mantid::DataObjects;

class LoadDAETest : public CxxTest::TestSuite
{
private:
// Function to determine whether we're running test at RAL or not
// because it won't work anywhere else
bool atRAL()
{
char ac[80];
if (gethostname(ac, sizeof(ac)) == -1) {
// On failure assume outside of RAL
return 0;
}

struct hostent *phe = gethostbyname(ac);
if (phe == 0) {
// On failure assume outside of RAL
return 0;
}

for (int i = 0; phe->h_addr_list[i] != 0; ++i) {
struct in_addr addr;
memcpy(&addr, phe->h_addr_list[i], sizeof(struct in_addr));
const std::string ip(inet_ntoa(addr));
if (ip.find("130.246")==0) return 1; // Yes, we're at RAL!
}

return 0;
}

public:

static LoadDAETest *createSuite() { return new LoadDAETest(); }
static void destroySuite(LoadDAETest *suite) { delete suite; }

LoadDAETest()
{
// Hostname of computer with DAE to connect to
m_inputDAE="ndw714.isis.cclrc.ac.uk";
//m_inputDAE="isis53147.nd.rl.ac.uk";
}

void testInit()
{
TS_ASSERT_THROWS_NOTHING( m_loader.initialize());
TS_ASSERT( m_loader.isInitialized() );
LoadDAE loader;
TS_ASSERT_THROWS_NOTHING( loader.initialize());
TS_ASSERT( loader.isInitialized() );
}

void testExec()
void testDeprecated()
{

#ifdef _WIN32
WSADATA wsaData;
WSAStartup(MAKEWORD(2,2), &wsaData);
#endif

if ( !m_loader.isInitialized() ) m_loader.initialize();

// Set inputs
TS_ASSERT_THROWS_NOTHING(m_loader.setPropertyValue("DAEname", m_inputDAE));
TS_ASSERT_THROWS_NOTHING(m_loader.setPropertyValue("SpectrumMin", "1"));
TS_ASSERT_THROWS_NOTHING(m_loader.setPropertyValue("SpectrumMax", "2"));

m_outputSpace = "DAEouter";
TS_ASSERT_THROWS_NOTHING(m_loader.setPropertyValue("OutputWorkspace", m_outputSpace));

std::string result;
TS_ASSERT_THROWS_NOTHING( result = m_loader.getPropertyValue("DAEname") );
TS_ASSERT( ! result.compare(m_inputDAE));

// Only do the rest if the test is being run on a machine at RAL,
// because it will fail if you're anywhere else
// (can't reach the machine where the DAE instance is running)
if ( atRAL() )
{

TS_ASSERT_THROWS_NOTHING(m_loader.execute());
TS_ASSERT_EQUALS( m_loader.isExecuted(),true);

// Get back the saved workspace
Workspace_sptr output;
TS_ASSERT_THROWS_NOTHING(output = AnalysisDataService::Instance().retrieve(m_outputSpace));
if (output != 0)
{
Workspace2D_sptr output2D = boost::dynamic_pointer_cast<Workspace2D>(output);

// As we are checking a live DAE, we cannot be sure what we will see
// as setup will change with experiments. All we can do is test
// things that must always be true irrespective of setup

// check number of spectra returned
TS_ASSERT_EQUALS( output2D->getNumberHistograms(), 2);

// Check two X vectors are the same
TS_ASSERT( (output2D->dataX(0)) == (output2D->dataX(1)) );

// Check two Y arrays have the same number of elements
TS_ASSERT_EQUALS( output2D->dataY(0).size(), output2D->dataY(1).size() );

// Check the unit has been set correctly
TS_ASSERT_EQUALS( output2D->getAxis(0)->unit()->unitID(), "TOF" );
TS_ASSERT( ! output2D-> isDistribution() );
}
}
LoadDAE loader;
TS_ASSERT( dynamic_cast<Mantid::API::DeprecatedAlgorithm*>(&loader) );
TS_ASSERT_EQUALS(loader.deprecationMsg(&loader), "LoadDAE is deprecated (on 2013-04-22). Use StartLiveData instead.");
}

// void testExecMultiPeriod()
// {
//
//#ifdef _WIN32
// WSADATA wsaData;
// WSAStartup(MAKEWORD(2,2), &wsaData);
//#endif
//
// if ( !m_loader.isInitialized() ) m_loader.initialize();
//
// // Should fail because mandatory parameter has not been set
// // TS_ASSERT_THROWS(m_loader.execute(),std::runtime_error);
//
// m_inputDAE="ndxcrisp";
// // Set inputs
// m_loader.setPropertyValue("DAEname", m_inputDAE);
// m_loader.setPropertyValue("SpectrumMin", "1");
// m_loader.setPropertyValue("SpectrumMax", "2");
//
// m_outputSpace = "DAEouter";
// m_loader.setPropertyValue("OutputWorkspace", m_outputSpace);
//
// std::string result;
// TS_ASSERT_THROWS_NOTHING( result = m_loader.getPropertyValue("DAEname") )
// TS_ASSERT( ! result.compare(m_inputDAE));
//
// TS_ASSERT_THROWS_NOTHING(m_loader.execute());
// TS_ASSERT_EQUALS( m_loader.isExecuted(),true);
//
// WorkspaceGroup_sptr outgrp;
// TS_ASSERT_THROWS_NOTHING(outgrp =boost::dynamic_pointer_cast<WorkspaceGroup> (AnalysisDataService::Instance().retrieve(m_outputSpace)));
// // Get back the saved workspace
// Workspace_sptr output;
// TS_ASSERT_THROWS_NOTHING(output = AnalysisDataService::Instance().retrieve(m_outputSpace+"_1"));
// if (output != 0)
// {
// Workspace2D_sptr output2D = boost::dynamic_pointer_cast<Workspace2D>(output);
//
// // As we are checking a live DAE, we cannot be sure what we will see
// // as setup will change with experiments. All we can do is test
// // things that must always be true irrespective of setup
//
// // check number of spectra returned
// TS_ASSERT_EQUALS( output2D->getNumberHistograms(), 4);
//
// // Check two X vectors are the same
// TS_ASSERT( (output2D->dataX(0)) == (output2D->dataX(1)) );
//
// // Check two Y arrays have the same number of elements
// TS_ASSERT_EQUALS( output2D->dataY(0).size(), output2D->dataY(1).size() );
//
// // Check the unit has been set correctly
// TS_ASSERT_EQUALS( output2D->getAxis(0)->unit()->unitID(), "TOF" )
// TS_ASSERT( ! output2D-> isDistribution() )
// }
// Workspace_sptr output2;
// TS_ASSERT_THROWS_NOTHING(output2 = AnalysisDataService::Instance().retrieve(m_outputSpace+"_2"));
// }

private:
LoadDAE m_loader;
std::string m_inputDAE;
std::string m_outputSpace;
};

#endif /*LOADDAETEST_H_*/

0 comments on commit 90cbfc8

Please sign in to comment.