Fixed various minor TODO issues.

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

6 files changed, 10 insertions, 35 deletions

diff --git a/cpp/test/unit/qpid/broker/ExchangeTest.cpp b/cpp/test/unit/qpid/broker/ExchangeTest.cpp
index adebc87422..40fa9cb032 100644
--- a/cpp/test/unit/qpid/broker/ExchangeTest.cpp
+++ b/cpp/test/unit/qpid/broker/ExchangeTest.cpp
@@ -34,8 +34,6 @@ class ExchangeTest : public CppUnit::TestCase
 
   public:
 
-    // TODO aconway 2006-09-12: Need more detailed tests.
-
     void testMe() 
     {
         Queue::shared_ptr queue(new Queue("queue", true, true));
@@ -56,7 +54,6 @@ class ExchangeTest : public CppUnit::TestCase
         topic.route(msg, "abc", 0);
         direct.route(msg, "abc", 0);
 
-        // TODO aconway 2006-09-12: TODO Why no assertions?
     }
 };
     
diff --git a/cpp/test/unit/qpid/broker/MessageTest.cpp b/cpp/test/unit/qpid/broker/MessageTest.cpp
index 210cd63934..9b4040a8ca 100644
--- a/cpp/test/unit/qpid/broker/MessageTest.cpp
+++ b/cpp/test/unit/qpid/broker/MessageTest.cpp
@@ -32,9 +32,6 @@ class MessageTest : public CppUnit::TestCase
 
   public:
 
-    // TODO aconway 2006-09-12: Need more detailed tests,
-    // need tests to assert something!
-    // 
     void testMe() 
     {
         APRBase::increment();
diff --git a/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp b/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
index 8d7903c4ac..6a15573e51 100644
--- a/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
+++ b/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
@@ -17,8 +17,6 @@ Tokens makeTokens(char** begin, char** end)
 #define TOKENS(a) makeTokens(a, a + LEN(a))
 
 // Allow CPPUNIT_EQUALS to print a Tokens.
-// TODO aconway 2006-09-19: Make it a template and put it in a shared test lib.
-//
 CppUnit::OStringStream& operator <<(CppUnit::OStringStream& out, const Tokens& v)
 {
     out << "[ ";
diff --git a/cpp/test/unit/qpid/broker/ValueTest.cpp b/cpp/test/unit/qpid/broker/ValueTest.cpp
index 2cb2563b46..8ea536f59f 100644
--- a/cpp/test/unit/qpid/broker/ValueTest.cpp
+++ b/cpp/test/unit/qpid/broker/ValueTest.cpp
@@ -4,18 +4,6 @@
 using namespace qpid::framing;
 
 
-// Allow CPPUNIT_EQUALS to print a Tokens.
-// TODO aconway 2006-09-19: Make it a template and put it in a shared test lib.
-//
-template <class T>
-CppUnit::OStringStream& operator <<(CppUnit::OStringStream& out,
-                                    const ValueOps<T>& v)
-{
-    out << v.getValue();
-    return out;
-}
-
-
 class ValueTest : public CppUnit::TestCase 
 {
     CPPUNIT_TEST_SUITE(ValueTest);
diff --git a/cpp/test/unit/qpid/framing/FramingTest.cpp b/cpp/test/unit/qpid/framing/FramingTest.cpp
index 950d1e045a..ad2d651fe0 100644
--- a/cpp/test/unit/qpid/framing/FramingTest.cpp
+++ b/cpp/test/unit/qpid/framing/FramingTest.cpp
@@ -15,17 +15,15 @@
  * limitations under the License.
  *
  */
-#include "qpid/framing/amqp_framing.h"
 #include "qpid/framing/ConnectionRedirectBody.h"
+#include "qpid/framing/amqp_framing.h"
 #include <iostream>
-#include <sstream>
 #include <qpid_test_plugin.h>
+#include <sstream>
 #include <typeinfo>
 
 using namespace qpid::framing;
 
-// TODO aconway 2006-09-12: Why do we  need explicit qpid::framing:: below?
-
 template <class T>
 std::string tostring(const T& x) 
 {
@@ -42,8 +40,8 @@ class FramingTest : public CppUnit::TestCase
     CPPUNIT_TEST(testConnectionRedirectBody);
     CPPUNIT_TEST(testAccessRequestBody);
     CPPUNIT_TEST(testBasicConsumeBody);
-    CPPUNIT_TEST(ConnectionRedirectBody);
-    CPPUNIT_TEST(BasicConsumeOkBody);
+    CPPUNIT_TEST(testConnectionRedirectBodyFrame);
+    CPPUNIT_TEST(testBasicConsumeOkBodyFrame);
     CPPUNIT_TEST_SUITE_END();
 
   private:
@@ -78,10 +76,10 @@ class FramingTest : public CppUnit::TestCase
     {
         std::string a = "hostA";
         std::string b = "hostB";
-        qpid::framing::ConnectionRedirectBody in(a, b);
+        ConnectionRedirectBody in(a, b);
         in.encodeContent(buffer);
         buffer.flip(); 
-        qpid::framing::ConnectionRedirectBody out;
+        ConnectionRedirectBody out;
         out.decodeContent(buffer);
         CPPUNIT_ASSERT_EQUAL(tostring(in), tostring(out));
     }
@@ -110,11 +108,11 @@ class FramingTest : public CppUnit::TestCase
     }
     
 
-    void ConnectionRedirectBody()
+    void testConnectionRedirectBodyFrame()
     {
         std::string a = "hostA";
         std::string b = "hostB";
-        AMQFrame in(999, new qpid::framing::ConnectionRedirectBody(a, b));
+        AMQFrame in(999, new ConnectionRedirectBody(a, b));
         in.encode(buffer);
         buffer.flip(); 
         AMQFrame out;
@@ -122,10 +120,10 @@ class FramingTest : public CppUnit::TestCase
         CPPUNIT_ASSERT_EQUAL(tostring(in), tostring(out));
     }
 
-    void BasicConsumeOkBody()
+    void testBasicConsumeOkBodyFrame()
     {
         std::string s = "hostA";
-        AMQFrame in(999, new qpid::framing::BasicConsumeOkBody(s));
+        AMQFrame in(999, new BasicConsumeOkBody(s));
         in.encode(buffer);
         buffer.flip(); 
         AMQFrame out;
diff --git a/cpp/test/unit/qpid/framing/HeaderTest.cpp b/cpp/test/unit/qpid/framing/HeaderTest.cpp
index cf0d9fe5bd..8b613127b1 100644
--- a/cpp/test/unit/qpid/framing/HeaderTest.cpp
+++ b/cpp/test/unit/qpid/framing/HeaderTest.cpp
@@ -31,9 +31,6 @@ class HeaderTest : public CppUnit::TestCase
 
 public:
 
-    // TODO aconway 2006-09-12: Need more detailed tests,
-    // need tests to assert something!
-    // 
     void testGenericProperties() 
     {
         AMQHeaderBody body(BASIC);