X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=Socket%2FSocketPolicy.test.cc;h=2e70df938868e37106d288f43778456695f10c5c;hb=81f84badf27b66dbadec9890646ca1193e998505;hp=4729bcadaa407738bbed8f3429cb7c4df3294cca;hpb=d6abda313f70c8a849c5e3f3bbfc12ce301789f1;p=senf.git

diff --git a/Socket/SocketPolicy.test.cc b/Socket/SocketPolicy.test.cc
index 4729bca..2e70df9 100644
--- a/Socket/SocketPolicy.test.cc
+++ b/Socket/SocketPolicy.test.cc
@@ -1,9 +1,9 @@
 // $Id$
 //
 // Copyright (C) 2006
-// Fraunhofer Institut fuer offene Kommunikationssysteme (FOKUS)
-// Kompetenzzentrum fuer Satelitenkommunikation (SatCom)
-//     Stefan Bund <stefan.bund@fokus.fraunhofer.de>
+// 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
 // it under the terms of the GNU General Public License as published by
@@ -20,20 +20,21 @@
 // Free Software Foundation, Inc.,
 // 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-// Unit tests
+/** \file
+    \brief SocketPolicy unit tests */
 
-//#include "SocketPolicy.test.hh"
+#include "SocketPolicy.test.hh"
 //#include "SocketPolicy.test.ih"
 
 // Custom includes
+#include <boost/mpl/assert.hpp>
+#include <boost/concept_check.hpp>
+#include <boost/utility.hpp> // enable_if
+
 #include "SocketPolicy.hh"
-#include "SocketPolicy.test.hh"
 
 #include "../Utils/auto_unit_test.hh"
 #include <boost/test/test_tools.hpp>
-#include <boost/mpl/assert.hpp>
-#include <boost/concept_check.hpp>
-#include <boost/utility.hpp> // enable_if
 
 #define prefix_
 ///////////////////////////////cc.p////////////////////////////////////////
@@ -56,9 +57,7 @@ namespace {
     struct WritablePolicy : public WritePolicyBase {};
     struct UnwritablePolicy : public WritePolicyBase {};
 
-    struct SocketBufferingPolicy : public BufferingPolicyBase {};
-
-    template <class Policy>
+    template <class SPolicy>
     struct ConvertibleValue
     {
         ConvertibleValue() {}
@@ -66,14 +65,14 @@ namespace {
 
         template <class OtherPolicy>
         ConvertibleValue(ConvertibleValue<OtherPolicy> const & other,
-                         typename boost::enable_if< SocketPolicyIsBaseOf<Policy,OtherPolicy> >::type * = 0)
+                         typename boost::enable_if< SocketPolicyIsBaseOf<SPolicy,OtherPolicy> >::type * = 0)
             {}
 
         ConvertibleValue const & operator=(ConvertibleValue const & other)
             { return *this; }
 
         template <class OtherPolicy>
-        typename boost::enable_if< SocketPolicyIsBaseOf<Policy,OtherPolicy>,
+        typename boost::enable_if< SocketPolicyIsBaseOf<SPolicy,OtherPolicy>,
                                    ConvertibleValue >::type const &
         operator=(ConvertibleValue<OtherPolicy> const & other)
             { return *this; }
@@ -95,8 +94,7 @@ BOOST_AUTO_UNIT_TEST(socketPolicy)
         UnspecifiedFramingPolicy,
         ConnectedCommunicationPolicy,
         ReadablePolicy,
-        UnspecifiedWritePolicy,
-        UnspecifiedBufferingPolicy> Policy2;
+        UnspecifiedWritePolicy> Policy2;
 
     BOOST_MPL_ASSERT(( boost::is_same<Policy1,Policy2> ));
 
@@ -109,8 +107,7 @@ BOOST_AUTO_UNIT_TEST(socketPolicy)
         UnspecifiedFramingPolicy,
         UnspecifiedCommunicationPolicy,
         ReadablePolicy,
-        UnspecifiedWritePolicy,
-        UnspecifiedBufferingPolicy> Policy4;
+        UnspecifiedWritePolicy> Policy4;
 
     BOOST_MPL_ASSERT(( boost::is_same<Policy3,Policy4> ));
     BOOST_MPL_ASSERT_NOT(( boost::is_same<Policy1, Policy3> ));
@@ -136,7 +133,7 @@ BOOST_AUTO_UNIT_TEST(socketPolicy)
         Policy3 p3;
 
         BOOST_CHECK_THROW( Policy1::checkBaseOf(p3), std::bad_cast );
-        BOOST_CHECK_NO_THROW( Policy3::checkBaseOf(p1) );
+        SENF_CHECK_NO_THROW( Policy3::checkBaseOf(p1) );
     }
 }