Renamed unit tests to follow naming conventions, fixed some #include inconsistencies.

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

13 files changed, 26 insertions, 26 deletions

diff --git a/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp b/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp
index 8d54208f77..2197c1724a 100644
--- a/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "../../src/qpid/broker/Channel.h"
-#include "../../src/qpid/broker/Message.h"
+#include "qpid/broker/Channel.h"
+#include "qpid/broker/Message.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <memory>
diff --git a/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp b/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp
index 3d21cb66f0..adebc87422 100644
--- a/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp
@@ -16,10 +16,10 @@
  *
  */
 
-#include "../../src/qpid/broker/DirectExchange.h"
-#include "../../src/qpid/broker/Exchange.h"
-#include "../../src/qpid/broker/Queue.h"
-#include "../../src/qpid/broker/TopicExchange.h"
+#include "qpid/broker/DirectExchange.h"
+#include "qpid/broker/Exchange.h"
+#include "qpid/broker/Queue.h"
+#include "qpid/broker/TopicExchange.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/qpid/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp b/qpid/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp
index d8fe71350e..a57c1d8800 100644
--- a/qpid/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp
@@ -16,9 +16,9 @@
  *
  */
 
-#include "../../src/qpid/broker/HeadersExchange.h"
-#include "../../src/qpid/framing/FieldTable.h"
-#include "../../src/qpid/framing/Value.h"
+#include "qpid/broker/HeadersExchange.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/framing/Value.h"
 #include <qpid_test_plugin.h>
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp b/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp
index f6586f721a..210cd63934 100644
--- a/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "../../src/qpid/concurrent/APRBase.h"
-#include "../../src/qpid/broker/Message.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/broker/Message.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/qpid/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp b/qpid/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp
index 96fbc88069..59034fb7c8 100644
--- a/qpid/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp
@@ -1,4 +1,4 @@
-#include "../../src/qpid/broker/QueueRegistry.h"
+#include "qpid/broker/QueueRegistry.h"
 #include <qpid_test_plugin.h>
 #include <string>
 
diff --git a/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp b/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp
index fa6344c265..5b06cb93ca 100644
--- a/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "../../src/qpid/broker/Queue.h"
-#include "../../src/qpid/broker/QueueRegistry.h"
+#include "qpid/broker/Queue.h"
+#include "qpid/broker/QueueRegistry.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/qpid/cpp/test/unit/qpid/broker/RouterTest.cpp b/qpid/cpp/test/unit/qpid/broker/RouterTest.cpp
index 7b77162905..f2c9f27abd 100644
--- a/qpid/cpp/test/unit/qpid/broker/RouterTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/RouterTest.cpp
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-#include "../../src/qpid/broker/Channel.h"
-#include "../../src/qpid/broker/Exchange.h"
-#include "../../src/qpid/broker/ExchangeRegistry.h"
-#include "../../src/qpid/broker/Message.h"
-#include "../../src/qpid/broker/Router.h"
+#include "qpid/broker/Channel.h"
+#include "qpid/broker/Exchange.h"
+#include "qpid/broker/ExchangeRegistry.h"
+#include "qpid/broker/Message.h"
+#include "qpid/broker/Router.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <memory>
diff --git a/qpid/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp b/qpid/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
index 4066a4709f..8d7903c4ac 100644
--- a/qpid/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
@@ -1,4 +1,4 @@
-#include "../../src/qpid/broker/TopicExchange.h"
+#include "qpid/broker/TopicExchange.h"
 #include <qpid_test_plugin.h>
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/test/unit/qpid/broker/ValueTest.cpp b/qpid/cpp/test/unit/qpid/broker/ValueTest.cpp
index 89444c38cf..2cb2563b46 100644
--- a/qpid/cpp/test/unit/qpid/broker/ValueTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/ValueTest.cpp
@@ -1,4 +1,4 @@
-#include "../../src/qpid/framing/Value.h"
+#include "qpid/framing/Value.h"
 #include <qpid_test_plugin.h>
 
 using namespace qpid::framing;
diff --git a/qpid/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp b/qpid/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp
index 6b011743c0..d6edf37d51 100644
--- a/qpid/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp
+++ b/qpid/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp
@@ -16,7 +16,7 @@
  *
  */
 #include <iostream>
-#include "../../src/qpid/framing/amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 #include "qpid_test_plugin.h"
 using namespace qpid::framing;
 
diff --git a/qpid/cpp/test/unit/qpid/framing/field_table_test.cpp b/qpid/cpp/test/unit/qpid/framing/FieldTableTest.cpp
index 8f2fe61611..b11addfd0e 100644
--- a/qpid/cpp/test/unit/qpid/framing/field_table_test.cpp
+++ b/qpid/cpp/test/unit/qpid/framing/FieldTableTest.cpp
@@ -16,7 +16,7 @@
  *
  */
 #include <iostream>
-#include "../../src/qpid/framing/amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 #include <qpid_test_plugin.h>
 
 using namespace qpid::framing;
diff --git a/qpid/cpp/test/unit/qpid/framing/framing_test.cpp b/qpid/cpp/test/unit/qpid/framing/FramingTest.cpp
index 40ce3d97ed..950d1e045a 100644
--- a/qpid/cpp/test/unit/qpid/framing/framing_test.cpp
+++ b/qpid/cpp/test/unit/qpid/framing/FramingTest.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "../../src/qpid/framing/amqp_framing.h"
-#include "ConnectionRedirectBody.h"
+#include "qpid/framing/amqp_framing.h"
+#include "qpid/framing/ConnectionRedirectBody.h"
 #include <iostream>
 #include <sstream>
 #include <qpid_test_plugin.h>
diff --git a/qpid/cpp/test/unit/qpid/framing/header_test.cpp b/qpid/cpp/test/unit/qpid/framing/HeaderTest.cpp
index 9268c54272..cf0d9fe5bd 100644
--- a/qpid/cpp/test/unit/qpid/framing/header_test.cpp
+++ b/qpid/cpp/test/unit/qpid/framing/HeaderTest.cpp
@@ -16,7 +16,7 @@
  *
  */
 #include <iostream>
-#include "../../src/qpid/framing/amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 #include <qpid_test_plugin.h>
 
 using namespace qpid::framing;