X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPackets%2F80221Bundle%2FMIHMessageRegistry.test.cc;h=2ff831443d11254cfe926662a54e57fb35d14905;hb=ddb2132be4265f8a0d7d4c954c7c9401e59d027c;hp=fa8dd625b1d76a995808492f247cec88f54ec584;hpb=ff305084cba283649a2c97e73d2608c3e4598683;p=senf.git

diff --git a/senf/Packets/80221Bundle/MIHMessageRegistry.test.cc b/senf/Packets/80221Bundle/MIHMessageRegistry.test.cc
index fa8dd62..2ff8314 100644
--- a/senf/Packets/80221Bundle/MIHMessageRegistry.test.cc
+++ b/senf/Packets/80221Bundle/MIHMessageRegistry.test.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2011
 // 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 MIH Message-Registry unit tests */
@@ -35,9 +40,12 @@
 
 #define prefix_
 //-/////////////////////////////////////////////////////////////////////////////////////////////////
-using namespace senf;
 
-namespace {
+// we cannot put these test classes into the anonymous namespace because of a g++ bug
+// see https://svn.boost.org/trac/boost/ticket/3729
+
+namespace senf {
+namespace test {
 
     class TestMessagePacketParser
         : public senf::PacketParserBase
@@ -77,8 +85,8 @@ namespace {
 
         static const boost::uint16_t MESSAGE_ID;
 
-        static std::pair<bool, std::string> validate(packet message) {
-            return std::make_pair(message->registerRequestCodeTLV().value() == 1, "");
+        static void validate(packet message) {
+            message->registerRequestCodeTLV().validate();
         }
     };
 
@@ -87,10 +95,13 @@ namespace {
 
     const boost::uint16_t TestMessagePacketType::MESSAGE_ID = 42;
     const boost::uint16_t ValidatedTestMessagePacketType::MESSAGE_ID = 43;
-
-    SENF_MIH_PACKET_REGISTRY_REGISTER( TestMessagePacket );
-    SENF_MIH_PACKET_REGISTRY_REGISTER( ValidatedTestMessagePacket );
 }
+}
+
+using namespace senf;
+
+SENF_MIH_PACKET_REGISTRY_REGISTER( test::TestMessagePacket );
+SENF_MIH_PACKET_REGISTRY_REGISTER( test::ValidatedTestMessagePacket );
 
 
 SENF_AUTO_UNIT_TEST(MIHMessageRegistry_validate)
@@ -100,22 +111,23 @@ SENF_AUTO_UNIT_TEST(MIHMessageRegistry_validate)
     mihPacket->src_mihfId().value( "senf@berlios.de");
     mihPacket->dst_mihfId().value( "test");
 
-    BOOST_CHECK(! MIHPacketType::validate( mihPacket).first);
+    BOOST_CHECK_THROW( MIHPacketType::validate( mihPacket), InvalidMIHPacketException);
 
     mihPacket.finalizeThis();
-    BOOST_CHECK( MIHPacketType::validate( mihPacket).first);
+    BOOST_CHECK_NO_THROW( MIHPacketType::validate( mihPacket));
 
     {
-        TestMessagePacket testMessage (TestMessagePacket::createAfter(mihPacket));
+        test::TestMessagePacket testMessage (test::TestMessagePacket::createAfter(mihPacket));
         mihPacket.finalizeAll();
-        BOOST_CHECK( MIHPacketType::validate( mihPacket).first);
+        BOOST_CHECK_NO_THROW( MIHPacketType::validate( mihPacket));
     }
     {
-        ValidatedTestMessagePacket testMessage (ValidatedTestMessagePacket::createAfter(mihPacket));
+        test::ValidatedTestMessagePacket testMessage (test::ValidatedTestMessagePacket::createAfter(mihPacket));
         mihPacket.finalizeAll();
-        BOOST_CHECK(! MIHPacketType::validate( mihPacket).first);
+        testMessage->registerRequestCodeTLV().value() << 3;
+        BOOST_CHECK_THROW( MIHPacketType::validate( mihPacket), InvalidMIHPacketException);
         testMessage->registerRequestCodeTLV().value() << 1;
-        BOOST_CHECK( MIHPacketType::validate( mihPacket).first);
+        BOOST_CHECK_NO_THROW( MIHPacketType::validate( mihPacket));
     }
 }