added test suite for bounce filter

diff --git a/src/Makefile.am b/src/Makefile.am
index c3488de..8875b4c 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.56 2006-09-26 13:04:07 marc Exp $
+## $Id: Makefile.am,v 1.57 2006-09-28 10:33:04 marc Exp $
 
 MAINTAINERCLEANFILES = Makefile.in config.in config.hpp
 
@@ -77,6 +77,7 @@ check_PROGRAMS = \
        test_filter_query_rewrite \
        test_filter_z3950_client \
        test_filter_backend_test \
+       test_filter_bounce \
        test_filter_virt_db \
        test_ses_map \
        test_router_flexml
@@ -100,6 +101,8 @@ test_filter_multi_SOURCES = test_filter_multi.cpp
 test_filter_query_rewrite_SOURCES = test_filter_query_rewrite.cpp
 test_filter_z3950_client_SOURCES = test_filter_z3950_client.cpp
 test_filter_backend_test_SOURCES = test_filter_backend_test.cpp
+test_filter_bounce_SOURCES = test_filter_bounce.cpp
+test_filter_sru_to_z3950_SOURCES = test_filter_sru_to_z3950.cpp
 test_filter_virt_db_SOURCES = test_filter_virt_db.cpp
 test_ses_map_SOURCES = test_ses_map.cpp
 test_router_flexml_SOURCES = test_router_flexml.cpp
@@ -114,7 +117,6 @@ test_session1_LDADD = $(TESTLDADD)
 test_session2_LDADD = $(TESTLDADD)
 test_boost_threads_LDADD = $(TESTLDADD)
 test_boost_time_LDADD = $(TESTLDADD)
-test_thread_pool_observer_LDADD = $(TESTLDADD)
 test_filter_auth_simple_LDADD = $(TESTLDADD)
 test_filter_factory_LDADD = $(TESTLDADD)
 test_filter_frontend_net_LDADD = $(TESTLDADD)
@@ -123,9 +125,12 @@ test_filter_multi_LDADD = $(TESTLDADD)
 test_filter_query_rewrite_LDADD = $(TESTLDADD)
 test_filter_z3950_client_LDADD = $(TESTLDADD)
 test_filter_backend_test_LDADD = $(TESTLDADD)
+test_filter_bounce_LDADD = $(TESTLDADD)
+test_filter_sru_to_z3950_LDADD = $(TESTLDADD)
 test_filter_virt_db_LDADD = $(TESTLDADD)
-test_ses_map_LDADD = $(TESTLDADD)
 test_router_flexml_LDADD = $(TESTLDADD)
+test_ses_map_LDADD = $(TESTLDADD)
+test_thread_pool_observer_LDADD = $(TESTLDADD)
 
 # doxygen target
 dox:

