Fix unit test style in Source/wtf/.

Source/wtf/text/CStringTest.cpp

Index: Source/wtf/text/CStringTest.cpp
diff --git a/Source/wtf/text/CStringTest.cpp b/Source/wtf/text/CStringTest.cpp
index d1582e2a0d6fcadd8b7f65d4b04a5560da84c048..087cbb63634c008046a5437ad0d11cae33e1e7a8 100644
--- a/Source/wtf/text/CStringTest.cpp
+++ b/Source/wtf/text/CStringTest.cpp
@@ -24,178 +24,178 @@
  */
 
 #include "config.h"
-
 #include "wtf/text/CString.h"
+
 #include <gtest/gtest.h>
 
-namespace {
+namespace WTF {
 
-TEST(WTF, CStringNullStringConstructor)
+TEST(CStringTest, NullStringConstructor)
 {
     CString string;
-    ASSERT_TRUE(string.isNull());
-    ASSERT_EQ(string.data(), static_cast<const char*>(0));
-    ASSERT_EQ(string.length(), static_cast<size_t>(0));
+    EXPECT_TRUE(string.isNull());
+    EXPECT_EQ(static_cast<const char*>(0), string.data());
+    EXPECT_EQ(static_cast<size_t>(0), string.length());
 
     CString stringFromCharPointer(static_cast<const char*>(0));
-    ASSERT_TRUE(stringFromCharPointer.isNull());
-    ASSERT_EQ(stringFromCharPointer.data(), static_cast<const char*>(0));
-    ASSERT_EQ(stringFromCharPointer.length(), static_cast<size_t>(0));
+    EXPECT_TRUE(stringFromCharPointer.isNull());
+    EXPECT_EQ(static_cast<const char*>(0), stringFromCharPointer.data());
+    EXPECT_EQ(static_cast<size_t>(0), stringFromCharPointer.length());
 
     CString stringFromCharAndLength(static_cast<const char*>(0), 0);
-    ASSERT_TRUE(stringFromCharAndLength.isNull());
-    ASSERT_EQ(stringFromCharAndLength.data(), static_cast<const char*>(0));
-    ASSERT_EQ(stringFromCharAndLength.length(), static_cast<size_t>(0));
+    EXPECT_TRUE(stringFromCharAndLength.isNull());
+    EXPECT_EQ(static_cast<const char*>(0), stringFromCharAndLength.data());
+    EXPECT_EQ(static_cast<size_t>(0), stringFromCharAndLength.length());
 }
 
-TEST(WTF, CStringEmptyEmptyConstructor)
+TEST(CStringTest, EmptyEmptyConstructor)
 {
     const char* emptyString = "";
     CString string(emptyString);
-    ASSERT_FALSE(string.isNull());
-    ASSERT_EQ(string.length(), static_cast<size_t>(0));
-    ASSERT_EQ(string.data()[0], 0);
+    EXPECT_FALSE(string.isNull());
+    EXPECT_EQ(static_cast<size_t>(0), string.length());
+    EXPECT_EQ(0, string.data()[0]);
 
     CString stringWithLength(emptyString, 0);
-    ASSERT_FALSE(stringWithLength.isNull());
-    ASSERT_EQ(stringWithLength.length(), static_cast<size_t>(0));
-    ASSERT_EQ(stringWithLength.data()[0], 0);
+    EXPECT_FALSE(stringWithLength.isNull());
+    EXPECT_EQ(static_cast<size_t>(0), stringWithLength.length());
+    EXPECT_EQ(0, stringWithLength.data()[0]);
 }
 
-TEST(WTF, CStringEmptyRegularConstructor)
+TEST(CStringTest, EmptyRegularConstructor)
 {
     const char* referenceString = "WebKit";
 
     CString string(referenceString);
-    ASSERT_FALSE(string.isNull());
-    ASSERT_EQ(string.length(), strlen(referenceString));
-    ASSERT_STREQ(referenceString, string.data());
+    EXPECT_FALSE(string.isNull());
+    EXPECT_EQ(strlen(referenceString), string.length());
+    EXPECT_STREQ(referenceString, string.data());
 
     CString stringWithLength(referenceString, 6);
-    ASSERT_FALSE(stringWithLength.isNull());
-    ASSERT_EQ(stringWithLength.length(), strlen(referenceString));
-    ASSERT_STREQ(referenceString, stringWithLength.data());
+    EXPECT_FALSE(stringWithLength.isNull());
+    EXPECT_EQ(strlen(referenceString), stringWithLength.length());
+    EXPECT_STREQ(referenceString, stringWithLength.data());
 }
 
-TEST(WTF, CStringUninitializedConstructor)
+TEST(CStringTest, UninitializedConstructor)
 {
     char* buffer;
     CString emptyString = CString::newUninitialized(0, buffer);
-    ASSERT_FALSE(emptyString.isNull());
-    ASSERT_EQ(buffer, emptyString.data());
-    ASSERT_EQ(buffer[0], 0);
+    EXPECT_FALSE(emptyString.isNull());
+    EXPECT_EQ(buffer, emptyString.data());
+    EXPECT_EQ(0, buffer[0]);
 
     const size_t length = 25;
     CString uninitializedString = CString::newUninitialized(length, buffer);
-    ASSERT_FALSE(uninitializedString.isNull());
-    ASSERT_EQ(buffer, uninitializedString.data());
-    ASSERT_EQ(uninitializedString.data()[length], 0);
+    EXPECT_FALSE(uninitializedString.isNull());
+    EXPECT_EQ(buffer, uninitializedString.data());
+    EXPECT_EQ(0, uninitializedString.data()[length]);
 }
 
-TEST(WTF, CStringZeroTerminated)
+TEST(CStringTest, ZeroTerminated)
 {
     const char* referenceString = "WebKit";
     CString stringWithLength(referenceString, 3);
-    ASSERT_EQ(stringWithLength.data()[3], 0);
+    EXPECT_EQ(0, stringWithLength.data()[3]);
 }
 
-TEST(WTF, CStringCopyOnWrite)
+TEST(CStringTest, CopyOnWrite)
 {
     const char* initialString = "Webkit";
     CString string(initialString);
     CString copy = string;
 
     string.mutableData()[3] = 'K';
-    ASSERT_TRUE(string != copy);
-    ASSERT_STREQ(string.data(), "WebKit");
-    ASSERT_STREQ(copy.data(), initialString);
+    EXPECT_TRUE(string != copy);
+    EXPECT_STREQ("WebKit", string.data());
+    EXPECT_STREQ(initialString, copy.data());
 }
 
-TEST(WTF, CStringComparison)
+TEST(CStringTest, Comparison)
 {
     // Comparison with another CString.
     CString a;
     CString b;
-    ASSERT_TRUE(a == b);
-    ASSERT_FALSE(a != b);
+    EXPECT_TRUE(a == b);
+    EXPECT_FALSE(a != b);
     a = "a";
     b = CString();
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
+    EXPECT_FALSE(a == b);
+    EXPECT_TRUE(a != b);
     a = "a";
     b = "b";
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
+    EXPECT_FALSE(a == b);
+    EXPECT_TRUE(a != b);
     a = "a";
     b = "a";
-    ASSERT_TRUE(a == b);
-    ASSERT_FALSE(a != b);
+    EXPECT_TRUE(a == b);
+    EXPECT_FALSE(a != b);
     a = "a";
     b = "aa";
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
+    EXPECT_FALSE(a == b);
+    EXPECT_TRUE(a != b);
     a = "";
     b = "";
-    ASSERT_TRUE(a == b);
-    ASSERT_FALSE(a != b);
+    EXPECT_TRUE(a == b);
+    EXPECT_FALSE(a != b);
     a = "";
     b = CString();
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
+    EXPECT_FALSE(a == b);
+    EXPECT_TRUE(a != b);
     a = "a";
     b = "";
-    ASSERT_FALSE(a == b);
-    ASSERT_TRUE(a != b);
+    EXPECT_FALSE(a == b);
+    EXPECT_TRUE(a != b);
 
     // Comparison with a const char*.
     CString c;
     const char* d = 0;
-    ASSERT_TRUE(c == d);
-    ASSERT_FALSE(c != d);
+    EXPECT_TRUE(c == d);
+    EXPECT_FALSE(c != d);
     c = "c";
     d = 0;
-    ASSERT_FALSE(c == d);
-    ASSERT_TRUE(c != d);
+    EXPECT_FALSE(c == d);
+    EXPECT_TRUE(c != d);
     c = CString();
     d = "d";
-    ASSERT_FALSE(c == d);
-    ASSERT_TRUE(c != d);
+    EXPECT_FALSE(c == d);
+    EXPECT_TRUE(c != d);
     c = "c";
     d = "d";
-    ASSERT_FALSE(c == d);
-    ASSERT_TRUE(c != d);
+    EXPECT_FALSE(c == d);
+    EXPECT_TRUE(c != d);
     c = "c";
     d = "c";
-    ASSERT_TRUE(c == d);
-    ASSERT_FALSE(c != d);
+    EXPECT_TRUE(c == d);
+    EXPECT_FALSE(c != d);
     c = "c";
     d = "cc";
-    ASSERT_FALSE(c == d);
-    ASSERT_TRUE(c != d);
+    EXPECT_FALSE(c == d);
+    EXPECT_TRUE(c != d);
     c = "cc";
     d = "c";
-    ASSERT_FALSE(c == d);
-    ASSERT_TRUE(c != d);
+    EXPECT_FALSE(c == d);
+    EXPECT_TRUE(c != d);
     c = "";
     d = "";
-    ASSERT_TRUE(c == d);
-    ASSERT_FALSE(c != d);
+    EXPECT_TRUE(c == d);
+    EXPECT_FALSE(c != d);
     c = "";
     d = 0;
-    ASSERT_FALSE(c == d);
-    ASSERT_TRUE(c != d);
+    EXPECT_FALSE(c == d);
+    EXPECT_TRUE(c != d);
     c = CString();
     d = "";
-    ASSERT_FALSE(c == d);
-    ASSERT_TRUE(c != d);
+    EXPECT_FALSE(c == d);
+    EXPECT_TRUE(c != d);
     c = "a";
     d = "";
-    ASSERT_FALSE(c == d);
-    ASSERT_TRUE(c != d);
+    EXPECT_FALSE(c == d);
+    EXPECT_TRUE(c != d);
     c = "";
     d = "b";
-    ASSERT_FALSE(c == d);
-    ASSERT_TRUE(c != d);
+    EXPECT_FALSE(c == d);
+    EXPECT_TRUE(c != d);
 }
 
-} // namespace
+} // namespace WTF