From bad40ac83b45d633aa9945da3797e65466c36092 Mon Sep 17 00:00:00 2001
From: Matt Broadstone <mbroadstone@devonit.com>
Date: Fri, 6 Jun 2014 14:32:46 -0400
Subject: [PATCH] - updated all manual tests to reorder publish parameters
 (routeKey first) - updated all manual tests to remove queues with no name

---
 tests/manual/qamqp/pubsub/EmitLog.h           | 2 +-
 tests/manual/qamqp/pubsub/ReceiveLog.h        | 4 ++--
 tests/manual/qamqp/routing/EmitLogDirect.h    | 2 +-
 tests/manual/qamqp/routing/ReceiveLogDirect.h | 2 +-
 tests/manual/qamqp/workqueues/NewTask.h       | 2 +-
 5 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/tests/manual/qamqp/pubsub/EmitLog.h b/tests/manual/qamqp/pubsub/EmitLog.h
index e3d90df..ac1dcbe 100644
--- a/tests/manual/qamqp/pubsub/EmitLog.h
+++ b/tests/manual/qamqp/pubsub/EmitLog.h
@@ -54,7 +54,7 @@ protected slots:
           );
         qDebug() << "EmitLog::emitlogMessage " << message;
 
-        exchange_->publish(message, "");
+        exchange_->publish("receive-log", message);
     }
 
 private:
diff --git a/tests/manual/qamqp/pubsub/ReceiveLog.h b/tests/manual/qamqp/pubsub/ReceiveLog.h
index 984345f..4fa4402 100644
--- a/tests/manual/qamqp/pubsub/ReceiveLog.h
+++ b/tests/manual/qamqp/pubsub/ReceiveLog.h
@@ -31,7 +31,7 @@ public:
         client->connectToHost(address);
 
         // Create an exclusive queue
-        queue_ = client->createQueue("");
+        queue_ = client->createQueue("receive-log");
         queue_->declare(Queue::Exclusive);
 
         connect(queue_, SIGNAL(declared()), this, SLOT(declared()));
@@ -46,7 +46,7 @@ protected slots:
     void declared()
     {
         // Bind the queue to the "logs" exchange (declared by publisher)
-        queue_->bind("logs", "");
+        queue_->bind("logs", "receive-log");
         queue_->consume(QAMQP::Queue::coNoAck);
     }
 
diff --git a/tests/manual/qamqp/routing/EmitLogDirect.h b/tests/manual/qamqp/routing/EmitLogDirect.h
index 7ddc2fd..eb92c8d 100644
--- a/tests/manual/qamqp/routing/EmitLogDirect.h
+++ b/tests/manual/qamqp/routing/EmitLogDirect.h
@@ -62,7 +62,7 @@ protected slots:
         qDebug() << "EmitLogDirect::emitLogMessage " << message;
 
         // Publish
-        exchange_->publish(message, key);
+        exchange_->publish(key, message);
     }
 
 private:
diff --git a/tests/manual/qamqp/routing/ReceiveLogDirect.h b/tests/manual/qamqp/routing/ReceiveLogDirect.h
index d14f96e..d1b4003 100644
--- a/tests/manual/qamqp/routing/ReceiveLogDirect.h
+++ b/tests/manual/qamqp/routing/ReceiveLogDirect.h
@@ -34,7 +34,7 @@ public:
         client->connectToHost(address);
 
         // Create an exclusive queue
-        queue_ = client->createQueue("");
+        queue_ = client->createQueue("receive-log-direct");
         queue_->declare(Queue::Exclusive);
 
         connect(queue_, SIGNAL(declared()), this, SLOT(declared()));
diff --git a/tests/manual/qamqp/workqueues/NewTask.h b/tests/manual/qamqp/workqueues/NewTask.h
index 62bda7c..9fbd098 100644
--- a/tests/manual/qamqp/workqueues/NewTask.h
+++ b/tests/manual/qamqp/workqueues/NewTask.h
@@ -61,7 +61,7 @@ protected slots:
           .arg(QString('.').repeated(qrand() % 10)));
         qDebug() << "NewTask::newtaskMessage " << message;
 
-        exchange_->publish(message, queue_->name(), properties);
+        exchange_->publish(queue_->name(), message, properties);
     }
 
 private: