X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_filter_backend_test.cpp;h=ce2c0359b6498d59cee0c92d220310b05a534474;hb=586d78659d671683f33ec55f4a7d32b28e345ccd;hp=f2a796570b94fed21de6ed8eba565408ad5da81e;hpb=614429c1f7eb3f66e6100352dce77ddfa31a6d58;p=metaproxy-moved-to-github.git

diff --git a/src/test_filter_backend_test.cpp b/src/test_filter_backend_test.cpp
index f2a7965..ce2c035 100644
--- a/src/test_filter_backend_test.cpp
+++ b/src/test_filter_backend_test.cpp
@@ -1,34 +1,46 @@
-/* $Id: test_filter_backend_test.cpp,v 1.9 2006-09-28 11:56:54 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 <iostream>
 #include <stdexcept>
 
-#include "util.hpp"
+#include <metaproxy/util.hpp>
 #include "filter_backend_test.hpp"
 #include "filter_log.hpp"
 
-#include "router_chain.hpp"
-#include "session.hpp"
-#include "package.hpp"
+#include <metaproxy/router_chain.hpp>
+#include <metaproxy/package.hpp>
 
 #include <yaz/zgdu.h>
 #include <yaz/pquery.h>
 #include <yaz/otherinfo.h>
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 using namespace boost::unit_test;
 
 namespace mp = metaproxy_1;
 
-BOOST_AUTO_UNIT_TEST( test_filter_backend_test_1 )
+BOOST_AUTO_TEST_CASE( test_filter_backend_test_1 )
 {
-    try 
+    try
     {
         mp::filter::BackendTest btest;
     }
@@ -37,32 +49,32 @@ BOOST_AUTO_UNIT_TEST( test_filter_backend_test_1 )
     }
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_backend_test_2 )
+BOOST_AUTO_TEST_CASE( test_filter_backend_test_2 )
 {
-    try 
+    try
     {
         mp::RouterChain router;
-        
+
         mp::filter::BackendTest btest;
         router.append(btest);
-        
+
         mp::Package pack;
-        
+
         mp::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_initRequest);
-        
+
         BOOST_CHECK(apdu);
-        
+
         pack.request() = apdu;
-        
+
         // Put it in router
-        pack.router(router).move(); 
-        
+        pack.router(router).move();
+
         // Inspect that we got Z39.50 init Response OK.
         yazpp_1::GDU *gdu = &pack.response();
-        
-        BOOST_CHECK(!pack.session().is_closed()); 
-        
+
+        BOOST_CHECK(!pack.session().is_closed());
+
         Z_GDU *z_gdu = gdu->get();
         BOOST_CHECK(z_gdu);
         if (z_gdu) {
@@ -75,41 +87,41 @@ BOOST_AUTO_UNIT_TEST( test_filter_backend_test_2 )
     }
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_backend_test_3 )
+BOOST_AUTO_TEST_CASE( test_filter_backend_test_3 )
 {
-    try 
+    try
     {
         mp::RouterChain router;
-        
+
         mp::filter::BackendTest btest;
         router.append(btest);
-        
+
         mp::Package pack;
-        
+
         // send search request as first request.. That should fail with
         // a close from the backend
         mp::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_searchRequest);
 
         mp::util::pqf(odr, apdu, "computer");
-        
+
         apdu->u.searchRequest->num_databaseNames = 1;
         apdu->u.searchRequest->databaseNames = (char**)
             odr_malloc(odr, sizeof(char *));
         apdu->u.searchRequest->databaseNames[0] = odr_strdup(odr, "Default");
-        
+
         BOOST_CHECK(apdu);
-        
+
         pack.request() = apdu;
-        
+
         // Put it in router
-        pack.router(router).move(); 
-        
+        pack.router(router).move();
+
         // Inspect that we got Z39.50 close
         yazpp_1::GDU *gdu = &pack.response();
-        
-        BOOST_CHECK(pack.session().is_closed()); 
-        
+
+        BOOST_CHECK(pack.session().is_closed());
+
         Z_GDU *z_gdu = gdu->get();
         BOOST_CHECK(z_gdu);
         if (z_gdu) {
@@ -122,34 +134,34 @@ BOOST_AUTO_UNIT_TEST( test_filter_backend_test_3 )
     }
 }
 
-BOOST_AUTO_UNIT_TEST( test_filter_backend_test_4 )
+BOOST_AUTO_TEST_CASE( test_filter_backend_test_4 )
 {
-    try 
+    try
     {
         mp::RouterChain router;
-        
+
         mp::filter::BackendTest btest;
         router.append(btest);
-        
+
         mp::Package pack;
-        
+
         // send present request as first request.. That should fail with
         // a close from the backend
         mp::odr odr;
         Z_APDU *apdu = zget_APDU(odr, Z_APDU_presentRequest);
 
         BOOST_CHECK(apdu);
-        
+
         pack.request() = apdu;
-        
+
         // Put it in router
-        pack.router(router).move(); 
-        
+        pack.router(router).move();
+
         // Inspect that we got Z39.50 close
         yazpp_1::GDU *gdu = &pack.response();
-        
-        BOOST_CHECK(pack.session().is_closed()); 
-        
+
+        BOOST_CHECK(pack.session().is_closed());
+
         Z_GDU *z_gdu = gdu->get();
         BOOST_CHECK(z_gdu);
         if (z_gdu) {
@@ -166,8 +178,9 @@ BOOST_AUTO_UNIT_TEST( test_filter_backend_test_4 )
 /*
  * 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
  */
+