Fix SCons 1.2.0 build failure

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

diff --git a/Socket/SocketHandle.test.cc b/Socket/SocketHandle.test.cc
index c8071f3..b4d8e5c 100644 (file)
--- a/Socket/SocketHandle.test.cc
+++ b/Socket/SocketHandle.test.cc
@@ -20,7 +20,8 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief SocketHandle unit tests */
 
 //#include "SocketHandle.test.hh"
 //#include "SocketHandle.test.ih"
@@ -80,8 +81,8 @@ BOOST_AUTO_UNIT_TEST(socketHandle)
         typedef senf::SocketHandle<senf::test::SomeSocketProtocol::Policy> SomeSocketHandle;
         SomeSocketHandle ssh = senf::static_socket_cast<SomeSocketHandle>(osh);
 
-        BOOST_CHECK_NO_THROW( senf::dynamic_socket_cast<SomeSocketHandle>(osh) );
-        BOOST_CHECK_NO_THROW( senf::dynamic_socket_cast<AnotherSocketHandle>(osh) );
+        SENF_CHECK_NO_THROW( senf::dynamic_socket_cast<SomeSocketHandle>(osh) );
+        SENF_CHECK_NO_THROW( senf::dynamic_socket_cast<AnotherSocketHandle>(osh) );
 
         typedef senf::SocketHandle< senf::MakeSocketPolicy<
             OtherSocketPolicy,
@@ -95,18 +96,19 @@ 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" );
-
-        BOOST_CHECK_NO_THROW( myh.facet<senf::test::SomeSocketProtocol>() );
+                "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>() );
     }
     
     // Ensure, the destructor is called and calls the correct close() implementation
-    BOOST_CHECK_EQUAL( senf::test::SomeSocketProtocol::closeCount(), 1u );
+    BOOST_CHECK( senf::test::SomeSocketProtocol::closeCount() >= 1u );
 }
 
 ///////////////////////////////cc.e////////////////////////////////////////