Merge branch 'master' into random-webseeding

1 files changed, 25 insertions, 20 deletions

diff --git a/test/BtExtendedMessageTest.cc b/test/BtExtendedMessageTest.cc
index dd6775ab..65d4fdbc 100644
--- a/test/BtExtendedMessageTest.cc
+++ b/test/BtExtendedMessageTest.cc
@@ -12,7 +12,7 @@
 
 namespace aria2 {
 
-class BtExtendedMessageTest:public CppUnit::TestFixture {
+class BtExtendedMessageTest : public CppUnit::TestFixture {
 
   CPPUNIT_TEST_SUITE(BtExtendedMessageTest);
   CPPUNIT_TEST(testCreate);
@@ -20,8 +20,8 @@ class BtExtendedMessageTest:public CppUnit::TestFixture {
   CPPUNIT_TEST(testDoReceivedAction);
   CPPUNIT_TEST(testToString);
   CPPUNIT_TEST_SUITE_END();
-private:
 
+private:
 public:
   void testCreate();
   void testCreateMessage();
@@ -29,20 +29,20 @@ public:
   void testToString();
 };
 
-
 CPPUNIT_TEST_SUITE_REGISTRATION(BtExtendedMessageTest);
 
-void BtExtendedMessageTest::testCreate() {
+void BtExtendedMessageTest::testCreate()
+{
   auto peer = std::make_shared<Peer>("192.168.0.1", 6969);
   peer->allocateSessionResource(1_k, 1_m);
   auto exmsgFactory = MockExtensionMessageFactory{};
 
   // payload:{4:name3:foo}->11bytes
   std::string payload = "4:name3:foo";
-  unsigned char msg[17];// 6+11bytes
+  unsigned char msg[17]; // 6+11bytes
   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());
+  memcpy(msg + 6, payload.c_str(), payload.size());
   auto pm = BtExtendedMessage::create(&exmsgFactory, peer, &msg[4], 13);
   CPPUNIT_ASSERT_EQUAL((uint8_t)20, pm->getId());
 
@@ -52,7 +52,8 @@ void BtExtendedMessageTest::testCreate() {
     bittorrent::createPeerMessageString(msg, sizeof(msg), 1, 20);
     BtExtendedMessage::create(&exmsgFactory, peer, &msg[4], 1);
     CPPUNIT_FAIL("exception must be thrown.");
-  } catch(Exception& e) {
+  }
+  catch (Exception& e) {
     std::cerr << e.stackTrace() << std::endl;
   }
   // case: id is wrong
@@ -61,39 +62,43 @@ void BtExtendedMessageTest::testCreate() {
     bittorrent::createPeerMessageString(msg, sizeof(msg), 2, 21);
     BtExtendedMessage::create(&exmsgFactory, peer, &msg[4], 2);
     CPPUNIT_FAIL("exception must be thrown.");
-  } catch(Exception& e) {
+  }
+  catch (Exception& e) {
     std::cerr << e.stackTrace() << std::endl;
   }
 }
 
-void BtExtendedMessageTest::testCreateMessage() {
+void BtExtendedMessageTest::testCreateMessage()
+{
   std::string payload = "4:name3:foo";
   uint8_t extendedMessageID = 1;
-  BtExtendedMessage msg{make_unique<MockExtensionMessage>
-      ("charlie", extendedMessageID, payload, nullptr)};
+  BtExtendedMessage msg{make_unique<MockExtensionMessage>(
+      "charlie", extendedMessageID, payload, nullptr)};
   unsigned char data[17];
   bittorrent::createPeerMessageString(data, sizeof(data), 13, 20);
-  *(data+5) = extendedMessageID;
-  memcpy(data+6, payload.c_str(), payload.size());
+  *(data + 5) = extendedMessageID;
+  memcpy(data + 6, payload.c_str(), payload.size());
   unsigned char* rawmsg = msg.createMessage();
   CPPUNIT_ASSERT(memcmp(rawmsg, data, 17) == 0);
-  delete [] rawmsg;
+  delete[] rawmsg;
   CPPUNIT_ASSERT_EQUAL((size_t)17, msg.getMessageLength());
 }
 
-void BtExtendedMessageTest::testDoReceivedAction() {
+void BtExtendedMessageTest::testDoReceivedAction()
+{
   auto evcheck = MockExtensionMessageEventCheck{};
-  BtExtendedMessage msg{make_unique<MockExtensionMessage>
-      ("charlie", 1, "", &evcheck)};
+  BtExtendedMessage msg{
+      make_unique<MockExtensionMessage>("charlie", 1, "", &evcheck)};
   msg.doReceivedAction();
   CPPUNIT_ASSERT(evcheck.doReceivedActionCalled);
 }
 
-void BtExtendedMessageTest::testToString() {
+void BtExtendedMessageTest::testToString()
+{
   std::string payload = "4:name3:foo";
   uint8_t extendedMessageID = 1;
-  BtExtendedMessage msg{make_unique<MockExtensionMessage>
-      ("charlie", extendedMessageID, payload, nullptr)};
+  BtExtendedMessage msg{make_unique<MockExtensionMessage>(
+      "charlie", extendedMessageID, payload, nullptr)};
   CPPUNIT_ASSERT_EQUAL(std::string("extended charlie"), msg.toString());
 }