diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-12 12:48:48 +0000 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2010-11-12 12:48:48 +0000 |
| commit | 93e5dbed325f29c1bf867a2847d3b839d545cfb2 (patch) | |
| tree | f657b55b41a05cf364403a36edf9d0921f426e7d /test/UTMetadataRequestExtensionMessageTest.cc | |
| parent | f6f5a7e5eeec4f14418fec5a7be1bbe57a7ea7e1 (diff) | |
2010-11-12 Tatsuhiro Tsujikawa <t-tujikawa@users.sourceforge.net>
Removed SharedHandle::isNull(). Instead we added operator* and
operator unspecified_bool_type. Removed use of WeakHandle and
replaced with raw pointer.
Diffstat (limited to 'test/UTMetadataRequestExtensionMessageTest.cc')
| -rw-r--r-- | test/UTMetadataRequestExtensionMessageTest.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/test/UTMetadataRequestExtensionMessageTest.cc b/test/UTMetadataRequestExtensionMessageTest.cc index ed854a9c..e22ae2af 100644 --- a/test/UTMetadataRequestExtensionMessageTest.cc +++ b/test/UTMetadataRequestExtensionMessageTest.cc @@ -103,14 +103,14 @@ void UTMetadataRequestExtensionMessageTest::testDoReceivedAction_reject() msg.setIndex(10); msg.setDownloadContext(dctx_); msg.setPeer(peer_); - msg.setBtMessageFactory(messageFactory_); - msg.setBtMessageDispatcher(dispatcher_); + msg.setBtMessageFactory(messageFactory_.get()); + msg.setBtMessageDispatcher(dispatcher_.get()); msg.doReceivedAction(); SharedHandle<UTMetadataRejectExtensionMessage> m = getFirstDispatchedMessage<UTMetadataRejectExtensionMessage>(); - CPPUNIT_ASSERT(!m.isNull()); + CPPUNIT_ASSERT(m); CPPUNIT_ASSERT_EQUAL((size_t)10, m->getIndex()); CPPUNIT_ASSERT_EQUAL((uint8_t)1, m->getExtensionMessageID()); } @@ -121,8 +121,8 @@ void UTMetadataRequestExtensionMessageTest::testDoReceivedAction_data() msg.setIndex(1); msg.setDownloadContext(dctx_); msg.setPeer(peer_); - msg.setBtMessageFactory(messageFactory_); - msg.setBtMessageDispatcher(dispatcher_); + msg.setBtMessageFactory(messageFactory_.get()); + msg.setBtMessageDispatcher(dispatcher_.get()); size_t metadataSize = METADATA_PIECE_SIZE*2; SharedHandle<TorrentAttribute> attrs = bittorrent::getTorrentAttrs(dctx_); @@ -136,7 +136,7 @@ void UTMetadataRequestExtensionMessageTest::testDoReceivedAction_data() SharedHandle<UTMetadataDataExtensionMessage> m = getFirstDispatchedMessage<UTMetadataDataExtensionMessage>(); - CPPUNIT_ASSERT(!m.isNull()); + CPPUNIT_ASSERT(m); CPPUNIT_ASSERT_EQUAL((size_t)1, m->getIndex()); CPPUNIT_ASSERT_EQUAL(second, m->getData()); CPPUNIT_ASSERT_EQUAL(metadataSize, m->getTotalSize()); @@ -155,7 +155,7 @@ void UTMetadataRequestExtensionMessageTest::testDoReceivedAction_data() m = getFirstDispatchedMessage<UTMetadataDataExtensionMessage>(); - CPPUNIT_ASSERT(!m.isNull()); + CPPUNIT_ASSERT(m); CPPUNIT_ASSERT_EQUAL((size_t)2, m->getIndex()); CPPUNIT_ASSERT_EQUAL(third, m->getData()); CPPUNIT_ASSERT_EQUAL(metadataSize, m->getTotalSize()); |