X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FProtocols%2FRaw%2FLLAddressing.test.cc;h=075000db2d9184819a4ca1b628338434dbc1e6f7;hb=72cc548dfc3fa72d14d4d8c1a178f162165e933a;hp=f547d9a8dee1f0256cf4c955ecc775f424e1ac9c;hpb=767a76da8e5b96a69b620e44d32e0a1b04005679;p=senf.git

diff --git a/senf/Socket/Protocols/Raw/LLAddressing.test.cc b/senf/Socket/Protocols/Raw/LLAddressing.test.cc
index f547d9a..075000d 100644
--- a/senf/Socket/Protocols/Raw/LLAddressing.test.cc
+++ b/senf/Socket/Protocols/Raw/LLAddressing.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 LLAddressing unit tests */
@@ -27,19 +32,20 @@
 //#include "LLAddressing.test.ih"
 
 // Custom includes
-#include <senf/Utils/String.hh>
 #include "LLAddressing.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////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 SENF_AUTO_UNIT_TEST(llAddress)
 {
     using senf::LLSocketAddress;
-    
+
     {
         LLSocketAddress addr;
 
@@ -82,24 +88,24 @@ SENF_AUTO_UNIT_TEST(llAddress)
         BOOST_CHECK_EQUAL( addr.pkttype(), LLSocketAddress::Undefined );
         BOOST_CHECK( ! addr.address() );
     }
-    
+
     {
         BOOST_CHECK_THROW( LLSocketAddress addr("SENF_TEST_INVALID_INTERFACENAME"),
-                senf::AddressSyntaxException );
-        
+                senf::UnknownInterfaceException );
+
         LLSocketAddress addr ("lo");
-        
+
         BOOST_CHECK_EQUAL( addr.protocol(), 0u );
         BOOST_CHECK_EQUAL( addr.interface(), "lo" );
         BOOST_CHECK_EQUAL( addr.arptype(), 0u );
         BOOST_CHECK_EQUAL( addr.pkttype(), LLSocketAddress::Undefined );
         BOOST_CHECK( ! addr.address() );
-        
+
         BOOST_CHECK_EQUAL( LLSocketAddress("").interface(), "" );
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_