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, 138 deletions

diff --git a/cpp/test/unit/qpid/broker/ChannelTest.cpp b/cpp/test/unit/qpid/broker/ChannelTest.cpp
deleted file mode 100644
index ff2ca60f32..0000000000
--- a/cpp/test/unit/qpid/broker/ChannelTest.cpp
+++ /dev/null
@@ -1,138 +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/Channel.h>
-#include <qpid/broker/Message.h>
-#include <qpid_test_plugin.h>
-#include <iostream>
-#include <memory>
-
-using namespace boost;
-using namespace qpid::broker;
-using namespace qpid::framing;
-using namespace qpid::sys;
-
-struct DummyHandler : OutputHandler{
-    std::vector<AMQFrame*> frames; 
-
-    virtual void send(AMQFrame* frame){
-        frames.push_back(frame);
-    }
-};
-
-
-class ChannelTest : public CppUnit::TestCase  
-{
-    CPPUNIT_TEST_SUITE(ChannelTest);
-    CPPUNIT_TEST(testConsumerMgmt);
-    CPPUNIT_TEST(testDeliveryNoAck);
-    CPPUNIT_TEST_SUITE_END();
-
-  public:
-
-    void testConsumerMgmt(){
-        Queue::shared_ptr queue(new Queue("my_queue"));
-        Channel channel(0, 0, 0);
-        CPPUNIT_ASSERT(!channel.exists("my_consumer"));
-
-        ConnectionToken* owner = 0;
-        string tag("my_consumer");
-        channel.consume(tag, queue, false, false, owner);
-        string tagA;
-        string tagB;
-        channel.consume(tagA, queue, false, false, owner);
-        channel.consume(tagB, queue, false, false, owner);
-        CPPUNIT_ASSERT_EQUAL((u_int32_t) 3, queue->getConsumerCount());
-        CPPUNIT_ASSERT(channel.exists("my_consumer"));
-        CPPUNIT_ASSERT(channel.exists(tagA));
-        CPPUNIT_ASSERT(channel.exists(tagB));
-        channel.cancel(tagA);
-        CPPUNIT_ASSERT_EQUAL((u_int32_t) 2, queue->getConsumerCount());
-        CPPUNIT_ASSERT(channel.exists("my_consumer"));
-        CPPUNIT_ASSERT(!channel.exists(tagA));
-        CPPUNIT_ASSERT(channel.exists(tagB));
-        channel.close();
-        CPPUNIT_ASSERT_EQUAL((u_int32_t) 0, queue->getConsumerCount());        
-    }
-
-    void testDeliveryNoAck(){
-        DummyHandler handler;
-        Channel channel(&handler, 7, 10000);
-
-        Message::shared_ptr msg(new Message(0, "test", "my_routing_key", false, false));
-        AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC));
-        header->setContentSize(14);
-        msg->setHeader(header);
-        AMQContentBody::shared_ptr body(new AMQContentBody("abcdefghijklmn"));
-        msg->addContent(body);
-
-        Queue::shared_ptr queue(new Queue("my_queue"));
-        ConnectionToken* owner(0);
-        string tag("no_ack");
-        channel.consume(tag, queue, false, false, owner);
-
-        queue->deliver(msg);
-        CPPUNIT_ASSERT_EQUAL((size_t) 3, handler.frames.size());
-        CPPUNIT_ASSERT_EQUAL((u_int16_t) 7, handler.frames[0]->getChannel());        
-        CPPUNIT_ASSERT_EQUAL((u_int16_t) 7, handler.frames[1]->getChannel());        
-        CPPUNIT_ASSERT_EQUAL((u_int16_t) 7, handler.frames[2]->getChannel());
-        BasicDeliverBody::shared_ptr deliver(dynamic_pointer_cast<BasicDeliverBody, AMQBody>(handler.frames[0]->getBody()));
-        AMQHeaderBody::shared_ptr contentHeader(dynamic_pointer_cast<AMQHeaderBody, AMQBody>(handler.frames[1]->getBody()));
-        AMQContentBody::shared_ptr contentBody(dynamic_pointer_cast<AMQContentBody, AMQBody>(handler.frames[2]->getBody()));
-        CPPUNIT_ASSERT(deliver);
-        CPPUNIT_ASSERT(contentHeader);
-        CPPUNIT_ASSERT(contentBody);
-        CPPUNIT_ASSERT_EQUAL(string("abcdefghijklmn"), contentBody->getData());
-    }
-
-    void testDeliveryAndRecovery(){
-        DummyHandler handler;
-        Channel channel(&handler, 7, 10000);
-
-        Message::shared_ptr msg(new Message(0, "test", "my_routing_key", false, false));
-        AMQHeaderBody::shared_ptr header(new AMQHeaderBody(BASIC));
-        header->setContentSize(14);
-        msg->setHeader(header);
-        AMQContentBody::shared_ptr body(new AMQContentBody("abcdefghijklmn"));
-        msg->addContent(body);
-
-        Queue::shared_ptr queue(new Queue("my_queue"));
-        ConnectionToken* owner;
-        string tag("ack");
-        channel.consume(tag, queue, true, false, owner);
-
-        queue->deliver(msg);
-        CPPUNIT_ASSERT_EQUAL((size_t) 3, handler.frames.size());
-        CPPUNIT_ASSERT_EQUAL((u_int16_t) 7, handler.frames[0]->getChannel());        
-        CPPUNIT_ASSERT_EQUAL((u_int16_t) 7, handler.frames[1]->getChannel());        
-        CPPUNIT_ASSERT_EQUAL((u_int16_t) 7, handler.frames[2]->getChannel());
-        BasicDeliverBody::shared_ptr deliver(dynamic_pointer_cast<BasicDeliverBody, AMQBody>(handler.frames[0]->getBody()));
-        AMQHeaderBody::shared_ptr contentHeader(dynamic_pointer_cast<AMQHeaderBody, AMQBody>(handler.frames[1]->getBody()));
-        AMQContentBody::shared_ptr contentBody(dynamic_pointer_cast<AMQContentBody, AMQBody>(handler.frames[2]->getBody()));
-        CPPUNIT_ASSERT(deliver);
-        CPPUNIT_ASSERT(contentHeader);
-        CPPUNIT_ASSERT(contentBody);
-        CPPUNIT_ASSERT_EQUAL(string("abcdefghijklmn"), contentBody->getData());
-    }
-};
-
-// Make this test suite a plugin.
-CPPUNIT_PLUGIN_IMPLEMENT();
-CPPUNIT_TEST_SUITE_REGISTRATION(ChannelTest);