Added additional tests. Refs #9026.

- Removed forward declaration from catalog interface to allow creation and assignment of `CatalogSearchParam`. - Had to add `DLLExport` to `CatalogSearchParam` to prevent linker issues. - Removed `CatalogSearchParam` include from catalogs as it is now in the inherited interface.
mantidproject · Feb 20, 2014 · 0a6469d · 0a6469d
1 parent e6af916
commit 0a6469d
Show file tree

Hide file tree

Showing 5 changed files with 37 additions and 10 deletions.
diff --git a/Code/Mantid/Framework/API/inc/MantidAPI/ICatalog.h b/Code/Mantid/Framework/API/inc/MantidAPI/ICatalog.h
@@ -1,16 +1,11 @@
 #ifndef MANTID_API_ICATLOG_H_
 #define MANTID_API_ICATLOG_H_
 #include "MantidAPI/ITableWorkspace.h"
+#include "MantidICat/CatalogSearchParam.h"
 
 namespace Mantid
 {
 
-//forward declarations
-namespace ICat
-{
-class CatalogSearchParam;
-}
-
 namespace API
 {
 

diff --git a/Code/Mantid/Framework/ICat/inc/MantidICat/CatalogSearchParam.h b/Code/Mantid/Framework/ICat/inc/MantidICat/CatalogSearchParam.h
@@ -31,7 +31,7 @@ namespace Mantid
       File change history is stored at: <https://github.com/mantidproject/mantid>
       Code Documentation is available at: <http://doxygen.mantidproject.org>
     */
-    class CatalogSearchParam
+    class DLLExport CatalogSearchParam
     {
     public:
       /// constructor

diff --git a/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Catalog.h b/Code/Mantid/Framework/ICat/inc/MantidICat/ICat3/ICat3Catalog.h
@@ -2,7 +2,6 @@
 #define MANTID_ICAT_ICAT3CATALOG_H_
 
 #include "MantidAPI/ICatalog.h"
-#include "MantidICat/CatalogSearchParam.h"
 #include "MantidICat/ICat3/ICat3ErrorHandling.h"
 #include "MantidICat/ICat3/ICat3Helper.h"
 

diff --git a/Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h b/Code/Mantid/Framework/ICat/inc/MantidICat/ICat4/ICat4Catalog.h
@@ -4,7 +4,6 @@
 #include "MantidAPI/ICatalog.h"
 #include "MantidAPI/TableRow.h"
 #include "MantidKernel/Logger.h"
-#include "MantidICat/CatalogSearchParam.h"
 
 namespace Mantid
 {

diff --git a/Code/Mantid/Framework/ICat/test/CompositeCatalogTest.h b/Code/Mantid/Framework/ICat/test/CompositeCatalogTest.h
@@ -3,7 +3,6 @@
 
 #include <cxxtest/TestSuite.h>
 
-#include "MantidICat/CatalogSearchParam.h"
 #include "MantidICat/CompositeCatalog.h"
 
 #include <boost/make_shared.hpp>
@@ -136,6 +135,41 @@ class CompositeCatalogTest : public CxxTest::TestSuite
       delete compositeCatalog;
     }
 
+    void testSearch()
+    {
+      CompositeCatalog* compositeCatalog = new CompositeCatalog();
+      DummyCatalog::m_counter = 0;
+
+      compositeCatalog->add(boost::make_shared<DummyCatalog>());
+      compositeCatalog->add(boost::make_shared<DummyCatalog>());
+
+      CatalogSearchParam params;
+      ITableWorkspace_sptr ws;
+      int limit = 0;
+      int offset = 0;
+      compositeCatalog->search(params,ws,offset,limit);
+
+      TS_ASSERT_EQUALS(DummyCatalog::m_counter,2);
+
+      delete compositeCatalog;
+    }
+
+    void testGetNumberOfSearchResults()
+    {
+      CompositeCatalog* compositeCatalog = new CompositeCatalog();
+      DummyCatalog::m_counter = 0;
+
+      compositeCatalog->add(boost::make_shared<DummyCatalog>());
+      compositeCatalog->add(boost::make_shared<DummyCatalog>());
+
+      CatalogSearchParam params;
+      compositeCatalog->getNumberOfSearchResults(params);
+
+      TS_ASSERT_EQUALS(DummyCatalog::m_counter,2);
+
+      delete compositeCatalog;
+    }
+
     void testMyData()
     {
       CompositeCatalog* compositeCatalog = new CompositeCatalog();