moved statistics classes from NetEmu to SENF

[senf.git] / Socket / ServerSocketHandle.test.cc

diff --git a/Socket/ServerSocketHandle.test.cc b/Socket/ServerSocketHandle.test.cc
index 0d9ba42..54963ea 100644 (file)
--- a/Socket/ServerSocketHandle.test.cc
+++ b/Socket/ServerSocketHandle.test.cc
@@ -1,8 +1,8 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institute for Open Communication Systems (FOKUS) 
-// Competence Center NETwork research (NET), St. Augustin, GERMANY 
+// Fraunhofer Institute for Open Communication Systems (FOKUS)
+// Competence Center NETwork research (NET), St. Augustin, GERMANY
 //     Stefan Bund <g0dil@berlios.de>
 //
 // This program is free software; you can redistribute it and/or modify
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief ServerSocketHandle unit tests */
 
 //#include "ServerSocketHandle.test.hh"
 //#include "ServerSocketHandle.test.ih"
@@ -40,13 +41,13 @@
 namespace {
 
     class MySocketHandle
-        : public senf::ServerSocketHandle<senf::test::SomeProtocol::Policy>
+        : public senf::ServerSocketHandle<senf::test::SomeSocketProtocol::Policy>
     {
     public:
         MySocketHandle()
-            : senf::ServerSocketHandle<senf::test::SomeProtocol::Policy>(
+            : senf::ServerSocketHandle<senf::test::SomeSocketProtocol::Policy>(
                 std::auto_ptr<senf::SocketBody>(
-                    new senf::ProtocolSocketBody<senf::test::SomeProtocol>(true)))
+                    new senf::ProtocolSocketBody<senf::test::SomeSocketProtocol>(true)))
             {}
     };
 
@@ -65,7 +66,7 @@ BOOST_AUTO_UNIT_TEST(serverSocketHandle)
     OtherSocketHandle osh (myh);
     osh = myh;
 
-    typedef senf::ServerSocketHandle<senf::test::SomeProtocol::Policy> SomeSocketHandle;
+    typedef senf::ServerSocketHandle<senf::test::SomeSocketProtocol::Policy> SomeSocketHandle;
     SomeSocketHandle ssh = senf::static_socket_cast<SomeSocketHandle>(osh);
 
     typedef senf::ServerSocketHandle<senf::MakeSocketPolicy<
@@ -74,17 +75,17 @@ BOOST_AUTO_UNIT_TEST(serverSocketHandle)
         >::policy> SomeOtherSocketHandle;
     typedef senf::ClientSocketHandle<OtherSocketPolicy> OtherClientHandle;
 
-    BOOST_CHECK_NO_THROW( senf::dynamic_socket_cast<SomeSocketHandle>(osh) );
+    SENF_CHECK_NO_THROW( senf::dynamic_socket_cast<SomeSocketHandle>(osh) );
     BOOST_CHECK_THROW( senf::dynamic_socket_cast<SomeOtherSocketHandle>(osh),
                        std::bad_cast );
     BOOST_CHECK_THROW( senf::dynamic_socket_cast<OtherClientHandle>(osh),
                        std::bad_cast );
 
-    BOOST_CHECK_NO_THROW( myh.bind(0) );
+    SENF_CHECK_NO_THROW( myh.bind(0) );
     BOOST_CHECK_EQUAL( myh.local(), 2u );
 
     {
-        MySocketHandle::ClientSocketHandle client = myh.accept();
+        MySocketHandle::ClientHandle client = myh.accept();
         BOOST_CHECK_EQUAL( client.fd(), -1 );
     }