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

refactor exchange test to create a client and connect/disconnect after each test

This commit is contained in:
Matt Broadstone 2014-06-11 11:36:59 -04:00
parent c2dad7d6bb
commit e1522771e3
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -12,11 +12,33 @@ class tst_QAMQPExchange : public TestCase
{ {
Q_OBJECT Q_OBJECT
private Q_SLOTS: private Q_SLOTS:
void init();
void cleanup();
void standardTypes_data(); void standardTypes_data();
void standardTypes(); void standardTypes();
void removeIfUnused(); void removeIfUnused();
private:
QScopedPointer<Client> client;
}; };
void tst_QAMQPExchange::init()
{
client.reset(new Client);
client->connectToHost();
QVERIFY(waitForSignal(client.data(), SIGNAL(connected())));
}
void tst_QAMQPExchange::cleanup()
{
if (client->isConnected()) {
client->disconnectFromHost();
QVERIFY(waitForSignal(client.data(), SIGNAL(disconnected())));
}
}
void tst_QAMQPExchange::standardTypes_data() void tst_QAMQPExchange::standardTypes_data()
{ {
QTest::addColumn<Exchange::ExchangeType>("type"); QTest::addColumn<Exchange::ExchangeType>("type");
@ -30,31 +52,20 @@ void tst_QAMQPExchange::standardTypes()
{ {
QFETCH(Exchange::ExchangeType, type); QFETCH(Exchange::ExchangeType, type);
Client client; Exchange *exchange = client->createExchange("test");
client.connectToHost();
QVERIFY(waitForSignal(&client, SIGNAL(connected())));
Exchange *exchange = client.createExchange("test");
exchange->declare(type); exchange->declare(type);
QVERIFY(waitForSignal(exchange, SIGNAL(declared()))); QVERIFY(waitForSignal(exchange, SIGNAL(declared())));
exchange->remove(Exchange::roForce); exchange->remove(Exchange::roForce);
QVERIFY(waitForSignal(exchange, SIGNAL(removed()))); QVERIFY(waitForSignal(exchange, SIGNAL(removed())));
client.disconnectFromHost();
QVERIFY(waitForSignal(&client, SIGNAL(disconnected())));
} }
void tst_QAMQPExchange::removeIfUnused() void tst_QAMQPExchange::removeIfUnused()
{ {
Client client; Exchange *exchange = client->createExchange("test-if-unused-exchange");
client.connectToHost();
QVERIFY(waitForSignal(&client, SIGNAL(connected())));
Exchange *exchange = client.createExchange("test-if-unused-exchange");
exchange->declare(Exchange::Direct, Exchange::AutoDelete); exchange->declare(Exchange::Direct, Exchange::AutoDelete);
QVERIFY(waitForSignal(exchange, SIGNAL(declared()))); QVERIFY(waitForSignal(exchange, SIGNAL(declared())));
Queue *queue = client.createQueue("test-if-unused-queue"); Queue *queue = client->createQueue("test-if-unused-queue");
queue->declare(); queue->declare();
QVERIFY(waitForSignal(queue, SIGNAL(declared()))); QVERIFY(waitForSignal(queue, SIGNAL(declared())));
queue->bind("test-if-unused-exchange", "testRoutingKey"); queue->bind("test-if-unused-exchange", "testRoutingKey");
@ -68,8 +79,6 @@ void tst_QAMQPExchange::removeIfUnused()
// cleanup // cleanup
queue->remove(Queue::roForce); queue->remove(Queue::roForce);
QVERIFY(waitForSignal(queue, SIGNAL(removed()))); QVERIFY(waitForSignal(queue, SIGNAL(removed())));
client.disconnectFromHost();
QVERIFY(waitForSignal(&client, SIGNAL(disconnected())));
} }
QTEST_MAIN(tst_QAMQPExchange) QTEST_MAIN(tst_QAMQPExchange)