switch to new MPL based Fraunhofer FOKUS Public License

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

diff --git a/senf/PPI/QueueingSocketSink.test.cc b/senf/PPI/QueueingSocketSink.test.cc
index 180af5b..04b14aa 100644 (file)
--- a/senf/PPI/QueueingSocketSink.test.cc
+++ b/senf/PPI/QueueingSocketSink.test.cc
@@ -2,23 +2,28 @@
 //
 // Copyright (C) 2010
 // 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 QueueingSocketSink unit tests */
@@ -36,7 +41,7 @@
 #include <boost/test/test_tools.hpp>
 
 #define prefix_
-///////////////////////////////cc.p////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 namespace ppi = senf::ppi;
 namespace module = ppi::module;
 namespace debug = module::debug;
@@ -75,16 +80,25 @@ namespace {
                 return false;
             return ConnectedDgramWriter::operator()( handle, packet);
         }
+
+        TestingConnectedDgramWriter(){
+            throttled = false;
+        }
     };
 }
 
 SENF_AUTO_UNIT_TEST(passiveQueueingSocketSink)
 {
+    senf::ConnectedUDPv4ClientSocketHandle os (senf::noinit);
+
     senf::ConnectedUDPv4ClientSocketHandle outputSocket (
             senf::INet4SocketAddress( localhost4str(0)));
-    ppi::FIFOQueueingAlgorithm<TestingConnectedDgramWriter::PacketType> queueingAlgorithm ( 100);
     module::PassiveQueueingSocketSink<TestingConnectedDgramWriter> udpSink (
-            outputSocket, queueingAlgorithm);
+            os, ppi::FIFOQueueingAlgorithm::create());
+    
+    // test re-assignment of socket
+    udpSink.handle( outputSocket);
+    
     udpSink.writer().throttled = false;
     debug::ActiveSource source;
     ppi::connect(source, udpSink);
@@ -107,17 +121,29 @@ SENF_AUTO_UNIT_TEST(passiveQueueingSocketSink)
     source.submit(p);
     BOOST_CHECK_EQUAL( udpSink.qAlgorithm().size(), 1);
 
+    for (int n = 0; n < 100; n++) {
+        source.submit(p);
+    }
+    // queue default size is 64
+    BOOST_CHECK_EQUAL( udpSink.qAlgorithm().size(), 64);
+
     udpSink.writer().throttled = false;
 
-    runPPI( senf::ClockService::milliseconds(200));
+    runPPI( senf::ClockService::milliseconds(250));
 
-    input = inputSocket.read();
-    BOOST_CHECK_EQUAL( data, input );
+    inputSocket.blocking(false);
+    while (true) {
+        input = inputSocket.read();
+        if (input.empty()) break;
+        BOOST_CHECK_EQUAL( data, input );
+    }
+
+    runPPI( senf::ClockService::milliseconds(250));
     BOOST_CHECK_EQUAL( udpSink.qAlgorithm().size(), 0);
 }
 
 
-///////////////////////////////cc.e////////////////////////////////////////
+//-/////////////////////////////////////////////////////////////////////////////////////////////////
 #undef prefix_
 
 \f