Added test cases 4 and 5, for message size tests.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/branches/M2.1@580040 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 58 insertions, 10 deletions

diff --git a/cpp/tests/SimpleTestCaseBase.cpp b/cpp/tests/SimpleTestCaseBase.cpp
index 691f2b0652..3603df3af3 100644
--- a/cpp/tests/SimpleTestCaseBase.cpp
+++ b/cpp/tests/SimpleTestCaseBase.cpp
@@ -21,49 +21,98 @@
 #include "SimpleTestCaseBase.h"
 
 using namespace qpid;
+using namespace qpid::client;
 
+/**
+ * Starts the test cases worker.
+ */
 void SimpleTestCaseBase::start()
 {
-    if (worker.get()) {
+    if (worker.get()) 
+    {
         worker->start();
     }
 }
 
+/**
+ * Stops the test cases worker.
+ */
 void SimpleTestCaseBase::stop()
 {
-    if (worker.get()) {
+    if (worker.get()) 
+    {
         worker->stop();
     }
 }
 
+/**
+ * Adds the test report to the specified message. This consists of writing the count of messages received into
+ * a header on the message.
+ *
+ * @param report The report message to add the test report to.
+ */
 void SimpleTestCaseBase::report(client::Message& report)
 {
-    if (worker.get()) {
+    if (worker.get()) 
+    {
         report.getHeaders().setInt("MESSAGE_COUNT", worker->getCount());
-        //add number of messages sent or received
+
+        // Add number of messages sent or received in the message body.
+        /*
         std::stringstream reportstr;
         reportstr << worker->getCount();
         report.setData(reportstr.str());
+        */
     }
 }
 
+/**
+ * Creates a sender using the specified options, for the given expected message count, exchange and routing key.
+ * This sets up the sender with the default message size for interop tests.
+ *
+ * @param options  The creation options.
+ * @param exchange The exchange to send the messages over.
+ * @param key      The routing key for the messages.
+ * @param messages The number of messages expected to be sent or received.
+ */
 SimpleTestCaseBase::Sender::Sender(TestOptions& options, 
                                    const Exchange& _exchange, 
                                    const std::string& _key, 
                                    const int _messages) 
-    : Worker(options, _messages), exchange(_exchange), key(_key) {}
+  : Worker(options, _messages), exchange(_exchange), key(_key), messageSize(DEFAULT_INTEROP_MESSAGE_SIZE) {}
+
+/**
+ * Creates a sender using the specified options, for the given expected message count, exchange and routing key.
+ *
+ * @param options     The creation options.
+ * @param exchange    The exchange to send the messages over.
+ * @param key         The routing key for the messages.
+ * @param messages    The number of messages expected to be sent or received.
+ * @param messageSize The size of test messages to send.
+ */
+SimpleTestCaseBase::Sender::Sender(TestOptions& options, 
+                                   const Exchange& _exchange, 
+                                   const std::string& _key, 
+                                   const int _messages,
+                                   const int _messageSize) 
+  : Worker(options, _messages), exchange(_exchange), key(_key), messageSize(_messageSize) {}
 
 void SimpleTestCaseBase::Sender::init()
 {
     channel.start();
 }
 
-void SimpleTestCaseBase::Sender::start(){
-    Message msg;
-    while (count < messages) {
-        channel.publish(msg, exchange, key);
+void SimpleTestCaseBase::Sender::start()
+{
+    Message message;
+    qpid::createTestMessageOfSize(message, messageSize);
+
+    while (count < messages) 
+    {
+        channel.publish(message, exchange, key);
         count++;
     }
+
     stop();
 }
 
@@ -84,4 +133,3 @@ int SimpleTestCaseBase::Worker::getCount()
 {
     return count;
 }
-