diff --git a/src/test_filter_bounce.cpp b/src/test_filter_bounce.cpp
new file mode 100644 (file)
index 0000000..51d3d18
--- /dev/null
+++ b/src/test_filter_bounce.cpp
@@ -0,0 +1,190 @@
+/* $Id: test_filter_bounce.cpp,v 1.1 2006-09-28 10:33:04 marc Exp $
+   Copyright (c) 2005-2006, Index Data.
+
+   See the LICENSE file for details
+ */
+
+#include "config.hpp"
+#include "filter_bounce.hpp"
+#include "util.hpp"
+#include "gduutil.hpp"
+//#include "sru_util.hpp"
+#include "router_chain.hpp"
+#include "session.hpp"
+#include "package.hpp"
+
+#include <iostream>
+#include <stdexcept>
+
+#define BOOST_AUTO_TEST_MAIN
+#include <boost/test/auto_unit_test.hpp>
+
+
+
+
+using namespace boost::unit_test;
+
+namespace mp = metaproxy_1;
+using namespace mp::util;
+
+void check_bounce_z3950(mp::RouterChain &router, int request, int response)
+{
+
+    bool print = false;
+    if (print)
+        std::cout << "check_bounce_z3950\n";
+
+    // Create package with Z39.50 init request in it
+    mp::Package pack;
+        
+    mp::odr odr;
+    Z_APDU *apdu = zget_APDU(odr, request);
+
+    pack.request() = apdu;
+
+    // Put it in router
+    pack.router(router).move(); 
+    
+    // Inspect bounced back request
+    yazpp_1::GDU *gdu_req = &pack.request();
+    yazpp_1::GDU *gdu_res = &pack.response();
+    
+    Z_GDU *z_gdu_req = gdu_req->get();
+    Z_GDU *z_gdu_res = gdu_res->get();
+
+    BOOST_CHECK(z_gdu_req);
+    if (z_gdu_req) {
+        if (print)
+            std::cout << "Z_GDU " << *(z_gdu_req) << "\n";
+        BOOST_CHECK_EQUAL(z_gdu_req->which, Z_GDU_Z3950);
+        BOOST_CHECK_EQUAL(z_gdu_req->u.z3950->which, request);
+    }
+
+    BOOST_CHECK(z_gdu_res);
+    if (z_gdu_res) {
+        if (print)
+            std::cout << "Z_GDU " << *(z_gdu_res) << "\n";
+        BOOST_CHECK_EQUAL(z_gdu_res->which, Z_GDU_Z3950);
+        BOOST_CHECK_EQUAL(z_gdu_res->u.z3950->which, response);
+    }
+}
+
+void check_bounce_http(mp::RouterChain &router)
+{
+
+    bool print = false;
+    if (print)
+        std::cout << "check_bounce_http\n";
+
+    // Create package with Z39.50 init request in it
+    mp::Package pack;
+        
+    mp::odr odr;
+    Z_GDU *gdu = z_get_HTTP_Request(odr);
+    //z_get_HTTP_Request_host_path(odr, host, path);
+    pack.request() = gdu;
+
+    // Put it in router
+    pack.router(router).move(); 
+    
+    // Inspect bounced back request
+    yazpp_1::GDU *gdu_req = &pack.request();
+    yazpp_1::GDU *gdu_res = &pack.response();
+    
+    Z_GDU *z_gdu_req = gdu_req->get();
+    Z_GDU *z_gdu_res = gdu_res->get();
+
+    BOOST_CHECK(z_gdu_req);
+    if (z_gdu_req) {
+        if (print)
+            std::cout << "Z_GDU " << *(z_gdu_req) << "\n";
+        BOOST_CHECK_EQUAL(z_gdu_req->which, Z_GDU_HTTP_Request);
+    }
+
+    BOOST_CHECK(z_gdu_res);
+    if (z_gdu_res) {
+        if (print)
+            std::cout << "Z_GDU " << *(z_gdu_res) << "\n";
+        BOOST_CHECK_EQUAL(z_gdu_res->which,  Z_GDU_HTTP_Response);
+    }
+}
+
+BOOST_AUTO_UNIT_TEST( test_filter_bounce_1 )
+{
+    try 
+    {
+        mp::filter::Bounce f_bounce;
+    }
+    catch ( ... ) {
+        BOOST_CHECK (false);
+    }
+}
+
+BOOST_AUTO_UNIT_TEST( test_filter_bounce_2 )
+{
+    try 
+    {
+        mp::RouterChain router;        
+        mp::filter::Bounce f_bounce;
+        router.append(f_bounce);
+
+        check_bounce_z3950(router, 
+                           Z_APDU_initRequest, Z_APDU_close);
+        //check_bounce_z3950(router, 
+        //                   Z_APDU_searchRequest, Z_APDU_close);
+        check_bounce_z3950(router, 
+                           Z_APDU_presentRequest, Z_APDU_close);
+        check_bounce_z3950(router, 
+                           Z_APDU_deleteResultSetRequest, Z_APDU_close);
+        //check_bounce_z3950(router, 
+        //                   Z_APDU_accessControlRequest, Z_APDU_close);
+        check_bounce_z3950(router, 
+                           Z_APDU_resourceControlRequest, Z_APDU_close);
+        check_bounce_z3950(router, 
+                           Z_APDU_triggerResourceControlRequest, Z_APDU_close);
+        check_bounce_z3950(router, 
+                           Z_APDU_resourceReportRequest, Z_APDU_close);
+        //check_bounce_z3950(router, 
+        //                   Z_APDU_scanRequest, Z_APDU_close);
+        //check_bounce_z3950(router, 
+        //                   Z_APDU_sortRequest, Z_APDU_close);
+        check_bounce_z3950(router, 
+                           Z_APDU_segmentRequest, Z_APDU_close);
+        //check_bounce_z3950(router, 
+        //                   Z_APDU_extendedServicesRequest, Z_APDU_close);
+        check_bounce_z3950(router, 
+                           Z_APDU_close , Z_APDU_close);
+        //check_bounce_z3950(router, 
+        //                   Z_APDU_duplicateDetectionRequest, Z_APDU_close);
+
+
+    }
+    catch ( ... ) {
+        BOOST_CHECK (false);
+    }
+}
+
+BOOST_AUTO_UNIT_TEST( test_filter_bounce_3 )
+{
+    try 
+    {
+        mp::RouterChain router;        
+        mp::filter::Bounce f_bounce;
+        router.append(f_bounce);
+
+        check_bounce_http(router);
+
+    }
+    catch ( ... ) {
+        BOOST_CHECK (false);
+    }
+}
+
+/*
+ * Local variables:
+ * c-basic-offset: 4
+ * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
+ * End:
+ * vim: shiftwidth=4 tabstop=8 expandtab
+ */