From 94e3a75a3e3c42f811e318a842921d67c308c785 Mon Sep 17 00:00:00 2001 From: Michael Wedel Date: Thu, 11 Sep 2014 14:32:45 +0200 Subject: [PATCH] Refs #10135. Fixing broken unit tests --- Code/Mantid/Framework/Geometry/test/CrystalStructureTest.h | 5 +++-- Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h | 6 ++++-- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Code/Mantid/Framework/Geometry/test/CrystalStructureTest.h b/Code/Mantid/Framework/Geometry/test/CrystalStructureTest.h index 5af8f60a7199..c54b2e355bee 100644 --- a/Code/Mantid/Framework/Geometry/test/CrystalStructureTest.h +++ b/Code/Mantid/Framework/Geometry/test/CrystalStructureTest.h @@ -4,6 +4,7 @@ #include #include "MantidGeometry/Crystal/CrystalStructure.h" +#include "MantidGeometry/Crystal/PointGroupFactory.h" using namespace Mantid::Geometry; using namespace Mantid::Kernel; @@ -18,7 +19,7 @@ class CrystalStructureTest : public CxxTest::TestSuite CrystalStructureTest() : m_CsCl(4.126, 4.126, 4.126), - m_pg(new PointGroupLaue13), + m_pg(PointGroupFactory::Instance().createPointGroup("m-3m")), m_centering(new ReflectionConditionPrimitive) { } @@ -129,7 +130,7 @@ class CrystalStructureTest : public CxxTest::TestSuite double dMax = 4.0; // make a structure with P-1 - CrystalStructure structure(m_CsCl); + CrystalStructure structure(m_CsCl, PointGroupFactory::Instance().createPointGroup("-1")); std::vector unique = structure.getUniqueHKLs(dMin, dMax); std::vector peaks = structure.getHKLs(dMin, dMax); diff --git a/Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h b/Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h index 65e85b839ada..66a83925053d 100644 --- a/Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h +++ b/Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h @@ -10,6 +10,8 @@ #include "MantidAPI/TableRow.h" #include "MantidAPI/WorkspaceFactory.h" +#include "MantidGeometry/Crystal/PointGroupFactory.h" + #include using namespace Mantid::Poldi; @@ -250,7 +252,7 @@ class PoldiPeakCollectionTest : public CxxTest::TestSuite void testStructureConstructor() { UnitCell CsCl(4.126, 4.126, 4.126); - PointGroup_sptr m3m = boost::make_shared(); + PointGroup_sptr m3m = PointGroupFactory::Instance().createPointGroup("m-3m"); CrystalStructure_sptr structure = boost::make_shared(CsCl, m3m); @@ -286,7 +288,7 @@ class PoldiPeakCollectionTest : public CxxTest::TestSuite void testSetPeaks() { UnitCell CsCl(4.126, 4.126, 4.126); - PointGroup_sptr m3m = boost::make_shared(); + PointGroup_sptr m3m = PointGroupFactory::Instance().createPointGroup("m-3m"); CrystalStructure_sptr structure = boost::make_shared(CsCl, m3m);