refs #6543 One more unit test and make most protected for testing

methods back private
mantidproject · Feb 15, 2013 · 15d0473 · 15d0473
1 parent a0515ce
commit 15d0473
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 10 deletions.
diff --git a/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorInfo.h b/Code/Mantid/Framework/DataHandling/inc/MantidDataHandling/LoadDetectorInfo.h
@@ -103,16 +103,17 @@ class DLLExport LoadDetectorInfo : public API::Algorithm
   /// Store a pointer to a single parameterized instrument instance
   Geometry::Instrument_const_sptr m_instrument;
 
+  /// If set to true then update the detector positions base on the information in the given file
+  bool m_moveDets;
   // Implement abstract Algorithm methods
   void init();
   void exec();
 protected: // for testing
-  void readDAT(const std::string& fName);
-  void readRAW(const std::string& fName);
   void readNXS(const std::string& fName);
-  /// If set to true then update the detector positions base on the information in the given file
-  bool m_moveDets;
 private:
+  void readDAT(const std::string& fName);
+  void readRAW(const std::string& fName);
+
   void readLibisisNXS(::NeXus::File *hFile, std::vector<detectorInfo> &detStruct,std::vector<int32_t>&detType,std::vector<float> &detOffset,std::vector<detid_t> &detList);
   void readDetDotDatNXS(::NeXus::File *hFile, std::vector<detectorInfo> &detStruct,std::vector<int32_t>&detType,std::vector<float> &detOffset,std::vector<detid_t> &detList);
 

diff --git a/Code/Mantid/Framework/DataHandling/test/LoadDetectorInfoTest.h b/Code/Mantid/Framework/DataHandling/test/LoadDetectorInfoTest.h
@@ -13,6 +13,7 @@
 #include "MantidGeometry/Instrument/DetectorGroup.h"
 #include "MantidGeometry/Instrument/ObjComponent.h"
 #include "MantidAPI/SpectraDetectorMap.h"
+#include "MantidAPI/FileFinder.h"
 #include <Poco/Path.h>
 #include <Poco/File.h>
 #include <boost/lexical_cast.hpp>
@@ -50,9 +51,8 @@ namespace SmallTestDatFile
 class LoadDetectorIndoTestHelper : public LoadDetectorInfo
 {
 public:
-  void readNXS(const std::string &fName,bool moveDetectors = true)
+  void readNXS(const std::string &fName)
   {
-    this->m_moveDets  = moveDetectors;
     LoadDetectorInfo::readNXS(fName);
   }
 };
@@ -262,7 +262,8 @@ class LoadDetectorInfoTest : public CxxTest::TestSuite
   {
     // create a .dat file in the current directory that we'll load later
     writeSmallDatFile(m_DatFile);
-    writeDetNXSfile(m_NXSFile,6);
+    // create correspondent nxs file
+    writeDetNXSfile(m_NXSFile,SmallTestDatFile::NDETECTS);
     m_rawFile = RAWFILE;
   }
 
@@ -279,9 +280,13 @@ class LoadDetectorInfoTest : public CxxTest::TestSuite
 
   void testLoadNXSmisc()
   {
-    //LoadDetectorIndoTestHelper loader;
-    //TS_ASSERT_THROWS(loader.readNXS("NonExistingFile"),std::invalid_argument);
-    //TS_ASSERT_THROWS_NOTHING(loader.readNXS("det_nxs_libisis.nxs"));
+    LoadDetectorIndoTestHelper loader;
+
+    TS_ASSERT_THROWS(loader.readNXS("NonExistingFile"),std::invalid_argument);
+
+    std::string nexusWithoutDet = FileFinder::Instance().getFullPath("argus0026287.nxs");
+    if(nexusWithoutDet.empty())return;
+    TSM_ASSERT_THROWS("this nexus does not have detector information ",loader.readNXS(nexusWithoutDet),std::invalid_argument);
 
   }