From 676c25552919eeb2d5d0250318efc013424f1240 Mon Sep 17 00:00:00 2001 From: tho <tho@wiback.org> Date: Sun, 16 Aug 2009 15:08:29 +0000 Subject: [PATCH] Socket: fixed socket handle dumpState() tests --- Socket/ProtocolServerSocketHandle.test.cc | 9 ++------- Socket/SocketHandle.test.cc | 13 +++++++------ 2 files changed, 9 insertions(+), 13 deletions(-) diff --git a/Socket/ProtocolServerSocketHandle.test.cc b/Socket/ProtocolServerSocketHandle.test.cc index 9a3913ff6..7d51364d4 100644 --- a/Socket/ProtocolServerSocketHandle.test.cc +++ b/Socket/ProtocolServerSocketHandle.test.cc @@ -67,13 +67,8 @@ BOOST_AUTO_UNIT_TEST(protocolServerSocketHandle) BOOST_CHECK_EQUAL( client.fd(), -1 ); BOOST_CHECK_EQUAL( h.dumpState(), - "file.handle: -1\n" - "file.refcount: 2\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" ); - + "handle: senf::ProtocolServerSocketHandle<(anonymous namespace)::MySocketProtocol>\n" + "valid: false\n" ); } { diff --git a/Socket/SocketHandle.test.cc b/Socket/SocketHandle.test.cc index 234ca02db..b4d8e5ca9 100644 --- a/Socket/SocketHandle.test.cc +++ b/Socket/SocketHandle.test.cc @@ -96,12 +96,13 @@ BOOST_AUTO_UNIT_TEST(socketHandle) std::bad_cast ); BOOST_CHECK_EQUAL( myh.dumpState(), - "file.handle: 0\n" - "file.refcount: 3\n" - "handle: senf::SocketHandle<senf::SocketPolicy<senf::test::SomeAddressingPolicy, senf::test::SomeFramingPolicy, senf::test::SomeCommunicationPolicy, senf::test::SomeReadPolicy, senf::test::SomeWritePolicy> >\n" - "socket.protocol: senf::test::SomeSocketProtocol\n" - "socket.protocol.policy: senf::SocketPolicy<senf::test::SomeAddressingPolicy, senf::test::SomeFramingPolicy, senf::test::SomeCommunicationPolicy, senf::test::SomeReadPolicy, senf::test::SomeWritePolicy>\n" - "socket.server: false\n" ); + "file.handle: 0\n" + "file.refcount: 3\n" + "handle: senf::SocketHandle<senf::SocketPolicy<senf::test::SomeAddressingPolicy, senf::test::SomeFramingPolicy, senf::test::SomeCommunicationPolicy, senf::test::SomeReadPolicy, senf::test::SomeWritePolicy> >\n" + "socket.protocol: senf::test::SomeSocketProtocol\n" + "socket.protocol.policy: senf::SocketPolicy<senf::test::SomeAddressingPolicy, senf::test::SomeFramingPolicy, senf::test::SomeCommunicationPolicy, senf::test::SomeReadPolicy, senf::test::SomeWritePolicy>\n" + "socket.server: false\n" + "valid: true\n" ); SENF_CHECK_NO_THROW( myh.facet<senf::test::SomeSocketProtocol>() ); } -- GitLab