Fix copyright lines for Bits.h and move BitsBenchmark.cpp

[folly.git] / folly / test / MacAddressTest.cpp

diff --git a/folly/test/MacAddressTest.cpp b/folly/test/MacAddressTest.cpp
index d40f795ac53790c8afd5fb478e0aaf351c59d06a..eef4b3e0c4f1bc4f52e2d3b28eff1d00afea0fd8 100644 (file)
--- a/folly/test/MacAddressTest.cpp
+++ b/folly/test/MacAddressTest.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright 2014 Facebook, Inc.
+ * Copyright 2017 Facebook, Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -14,10 +14,10 @@
  * limitations under the License.
  */
 
-#include <gtest/gtest.h>
-
+#include <folly/Format.h>
 #include <folly/IPAddressV6.h>
 #include <folly/MacAddress.h>
+#include <folly/portability/GTest.h>
 
 using folly::MacAddress;
 using folly::IPAddressV6;
@@ -94,8 +94,8 @@ TEST(MacAddress, fromBinary) {
 }
 
 TEST(MacAddress, toString) {
-  EXPECT_EQ("12:34:56:78:9a:bc",
-            MacAddress::fromHBO(0x123456789abc).toString());
+  EXPECT_EQ(
+      "12:34:56:78:9a:bc", MacAddress::fromHBO(0x123456789abc).toString());
   EXPECT_EQ("12:34:56:78:9a:bc", MacAddress("12:34:56:78:9a:bc").toString());
   EXPECT_EQ("01:23:45:67:89:ab", MacAddress("01-23-45-67-89-ab").toString());
   EXPECT_EQ("01:23:45:67:89:ab", MacAddress("0123456789ab").toString());
@@ -131,14 +131,16 @@ TEST(MacAddress, attributes) {
 }
 
 TEST(MacAddress, createMulticast) {
-  EXPECT_EQ(MacAddress("33:33:00:01:00:03"),
-            MacAddress::createMulticast(IPAddressV6("ff02:dead:beef::1:3")));
-  EXPECT_EQ(MacAddress("33:33:12:34:56:78"),
-            MacAddress::createMulticast(IPAddressV6("ff02::abcd:1234:5678")));
+  EXPECT_EQ(
+      MacAddress("33:33:00:01:00:03"),
+      MacAddress::createMulticast(IPAddressV6("ff02:dead:beef::1:3")));
+  EXPECT_EQ(
+      MacAddress("33:33:12:34:56:78"),
+      MacAddress::createMulticast(IPAddressV6("ff02::abcd:1234:5678")));
 }
 
 void testCmp(const char* str1, const char* str2) {
-  SCOPED_TRACE(folly::to<std::string>(str1, " < ", str2));
+  SCOPED_TRACE(folly::sformat("{} < {}", str1, str2));
   MacAddress m1(str1);
   MacAddress m2(str2);
 
@@ -149,7 +151,7 @@ void testCmp(const char* str1, const char* str2) {
   EXPECT_TRUE(m2 > m1);
   EXPECT_TRUE(m2 >= m1);
   EXPECT_TRUE(m1 != m2);
-  EXPECT_TRUE(m1 == m1);
+  EXPECT_TRUE(m1 == (m1));
   EXPECT_FALSE(m1 == m2);
 
   // Also test the copy constructor and assignment operator