Merge branch 'master' into random-webseeding

1 files changed, 23 insertions, 20 deletions

diff --git a/test/ExtensionMessageRegistryTest.cc b/test/ExtensionMessageRegistryTest.cc
index 8791ce69..6d923cb1 100644
--- a/test/ExtensionMessageRegistryTest.cc
+++ b/test/ExtensionMessageRegistryTest.cc
@@ -4,29 +4,30 @@
 
 namespace aria2 {
 
-class ExtensionMessageRegistryTest:public CppUnit::TestFixture {
+class ExtensionMessageRegistryTest : public CppUnit::TestFixture {
 
   CPPUNIT_TEST_SUITE(ExtensionMessageRegistryTest);
   CPPUNIT_TEST(testStrBtExtension);
   CPPUNIT_TEST(testKeyBtExtension);
   CPPUNIT_TEST(testGetExtensionMessageID);
   CPPUNIT_TEST_SUITE_END();
+
 public:
   void testStrBtExtension();
   void testKeyBtExtension();
   void testGetExtensionMessageID();
 };
 
-CPPUNIT_TEST_SUITE_REGISTRATION( ExtensionMessageRegistryTest );
+CPPUNIT_TEST_SUITE_REGISTRATION(ExtensionMessageRegistryTest);
 
 void ExtensionMessageRegistryTest::testStrBtExtension()
 {
-  CPPUNIT_ASSERT_EQUAL(std::string("ut_pex"),
-                       std::string(strBtExtension
-                                   (ExtensionMessageRegistry::UT_PEX)));
-  CPPUNIT_ASSERT_EQUAL(std::string("ut_metadata"),
-                       std::string(strBtExtension
-                                   (ExtensionMessageRegistry::UT_METADATA)));
+  CPPUNIT_ASSERT_EQUAL(
+      std::string("ut_pex"),
+      std::string(strBtExtension(ExtensionMessageRegistry::UT_PEX)));
+  CPPUNIT_ASSERT_EQUAL(
+      std::string("ut_metadata"),
+      std::string(strBtExtension(ExtensionMessageRegistry::UT_METADATA)));
   CPPUNIT_ASSERT(!strBtExtension(100));
 }
 
@@ -43,8 +44,8 @@ void ExtensionMessageRegistryTest::testKeyBtExtension()
 void ExtensionMessageRegistryTest::testGetExtensionMessageID()
 {
   ExtensionMessageRegistry reg;
-  CPPUNIT_ASSERT_EQUAL((uint8_t)0, reg.getExtensionMessageID
-                       (ExtensionMessageRegistry::UT_PEX));
+  CPPUNIT_ASSERT_EQUAL(
+      (uint8_t)0, reg.getExtensionMessageID(ExtensionMessageRegistry::UT_PEX));
   CPPUNIT_ASSERT(!reg.getExtensionName(0));
   CPPUNIT_ASSERT(!reg.getExtensionName(1));
   CPPUNIT_ASSERT(!reg.getExtensionName(100));
@@ -53,22 +54,24 @@ void ExtensionMessageRegistryTest::testGetExtensionMessageID()
 
   CPPUNIT_ASSERT_EQUAL(std::string("ut_pex"),
                        std::string(reg.getExtensionName(1)));
-  CPPUNIT_ASSERT_EQUAL((uint8_t)1, reg.getExtensionMessageID
-                       (ExtensionMessageRegistry::UT_PEX));
+  CPPUNIT_ASSERT_EQUAL(
+      (uint8_t)1, reg.getExtensionMessageID(ExtensionMessageRegistry::UT_PEX));
 
   reg.setExtensionMessageID(ExtensionMessageRegistry::UT_METADATA, 127);
 
-  CPPUNIT_ASSERT_EQUAL((uint8_t)127, reg.getExtensionMessageID
-                       (ExtensionMessageRegistry::UT_METADATA));
-  CPPUNIT_ASSERT_EQUAL((uint8_t)1, reg.getExtensionMessageID
-                       (ExtensionMessageRegistry::UT_PEX));
+  CPPUNIT_ASSERT_EQUAL(
+      (uint8_t)127,
+      reg.getExtensionMessageID(ExtensionMessageRegistry::UT_METADATA));
+  CPPUNIT_ASSERT_EQUAL(
+      (uint8_t)1, reg.getExtensionMessageID(ExtensionMessageRegistry::UT_PEX));
 
   reg.removeExtension(ExtensionMessageRegistry::UT_PEX);
 
-  CPPUNIT_ASSERT_EQUAL((uint8_t)127, reg.getExtensionMessageID
-                       (ExtensionMessageRegistry::UT_METADATA));
-  CPPUNIT_ASSERT_EQUAL((uint8_t)0, reg.getExtensionMessageID
-                       (ExtensionMessageRegistry::UT_PEX));
+  CPPUNIT_ASSERT_EQUAL(
+      (uint8_t)127,
+      reg.getExtensionMessageID(ExtensionMessageRegistry::UT_METADATA));
+  CPPUNIT_ASSERT_EQUAL(
+      (uint8_t)0, reg.getExtensionMessageID(ExtensionMessageRegistry::UT_PEX));
   CPPUNIT_ASSERT(!reg.getExtensionName(1));
 }