Swiftdiff options
| author | Remko Tronçon <git@el-tramo.be> | 2011-01-15 15:58:05 (GMT) |
|---|---|---|
| committer | Remko Tronçon <git@el-tramo.be> | 2011-01-15 15:58:05 (GMT) |
| commit | abf3fbe3dc2b56e1f148b999a3003a0ec7e6ef43 (patch) | |
| tree | aeacd7528906e174a370b773e7bcbac52c9489f0 /Swiften/QA/NetworkTest | |
| parent | a85b96ec1f65e7cf5bd28dd9ab43d656f20e0696 (diff) | |
| download | swift-abf3fbe3dc2b56e1f148b999a3003a0ec7e6ef43.zip swift-abf3fbe3dc2b56e1f148b999a3003a0ec7e6ef43.tar.bz2 | |
Comply with asio's documentation that we cannot call async_write multiple times simultaniously.
Diffstat (limited to 'Swiften/QA/NetworkTest')
| -rw-r--r-- | Swiften/QA/NetworkTest/BoostConnectionTest.cpp | 43 |
1 files changed, 43 insertions, 0 deletions
diff --git a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp index 530a126..7259807 100644 --- a/Swiften/QA/NetworkTest/BoostConnectionTest.cpp +++ b/Swiften/QA/NetworkTest/BoostConnectionTest.cpp @@ -25,6 +25,7 @@ class BoostConnectionTest : public CppUnit::TestFixture { CPPUNIT_TEST(testDestructor); CPPUNIT_TEST(testDestructor_PendingEvents); CPPUNIT_TEST(testWrite); + CPPUNIT_TEST(testWriteMultipleSimultaniouslyQueuesWrites); #ifdef TEST_IPV6 CPPUNIT_TEST(testWrite_IPv6); #endif @@ -37,6 +38,7 @@ class BoostConnectionTest : public CppUnit::TestFixture { boostIOServiceThread_ = new BoostIOServiceThread(); eventLoop_ = new DummyEventLoop(); disconnected = false; + connectFinished = false; } void tearDown() { @@ -88,6 +90,41 @@ class BoostConnectionTest : public CppUnit::TestFixture { testling->disconnect(); } + + void testWriteMultipleSimultaniouslyQueuesWrites() { + BoostConnection::ref testling(BoostConnection::create(&boostIOService, eventLoop_)); + testling->onConnectFinished.connect(boost::bind(&BoostConnectionTest::handleConnectFinished, this)); + testling->onDataRead.connect(boost::bind(&BoostConnectionTest::handleDataRead, this, _1)); + testling->onDisconnected.connect(boost::bind(&BoostConnectionTest::handleDisconnected, this)); + testling->connect(HostAddressPort(HostAddress("65.99.222.137"), 5222)); + while (!connectFinished) { + boostIOService.run_one(); + eventLoop_->processEvents(); + } + + testling->write(ByteArray("<stream:strea")); + testling->write(ByteArray("m")); + testling->write(ByteArray(">")); + + // Check that we only did one write event, the others are queued + /*int runHandlers = */boostIOService.poll(); + // Disabling this test, because poll runns all handlers that are added during poll() as well, so + // this test doesn't really work any more. We'll have to trust that things are queued. + //CPPUNIT_ASSERT_EQUAL(1, runHandlers); + // Process the other events + while (receivedData.isEmpty()) { + boostIOService.run_one(); + eventLoop_->processEvents(); + } + + // Disconnect & clean up + testling->disconnect(); + while (!disconnected) { + boostIOService.run_one(); + eventLoop_->processEvents(); + } + } + void doWrite(BoostConnection* connection) { connection->write(ByteArray("<stream:stream>")); connection->write(ByteArray("\r\n\r\n")); // Temporarily, while we don't have an xmpp server running on ipv6 @@ -101,11 +138,17 @@ class BoostConnectionTest : public CppUnit::TestFixture { disconnected = true; } + void handleConnectFinished() { + connectFinished = true; + } + private: BoostIOServiceThread* boostIOServiceThread_; + boost::asio::io_service boostIOService; DummyEventLoop* eventLoop_; ByteArray receivedData; bool disconnected; + bool connectFinished; }; CPPUNIT_TEST_SUITE_REGISTRATION(BoostConnectionTest); |