X-Git-Url: http://sru.miketaylor.org.uk/?a=blobdiff_plain;f=src%2Ftest_pipe.cpp;h=9dcba67249cbb08ab4528cb568ee884e48588f11;hb=1e61b0aa05e2351e33d909f7503eaf936a2d9bb0;hp=d1f123365d29a0d251546c02d7c07c8058849b7c;hpb=d8ae25e485e2b560d7990fadbd061c45e70b69a6;p=metaproxy-moved-to-github.git

diff --git a/src/test_pipe.cpp b/src/test_pipe.cpp
index d1f1233..9dcba67 100644
--- a/src/test_pipe.cpp
+++ b/src/test_pipe.cpp
@@ -1,12 +1,12 @@
-/* $Id: test_pipe.cpp,v 1.2 2005-11-07 21:57:10 adam Exp $
-   Copyright (c) 2005, Index Data.
+/* $Id: test_pipe.cpp,v 1.7 2006-06-10 14:29:13 adam Exp $
+   Copyright (c) 2005-2006, Index Data.
 
-%LICENSE%
+   See the LICENSE file for details
  */
 
 #include "config.hpp"
 
-#include <yaz++/socket-manager.h>
+#include <yazpp/socket-manager.h>
 
 #include <iostream>
 #include <stdexcept>
@@ -18,11 +18,12 @@
 #include <boost/test/auto_unit_test.hpp>
 
 using namespace boost::unit_test;
+namespace mp = metaproxy_1;
 
 class Timer : public yazpp_1::ISocketObserver {
 private:
     yazpp_1::ISocketObservable *m_obs;
-    yp2::Pipe m_pipe;
+    mp::Pipe m_pipe;
     bool m_timeout;
 public:
     Timer(yazpp_1::ISocketObservable *obs, int duration);
@@ -33,7 +34,7 @@ public:
 
 Timer::Timer(yazpp_1::ISocketObservable *obs,
 				 int duration) : 
-    m_obs(obs), m_pipe(0), m_timeout(false)
+    m_obs(obs), m_pipe(9122), m_timeout(false)
 {
     obs->addObserver(m_pipe.read_fd(), this);
     obs->maskObserver(this, yazpp_1::SOCKET_OBSERVE_READ);
@@ -46,12 +47,10 @@ void Timer::socketNotify(int event)
     m_obs->deleteObserver(this);
 }
 
-BOOST_AUTO_TEST_CASE( test_pipe_1 )
+BOOST_AUTO_UNIT_TEST( test_pipe_1 )
 {
     yazpp_1::SocketManager mySocketManager;
     
-    yp2::Pipe pipe(9999);
-
     Timer t(&mySocketManager, 0);
 
     while (mySocketManager.processEvent() > 0)