Google Git
Sign in
pdfium/pdfium.git/refs/heads/chromium/6812^!/.
commit
bbf2f318d1bbe251582e93b06d118a7ef8509db4
[log]
author
Ho Cheung <hocheung@chromium.org>
Thu Oct 31 21:07:01 2024 +0000
committer
Pdfium LUCI CQ <pdfium-scoped@luci-project-accounts.iam.gserviceaccount.com>
Thu Oct 31 21:07:01 2024 +0000
tree
877b97dc3d348e2ee9c2f4b82a7e1f7e4d5cbb16
parent
28d0eb698fe8c5a5d604fb8dab2a4559ff4ed711 [diff]
[cleanup] Clean up underscores in some test names again

Tests written with the GoogleTest framework should
not use underscores in test names.

Bug: 42270790
Change-Id: I7519af8b056ac69e4c9fbfc128a193ccb188afce
Reviewed-on: https://pdfium-review.googlesource.com/c/pdfium/+/125510
Reviewed-by: Thomas Sepez <tsepez@google.com>
Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: Tom Sepez <tsepez@chromium.org>
Commit-Queue: Thomas Sepez <tsepez@google.com>

diff --git a/core/fxcrt/bytestring_unittest.cpp b/core/fxcrt/bytestring_unittest.cpp
index 64ea16c..398749c 100644
--- a/core/fxcrt/bytestring_unittest.cpp
+++ b/core/fxcrt/bytestring_unittest.cpp

@@ -1850,7 +1850,7 @@
   EXPECT_FALSE(pdfium::Contains(str, 'z'));
 }
 
