X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_record_transform.cpp;h=8a997fb96ce36a6ec1c47f60588595162b651e48;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=ec966c9c9b9108739c3e8503435524d3bf6a6ee6;hpb=637a685d61a9ff0e3f398a59da426979815c4d68;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_record_transform.cpp b/src/test_filter_record_transform.cpp
index ec966c9..8a997fb 100644
--- a/src/test_filter_record_transform.cpp
+++ b/src/test_filter_record_transform.cpp
@@ -1,7 +1,5 @@
-/* $Id: test_filter_record_transform.cpp,v 1.6 2007-05-09 21:23:09 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
 Metaproxy is free software; you can redistribute it and/or modify it under
 the terms of the GNU General Public License as published by the Free
@@ -14,23 +12,18 @@ FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License
 for more details.
 
 You should have received a copy of the GNU General Public License
-along with Metaproxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+along with this program; if not, write to the Free Software
+Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "config.hpp"
 #include "filter_record_transform.hpp"
-//#include "util.hpp"
-//#include "sru_util.hpp"
-#include "router_chain.hpp"
-#include "session.hpp"
-#include "package.hpp"
 
-//#include <iostream>
-//#include <stdexcept>
+#include <metaproxy/router_chain.hpp>
+#include <metaproxy/package.hpp>
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 #include <iostream>
@@ -43,9 +36,9 @@ namespace mp = metaproxy_1;
 
 
 
-BOOST_AUTO_UNIT_TEST( test_filter_record_transform_1 )
+BOOST_AUTO_TEST_CASE( test_filter_record_transform_1 )
 {
-    try 
+    try
     {
         mp::filter::RecordTransform f_rec_trans;
     }
@@ -54,19 +47,19 @@ BOOST_AUTO_UNIT_TEST( test_filter_record_transform_1 )
     }
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_record_transform_2 )
+BOOST_AUTO_TEST_CASE( test_filter_record_transform_2 )
 {
-    try 
+    try
     {
         mp::RouterChain router;
-        
+
         mp::filter::RecordTransform f_rec_trans;
-        
+
         router.append(f_rec_trans);
 
         //check_sru_to_z3950_init(router);
-        //check_sru_to_z3950_search(router, 
-        //                           "@attrset Bib-1 @attr 1=4 the", 
+        //check_sru_to_z3950_search(router,
+        //                           "@attrset Bib-1 @attr 1=4 the",
         //                           "@attrset Bib-1 @attr 1=4 the");
 
     }
@@ -76,21 +69,21 @@ BOOST_AUTO_UNIT_TEST( test_filter_record_transform_2 )
 }
 
 
-BOOST_AUTO_UNIT_TEST( test_filter_record_transform_3 )
+BOOST_AUTO_TEST_CASE( test_filter_record_transform_3 )
 {
-    
 
-    try 
+
+    try
     {
         mp::RouterChain router;
-        
 
-        std::string xmlconf = 
+
+        std::string xmlconf =
             "<?xml version='1.0'?>\n"
             "<filter xmlns='http://indexdata.com/metaproxy'\n"
             "        id='rec_trans_1' type='record_transform'>\n"
             "<retrievalinfo>"
-            "<retrieval" 
+            "<retrieval"
             " syntax=\"usmarc\""
             " name=\"marcxml\">"
             "<backend syntax=\"usmarc\""
@@ -100,7 +93,7 @@ BOOST_AUTO_UNIT_TEST( test_filter_record_transform_3 )
             "</retrievalinfo>"
             "</filter>\n"
             ;
-         
+
         //std::cout << xmlconf  << std::endl;
 
         // reading and parsing XML conf
@@ -110,18 +103,18 @@ BOOST_AUTO_UNIT_TEST( test_filter_record_transform_3 )
 
         // creating and configuring filter
         mp::filter::RecordTransform f_rec_trans;
-        f_rec_trans.configure(root_element);
-        
+        f_rec_trans.configure(root_element, true, 0);
+
         // remeber to free XML DOM
         xmlFreeDoc(doc);
-        
+
         // add only filter to router
         router.append(f_rec_trans);
 
         // start testing
         //check_sru_to_z3950_init(router);
-        //check_sru_to_z3950_search(router, 
-        //                           "@attrset Bib-1 @attr 1=4 the", 
+        //check_sru_to_z3950_search(router,
+        //                           "@attrset Bib-1 @attr 1=4 the",
         //                           "@attrset Bib-1 @attr 1=4 the");
 
     }
@@ -139,8 +132,9 @@ BOOST_AUTO_UNIT_TEST( test_filter_record_transform_3 )
 /*
  * Local variables:
  * c-basic-offset: 4
+ * c-file-style: "Stroustrup"
  * indent-tabs-mode: nil
- * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */
+