Use boost unit test for test filter 1 case.

diff --git a/src/.cvsignore b/src/.cvsignore
index 1500107..3fbe9aa 100644 (file)
--- a/src/.cvsignore
+++ b/src/.cvsignore
@@ -2,6 +2,7 @@
 .deps
 *.lo
 *.la
+config.hpp
 Makefile
 Makefile.in
 test_filter1

diff --git a/src/Makefile.am b/src/Makefile.am
index 7600831..8e09b58 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
-## $Id: Makefile.am,v 1.7 2005-10-07 10:03:07 marc Exp $
+## $Id: Makefile.am,v 1.8 2005-10-07 11:42:04 adam Exp $
 
 AM_CXXFLAGS = $(YAZPPINC) $(XSLT_CFLAGS)
 
@@ -26,7 +26,7 @@ p2_SOURCES=p2_frontend.cpp p2_msg.cpp p2.cpp p2_frontend.h \
  thread_pool_observer.cpp thread_pool_observer.h
 
 
-LDADD= $(YAZPPLALIB) $(XSLT_LIBS) -lboost_thread
+LDADD= $(YAZPPLALIB) $(XSLT_LIBS)
 
+test_filter1_LDADD = $(LDADD) -lboost_unit_test_framework
 
-# Modules

diff --git a/src/test_filter1.cpp b/src/test_filter1.cpp
index e505c38..432cbd3 100644 (file)
--- a/src/test_filter1.cpp
+++ b/src/test_filter1.cpp
@@ -1,10 +1,18 @@
 
 #include <iostream>
-
+#include <stdexcept>
 #include "filter.hpp"
 //#include "router.hpp"
 //#include "package.hpp"
 
+ #define BOOST_AUTO_TEST_MAIN
+ #include <boost/test/auto_unit_test.hpp>
+
+//#include <boost/test/unit_test.hpp>
+//#include <boost/test/unit_test_monitor.hpp>
+
+using namespace boost::unit_test;
+
 class TFilter: public yp2::Filter {
 public:
     yp2::Package & process(yp2::Package & package) const {
@@ -12,34 +20,30 @@ public:
     };
 };
     
-int main(int argc, char **argv)
+
+BOOST_AUTO_TEST_CASE( test1 )
 {
-    // test filter set/get/exception
-    try {
-        TFilter filter;
-       
-        filter.name("filter1");
-        std::cout <<  filter.name() << std::endl;
-
-       if (filter.name() != "filter1")
-       {
-           std::cout << "filter name does not match 1\n";
-           exit(1);
-       }
-
-        filter.name() = "filter1 rename";
-        std::cout <<  filter.name() << std::endl;
-       if (filter.name() != "filter1 rename")
-       {
-           std::cout << "filter name does not match 2\n";
-           exit(1);
-       }
+
+    try{
+    TFilter filter;
+    
+    filter.name("filter1");
+    
+    BOOST_CHECK (filter.name() == "filter1");
+
+    filter.name() = "filter1 rename";
+
+    BOOST_CHECK(filter.name() == "filter1 rename");
     }
-    catch (std::exception &e) {
-        std::cout << e.what() << "\n";
-       exit(1);
+
+    catch(std::runtime_error &e ){
+        BOOST_CHECK (true);
     }
-    exit(0);
+    catch ( ...) {
+        BOOST_CHECK (false);
+    }
+
+
 }
 
 /*