6 files changed, 39 insertions, 14 deletions

diff --git a/cpp/tests/ChannelTest.cpp b/cpp/tests/ChannelTest.cpp
index cc0a90bad9..637e971077 100644
--- a/cpp/tests/ChannelTest.cpp
+++ b/cpp/tests/ChannelTest.cpp
@@ -39,8 +39,8 @@ using std::queue;
 struct DummyHandler : OutputHandler{
     std::vector<AMQFrame*> frames; 
 
-    virtual void send(AMQFrame* frame){
-        frames.push_back(frame);
+    virtual void send(AMQDataBlock* block){
+        frames.push_back(dynamic_cast<AMQFrame*>(block));
     }
 };
 
diff --git a/cpp/tests/InMemoryContentTest.cpp b/cpp/tests/InMemoryContentTest.cpp
index bd638dae66..ca27e80515 100644
--- a/cpp/tests/InMemoryContentTest.cpp
+++ b/cpp/tests/InMemoryContentTest.cpp
@@ -33,8 +33,9 @@ using namespace qpid::framing;
 struct DummyHandler : OutputHandler{
     std::vector<AMQFrame*> frames; 
 
-    virtual void send(AMQFrame* frame){
-        frames.push_back(frame);
+
+    virtual void send(AMQDataBlock* block){
+        frames.push_back(dynamic_cast<AMQFrame*>(block));
     }
 };
 
diff --git a/cpp/tests/LazyLoadedContentTest.cpp b/cpp/tests/LazyLoadedContentTest.cpp
index 2075a6dd3a..8d0ad65a6a 100644
--- a/cpp/tests/LazyLoadedContentTest.cpp
+++ b/cpp/tests/LazyLoadedContentTest.cpp
@@ -35,8 +35,8 @@ using namespace qpid::framing;
 struct DummyHandler : OutputHandler{
     std::vector<AMQFrame*> frames; 
 
-    virtual void send(AMQFrame* frame){
-        frames.push_back(frame);
+    virtual void send(AMQDataBlock* block){
+        frames.push_back(dynamic_cast<AMQFrame*>(block));
     }
 };
 
diff --git a/cpp/tests/MessageTest.cpp b/cpp/tests/MessageTest.cpp
index bcf3ad8064..ee864a3883 100644
--- a/cpp/tests/MessageTest.cpp
+++ b/cpp/tests/MessageTest.cpp
@@ -30,8 +30,8 @@ using namespace qpid::framing;
 struct DummyHandler : OutputHandler{
     std::vector<AMQFrame*> frames; 
 
-    virtual void send(AMQFrame* frame){
-        frames.push_back(frame);
+    virtual void send(AMQDataBlock* block){
+        frames.push_back(dynamic_cast<AMQFrame*>(block));
     }
 };
 
diff --git a/cpp/tests/client_test.cpp b/cpp/tests/client_test.cpp
index a5cc64d1e4..55bf6234d1 100644
--- a/cpp/tests/client_test.cpp
+++ b/cpp/tests/client_test.cpp
@@ -35,6 +35,7 @@
 #include <MessageListener.h>
 #include <sys/Monitor.h>
 #include <FieldTable.h>
+#include <cstdlib>
 
 using namespace qpid::client;
 using namespace qpid::sys;
@@ -52,12 +53,28 @@ public:
     inline SimpleListener(Monitor* _monitor) : monitor(_monitor){}
 
     inline virtual void received(Message& msg){
-	std::cout << "Received message " << msg.getData()  << std::endl;
+	std::cout << "Received message " << msg.getData().substr(0, 5) << "..." << std::endl;
 	monitor->notify();
     }
 };
 
-int main(int argc, char**)
+const std::string chars("abcdefghijklmnopqrstuvwxyzABCDEFGHIJKLMNOPQRSTUVWXYZ");
+
+std::string generateData(uint size)
+{
+    if (size < chars.length()) {
+        return chars.substr(0, size);
+    }   
+    std::string data;
+    for (uint i = 0; i < (size / chars.length()); i++) {
+        data += chars;
+    }
+    data += chars.substr(0, size % chars.length());
+    return data;
+}
+
+
+int main(int argc, char** argv)
 {
     try{               
         //Use a custom exchange
@@ -109,10 +126,17 @@ int main(int argc, char**)
         //Now we create and publish a message to our exchange with a
         //routing key that will cause it to be routed to our queue
 	Message msg;
-	string data("MyMessage");
-	msg.setData(data);
+        uint size = 0;
+        if (argc > 1) {
+            size = atoi(argv[1]);
+        }
+        if (size) {
+            msg.setData(generateData(size));
+        } else {
+            msg.setData("MyMessage");
+        }
 	channel.publish(msg, exchange, "MyTopic");
-	std::cout << "Published message: " << data << std::endl;
+	std::cout << "Published message: " << msg.getData().substr(0, 5) << "..." << std::endl;
 
 	{
             Monitor::ScopedLock l(monitor);
diff --git a/cpp/tests/run-python-tests b/cpp/tests/run-python-tests
index 5148f644eb..e2e45f9ea9 100755
--- a/cpp/tests/run-python-tests
+++ b/cpp/tests/run-python-tests
@@ -41,7 +41,7 @@ sleep 4
 
 # Run the tests.
 ( cd $abs_srcdir/../../python \
-    && python ./run-tests -v -I cpp_failing.txt ) || fail=1 
+    && python ./run-tests -v -I cpp_failing.txt -s ../specs/amqp.0-9.no-wip.xml ) || fail=1 
 
 kill $pid || { echo FAIL: process already died; cat log; fail=1; }