Generate c++ code from final 0-10 spec

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

4 files changed, 4 insertions, 4 deletions

diff --git a/cpp/src/tests/ExchangeTest.cpp b/cpp/src/tests/ExchangeTest.cpp
index 94e2c025d6..0b69f76a76 100644
--- a/cpp/src/tests/ExchangeTest.cpp
+++ b/cpp/src/tests/ExchangeTest.cpp
@@ -28,6 +28,7 @@
 #include "qpid/broker/FanOutExchange.h"
 #include "qpid/broker/HeadersExchange.h"
 #include "qpid/broker/TopicExchange.h"
+#include "qpid/framing/reply_exceptions.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include "MessageUtils.h"
@@ -166,7 +167,7 @@ class ExchangeTest : public CppUnit::TestCase
         exchanges.destroy("my-exchange");
         try {
             exchanges.get("my-exchange");
-        } catch (const ChannelException&) {}
+        } catch (const NotFoundException&) {}
         std::pair<Exchange::shared_ptr, bool> response = exchanges.declare("my-exchange", "direct", false, FieldTable());
         CPPUNIT_ASSERT_EQUAL(string("direct"), response.first->getType());
   
diff --git a/cpp/src/tests/exception_test.cpp b/cpp/src/tests/exception_test.cpp
index 7c68973d4d..f75269c959 100644
--- a/cpp/src/tests/exception_test.cpp
+++ b/cpp/src/tests/exception_test.cpp
@@ -91,7 +91,7 @@ QPID_AUTO_TEST_CASE(DisconnectedListen) {
     Thread t(fix.subs);
     fix.connection.proxy.close();
     t.join();
-    BOOST_CHECK_THROW(fix.session.close(), InternalErrorException);    
+    BOOST_CHECK_THROW(fix.session.close(), ConnectionException);    
 }
 
 QPID_AUTO_TEST_CASE(NoSuchQueueTest) {
diff --git a/cpp/src/tests/interop_runner.cpp b/cpp/src/tests/interop_runner.cpp
index 1d77408eff..51dd2cb924 100644
--- a/cpp/src/tests/interop_runner.cpp
+++ b/cpp/src/tests/interop_runner.cpp
@@ -158,7 +158,7 @@ void Listener::sendResponse(Message& response, Message& request)
 
 void Listener::sendResponse(Message& response, ReplyTo replyTo)
 {
-    string exchange = replyTo.getExchangeName();
+    string exchange = replyTo.getExchange();
     string routingKey = replyTo.getRoutingKey();
     channel.publish(response, exchange, routingKey);
 }
diff --git a/cpp/src/tests/python_tests b/cpp/src/tests/python_tests
index ce6b1f3810..e4b70f5ff5 100755
--- a/cpp/src/tests/python_tests
+++ b/cpp/src/tests/python_tests
@@ -14,7 +14,6 @@ run() {
 if test -d ${PYTHON_DIR} ;  then
     cd ${PYTHON_DIR}
     run 0-10-errata cpp_failing_0-10.txt
-    if test -z "$QPID_NO_PREVIEW" ; then run ../specs/amqp.0-10-preview.xml cpp_failing_0-10_preview.txt; fi
 else
     echo Warning: python tests not found.
 fi