jessequ
/
qamqp
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

refactor Channel::channelClose to just Channel::close

This commit is contained in:
Matt Broadstone 2014-08-08 08:20:31 -04:00
parent 81cdb98c86
commit baa5c1de3e
4 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/amqp_channel.cpp
View File

@ -255,7 +255,7 @@ Channel::~Channel()
{ {
} }
void Channel::closeChannel() void Channel::close()
{ {
Q_D(Channel); Q_D(Channel);
d->needOpen = true; d->needOpen = true;
@ -267,7 +267,7 @@ void Channel::reopen()
{ {
Q_D(Channel); Q_D(Channel);
if (d->opened) if (d->opened)
closeChannel(); close();
d->open(); d->open();
} }

2
src/amqp_channel.h
View File

@ -34,7 +34,7 @@ public:
void qos(qint16 prefetchCount, qint32 prefetchSize = 0); void qos(qint16 prefetchCount, qint32 prefetchSize = 0);
public Q_SLOTS: public Q_SLOTS:
void closeChannel(); void close();
void reopen(); void reopen();
void resume(); void resume();

6
tests/auto/qamqpexchange/tst_qamqpexchange.cpp
View File

@ -175,8 +175,12 @@ void tst_QAMQPExchange::closeChannel()
QVERIFY(waitForSignal(exchange, SIGNAL(opened()))); QVERIFY(waitForSignal(exchange, SIGNAL(opened())));
exchange->declare(Exchange::Direct); exchange->declare(Exchange::Direct);
QVERIFY(waitForSignal(exchange, SIGNAL(declared()))); QVERIFY(waitForSignal(exchange, SIGNAL(declared())));
exchange->closeChannel(); exchange->close();
QVERIFY(waitForSignal(exchange, SIGNAL(closed()))); QVERIFY(waitForSignal(exchange, SIGNAL(closed())));
exchange->reopen();
QVERIFY(waitForSignal(exchange, SIGNAL(opened())));
exchange->remove(Exchange::roForce);
QVERIFY(waitForSignal(exchange, SIGNAL(removed())));
} }
QTEST_MAIN(tst_QAMQPExchange) QTEST_MAIN(tst_QAMQPExchange)

2
tests/auto/qamqpqueue/tst_qamqpqueue.cpp
View File

@ -672,7 +672,7 @@ void tst_QAMQPQueue::closeChannel()
QVERIFY(waitForSignal(queue, SIGNAL(opened()))); QVERIFY(waitForSignal(queue, SIGNAL(opened())));
declareQueueAndVerifyConsuming(queue); declareQueueAndVerifyConsuming(queue);
queue->closeChannel(); queue->close();
QVERIFY(waitForSignal(queue, SIGNAL(closed()))); QVERIFY(waitForSignal(queue, SIGNAL(closed())));
} }