X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_sru_to_z3950.cpp;h=e37697b3bf1ff117c99aa320261220243de894f6;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=2c9b505c4a31b42ddc7a3825e880379722013d42;hpb=1186f052158a6c1e85d51bacc0d73264bb1fc45a;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_sru_to_z3950.cpp b/src/test_filter_sru_to_z3950.cpp
index 2c9b505..e37697b 100644
--- a/src/test_filter_sru_to_z3950.cpp
+++ b/src/test_filter_sru_to_z3950.cpp
@@ -1,21 +1,33 @@
-/* $Id: test_filter_sru_to_z3950.cpp,v 1.1 2006-09-28 10:38:00 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_sru_to_z3950.hpp"
-#include "util.hpp"
+#include <metaproxy/util.hpp>
 #include "sru_util.hpp"
-#include "router_chain.hpp"
-#include "session.hpp"
-#include "package.hpp"
+#include <metaproxy/router_chain.hpp>
+#include <metaproxy/package.hpp>
 
 #include <iostream>
 #include <stdexcept>
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
@@ -25,9 +37,9 @@ using namespace mp::util;
 
 
 
-BOOST_AUTO_UNIT_TEST( test_filter_sru_to_z3950_1 )
+BOOST_AUTO_TEST_CASE( test_filter_sru_to_z3950_1 )
 {
-    try 
+    try
     {
         mp::filter::SRUtoZ3950 f_sru_to_z3950;
     }
@@ -36,46 +48,44 @@ BOOST_AUTO_UNIT_TEST( test_filter_sru_to_z3950_1 )
     }
 }
 
-// BOOST_AUTO_UNIT_TEST( test_filter_sru_to_z3950_2 )
-// {
-//     try 
-//     {
-//         mp::RouterChain router;
-        
-//         mp::filter::SRUtoZ3950 f_sru_to_z3950;
-//         //FilterBounceZ3950 f_bounce_z3950;
-        
-//         router.append(f_sru_to_z3950);
-//         //router.append(f_bounce_z3950);
+BOOST_AUTO_TEST_CASE( test_filter_sru_to_z3950_2 )
+{
+    try
+    {
+        mp::RouterChain router;
 
-//         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");
+        mp::filter::SRUtoZ3950 f_sru_to_z3950;
 
-//     }
-//     catch ( ... ) {
-//         BOOST_CHECK (false);
-//     }
-// }
+        router.append(f_sru_to_z3950);
 
+        //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 ( ... ) {
+        BOOST_CHECK (false);
+    }
+}
 
-// BOOST_AUTO_UNIT_TEST( test_filter_sru_to_z3950_3 )
+
+// BOOST_AUTO_TEST_CASE( test_filter_sru_to_z3950_3 )
 // {
-    
 
-//     try 
+
+//     try
 //     {
 //         mp::RouterChain router;
-        
 
-//         std::string xmlconf = 
+
+//         std::string xmlconf =
 //             "<?xml version='1.0'?>\n"
-//             "<filter xmlns='http://indexdata.dk/yp2/config/1'\n"
+//             "<filter xmlns='http://indexdata.com/metaproxy'\n"
 //             "        id='qrw1' type='sru_to_z3950'>\n"
 //             "</filter>\n"
 //             ;
-         
+
 //         //std::cout << xmlconf  << std::endl;
 
 //         // reading and parsing XML conf
@@ -86,17 +96,17 @@ BOOST_AUTO_UNIT_TEST( test_filter_sru_to_z3950_1 )
 //         // creating and configuring filter
 //         mp::filter::SRUtoZ3950 f_sru_to_z3950;
 //         f_sru_to_z3950.configure(root_element);
-        
+
 //         // remeber to free XML DOM
 //         xmlFreeDoc(doc);
-        
+
 //         // add only filter to router
 //         router.append(f_sru_to_z3950);
 
 //         // 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");
 
 //     }
@@ -114,8 +124,9 @@ BOOST_AUTO_UNIT_TEST( test_filter_sru_to_z3950_1 )
 /*
  * 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
  */
+