Refs #11006. Fixing unit tests that depended on concrete point groups.

Code/Mantid/Framework/Crystal/src/SortHKL.cpp

@@ -4,7 +4,7 @@
 #include "MantidDataObjects/Peak.h"
 #include "MantidDataObjects/PeaksWorkspace.h"
 #include "MantidGeometry/Instrument/RectangularDetector.h"
-#include "MantidGeometry/Crystal/PointGroup.h"
+#include "MantidGeometry/Crystal/PointGroupFactory.h"
 #include "MantidKernel/Strings.h"
 #include "MantidKernel/System.h"
 #include "MantidKernel/Utils.h"
@@ -75,7 +75,8 @@ void SortHKL::exec() {
     peaksW->getPeaks()[i].setHKL(hkl1);
   }
   // Use the primitive by default
-  PointGroup_sptr pointGroup(new PointGroupLaue1());
+  PointGroup_sptr pointGroup =
+      PointGroupFactory::Instance().createPointGroup("-1");
   // Get it from the property
   std::string pointGroupName = getPropertyValue("PointGroup");
   for (size_t i = 0; i < m_pointGroups.size(); ++i)
@@ -96,7 +97,7 @@ void SortHKL::exec() {
     }
   }
 
-  std::vector<std::pair<std::string, bool>> criteria;
+  std::vector<std::pair<std::string, bool> > criteria;
   // Sort by detector ID then descending wavelength
   criteria.push_back(std::pair<std::string, bool>("BankName", true));
   criteria.push_back(std::pair<std::string, bool>("H", true));

Code/Mantid/Framework/SINQ/test/PoldiPeakCollectionTest.h

@@ -188,7 +188,8 @@ public:
         PoldiPeakCollection peaks;
         TS_ASSERT(!peaks.pointGroup());
 
-        PointGroup_sptr m3m = boost::make_shared<PointGroupLaue13>();
+        PointGroup_sptr m3m = PointGroupFactory::Instance().createPointGroup("m-3m");
+
         peaks.setPointGroup(m3m);
         TS_ASSERT_EQUALS(peaks.pointGroup()->getName(), m3m->getName());
     }
@@ -196,7 +197,14 @@ public:
     void testPointGroupStringConversion()
     {
         TestablePoldiPeakCollection peaks;
-        PointGroup_sptr m3m = boost::make_shared<PointGroupLaue13>();
+        PointGroup_sptr m3m = PointGroupFactory::Instance().createPointGroup("m-3m");
+
+        TS_ASSERT(peaks.pointGroupFromString(peaks.pointGroupToString(m3m)));
+
+        std::cout << m3m->getName() << std::endl;
+
+        std::vector<PointGroup_sptr> pgs = getAllPointGroups();
+        std::cout << "Size:  " << pgs.size() << std::endl;
 
         TS_ASSERT_EQUALS(m3m->getName(), peaks.pointGroupFromString(peaks.pointGroupToString(m3m))->getName());
     }