X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FSocket%2FNetdeviceController.test.cc;h=753aa77ad56faf4b8873c14276b310a733b0cb4e;hb=51b24c3227717ce5ad8111a99c2d7eea5fa0bd8d;hp=38f1912777c4d62674a7cf3cc4c7c5fec17d752b;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Socket/NetdeviceController.test.cc b/senf/Socket/NetdeviceController.test.cc
index 38f1912..753aa77 100644
--- a/senf/Socket/NetdeviceController.test.cc
+++ b/senf/Socket/NetdeviceController.test.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2007
 // Fraunhofer Institute for Open Communication Systems (FOKUS)
-// Competence Center NETwork research (NET), St. Augustin, GERMANY
-//     Thorsten Horstmann <tho@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):
+//   Thorsten Horstmann <tho@berlios.de>
 
 /** \file
     \brief NetdeviceController unit tests */
@@ -28,16 +33,16 @@
 
 // Custom includes
 #include "NetdeviceController.hh"
-#include "Protocols/Raw/MACAddress.hh"
 #include <net/if.h>
+#include <senf/Utils/Exception.hh>
 
-#include "../Utils/auto_unit_test.hh"
+#include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
-BOOST_AUTO_UNIT_TEST(NetdeviceController) {
+SENF_AUTO_UNIT_TEST(NetdeviceController) {
 
     std::string ifname ("lo");
     senf::NetdeviceController ctrl (ifname);
@@ -46,15 +51,15 @@ BOOST_AUTO_UNIT_TEST(NetdeviceController) {
     int index = ctrl.interfaceIndex();
     BOOST_CHECK_EQUAL( index, senf::NetdeviceController(index).interfaceIndex() );
     BOOST_CHECK_EQUAL( index, if_nametoindex( ifname.c_str()) );
-    
+
     BOOST_CHECK_THROW( senf::NetdeviceController("invalid_interfacename"), senf::SystemException );
-    
+
     int oldMTU (0);
     SENF_CHECK_NO_THROW( oldMTU = ctrl.mtu());
-    
+
     bool promisc (false);
     SENF_CHECK_NO_THROW( promisc = ctrl.promisc());
-    
+
     BOOST_CHECK( ctrl.isUp());
 
     if (getuid() != 0) {
@@ -66,14 +71,14 @@ BOOST_AUTO_UNIT_TEST(NetdeviceController) {
     BOOST_CHECK_EQUAL( ctrl.mtu(), oldMTU-16);
     SENF_CHECK_NO_THROW( ctrl.mtu(oldMTU));
     BOOST_CHECK_EQUAL( ctrl.mtu(), oldMTU);
-    
+
     SENF_CHECK_NO_THROW( ctrl.promisc( !promisc));
     BOOST_CHECK_EQUAL( ctrl.promisc(), !promisc);
     SENF_CHECK_NO_THROW( ctrl.promisc( promisc));
     BOOST_CHECK_EQUAL( ctrl.promisc(), promisc);
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_