Some restructuring of the client code:

 * Introduced three separate 'handlers' for the connection, channel and execution 'layers'.
 * Support for asynchronous retrieval of response or completion status.
 * Channel methods no longer included in execution layers command id count.



git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@562212 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 9 insertions, 4 deletions

diff --git a/qpid/cpp/src/tests/Serializer.cpp b/qpid/cpp/src/tests/Serializer.cpp
index 8c0ee7b85c..d7345acf06 100644
--- a/qpid/cpp/src/tests/Serializer.cpp
+++ b/qpid/cpp/src/tests/Serializer.cpp
@@ -61,12 +61,17 @@ struct Tester {
     }
 };
 
+void execute(Serializer& s, Serializer::Task t) 
+{
+    s.execute(t);
+}
+
 BOOST_AUTO_TEST_CASE(testSingleThread) {
     // Verify that we call in the same thread by default.
     Tester tester;
     Serializer s;
     for (int i = 0; i < 100; ++i) 
-        s.execute(boost::bind(&Tester::test, &tester));
+        execute(s, boost::bind(&Tester::test, &tester));
     // All should be executed in this thread.
     BOOST_CHECK_EQUAL(0u, tester.collisions);
     BOOST_CHECK_EQUAL(100u, tester.count);
@@ -80,7 +85,7 @@ BOOST_AUTO_TEST_CASE(testSingleThreadNoImmediate) {
     Tester tester;
     Serializer s(false);
     for (int i = 0; i < 100; ++i)
-        s.execute(boost::bind(&Tester::test, &tester));
+        execute(s, boost::bind(&Tester::test, &tester));
     {
         // Wait for dispatch thread to complete.
         Mutex::ScopedLock l(tester.lock);
@@ -95,7 +100,7 @@ BOOST_AUTO_TEST_CASE(testSingleThreadNoImmediate) {
 
 struct Caller : public Runnable, public Tester {
     Caller(Serializer& s) : serializer(s) {}
-    void run() { serializer.execute(boost::bind(&Tester::test, this)); }
+    void run() { execute(serializer, boost::bind(&Tester::test, this)); }
     Serializer& serializer;
 };
 
@@ -134,7 +139,7 @@ BOOST_AUTO_TEST_CASE(testExternalDispatch) {
     serializer.reset(new Serializer(false, &notifyDispatch));
     Tester tester;
     for (int i = 0; i < 100; ++i) 
-        serializer->execute(boost::bind(&Tester::test, &tester));
+        execute(*serializer, boost::bind(&Tester::test, &tester));
     {
         // Wait for dispatch thread to complete.
         Mutex::ScopedLock l(tester.lock);