X-Git-Url: http://git.indexdata.com/?a=blobdiff_plain;f=src%2Ftest_thread_pool_observer.cpp;h=3b2fe9a435dc69ac1a87af9c1b30b11f38de849a;hb=00620b50effe98eed17a78fd8f26f0d9935bdad3;hp=10ea2adb5d69adbc556b3a4a52ba3c9537465f27;hpb=637a685d61a9ff0e3f398a59da426979815c4d68;p=metaproxy-moved-to-github.git

diff --git a/src/test_thread_pool_observer.cpp b/src/test_thread_pool_observer.cpp
index 10ea2ad..3b2fe9a 100644
--- a/src/test_thread_pool_observer.cpp
+++ b/src/test_thread_pool_observer.cpp
@@ -1,7 +1,5 @@
-/* $Id: test_thread_pool_observer.cpp,v 1.14 2007-05-09 21:23:09 adam Exp $
-   Copyright (c) 2005-2007, Index Data.
-
-This file is part of Metaproxy.
+/* This file is part of Metaproxy.
+   Copyright (C) Index Data
 
 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
@@ -14,10 +12,9 @@ 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 Metaproxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
- */
+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 <stdlib.h>
@@ -30,6 +27,7 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 #include "thread_pool_observer.hpp"
 
 #define BOOST_AUTO_TEST_MAIN
+#define BOOST_TEST_DYN_LINK
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
@@ -41,7 +39,8 @@ class My_Timer_Thread;
 class My_Msg : public mp::IThreadPoolMsg {
 public:
     mp::IThreadPoolMsg *handle();
-    void result();
+    void result(const char *t_info);
+    bool cleanup(void *info);
     int m_val;
     My_Timer_Thread *m_timer;
 };
@@ -72,15 +71,20 @@ mp::IThreadPoolMsg *My_Msg::handle()
     return res;
 }
 
-void My_Msg::result()
+bool My_Msg::cleanup(void *info)
+{
+    return false;
+}
+
+void My_Msg::result(const char *t_info)
 {
     m_timer->m_sum += m_val;
     m_timer->m_responses++;
 }
 
 My_Timer_Thread::My_Timer_Thread(ISocketObservable *obs,
-                                 mp::ThreadPoolSocketObserver *t) : 
-    m_obs(obs), m_pipe(9123) 
+                                 mp::ThreadPoolSocketObserver *t) :
+    m_obs(obs), m_pipe(9123)
 {
     m_t = t;
     m_sum = 0;
@@ -107,7 +111,7 @@ void My_Timer_Thread::socketNotify(int event)
 #endif
 }
 
-BOOST_AUTO_UNIT_TEST( thread_pool_observer1 ) 
+BOOST_AUTO_TEST_CASE( thread_pool_observer1 )
 {
     SocketManager mySocketManager;
 
@@ -122,8 +126,8 @@ BOOST_AUTO_UNIT_TEST( thread_pool_observer1 )
 /*
  * 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
  */