Session resume support in client & broker: Client can resume a session

after voluntary suspend() or network failure. Frames lost in network
failure are automatically re-transmitted for transparent re-connection.

client::Session improvements:
 - Locking to avoid races between network & user threads.
 - Replaced client::StateManager with sys::StateMonitor - avoid heap allocation.

qpid::Exception clean up:
 - use QPID_MSG consistently to format exception messages.
 - throw typed exceptions (in reply_exceptions.h) for AMQP exceptions.
 - re-throw correct typed exception on client for exceptions from broker.
 - Removed QpidError.h

rubygen/templates/constants.rb: 
 - constants.h: Added FOO_CLASS_ID and FOO_BAR_METHOD_ID constants.
 - reply_constants.h: Added throwReplyException(code, text)
 
log::Logger:
 - Fixed shutdown race in Statement::~Initializer()


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

1 files changed, 5 insertions, 15 deletions

diff --git a/cpp/src/tests/FramingTest.cpp b/cpp/src/tests/FramingTest.cpp
index 5ca4e6c216..9e82447ffa 100644
--- a/cpp/src/tests/FramingTest.cpp
+++ b/cpp/src/tests/FramingTest.cpp
@@ -18,8 +18,6 @@
  * under the License.
  *
  */
-#include "InProcessBroker.h"
-#include "qpid/QpidError.h"
 #include "qpid/client/Exchange.h"
 #include "qpid/client/Queue.h"
 #include "qpid/client/Connection.h"
@@ -30,6 +28,7 @@
 #include "qpid/framing/ProtocolVersion.h"
 #include "qpid/framing/all_method_bodies.h"
 #include "qpid/framing/amqp_framing.h"
+#include "qpid/framing/reply_exceptions.h"
 #include "qpid_test_plugin.h"
 
 #include <boost/bind.hpp>
@@ -200,18 +199,12 @@ class FramingTest : public CppUnit::TestCase
         try {
             Content content(REFERENCE, "");
             CPPUNIT_ASSERT(false);//fail, expected exception
-        } catch (QpidError& e) {
-            CPPUNIT_ASSERT_EQUAL(FRAMING_ERROR, e.code);
-            CPPUNIT_ASSERT_EQUAL(string("Reference cannot be empty"), e.msg);
-        }
+        } catch (const InvalidArgumentException& e) {}
         
         try {
             Content content(2, "Blah");
             CPPUNIT_ASSERT(false);//fail, expected exception
-        } catch (QpidError& e) {
-            CPPUNIT_ASSERT_EQUAL(FRAMING_ERROR, e.code);
-            CPPUNIT_ASSERT_EQUAL(string("Invalid discriminator: 2"), e.msg);
-        }
+        } catch (const SyntaxErrorException& e) {}
         
         try {
             Buffer wbuff(buffer, sizeof(buffer));
@@ -221,11 +214,8 @@ class FramingTest : public CppUnit::TestCase
             Buffer rbuff(buffer, sizeof(buffer));
             Content content;
             content.decode(rbuff);
-            CPPUNIT_ASSERT(false);//fail, expected exception
-        } catch (QpidError& e) {
-            CPPUNIT_ASSERT_EQUAL(FRAMING_ERROR, e.code);
-            CPPUNIT_ASSERT_EQUAL(string("Invalid discriminator: 2"), e.msg);
-        }
+            CPPUNIT_FAIL("Expected exception");
+        } catch (Exception& e) {}
         
     }