2006-12-01 Jim Meyering <meyering@redhat.com>

This delta imposes two major changes on the C++ hierarchy:
  - adds autoconf, automake, libtool support
  - makes the hierarchy flatter and renames a few files (e.g., Queue.h,
  Queue.cpp) that appeared twice, once under client/ and again under broker/.

In the process, I've changed many #include directives, mostly
to remove a qpid/ or qpid/framing/ prefix from the file name argument.
Although most changes were to .cpp and .h files under qpid/cpp/, there
were also several to template files under qpid/gentools, and even one
to CppGenerator.java.

Nearly all files are moved to a new position in the hierarchy.
The new hierarchy looks like this:

  src               # this is the new home of qpidd.cpp
  tests             # all tests are here.  See Makefile.am.
  gen               # As before, all generated files go here.
  lib               # This is just a container for the 3 lib dirs:
  lib/client
  lib/broker
  lib/common
  lib/common/framing
  lib/common/sys
  lib/common/sys/posix
  lib/common/sys/apr
  build-aux
  m4


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

1 files changed, 0 insertions, 179 deletions

diff --git a/cpp/test/unit/qpid/broker/QueueTest.cpp b/cpp/test/unit/qpid/broker/QueueTest.cpp
deleted file mode 100644
index 198c861056..0000000000
--- a/cpp/test/unit/qpid/broker/QueueTest.cpp
+++ /dev/null
@@ -1,179 +0,0 @@
- /*
- *
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements.  See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership.  The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License.  You may obtain a copy of the License at
- * 
- *   http://www.apache.org/licenses/LICENSE-2.0
- * 
- * Unless required by applicable law or agreed to in writing,
- * software distributed under the License is distributed on an
- * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- * KIND, either express or implied.  See the License for the
- * specific language governing permissions and limitations
- * under the License.
- *
- */
-#include <qpid/broker/Queue.h>
-#include <qpid/broker/QueueRegistry.h>
-#include <qpid_test_plugin.h>
-#include <iostream>
-
-using namespace qpid::broker;
-using namespace qpid::sys;
-
-
-class TestBinding : public virtual Binding{
-    bool cancelled;
-
-public:
-    TestBinding();
-    virtual void cancel();
-    bool isCancelled();
-};
-
-class TestConsumer : public virtual Consumer{
-public:
-    Message::shared_ptr last;
-
-    virtual bool deliver(Message::shared_ptr& msg);
-};
-
-
-class QueueTest : public CppUnit::TestCase  
-{
-    CPPUNIT_TEST_SUITE(QueueTest);
-    CPPUNIT_TEST(testConsumers);
-    CPPUNIT_TEST(testBinding);
-    CPPUNIT_TEST(testRegistry);
-    CPPUNIT_TEST(testDequeue);
-    CPPUNIT_TEST_SUITE_END();
-
-  public:
-    void testConsumers(){
-        Queue::shared_ptr queue(new Queue("my_queue", true));
-    
-        //Test adding consumers:
-        TestConsumer c1; 
-        TestConsumer c2; 
-        queue->consume(&c1);
-        queue->consume(&c2);
-
-        CPPUNIT_ASSERT_EQUAL(u_int32_t(2), queue->getConsumerCount());
-        
-        //Test basic delivery:
-        Message::shared_ptr msg1 = Message::shared_ptr(new Message(0, "e", "A", true, true));
-        Message::shared_ptr msg2 = Message::shared_ptr(new Message(0, "e", "B", true, true));
-        Message::shared_ptr msg3 = Message::shared_ptr(new Message(0, "e", "C", true, true));
-
-        queue->deliver(msg1);
-        CPPUNIT_ASSERT_EQUAL(msg1.get(), c1.last.get());
-
-        queue->deliver(msg2);
-        CPPUNIT_ASSERT_EQUAL(msg2.get(), c2.last.get());
-        
-        queue->deliver(msg3);
-        CPPUNIT_ASSERT_EQUAL(msg3.get(), c1.last.get());        
-    
-        //Test cancellation:
-        queue->cancel(&c1);
-        CPPUNIT_ASSERT_EQUAL(u_int32_t(1), queue->getConsumerCount());
-        queue->cancel(&c2);
-        CPPUNIT_ASSERT_EQUAL(u_int32_t(0), queue->getConsumerCount());
-    }
-
-    void testBinding(){
-        Queue::shared_ptr queue(new Queue("my_queue", true));
-        //Test bindings:
-        TestBinding a;
-        TestBinding b;
-        queue->bound(&a);
-        queue->bound(&b);    
-    
-        queue.reset();
-
-        CPPUNIT_ASSERT(a.isCancelled());
-        CPPUNIT_ASSERT(b.isCancelled());
-    }
-
-    void testRegistry(){
-        //Test use of queues in registry:
-        QueueRegistry registry;
-        registry.declare("queue1", true, true);
-        registry.declare("queue2", true, true);
-        registry.declare("queue3", true, true);
-
-        CPPUNIT_ASSERT(registry.find("queue1"));
-        CPPUNIT_ASSERT(registry.find("queue2"));
-        CPPUNIT_ASSERT(registry.find("queue3"));
-        
-        registry.destroy("queue1");
-        registry.destroy("queue2");
-        registry.destroy("queue3");
-
-        CPPUNIT_ASSERT(!registry.find("queue1"));
-        CPPUNIT_ASSERT(!registry.find("queue2"));
-        CPPUNIT_ASSERT(!registry.find("queue3"));
-    }
-
-    void testDequeue(){
-        Queue::shared_ptr queue(new Queue("my_queue", true));
-
-        Message::shared_ptr msg1 = Message::shared_ptr(new Message(0, "e", "A", true, true));
-        Message::shared_ptr msg2 = Message::shared_ptr(new Message(0, "e", "B", true, true));
-        Message::shared_ptr msg3 = Message::shared_ptr(new Message(0, "e", "C", true, true));
-        Message::shared_ptr received;
-
-        queue->deliver(msg1);
-        queue->deliver(msg2);
-        queue->deliver(msg3);
-
-        CPPUNIT_ASSERT_EQUAL(u_int32_t(3), queue->getMessageCount());
-        
-        received = queue->dequeue();
-        CPPUNIT_ASSERT_EQUAL(msg1.get(), received.get());
-        CPPUNIT_ASSERT_EQUAL(u_int32_t(2), queue->getMessageCount());
-
-        received = queue->dequeue();
-        CPPUNIT_ASSERT_EQUAL(msg2.get(), received.get());
-        CPPUNIT_ASSERT_EQUAL(u_int32_t(1), queue->getMessageCount());
-
-        TestConsumer consumer; 
-        queue->consume(&consumer);
-        queue->dispatch();
-        CPPUNIT_ASSERT_EQUAL(msg3.get(), consumer.last.get());
-        CPPUNIT_ASSERT_EQUAL(u_int32_t(0), queue->getMessageCount());
-
-        received = queue->dequeue();
-        CPPUNIT_ASSERT(!received);
-        CPPUNIT_ASSERT_EQUAL(u_int32_t(0), queue->getMessageCount());
-        
-    }
-};
-
-// Make this test suite a plugin.
-CPPUNIT_PLUGIN_IMPLEMENT();
-CPPUNIT_TEST_SUITE_REGISTRATION(QueueTest);
-
-//TestBinding
-TestBinding::TestBinding() : cancelled(false) {}
-
-void TestBinding::cancel(){
-    CPPUNIT_ASSERT(!cancelled);
-    cancelled = true;
-}
-
-bool TestBinding::isCancelled(){
-    return cancelled;
-}
-
-//TestConsumer
-bool TestConsumer::deliver(Message::shared_ptr& msg){
-    last = msg;
-    return true;
-}
-