diff options
| author | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
|---|---|---|
| committer | Tatsuhiro Tsujikawa <tatsuhiro.t@gmail.com> | 2013-06-22 01:10:38 +0900 |
| commit | 07d270c87e6f9184aea4ca17eb26e466712e8db2 (patch) | |
| tree | 2dfbaa2e0d2ad0f38cb73098608f7d67a64320f8 /test/BtExtendedMessageTest.cc | |
| parent | 126a4bde612eb0e6c48cf2f13ebe3eac45cc71a8 (diff) | |
Require -std=c++11 and use std::shared_ptr instead of SharedHandle
Diffstat (limited to 'test/BtExtendedMessageTest.cc')
| -rw-r--r-- | test/BtExtendedMessageTest.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/test/BtExtendedMessageTest.cc b/test/BtExtendedMessageTest.cc index f12e4343..a459e287 100644 --- a/test/BtExtendedMessageTest.cc +++ b/test/BtExtendedMessageTest.cc @@ -33,10 +33,10 @@ public: CPPUNIT_TEST_SUITE_REGISTRATION(BtExtendedMessageTest); void BtExtendedMessageTest::testCreate() { - SharedHandle<Peer> peer(new Peer("192.168.0.1", 6969)); + std::shared_ptr<Peer> peer(new Peer("192.168.0.1", 6969)); peer->allocateSessionResource(1024, 1024*1024); - SharedHandle<MockExtensionMessageFactory> exmsgFactory + std::shared_ptr<MockExtensionMessageFactory> exmsgFactory (new MockExtensionMessageFactory()); // payload:{4:name3:foo}->11bytes @@ -45,7 +45,7 @@ void BtExtendedMessageTest::testCreate() { bittorrent::createPeerMessageString((unsigned char*)msg, sizeof(msg), 13, 20); msg[5] = 1; // Set dummy extended message ID 1 memcpy(msg+6, payload.c_str(), payload.size()); - SharedHandle<BtExtendedMessage> pm(BtExtendedMessage::create(exmsgFactory, + std::shared_ptr<BtExtendedMessage> pm(BtExtendedMessage::create(exmsgFactory, peer, &msg[4], 13)); CPPUNIT_ASSERT_EQUAL((uint8_t)20, pm->getId()); @@ -73,7 +73,7 @@ void BtExtendedMessageTest::testCreate() { void BtExtendedMessageTest::testCreateMessage() { std::string payload = "4:name3:foo"; uint8_t extendedMessageID = 1; - SharedHandle<MockExtensionMessage> exmsg + std::shared_ptr<MockExtensionMessage> exmsg (new MockExtensionMessage("charlie", extendedMessageID, payload)); BtExtendedMessage msg(exmsg); @@ -88,7 +88,7 @@ void BtExtendedMessageTest::testCreateMessage() { } void BtExtendedMessageTest::testDoReceivedAction() { - SharedHandle<MockExtensionMessage> exmsg + std::shared_ptr<MockExtensionMessage> exmsg (new MockExtensionMessage("charlie", 1, "")); BtExtendedMessage msg(exmsg); msg.doReceivedAction(); @@ -98,7 +98,7 @@ void BtExtendedMessageTest::testDoReceivedAction() { void BtExtendedMessageTest::testToString() { std::string payload = "4:name3:foo"; uint8_t extendedMessageID = 1; - SharedHandle<MockExtensionMessage> exmsg + std::shared_ptr<MockExtensionMessage> exmsg (new MockExtensionMessage("charlie", extendedMessageID, payload)); BtExtendedMessage msg(exmsg); CPPUNIT_ASSERT_EQUAL(std::string("extended charlie"), msg.toString()); |
