X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_thread_pool_observer.cpp;h=61387591694d1aa1773c9143c8515acd9227101f;hb=d15eeaaabd7e3f92ffe0215bd930bbc92b380e0f;hp=8086d2c885aa9985fca56eca38f0000417b2a7f2;hpb=9c480b66660e691cd0dc5ed869c1d902250dd674;p=metaproxy-moved-to-github.git

diff --git a/src/test_thread_pool_observer.cpp b/src/test_thread_pool_observer.cpp
index 8086d2c..6138759 100644
--- a/src/test_thread_pool_observer.cpp
+++ b/src/test_thread_pool_observer.cpp
@@ -1,44 +1,31 @@
-/* $Id: test_thread_pool_observer.cpp,v 1.3 2005-10-12 23:30:43 adam Exp $
-   Copyright (c) 1998-2005, Index Data.
+/* $Id: test_thread_pool_observer.cpp,v 1.12 2007-01-25 14:05:54 adam Exp $
+   Copyright (c) 2005-2007, Index Data.
 
-This file is part of the yaz-proxy.
-
-YAZ proxy 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.
-
-YAZ proxy 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 YAZ proxy; see the file LICENSE.  If not, write to the
-Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
-02111-1307, USA.
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
 #include <stdlib.h>
 #include <ctype.h>
 
-#include <yaz++/pdu-assoc.h>
-#include <yaz++/socket-manager.h>
+#include <yazpp/pdu-assoc.h>
+#include <yazpp/socket-manager.h>
 #include <yaz/log.h>
-#include "thread_pool_observer.h"
+#include "pipe.hpp"
+#include "thread_pool_observer.hpp"
 
 #define BOOST_AUTO_TEST_MAIN
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
 using namespace yazpp_1;
+namespace mp = metaproxy_1;
 
 class My_Timer_Thread;
 
-class My_Msg : public IThreadPoolMsg {
+class My_Msg : public mp::IThreadPoolMsg {
 public:
-    IThreadPoolMsg *handle();
+    mp::IThreadPoolMsg *handle();
     void result();
     int m_val;
     My_Timer_Thread *m_timer;
@@ -47,18 +34,18 @@ public:
 class My_Timer_Thread : public ISocketObserver {
 private:
     ISocketObservable *m_obs;
-    int m_fd[2];
-    ThreadPoolSocketObserver *m_t;
+    mp::Pipe m_pipe;
+    mp::ThreadPoolSocketObserver *m_t;
 public:
     int m_sum;
     int m_requests;
     int m_responses;
-    My_Timer_Thread(ISocketObservable *obs, ThreadPoolSocketObserver *t);
+    My_Timer_Thread(ISocketObservable *obs, mp::ThreadPoolSocketObserver *t);
     void socketNotify(int event);
 };
 
 
-IThreadPoolMsg *My_Msg::handle()
+mp::IThreadPoolMsg *My_Msg::handle()
 {
     My_Msg *res = new My_Msg;
 
@@ -77,14 +64,14 @@ void My_Msg::result()
 }
 
 My_Timer_Thread::My_Timer_Thread(ISocketObservable *obs,
-                                 ThreadPoolSocketObserver *t) : m_obs(obs) 
+                                 mp::ThreadPoolSocketObserver *t) : 
+    m_obs(obs), m_pipe(9123) 
 {
-    pipe(m_fd);
     m_t = t;
     m_sum = 0;
     m_requests = 0;
     m_responses = 0;
-    obs->addObserver(m_fd[0], this);
+    obs->addObserver(m_pipe.read_fd(), this);
     obs->maskObserver(this, SOCKET_OBSERVE_READ);
     obs->timeoutObserver(this, 0);
 }
@@ -97,11 +84,11 @@ void My_Timer_Thread::socketNotify(int event)
     m_t->put(m);
 }
 
-BOOST_AUTO_TEST_CASE( thread_pool_observer1 ) 
+BOOST_AUTO_UNIT_TEST( thread_pool_observer1 ) 
 {
     SocketManager mySocketManager;
 
-    ThreadPoolSocketObserver m(&mySocketManager, 3);
+    mp::ThreadPoolSocketObserver m(&mySocketManager, 3);
     My_Timer_Thread t(&mySocketManager, &m) ;
     while (t.m_responses < 30 && mySocketManager.processEvent() > 0)
         ;
@@ -113,6 +100,7 @@ BOOST_AUTO_TEST_CASE( thread_pool_observer1 )
  * Local variables:
  * c-basic-offset: 4
  * indent-tabs-mode: nil
+ * c-file-style: "stroustrup"
  * End:
  * vim: shiftwidth=4 tabstop=8 expandtab
  */