-TEST(CFX_BytrString, EqualNoCase) {
+TEST(ByteString, EqualNoCase) {
   ByteString str("aaa");
   EXPECT_TRUE(str.EqualNoCase("aaa"));
   EXPECT_TRUE(str.EqualNoCase("AAA"));
@@ -2000,7 +2000,7 @@
   EXPECT_EQ("-2147483648", ByteString::FormatInteger(INT_MIN));
 }
 
-TEST(ByteString, FX_HashCode_Ascii) {
+TEST(ByteString, FXHashCodeAscii) {
   EXPECT_EQ(0u, FX_HashCode_GetA(""));
   EXPECT_EQ(65u, FX_HashCode_GetA("A"));
   EXPECT_EQ(97u, FX_HashCode_GetLoweredA("A"));
@@ -2009,7 +2009,7 @@
   EXPECT_EQ(31u * 97u + 255u, FX_HashCode_GetLoweredA("A\xff"));
 }
 
-TEST(ByteString, FX_HashCode_Wide) {
+TEST(ByteString, FXHashCodeWide) {
   EXPECT_EQ(0u, FX_HashCode_GetAsIfW(""));
   EXPECT_EQ(65u, FX_HashCode_GetAsIfW("A"));
   EXPECT_EQ(97u, FX_HashCode_GetLoweredAsIfW("A"));

diff --git a/core/fxcrt/fx_extension_unittest.cpp b/core/fxcrt/fx_extension_unittest.cpp
index 6e2a7d2..49608a1 100644
--- a/core/fxcrt/fx_extension_unittest.cpp
+++ b/core/fxcrt/fx_extension_unittest.cpp

@@ -13,7 +13,7 @@
 #include "core/fxcrt/compiler_specific.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(fxcrt, FXSYS_IsLowerASCII) {
+TEST(fxcrt, FXSYSIsLowerASCII) {
   EXPECT_TRUE(FXSYS_IsLowerASCII('a'));
   EXPECT_TRUE(FXSYS_IsLowerASCII(L'a'));
   EXPECT_TRUE(FXSYS_IsLowerASCII('b'));
@@ -34,7 +34,7 @@
   EXPECT_FALSE(FXSYS_IsLowerASCII(static_cast<wchar_t>(0xb2)));
 }
 
-TEST(fxcrt, FXSYS_IsUpperASCII) {
+TEST(fxcrt, FXSYSIsUpperASCII) {
   EXPECT_TRUE(FXSYS_IsUpperASCII('A'));
   EXPECT_TRUE(FXSYS_IsUpperASCII(L'A'));
   EXPECT_TRUE(FXSYS_IsUpperASCII('B'));
@@ -55,14 +55,14 @@
   EXPECT_FALSE(FXSYS_IsUpperASCII(static_cast<wchar_t>(0xb2)));
 }
 
-TEST(fxcrt, FXSYS_HexCharToInt) {
+TEST(fxcrt, FXSYSHexCharToInt) {
   EXPECT_EQ(10, FXSYS_HexCharToInt('a'));
   EXPECT_EQ(10, FXSYS_HexCharToInt('A'));
   EXPECT_EQ(7, FXSYS_HexCharToInt('7'));
   EXPECT_EQ(0, FXSYS_HexCharToInt('i'));
 }
 
-TEST(fxcrt, FXSYS_DecimalCharToInt) {
+TEST(fxcrt, FXSYSDecimalCharToInt) {
   EXPECT_EQ(7, FXSYS_DecimalCharToInt('7'));
   EXPECT_EQ(0, FXSYS_DecimalCharToInt('a'));
   EXPECT_EQ(7, FXSYS_DecimalCharToInt(L'7'));
@@ -71,7 +71,7 @@
   EXPECT_EQ(0, FXSYS_DecimalCharToInt(static_cast<wchar_t>(0xb2)));
 }
 
-TEST(fxcrt, FXSYS_IsDecimalDigit) {
+TEST(fxcrt, FXSYSIsDecimalDigit) {
   EXPECT_TRUE(FXSYS_IsDecimalDigit('7'));
   EXPECT_TRUE(FXSYS_IsDecimalDigit(L'7'));
   EXPECT_FALSE(FXSYS_IsDecimalDigit('a'));
@@ -80,7 +80,7 @@
   EXPECT_FALSE(FXSYS_IsDecimalDigit(static_cast<wchar_t>(0xb2)));
 }
 
-TEST(fxcrt, FXSYS_IntToTwoHexChars) {
+TEST(fxcrt, FXSYSIntToTwoHexChars) {
   char buf[3] = {0};
   FXSYS_IntToTwoHexChars(0x0, buf);
   EXPECT_STREQ("00", buf);
@@ -98,7 +98,7 @@
   EXPECT_STREQ("FF", buf);
 }
 
-TEST(fxcrt, FXSYS_IntToFourHexChars) {
+TEST(fxcrt, FXSYSIntToFourHexChars) {
   char buf[5] = {0};
   FXSYS_IntToFourHexChars(0x0, buf);
   EXPECT_STREQ("0000", buf);
@@ -110,7 +110,7 @@
   EXPECT_STREQ("FFFF", buf);
 }
 
-TEST(fxcrt, FXSYS_ToUTF16BE) {
+TEST(fxcrt, FXSYSToUTF16BE) {
   char buf[9] = {0};
   // Test U+0000 to U+D7FF and U+E000 to U+FFFF
   EXPECT_EQ(4U, FXSYS_ToUTF16BE(0x0, buf));
@@ -130,7 +130,7 @@
   EXPECT_STREQ("D840DC3E", buf);
 }
 
-TEST(fxcrt, FXSYS_wcstof) {
+TEST(fxcrt, FXSYSwcstof) {
   size_t used_len = 0;
   EXPECT_FLOAT_EQ(-12.0f, FXSYS_wcstof(L"-12", &used_len));
   EXPECT_EQ(3u, used_len);
@@ -221,7 +221,7 @@
   EXPECT_EQ(131u, used_len);
 }
 
-TEST(fxcrt, FXSYS_SafeOps) {
+TEST(fxcrt, FXSYSSafeOps) {
   const float fMin = std::numeric_limits<float>::min();
   const float fMax = std::numeric_limits<float>::max();
   const float fInf = std::numeric_limits<float>::infinity();

diff --git a/core/fxcrt/fx_memcpy_wrappers_unittest.cpp b/core/fxcrt/fx_memcpy_wrappers_unittest.cpp
index 3055444..0bff513 100644
--- a/core/fxcrt/fx_memcpy_wrappers_unittest.cpp
+++ b/core/fxcrt/fx_memcpy_wrappers_unittest.cpp

@@ -6,52 +6,52 @@
 
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(fxcrt, FXSYS_memset) {
+TEST(fxcrt, FXSYSmemset) {
   // Test passes if it does not trigger UBSAN warnings.
   EXPECT_EQ(nullptr, UNSAFE_BUFFERS(FXSYS_memset(nullptr, 0, 0)));
 }
 
-TEST(fxcrt, FXSYS_wmemset) {
+TEST(fxcrt, FXSYSwmemset) {
   // Test passes if it does not trigger UBSAN warnings.
   EXPECT_EQ(nullptr, UNSAFE_BUFFERS(FXSYS_wmemset(nullptr, 0, 0)));
 }
 
-TEST(fxcrt, FXSYS_memcpy) {
+TEST(fxcrt, FXSYSmemcpy) {
   // Test passes if it does not trigger UBSAN warnings.
   EXPECT_EQ(nullptr, UNSAFE_BUFFERS(FXSYS_memcpy(nullptr, nullptr, 0)));
 }
 
-TEST(fxcrt, FXSYS_wmemcpy) {
+TEST(fxcrt, FXSYSwmemcpy) {
   // Test passes if it does not trigger UBSAN warnings.
   EXPECT_EQ(nullptr, UNSAFE_BUFFERS(FXSYS_wmemcpy(nullptr, nullptr, 0)));
 }
 
-TEST(fxcrt, FXSYS_memmove) {
+TEST(fxcrt, FXSYSmemmove) {
   // Test passes if it does not trigger UBSAN warnings.
   EXPECT_EQ(nullptr, UNSAFE_BUFFERS(FXSYS_memmove(nullptr, nullptr, 0)));
 }
 
-TEST(fxcrt, FXSYS_wmemmove) {
+TEST(fxcrt, FXSYSwmemmove) {
   // Test passes if it does not trigger UBSAN warnings.
   EXPECT_EQ(nullptr, UNSAFE_BUFFERS(FXSYS_wmemmove(nullptr, nullptr, 0)));
 }
 
-TEST(fxcrt, FXSYS_memcmp) {
+TEST(fxcrt, FXSYSmemcmp) {
   // Test passes if it does not trigger UBSAN warnings.
   EXPECT_EQ(0, UNSAFE_BUFFERS(FXSYS_memcmp(nullptr, nullptr, 0)));
 }
 
-TEST(fxcrt, FXSYS_wmemcmp) {
+TEST(fxcrt, FXSYSwmemcmp) {
   // Test passes if it does not trigger UBSAN warnings.
   EXPECT_EQ(0, UNSAFE_BUFFERS(FXSYS_wmemcmp(nullptr, nullptr, 0)));
 }
 
-TEST(fxcrt, FXSYS_memchr) {
+TEST(fxcrt, FXSYSmemchr) {
   // Test passes if it does not trigger UBSAN warnings.
   EXPECT_EQ(nullptr, UNSAFE_BUFFERS(FXSYS_memchr(nullptr, 0, 0)));
 }
 
-TEST(fxcrt, FXSYS_wmemchr) {
+TEST(fxcrt, FXSYSwmemchr) {
   // Test passes if it does not trigger UBSAN warnings.
   EXPECT_EQ(nullptr, UNSAFE_BUFFERS(FXSYS_wmemchr(nullptr, 0, 0)));
 }

diff --git a/core/fxcrt/fx_memory_unittest.cpp b/core/fxcrt/fx_memory_unittest.cpp
index 7b05c4e..75a5209 100644
--- a/core/fxcrt/fx_memory_unittest.cpp
+++ b/core/fxcrt/fx_memory_unittest.cpp

@@ -27,7 +27,7 @@
 
 }  // namespace
 
-TEST(fxcrt, FX_AllocZero) {
+TEST(fxcrt, FXAllocZero) {
   uint8_t* ptr = FX_Alloc(uint8_t, 0);
   uint8_t* ptr2 = FX_Alloc(uint8_t, 0);
   EXPECT_TRUE(ptr);      // Malloc(0) is distinguishable from OOM.
@@ -46,7 +46,7 @@
   FX_Free(ptr);
 }
 
-TEST(fxcrt, FX_AllocOverflow) {
+TEST(fxcrt, FXAllocOverflow) {
   // |ptr| needs to be defined and used to avoid Clang optimizes away the
   // FX_Alloc() statement overzealously for optimized builds.
   int* ptr = nullptr;
@@ -58,7 +58,7 @@
   FX_Free(ptr);
 }
 
-TEST(fxcrt, FX_AllocOverflow2D) {
+TEST(fxcrt, FXAllocOverflow2D) {
   // |ptr| needs to be defined and used to avoid Clang optimizes away the
   // FX_Alloc() statement overzealously for optimized builds.
   int* ptr = nullptr;
@@ -92,7 +92,7 @@
 }
 
 #if !defined(COMPILER_GCC)
-TEST(fxcrt, FX_TryAllocOverflow) {
+TEST(fxcrt, FXTryAllocOverflow) {
   // |ptr| needs to be defined and used to avoid Clang optimizes away the
   // calloc() statement overzealously for optimized builds.
   int* ptr = (int*)calloc(sizeof(int), kOverflowIntAlloc);

diff --git a/core/fxcrt/fx_system_unittest.cpp b/core/fxcrt/fx_system_unittest.cpp
index 4ca78ac..0e0aa73 100644
--- a/core/fxcrt/fx_system_unittest.cpp
+++ b/core/fxcrt/fx_system_unittest.cpp

@@ -90,7 +90,7 @@
 
 }  // namespace
 
-TEST(fxcrt, FXSYS_roundf) {
+TEST(fxcrt, FXSYSroundf) {
   EXPECT_EQ(0, FXSYS_roundf(0.0f));
   EXPECT_EQ(0, FXSYS_roundf(-0.0f));
   EXPECT_EQ(0, FXSYS_roundf(0.00001f));
@@ -140,7 +140,7 @@
   EXPECT_EQ(0, FXSYS_roundf(NAN));
 }
 
-TEST(fxcrt, FXSYS_round) {
+TEST(fxcrt, FXSYSround) {
   EXPECT_EQ(0, FXSYS_round(0.0));
   EXPECT_EQ(0, FXSYS_round(-0.0));
   EXPECT_EQ(0, FXSYS_round(0.00001));
@@ -191,7 +191,7 @@
   EXPECT_EQ(0, FXSYS_round(NAN));
 }
 
-TEST(fxcrt, FXSYS_itoa_InvalidRadix) {
+TEST(fxcrt, FXSYSitoaInvalidRadix) {
   char buf[32];
 
   FXSYS_itoa(42, buf, 17);  // Ours stops at 16.
@@ -207,7 +207,7 @@
   EXPECT_STREQ("", buf);
 }
 
-TEST(fxcrt, FXSYS_itoa) {
+TEST(fxcrt, FXSYSitoa) {
   Check32BitBase16Itoa(std::numeric_limits<int32_t>::min(), "-80000000");
   Check32BitBase10Itoa(std::numeric_limits<int32_t>::min(), "-2147483648");
   Check32BitBase2Itoa(std::numeric_limits<int32_t>::min(),
@@ -231,7 +231,7 @@
                       "1111111111111111111111111111111");
 }
 
-TEST(fxcrt, FXSYS_i64toa_InvalidRadix) {
+TEST(fxcrt, FXSYSi64toaInvalidRadix) {
   char buf[32];
 
   FXSYS_i64toa(42, buf, 17);  // Ours stops at 16.
@@ -247,7 +247,7 @@
   EXPECT_STREQ("", buf);
 }
 
-TEST(fxcrt, FXSYS_i64toa) {
+TEST(fxcrt, FXSYSi64toa) {
   Check64BitBase16Itoa(std::numeric_limits<int64_t>::min(),
                        "-8000000000000000");
   Check64BitBase10Itoa(std::numeric_limits<int64_t>::min(),
@@ -278,7 +278,7 @@
 
 #endif  // !BUILDFLAG(IS_WIN)
 
-TEST(fxcrt, FXSYS_wcsftime) {
+TEST(fxcrt, FXSYSwcsftime) {
   struct tm good_time = {};
   good_time.tm_year = 74;  // 1900-based.
   good_time.tm_mon = 7;    // 0-based.
@@ -332,7 +332,7 @@
       FXSYS_wcsftime(buf, std::size(buf), L"%y-%m-%dT%H:%M:%S", &feb_time));
 }
 
-TEST(fxcrt, FXSYS_atoi) {
+TEST(fxcrt, FXSYSatoi) {
   EXPECT_EQ(0, FXSYS_atoi(""));
   EXPECT_EQ(0, FXSYS_atoi("0"));
   EXPECT_EQ(-1, FXSYS_atoi("-1"));
@@ -355,7 +355,7 @@
   EXPECT_EQ(-2147483647 - 1, FXSYS_atoi("-2147483650"));
 }
 
-TEST(fxcrt, FXSYS_atoi64) {
+TEST(fxcrt, FXSYSatoi64) {
   EXPECT_EQ(0, FXSYS_atoi64(""));
   EXPECT_EQ(0, FXSYS_atoi64("0"));
   EXPECT_EQ(-1, FXSYS_atoi64("-1"));
@@ -377,7 +377,7 @@
   EXPECT_EQ(-9223372036854775807LL - 1LL, FXSYS_atoi64("-9223372036854775810"));
 }
 
-TEST(fxcrt, FXSYS_wtoi) {
+TEST(fxcrt, FXSYSwtoi) {
   EXPECT_EQ(0, FXSYS_wtoi(L""));
   EXPECT_EQ(0, FXSYS_wtoi(L"0"));
   EXPECT_EQ(-1, FXSYS_wtoi(L"-1"));
@@ -394,7 +394,7 @@
   EXPECT_EQ(-2147483647 - 1, FXSYS_wtoi(L"-2147483652"));
 }
 
-TEST(fxcrt, FXSYS_atoui) {
+TEST(fxcrt, FXSYSatoui) {
   EXPECT_EQ(0u, FXSYS_atoui(""));
   EXPECT_EQ(0u, FXSYS_atoui("0"));
   EXPECT_EQ(4294967295, FXSYS_atoui("-1"));

diff --git a/core/fxcrt/widestring_unittest.cpp b/core/fxcrt/widestring_unittest.cpp
index a15bdc9..885b4cf 100644
--- a/core/fxcrt/widestring_unittest.cpp
+++ b/core/fxcrt/widestring_unittest.cpp

@@ -1892,7 +1892,7 @@
   EXPECT_FALSE(cspan.data());
 }
 
-TEST(CFX_WidString, InitializerList) {
+TEST(WideString, InitializerList) {
   WideString many_str({L"clams", L" and ", L"oysters"});
   EXPECT_EQ(L"clams and oysters", many_str);
   many_str = {L"fish", L" and ", L"chips", L" and ", L"soda"};
@@ -2254,7 +2254,7 @@
   EXPECT_EQ(L"-2147483648", WideString::FormatInteger(INT_MIN));
 }
 
-TEST(WideString, FX_HashCode_Wide) {
+TEST(WideString, FXHashCodeWide) {
   EXPECT_EQ(0u, FX_HashCode_GetW(L""));
   EXPECT_EQ(65u, FX_HashCode_GetW(L"A"));
   EXPECT_EQ(97u, FX_HashCode_GetLoweredW(L"A"));

diff --git a/core/fxge/cfx_defaultrenderdevice_unittest.cpp b/core/fxge/cfx_defaultrenderdevice_unittest.cpp
index 24b2195..c2a1369 100644
--- a/core/fxge/cfx_defaultrenderdevice_unittest.cpp
+++ b/core/fxge/cfx_defaultrenderdevice_unittest.cpp

@@ -13,14 +13,14 @@
 #include "core/fxge/dib/fx_dib.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(CFX_DefaultRenderDeviceTest, GetClipBox_Default) {
+TEST(CFXDefaultRenderDeviceTest, GetClipBoxDefault) {
   CFX_DefaultRenderDevice device;
   ASSERT_TRUE(device.Create(/*width=*/16, /*height=*/16, FXDIB_Format::kBgra));
 
   EXPECT_EQ(FX_RECT(0, 0, 16, 16), device.GetClipBox());
 }
 
-TEST(CFX_DefaultRenderDeviceTest, GetClipBox_PathFill) {
+TEST(CFXDefaultRenderDeviceTest, GetClipBoxPathFill) {
   // Matrix that transposes and translates by 1 unit on each axis.
   const CFX_Matrix object_to_device(0, 1, 1, 0, 1, -1);
 
@@ -38,7 +38,7 @@
   EXPECT_EQ(FX_RECT(5, 1, 13, 13), device.GetClipBox());
 }
 
-TEST(CFX_DefaultRenderDeviceTest, GetClipBox_PathStroke) {
+TEST(CFXDefaultRenderDeviceTest, GetClipBoxPathStroke) {
   // Matrix that transposes and translates by 1 unit on each axis.
   const CFX_Matrix object_to_device(0, 1, 1, 0, 1, -1);
 
@@ -56,7 +56,7 @@
   EXPECT_EQ(FX_RECT(4, 0, 14, 14), device.GetClipBox());
 }
 
-TEST(CFX_DefaultRenderDeviceTest, GetClipBox_Rect) {
+TEST(CFXDefaultRenderDeviceTest, GetClipBoxRect) {
   CFX_DefaultRenderDevice device;
   ASSERT_TRUE(device.Create(/*width=*/16, /*height=*/16, FXDIB_Format::kBgra));
 
@@ -65,7 +65,7 @@
   EXPECT_EQ(FX_RECT(2, 4, 14, 12), device.GetClipBox());
 }
 
-TEST(CFX_DefaultRenderDeviceTest, GetClipBox_Empty) {
+TEST(CFXDefaultRenderDeviceTest, GetClipBoxEmpty) {
   CFX_DefaultRenderDevice device;
   ASSERT_TRUE(device.Create(/*width=*/16, /*height=*/16, FXDIB_Format::kBgra));
 

diff --git a/core/fxge/cfx_fontmapper_unittest.cpp b/core/fxge/cfx_fontmapper_unittest.cpp
index 43712b3..cdb1589 100644
--- a/core/fxge/cfx_fontmapper_unittest.cpp
+++ b/core/fxge/cfx_fontmapper_unittest.cpp

@@ -89,7 +89,7 @@
 // Deliberately give this global variable external linkage.
 char g_maybe_changes = '\xff';
 
-TEST(CFX_FontMapper, IsStandardFontName) {
+TEST(CFXFontMapperTest, IsStandardFontName) {
   EXPECT_TRUE(CFX_FontMapper::IsStandardFontName("Courier"));
   EXPECT_TRUE(CFX_FontMapper::IsStandardFontName("Courier-Bold"));
   EXPECT_TRUE(CFX_FontMapper::IsStandardFontName("Courier-BoldOblique"));
@@ -111,7 +111,7 @@
   EXPECT_FALSE(CFX_FontMapper::IsStandardFontName("YapfDingbats"));
 }
 
-TEST(CFX_FontMapper, MakeTag) {
+TEST(CFXFontMapperTest, MakeTag) {
   EXPECT_EQ(0x61626364u, CFX_FontMapper::MakeTag('a', 'b', 'c', 'd'));
   EXPECT_EQ(0x00000000u, CFX_FontMapper::MakeTag('\0', '\0', '\0', '\0'));
   EXPECT_EQ(0xfffe0a08u, CFX_FontMapper::MakeTag('\xff', '\xfe', '\n', '\b'));
@@ -125,7 +125,7 @@
             CFX_FontMapper::MakeTag('G', 'S', 'U', 'B'));
 }
 
-TEST(CFX_FontMapper, AddInstalledFontBasic) {
+TEST(CFXFontMapperTest, AddInstalledFontBasic) {
   const char kFontName[] = "dummy";
   CFX_FontMapper font_mapper(nullptr);
   font_mapper.SetSystemFontInfo(std::make_unique<MockSystemFontInfo>());

diff --git a/core/fxge/cfx_path_unittest.cpp b/core/fxge/cfx_path_unittest.cpp
index bae99ad..a1ec3c1 100644
--- a/core/fxge/cfx_path_unittest.cpp
+++ b/core/fxge/cfx_path_unittest.cpp

@@ -7,7 +7,7 @@
 #include "core/fxcrt/fx_coordinates.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
-TEST(CFX_Path, BasicTest) {
+TEST(CFXPath, BasicTest) {
   CFX_Path path;
   path.AppendRect(/*left=*/1, /*bottom=*/2, /*right=*/3, /*top=*/5);
   EXPECT_EQ(5u, path.GetPoints().size());
@@ -65,7 +65,7 @@
   EXPECT_EQ(CFX_FloatRect(1, 2, 3, 5), path.GetBoundingBox());
 }
 
-TEST(CFX_Path, ShearTransform) {
+TEST(CFXPath, ShearTransform) {
   CFX_Path path;
   path.AppendRect(/*left=*/1, /*bottom=*/2, /*right=*/3, /*top=*/5);
 
@@ -95,7 +95,7 @@
   EXPECT_EQ(CFX_FloatRect(1, 2, 3, 5), path.GetBoundingBox());
 }
 
-TEST(CFX_Path, Hexagon) {
+TEST(CFXPath, Hexagon) {
   CFX_Path path;
   path.AppendPoint({1, 0}, CFX_Path::Point::Type::kMove);
   path.AppendPoint({2, 0}, CFX_Path::Point::Type::kLine);
@@ -139,7 +139,7 @@
   EXPECT_EQ(CFX_FloatRect(0, 0, 3, 2), path.GetBoundingBox());
 }
 
-TEST(CFX_Path, ClosePath) {
+TEST(CFXPath, ClosePath) {
   CFX_Path path;
   path.AppendLine({0, 0}, {0, 1});
   path.AppendLine({0, 1}, {1, 1});
@@ -189,7 +189,7 @@
   EXPECT_EQ(CFX_FloatRect(0, 0, 1, 1), rect.value());
 }
 
-TEST(CFX_Path, FivePointRect) {
+TEST(CFXPath, FivePointRect) {
   CFX_Path path;
   path.AppendPoint({0, 0}, CFX_Path::Point::Type::kMove);
   path.AppendPoint({2, 0}, CFX_Path::Point::Type::kLine);
@@ -214,7 +214,7 @@
   EXPECT_EQ(CFX_FloatRect(0, 0, 2, 1), rect.value());
 }
 
-TEST(CFX_Path, SixPlusPointRect) {
+TEST(CFXPath, SixPlusPointRect) {
   CFX_Path path;
   path.AppendPoint({0, 0}, CFX_Path::Point::Type::kMove);
   path.AppendPoint({0, 0}, CFX_Path::Point::Type::kLine);
@@ -249,7 +249,7 @@
   EXPECT_EQ(CFX_FloatRect(0, 0, 2, 1), path.GetBoundingBox());
 }
 
-TEST(CFX_Path, NotRect) {
+TEST(CFXPath, NotRect) {
   CFX_Path path;
   path.AppendPoint({0, 0}, CFX_Path::Point::Type::kMove);
   path.AppendPoint({2, 0}, CFX_Path::Point::Type::kLine);
@@ -333,7 +333,7 @@
   EXPECT_EQ(CFX_FloatRect(0, 0, 2, 2), path.GetBoundingBox());
 }
 
-TEST(CFX_Path, EmptyRect) {
+TEST(CFXPath, EmptyRect) {
   // Document existing behavior where an empty rect is still considered a rect.
   CFX_Path path;
   path.AppendPoint({0, 0}, CFX_Path::Point::Type::kMove);
@@ -348,7 +348,7 @@
   EXPECT_EQ(CFX_FloatRect(0, 0, 0, 1), path.GetBoundingBox());
 }
 
-TEST(CFX_Path, Append) {
+TEST(CFXPath, Append) {
   CFX_Path path;
   path.AppendPoint({5, 6}, CFX_Path::Point::Type::kMove);
   ASSERT_EQ(1u, path.GetPoints().size());
@@ -373,7 +373,7 @@
   EXPECT_EQ(CFX_PointF(65, 82), path.GetPoint(3));
 }
 
-TEST(CFX_Path, GetBoundingBoxForStrokePath) {
+TEST(CFXPath, GetBoundingBoxForStrokePath) {
   static constexpr float kLineWidth = 1.0f;
   static constexpr float kMiterLimit = 1.0f;
 

diff --git a/core/fxge/dib/cfx_cmyk_to_srgb_unittest.cpp b/core/fxge/dib/cfx_cmyk_to_srgb_unittest.cpp
index d14cbbf..583bf5a 100644
--- a/core/fxge/dib/cfx_cmyk_to_srgb_unittest.cpp
+++ b/core/fxge/dib/cfx_cmyk_to_srgb_unittest.cpp

@@ -13,7 +13,7 @@
   float f;
 };
 
-TEST(fxge, CMYK_Rounding) {
+TEST(fxge, CMYKRounding) {
   // Testing all floats from 0.0 to 1.0 takes about 35 seconds in release
   // builds and much longer in debug builds, so just test the known-dangerous
   // range.

diff --git a/xfa/fxfa/formcalc/cxfa_fmexpression_unittest.cpp b/xfa/fxfa/formcalc/cxfa_fmexpression_unittest.cpp
index a18bff1..5d3e137 100644
--- a/xfa/fxfa/formcalc/cxfa_fmexpression_unittest.cpp
+++ b/xfa/fxfa/formcalc/cxfa_fmexpression_unittest.cpp

@@ -18,7 +18,7 @@
 class FMCallExpressionTest : public FXGCUnitTest {};
 class FMStringExpressionTest : public FXGCUnitTest {};
 
-TEST_F(FMCallExpressionTest, more_than_32_arguments) {
+TEST_F(FMCallExpressionTest, MoreThan32Arguments) {
   // Use sign as it has 3 object parameters at positions 0, 5, and 6.
   auto* exp = cppgc::MakeGarbageCollected<CXFA_FMIdentifierExpression>(
       heap()->GetAllocationHandle(), L"sign");

diff --git a/xfa/fxfa/parser/xfa_utils_unittest.cpp b/xfa/fxfa/parser/xfa_utils_unittest.cpp
index 48f448d..a2e7c52 100644
--- a/xfa/fxfa/parser/xfa_utils_unittest.cpp
+++ b/xfa/fxfa/parser/xfa_utils_unittest.cpp

@@ -17,7 +17,7 @@
 
 }  // namespace
 
-TEST(XfaUtilsImpTest, XFA_MapRotation) {
+TEST(XfaUtilsImpTest, XFAMapRotation) {
   static const TestCase kTestCases[] = {
       {-1000000, 80}, {-361, 359},  {-360, 0}, {-359, 1},  {-91, 269},
       {-90, 270},     {-89, 271},   {-1, 359}, {0, 0},     {1, 1},