X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FINet%2FINetAddressing.test.cc;h=b06da088a2b914c6fa3fb81d4c1ba0695ba23047;hb=72cc548dfc3fa72d14d4d8c1a178f162165e933a;hp=b176dc1f60e8dbcc11c58b2b6569d1dac3b8599d;hpb=3fe2ed38b800bcb57afff676698462e763724245;p=senf.git

diff --git a/senf/Socket/Protocols/INet/INetAddressing.test.cc b/senf/Socket/Protocols/INet/INetAddressing.test.cc
index b176dc1..b06da08 100644
--- a/senf/Socket/Protocols/INet/INetAddressing.test.cc
+++ b/senf/Socket/Protocols/INet/INetAddressing.test.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2006
 // 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
-// the Free Software Foundation; either version 2 of the License, or
-// (at your option) any later version.
+// The contents of this file are subject to the Fraunhofer FOKUS Public License
+// Version 1.0 (the "License"); you may not use this file except in compliance
+// with the License. You may obtain a copy of the License at 
+// http://senf.berlios.de/license.html
 //
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
+// The Fraunhofer FOKUS Public License Version 1.0 is based on, 
+// but modifies the Mozilla Public License Version 1.1.
+// See the full license text for the amendments.
 //
-// You should have received a copy of the GNU General Public License
-// along with this program; if not, write to the
-// Free Software Foundation, Inc.,
-// 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+// Software distributed under the License is distributed on an "AS IS" basis, 
+// WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License 
+// for the specific language governing rights and limitations under the License.
+//
+// The Original Code is Fraunhofer FOKUS code.
+//
+// The Initial Developer of the Original Code is Fraunhofer-Gesellschaft e.V. 
+// (registered association), Hansastraße 27 c, 80686 Munich, Germany.
+// All Rights Reserved.
+//
+// Contributor(s):
+//   Stefan Bund <g0dil@berlios.de>
 
 /** \file
     \brief INetAddressing unit tests */
@@ -29,14 +34,15 @@
 // Custom includes
 #include "INetAddressing.hh"
 #include <senf/Utils/String.hh>
+#include <senf/Socket/Protocols/AddressExceptions.hh>
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOST_AUTO_UNIT_TEST(inet4SocketAddress)
+SENF_AUTO_UNIT_TEST(inet4SocketAddress)
 {
     using senf::INet4SocketAddress;
     using senf::INet4Address;
@@ -94,7 +100,7 @@ BOOST_AUTO_UNIT_TEST(inet4SocketAddress)
     }
 }
 
-BOOST_AUTO_UNIT_TEST(inet6SocketAddress)
+SENF_AUTO_UNIT_TEST(inet6SocketAddress)
 {
     using senf::INet6Address;
     using senf::INet6SocketAddress;
@@ -109,7 +115,7 @@ BOOST_AUTO_UNIT_TEST(inet6SocketAddress)
         addr = INet6SocketAddress("[12::21]:12345");
         BOOST_CHECK( addr == INet6SocketAddress("[12::21]:12345") );
         BOOST_CHECK_EQUAL( addr, INet6SocketAddress(addr) );
-        BOOST_CHECK( addr != INet6SocketAddress("[12::21%lo]:12345") );
+        SENF_CHECK_NOT_EQUAL( addr, INet6SocketAddress("[12::21%lo]:12345") );
         BOOST_CHECK( addr );
         BOOST_CHECK_EQUAL( addr.address(), INet6Address::from_string("12::21") );
         BOOST_CHECK_EQUAL( addr.port(), 12345u );
@@ -172,7 +178,7 @@ BOOST_AUTO_UNIT_TEST(inet6SocketAddress)
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_