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

diff --git a/src/test_filter_record_transform.cpp b/src/test_filter_record_transform.cpp
index cf54ff4..8a997fb 100644
--- a/src/test_filter_record_transform.cpp
+++ b/src/test_filter_record_transform.cpp
@@ -1,23 +1,34 @@
-/* $Id: test_filter_record_transform.cpp,v 1.1 2006-10-03 14:04:22 marc Exp $
-   Copyright (c) 2005-2006, Index Data.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
-   See the LICENSE file for details
- */
+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
+Software Foundation; either version 2, or (at your option) any later
+version.
+
+Metaproxy is distributed in the hope that it will be useful, but WITHOUT ANY
+WARRANTY; without even the implied warranty of MERCHANTABILITY or
+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 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>
+
+
 using namespace boost::unit_test;
 
 namespace mp = metaproxy_1;
@@ -25,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;
     }
@@ -36,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");
 
     }
@@ -58,62 +69,72 @@ BOOST_AUTO_UNIT_TEST( test_filter_record_transform_2 )
 }
 
 
-// BOOST_AUTO_UNIT_TEST( test_filter_record_transform_3 )
-// {
-    
-
-//     try 
-//     {
-//         mp::RouterChain router;
-        
-
-//         std::string xmlconf = 
-//             "<?xml version='1.0'?>\n"
-//             "<filter xmlns='http://indexdata.dk/yp2/config/1'\n"
-//             "        id='qrw1' type='sru_to_z3950'>\n"
-//             "</filter>\n"
-//             ;
-         
-//         //std::cout << xmlconf  << std::endl;
-
-//         // reading and parsing XML conf
-//         xmlDocPtr doc = xmlParseMemory(xmlconf.c_str(), xmlconf.size());
-//         BOOST_CHECK(doc);
-//         xmlNode *root_element = xmlDocGetRootElement(doc);
-
-//         // creating and configuring filter
-//         mp::filter::RecordTransform f_rec_trans;
-//         f_rec_trans.configure(root_element);
-        
-//         // 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", 
-//                                    "@attrset Bib-1 @attr 1=4 the");
-
-//     }
-
-//     catch (std::exception &e) {
-//         std::cout << e.what() << "\n";
-//         BOOST_CHECK (false);
-//     }
-
-//     catch ( ... ) {
-//         BOOST_CHECK (false);
-//     }
-// }
+BOOST_AUTO_TEST_CASE( test_filter_record_transform_3 )
+{
+
+
+    try
+    {
+        mp::RouterChain router;
+
+
+        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"
+            " syntax=\"usmarc\""
+            " name=\"marcxml\">"
+            "<backend syntax=\"usmarc\""
+            " name=\"marcxml\""
+            "/>"
+            "</retrieval>"
+            "</retrievalinfo>"
+            "</filter>\n"
+            ;
+
+        //std::cout << xmlconf  << std::endl;
+
+        // reading and parsing XML conf
+        xmlDocPtr doc = xmlParseMemory(xmlconf.c_str(), xmlconf.size());
+        BOOST_CHECK(doc);
+        xmlNode *root_element = xmlDocGetRootElement(doc);
+
+        // creating and configuring filter
+        mp::filter::RecordTransform f_rec_trans;
+        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",
+        //                           "@attrset Bib-1 @attr 1=4 the");
+
+    }
+
+    catch (std::exception &e) {
+        std::cout << e.what() << "\n";
+        BOOST_CHECK (false);
+    }
+
+    catch ( ... ) {
+        BOOST_CHECK (false);
+    }
+}
 
 /*
  * 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
  */
+