X-Git-Url: http://lists.indexdata.com/cgi-bin?a=blobdiff_plain;f=src%2Ftest_thread_pool_observer.cpp;h=5a72c29aa71432259f00472181cb33374e74a3ca;hb=a82e0c29c7c7257cfef96efbb6aec90e12fa10c8;hp=c496391adb9142794b043ba114015b393a6360b4;hpb=d8ae25e485e2b560d7990fadbd061c45e70b69a6;p=metaproxy-moved-to-github.git

diff --git a/src/test_thread_pool_observer.cpp b/src/test_thread_pool_observer.cpp
index c496391..5a72c29 100644
--- a/src/test_thread_pool_observer.cpp
+++ b/src/test_thread_pool_observer.cpp
@@ -1,35 +1,15 @@
-/* $Id: test_thread_pool_observer.cpp,v 1.7 2005-11-07 21:57:10 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_thread_pool_observer.cpp,v 1.11 2006-06-10 14:29:13 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
- */
-/* $Id: test_thread_pool_observer.cpp,v 1.7 2005-11-07 21:57:10 adam Exp $
-   Copyright (c) 1998-2005, 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 "pipe.hpp"
 #include "thread_pool_observer.hpp"
@@ -39,12 +19,13 @@ Free Software Foundation, 59 Temple Place - Suite 330, Boston, MA
 
 using namespace boost::unit_test;
 using namespace yazpp_1;
+namespace mp = metaproxy_1;
 
 class My_Timer_Thread;
 
-class My_Msg : public yp2::IThreadPoolMsg {
+class My_Msg : public mp::IThreadPoolMsg {
 public:
-    yp2::IThreadPoolMsg *handle();
+    mp::IThreadPoolMsg *handle();
     void result();
     int m_val;
     My_Timer_Thread *m_timer;
@@ -53,18 +34,18 @@ public:
 class My_Timer_Thread : public ISocketObserver {
 private:
     ISocketObservable *m_obs;
-    yp2::Pipe m_pipe;
-    yp2::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, yp2::ThreadPoolSocketObserver *t);
+    My_Timer_Thread(ISocketObservable *obs, mp::ThreadPoolSocketObserver *t);
     void socketNotify(int event);
 };
 
 
-yp2::IThreadPoolMsg *My_Msg::handle()
+mp::IThreadPoolMsg *My_Msg::handle()
 {
     My_Msg *res = new My_Msg;
 
@@ -83,7 +64,7 @@ void My_Msg::result()
 }
 
 My_Timer_Thread::My_Timer_Thread(ISocketObservable *obs,
-                                 yp2::ThreadPoolSocketObserver *t) : 
+                                 mp::ThreadPoolSocketObserver *t) : 
     m_obs(obs), m_pipe(9123) 
 {
     m_t = t;
@@ -103,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;
 
-    yp2::ThreadPoolSocketObserver m(&mySocketManager, 3);
+    mp::ThreadPoolSocketObserver m(&mySocketManager, 3);
     My_Timer_Thread t(&mySocketManager, &m) ;
     while (t.m_responses < 30 && mySocketManager.processEvent() > 0)
         ;