X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2FDefaultBundle%2FEthernetPacket.test.cc;h=35651589781f50b32f24ff3b8c542843aaedebe7;hb=HEAD;hp=f3dca00835558172349035d5bfeee65c22fa0f4b;hpb=601d1f509f5bb24df167a4dd5a20da67a0af9af8;p=senf.git

diff --git a/senf/Packets/DefaultBundle/EthernetPacket.test.cc b/senf/Packets/DefaultBundle/EthernetPacket.test.cc
index f3dca00..3565158 100644
--- a/senf/Packets/DefaultBundle/EthernetPacket.test.cc
+++ b/senf/Packets/DefaultBundle/EthernetPacket.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 EthernetPacket unit tests */
@@ -31,13 +36,13 @@
 #include "LlcSnapPacket.hh"
 #include "IPv4Packet.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(ethernetPacket_parse)
+SENF_AUTO_UNIT_TEST(ethernetPacket_parse)
 {
     senf::PacketData::byte data[] = {
         0x01, 0x02, 0x03, 0x04, 0x05, 0x06,  // destination MAC
@@ -54,7 +59,7 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_parse)
     SENF_CHECK_NO_THROW( p.dump( oss));
 }
 
-BOOST_AUTO_UNIT_TEST(ethernetPacket_parse_chain)
+SENF_AUTO_UNIT_TEST(ethernetPacket_parse_chain)
 {
     unsigned char data[] = {
         0x01, 0x02, 0x03, 0x04, 0x05, 0x06,  // destination MAC
@@ -74,9 +79,12 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_parse_chain)
     BOOST_CHECK_EQUAL( v->type(), 0xabcd );
     BOOST_CHECK( v.next().is<senf::DataPacket>() );
     BOOST_CHECK_EQUAL( *v.next().data().begin(), 0xf0 );
+
+    std::ostringstream oss (std::ostringstream::out);
+    SENF_CHECK_NO_THROW( p.dump( oss));
 }
 
-BOOST_AUTO_UNIT_TEST(ethernetPacket_create)
+SENF_AUTO_UNIT_TEST(ethernetPacket_create)
 {
     senf::EthernetPacket eth (senf::EthernetPacket::create());
     eth->source() = senf::MACAddress::from_string("01:02:03:04:05:06");
@@ -96,7 +104,7 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_create)
     BOOST_CHECK_EQUAL(vlan->type(), 0x0800u);
 }
 
-BOOST_AUTO_UNIT_TEST(ethernetPacket_llcsnap)
+SENF_AUTO_UNIT_TEST(ethernetPacket_llcsnap)
 {
     senf::EthernetPacket eth (senf::EthernetPacket::create());
     eth->source() = senf::MACAddress::from_string("01:02:03:04:05:06");
@@ -119,10 +127,10 @@ BOOST_AUTO_UNIT_TEST(ethernetPacket_llcsnap)
     BOOST_CHECK_EQUAL(llcsnap->type_length(), 0x0800u);
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
-
+
 // Local Variables:
 // mode: c++
 // fill-column: 100