diff options
| author | Gordon Sim <gsim@apache.org> | 2008-10-21 23:30:32 +0000 |
|---|---|---|
| committer | Gordon Sim <gsim@apache.org> | 2008-10-21 23:30:32 +0000 |
| commit | d2925719fe1db290ff33621d448e5e3a2c2c26eb (patch) | |
| tree | 859a01045df935c68821c1d7fb95c0c30d15e7ee /qpid/cpp/src/tests | |
| parent | 573739f14409d3e2f3c42a3452712dbf30c70472 (diff) | |
| download | qpid-python-d2925719fe1db290ff33621d448e5e3a2c2c26eb.tar.gz | |
Refactored DeliveryRecord and delivery path to remove some redundant code.
git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@706811 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'qpid/cpp/src/tests')
| -rw-r--r-- | qpid/cpp/src/tests/DeliveryRecordTest.cpp | 4 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/MessageUtils.h | 1 | ||||
| -rw-r--r-- | qpid/cpp/src/tests/QueuePolicyTest.cpp | 1 | ||||
| -rwxr-xr-x | qpid/cpp/src/tests/run_federation_tests | 2 |
4 files changed, 5 insertions, 3 deletions
diff --git a/qpid/cpp/src/tests/DeliveryRecordTest.cpp b/qpid/cpp/src/tests/DeliveryRecordTest.cpp index 9bdc456993..47c7157749 100644 --- a/qpid/cpp/src/tests/DeliveryRecordTest.cpp +++ b/qpid/cpp/src/tests/DeliveryRecordTest.cpp @@ -45,7 +45,9 @@ QPID_AUTO_TEST_CASE(testSort) list<DeliveryRecord> records; for (list<SequenceNumber>::iterator i = ids.begin(); i != ids.end(); i++) { - records.push_back(DeliveryRecord(QueuedMessage(0), Queue::shared_ptr(), "tag", DeliveryToken::shared_ptr(), *i, false, false, false)); + DeliveryRecord r(QueuedMessage(0), Queue::shared_ptr(), "tag", false, false, false); + r.setId(*i); + records.push_back(r); } records.sort(); diff --git a/qpid/cpp/src/tests/MessageUtils.h b/qpid/cpp/src/tests/MessageUtils.h index 21ee834ba7..81508e534e 100644 --- a/qpid/cpp/src/tests/MessageUtils.h +++ b/qpid/cpp/src/tests/MessageUtils.h @@ -20,7 +20,6 @@ */ #include "qpid/broker/Message.h" -#include "qpid/broker/MessageDelivery.h" #include "qpid/framing/AMQFrame.h" #include "qpid/framing/MessageTransferBody.h" #include "qpid/framing/Uuid.h" diff --git a/qpid/cpp/src/tests/QueuePolicyTest.cpp b/qpid/cpp/src/tests/QueuePolicyTest.cpp index cf45f554df..f7fe81a709 100644 --- a/qpid/cpp/src/tests/QueuePolicyTest.cpp +++ b/qpid/cpp/src/tests/QueuePolicyTest.cpp @@ -23,6 +23,7 @@ #include "qpid/broker/QueuePolicy.h" #include "qpid/sys/Time.h" +#include "qpid/framing/reply_exceptions.h" #include "MessageUtils.h" #include "BrokerFixture.h" diff --git a/qpid/cpp/src/tests/run_federation_tests b/qpid/cpp/src/tests/run_federation_tests index 6142c1c37c..685467a681 100755 --- a/qpid/cpp/src/tests/run_federation_tests +++ b/qpid/cpp/src/tests/run_federation_tests @@ -22,7 +22,7 @@ if test -d ${PYTHON_DIR} ; then echo "Running federation tests using brokers on ports $LOCAL_PORT $REMOTE_PORT" PYTHONPATH=${PYTHON_DIR} export PYTHONPATH - ${MY_DIR}/federation.py -v -s ${MY_DIR}/../../../specs/amqp.0-10-qpid-errata.xml -b localhost:$LOCAL_PORT --remote-port $REMOTE_PORT + ${MY_DIR}/federation.py -v -s ${MY_DIR}/../../../specs/amqp.0-10-qpid-errata.xml -b localhost:$LOCAL_PORT --remote-port $REMOTE_PORT $@ RETCODE=$? stop_brokers if test x$RETCODE != x0; then |