minor fixes for clang++

[senf.git] / senf / PPI / AnnotationRouter.test.cc

diff --git a/senf/PPI/AnnotationRouter.test.cc b/senf/PPI/AnnotationRouter.test.cc
index d862bd3..e502b69 100644 (file)
--- a/senf/PPI/AnnotationRouter.test.cc
+++ b/senf/PPI/AnnotationRouter.test.cc
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2008 
+// Copyright (C) 2008
 // 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 AnnotationRouter unit tests */
@@ -34,7 +39,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 namespace ppi = senf::ppi;
 namespace connector = ppi::connector;
 namespace module = ppi::module;
@@ -60,19 +65,19 @@ namespace {
     };
 }
 
-BOOST_AUTO_UNIT_TEST(annotationRouter)
+SENF_AUTO_UNIT_TEST(annotationRouter)
 {
     debug::ActiveSource source;
     debug::PassiveSink sink1;
     debug::PassiveSink sink2;
 
     AnnotationRouter router;
-    
+
     ppi::connect(source, router);
     ppi::connect(router, 1, sink1);
     ppi::connect(router, 2, sink2);
-    
-    BOOST_CHECK_THROW( connect(router, 2, sink2), 
+
+    BOOST_CHECK_THROW( connect(router, 2, sink2),
             module::AnnotationRouter<IntAnnotation>::DuplicateKeyException);
 
     ppi::init();
@@ -94,22 +99,16 @@ BOOST_AUTO_UNIT_TEST(annotationRouter)
 
     sink1.input.disconnect();
     BOOST_CHECK_EQUAL(router.connectors().size(), 1u);
-    
+
+    senf::ppi::connect(router, 1, sink1);
+    senf::ppi::init();
     source.submit(p1);
-    source.submit(p2);
-    BOOST_CHECK_EQUAL( sink1.size(), 1u );
-    BOOST_CHECK_EQUAL( sink2.size(), 2u );
-    
-//    ppi::connect(router, 1, sink1);
-//    ppi::init();
-//    
-//    source.submit(p1);
-//    source.submit(p2);
-//    BOOST_CHECK_EQUAL( sink1.size(), 2u );
-//    BOOST_CHECK_EQUAL( sink2.size(), 3u );
+
+    BOOST_CHECK_EQUAL( sink1.size(), 2u );
+    BOOST_CHECK_EQUAL( sink2.size(), 1u );
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f