X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FProtocolServerSocketHandle.test.cc;h=9a3913ff6df537e75844b8c7d1826cd9842b25d8;hb=5443435c4c2b6e4386c5334b5b8358273f2bae93;hp=b8065ee53e855e5424a5148b16c7f1cac649a277;hpb=a1a6c76a214ad1935032826713cabaf9ac57bf07;p=senf.git

diff --git a/Socket/ProtocolServerSocketHandle.test.cc b/Socket/ProtocolServerSocketHandle.test.cc
index b8065ee..9a3913f 100644
--- a/Socket/ProtocolServerSocketHandle.test.cc
+++ b/Socket/ProtocolServerSocketHandle.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief ProtocolServerSocketHandle unit tests */
 
 //#include "ProtocolServerSocketHandle.test.hh"
 //#include "ProtocolServerSocketHandle.test.ih"
@@ -37,16 +38,16 @@
 
 namespace {
 
-    struct MyProtocol : public senf::test::SomeProtocol
+    struct MySocketProtocol : public senf::test::SomeSocketProtocol
     {
-        using senf::test::SomeProtocol::init_server;
+        using senf::test::SomeSocketProtocol::init_server;
         void init_server(char const *,unsigned) const {}
     };
 }
 
 BOOST_AUTO_UNIT_TEST(protocolServerSocketHandle)
 {
-    typedef senf::ProtocolServerSocketHandle<MyProtocol> MySocketHandle;
+    typedef senf::ProtocolServerSocketHandle<MySocketProtocol> MySocketHandle;
 
     {
         typedef senf::MakeSocketPolicy<
@@ -62,14 +63,14 @@ BOOST_AUTO_UNIT_TEST(protocolServerSocketHandle)
         OtherSocketHandle osh (h);
         h = senf::static_socket_cast<MySocketHandle>(osh);
 
-        MySocketHandle::ClientSocketHandle client = h.accept();
+        MySocketHandle::ClientHandle client = h.accept();
         BOOST_CHECK_EQUAL( client.fd(), -1 );
 
         BOOST_CHECK_EQUAL( h.dumpState(),
                            "file.handle: -1\n"
                            "file.refcount: 2\n"
-                           "handle: senf::ProtocolServerSocketHandle<(anonymous namespace)::MyProtocol>\n"
-                           "socket.protocol: (anonymous namespace)::MyProtocol\n"
+                           "handle: senf::ProtocolServerSocketHandle<(anonymous namespace)::MySocketProtocol>\n"
+                           "socket.protocol: (anonymous namespace)::MySocketProtocol\n"
                            "socket.protocol.policy: senf::SocketPolicy<senf::test::SomeAddressingPolicy, senf::test::SomeFramingPolicy, senf::test::SomeCommunicationPolicy, senf::test::SomeReadPolicy, senf::test::SomeWritePolicy>\n"
                            "socket.server: true\n" );