From 529b9fdceb7b5a277a983badd29dca3cc69259c5 Mon Sep 17 00:00:00 2001 From: Tatsuhiro Tsujikawa Date: Mon, 1 Jul 2013 21:42:51 +0900 Subject: Use std::unique_ptr for ExtensionMessage --- test/UTMetadataDataExtensionMessageTest.cc | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) (limited to 'test/UTMetadataDataExtensionMessageTest.cc') diff --git a/test/UTMetadataDataExtensionMessageTest.cc b/test/UTMetadataDataExtensionMessageTest.cc index be6c2529..9e1a4af8 100644 --- a/test/UTMetadataDataExtensionMessageTest.cc +++ b/test/UTMetadataDataExtensionMessageTest.cc @@ -65,14 +65,13 @@ void UTMetadataDataExtensionMessageTest::testToString() void UTMetadataDataExtensionMessageTest::testDoReceivedAction() { - std::shared_ptr diskAdaptor(new DirectDiskAdaptor()); - std::shared_ptr diskWriter(new ByteArrayDiskWriter()); + auto diskAdaptor = std::make_shared(); + auto diskWriter = std::make_shared(); diskAdaptor->setDiskWriter(diskWriter); - std::shared_ptr pieceStorage(new MockPieceStorage()); + auto pieceStorage = make_unique(); pieceStorage->setDiskAdaptor(diskAdaptor); - std::shared_ptr tracker - (new UTMetadataRequestTracker()); - std::shared_ptr dctx(new DownloadContext()); + auto tracker = make_unique(); + auto dctx = make_unique(); std::string piece0 = std::string(METADATA_PIECE_SIZE, '0'); std::string piece1 = std::string(METADATA_PIECE_SIZE, '1'); @@ -88,9 +87,9 @@ void UTMetadataDataExtensionMessageTest::testDoReceivedAction() dctx->setAttribute(CTX_ATTR_BT, std::move(attrs)); } UTMetadataDataExtensionMessage m(1); - m.setPieceStorage(pieceStorage); + m.setPieceStorage(pieceStorage.get()); m.setUTMetadataRequestTracker(tracker.get()); - m.setDownloadContext(dctx); + m.setDownloadContext(dctx.get()); m.setIndex(1); m.setData(piece1); -- cgit