Skip to content

Commit

Permalink
Change to VATES which should fix the develop build. Re #7253
Browse files Browse the repository at this point in the history
  • Loading branch information
mantid-roman committed Jun 7, 2013
1 parent 75067c6 commit 75e6a70
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 27 deletions.
7 changes: 0 additions & 7 deletions Code/Mantid/Vates/VatesAPI/test/MockObjects.h
Original file line number Diff line number Diff line change
Expand Up @@ -102,13 +102,6 @@ class MockIMDWorkspace: public Mantid::API::IMDWorkspace
return 0;
}

//constructor allows a workspace name to be provide.
MockIMDWorkspace(std::string name)
: IMDWorkspace()
{
setName(name);
}

MockIMDWorkspace()
: IMDWorkspace()
{
Expand Down
20 changes: 0 additions & 20 deletions Code/Mantid/Vates/VatesAPI/test/RebinningKnowledgeSerializerTest.h
Original file line number Diff line number Diff line change
Expand Up @@ -74,26 +74,6 @@ void testNoNameThrows()
std::runtime_error);
}

void testCreateXMLWithWorkspace() //Uses the workspace setter.
{
MockImplicitFunction* pImpFunction = new MockImplicitFunction;
EXPECT_CALL(*pImpFunction, toXMLString()).Times(1).WillRepeatedly(testing::Return("<ImplicitFunction/>"));

MockIMDWorkspace* pWorkspace = new MockIMDWorkspace("name");

boost::shared_ptr<const Mantid::API::IMDWorkspace> workspace(pWorkspace);
Mantid::Geometry::MDImplicitFunction_sptr impFunction(pImpFunction);
RebinningKnowledgeSerializer generator;

//Apply setters.
generator.setImplicitFunction(impFunction);
generator.setWorkspace(workspace);

std::string xml = generator.createXMLString();

TSM_ASSERT_EQUALS("The xml has been created, but is incorrect.", "<MDInstruction><MDWorkspaceName>name</MDWorkspaceName><MDWorkspaceLocation></MDWorkspaceLocation>"
+ workspace->getGeometryXML() + "<ImplicitFunction/></MDInstruction>" ,xml)
}

void testCreateXMLWithComponents() //Uses individual setters for geometry, location and name.
{
Expand Down

0 comments on commit 75e6a70

Please sign in to comment.