X-Git-Url: http://g0dil.de/git?a=blobdiff_plain;f=senf%2FPPI%2FJack.test.cc;h=2086208fa61c157879b44788a6c690c1e0eb0b6f;hb=HEAD;hp=93734b5970a3af23bd81f6ed78dde0a7fc187506;hpb=26610f603ebdd465307b9621f532c1fe19fd5571;p=senf.git

diff --git a/senf/PPI/Jack.test.cc b/senf/PPI/Jack.test.cc
index 93734b5..2086208 100644
--- a/senf/PPI/Jack.test.cc
+++ b/senf/PPI/Jack.test.cc
@@ -1,24 +1,29 @@
 // $Id$
 //
-// Copyright (C) 2009 
+// Copyright (C) 2009
 // 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 Jack unit tests */
@@ -27,17 +32,18 @@
 //#include "Jack.test.ih"
 
 // Custom includes
-#include "PPI.hh"
+#include "Jack.hh"
+#include "DebugModules.hh"
 
 #include <senf/Utils/auto_unit_test.hh>
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 
 namespace {
 
-    class ActiveDummyForward 
+    class ActiveDummyForward
         : public senf::ppi::module::Module
     {
         SENF_PPI_MODULE(ActiveDummyForward);
@@ -55,7 +61,7 @@ namespace {
             { ++n; output(input()); }
     };
 
-    class PassiveDummyForward 
+    class PassiveDummyForward
         : public senf::ppi::module::Module
     {
         SENF_PPI_MODULE(PassiveDummyForward);
@@ -98,7 +104,7 @@ namespace {
 
         PassiveGroup()
             : input (forward1.input), output (forward1.output) {}
-        
+
         void flip()
         {
             input.reset(forward2.input);
@@ -111,7 +117,7 @@ namespace {
 
 }
 
-BOOST_AUTO_UNIT_TEST(jacks)
+SENF_AUTO_UNIT_TEST(jacks)
 {
     {
         ActiveGroup group;
@@ -120,9 +126,9 @@ BOOST_AUTO_UNIT_TEST(jacks)
 
         senf::ppi::connect(source, group);
         senf::ppi::connect(group, sink);
-        
+
         senf::ppi::init();
-        
+
         {
             senf::Packet p (senf::DataPacket::create());
             source.submit(p);
@@ -132,7 +138,7 @@ BOOST_AUTO_UNIT_TEST(jacks)
 
         group.flip();
         senf::ppi::init();
-        
+
         {
             senf::Packet p (senf::DataPacket::create());
             source.submit(p);
@@ -143,7 +149,7 @@ BOOST_AUTO_UNIT_TEST(jacks)
         BOOST_CHECK_EQUAL( group.forward1.n, 1u );
         BOOST_CHECK_EQUAL( group.forward2.n, 1u );
     }
-     
+
     {
         PassiveGroup group;
         senf::ppi::module::debug::ActiveSource source;
@@ -176,7 +182,7 @@ BOOST_AUTO_UNIT_TEST(jacks)
     }
 }
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_