Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit 9f7e3ae

Browse files
authored
Turn on clang tidy error for underscores in Google tests (#37700)
1 parent 1e1a4ab commit 9f7e3ae

File tree

4 files changed

+36
-24
lines changed

4 files changed

+36
-24
lines changed

.clang-tidy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ readability-identifier-naming,\
2929
clang-diagnostic-*,\
3030
google-objc-*,\
3131
google-explicit-constructor,\
32+
google-readability-avoid-underscore-in-googletest-name,\
3233
performance-move-const-arg,\
3334
performance-unnecessary-value-param"
3435

display_list/display_list_image_filter_unittests.cc

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -653,7 +653,7 @@ TEST(DisplayListImageFilter, ComposeBoundsWithUnboundedInnerAndOuter) {
653653
}
654654

655655
// See https://github.com/flutter/flutter/issues/108433
656-
TEST(DisplayListImageFilter, Issue_108433) {
656+
TEST(DisplayListImageFilter, Issue108433) {
657657
auto input_bounds = SkIRect::MakeLTRB(20, 20, 80, 80);
658658

659659
auto sk_filter = SkColorFilters::Blend(SK_ColorRED, SkBlendMode::kSrcOver);

flow/raster_cache_unittests.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -806,7 +806,7 @@ TEST(RasterCache, RasterCacheKeySameType) {
806806
ASSERT_EQ(map[layer_children_third_key], 300);
807807
}
808808

809-
TEST(RasterCache, RasterCacheKeyID_Equal) {
809+
TEST(RasterCache, RasterCacheKeyIDEqual) {
810810
RasterCacheKeyID first = RasterCacheKeyID(1, RasterCacheKeyType::kLayer);
811811
RasterCacheKeyID second = RasterCacheKeyID(2, RasterCacheKeyType::kLayer);
812812
RasterCacheKeyID third =
@@ -826,7 +826,7 @@ TEST(RasterCache, RasterCacheKeyID_Equal) {
826826
ASSERT_NE(fifth, sixth);
827827
}
828828

829-
TEST(RasterCache, RasterCacheKeyID_HashCode) {
829+
TEST(RasterCache, RasterCacheKeyIDHashCode) {
830830
uint64_t foo = 1;
831831
uint64_t bar = 2;
832832
RasterCacheKeyID first = RasterCacheKeyID(foo, RasterCacheKeyType::kLayer);
@@ -860,7 +860,7 @@ TEST(RasterCache, RasterCacheKeyID_HashCode) {
860860

861861
using RasterCacheTest = SkiaGPUObjectLayerTest;
862862

863-
TEST_F(RasterCacheTest, RasterCacheKeyID_LayerChildrenIds) {
863+
TEST_F(RasterCacheTest, RasterCacheKeyIDLayerChildrenIds) {
864864
auto layer = std::make_shared<ContainerLayer>();
865865

866866
const SkPath child_path = SkPath().addRect(SkRect::MakeWH(5.0f, 5.0f));

shell/platform/embedder/tests/embedder_unittests.cc

Lines changed: 31 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1629,44 +1629,55 @@ static void expectSoftwareRenderingOutputMatches(
16291629
std::vector<uint8_t>(bytes, bytes + sizeof(T)));
16301630
}
16311631

1632-
#define SW_PIXFMT_TEST_F(dart_entrypoint, pixfmt, matcher) \
1633-
TEST_F(EmbedderTest, \
1634-
SoftwareRenderingPixelFormats_##dart_entrypoint##_##pixfmt) { \
1632+
#define SW_PIXFMT_TEST_F(test_name, dart_entrypoint, pixfmt, matcher) \
1633+
TEST_F(EmbedderTest, SoftwareRenderingPixelFormats##test_name) { \
16351634
expectSoftwareRenderingOutputMatches(*this, #dart_entrypoint, pixfmt, \
16361635
matcher); \
16371636
}
16381637

16391638
// Don't test the pixel formats that contain padding (so an X) and the kNative32
16401639
// pixel format here, so we don't add any flakiness.
1641-
SW_PIXFMT_TEST_F(draw_solid_red, kRGB565, (uint16_t)0xF800);
1642-
SW_PIXFMT_TEST_F(draw_solid_red, kRGBA4444, (uint16_t)0xF00F);
1643-
SW_PIXFMT_TEST_F(draw_solid_red,
1640+
SW_PIXFMT_TEST_F(RedRGBA565xF800, draw_solid_red, kRGB565, (uint16_t)0xF800);
1641+
SW_PIXFMT_TEST_F(RedRGBA4444xF00F, draw_solid_red, kRGBA4444, (uint16_t)0xF00F);
1642+
SW_PIXFMT_TEST_F(RedRGBA8888xFFx00x00xFF,
1643+
draw_solid_red,
16441644
kRGBA8888,
16451645
(std::vector<uint8_t>{0xFF, 0x00, 0x00, 0xFF}));
1646-
SW_PIXFMT_TEST_F(draw_solid_red,
1646+
SW_PIXFMT_TEST_F(RedBGRA8888x00x00xFFxFF,
1647+
draw_solid_red,
16471648
kBGRA8888,
16481649
(std::vector<uint8_t>{0x00, 0x00, 0xFF, 0xFF}));
1649-
SW_PIXFMT_TEST_F(draw_solid_red, kGray8, (uint8_t)0x36);
1650-
1651-
SW_PIXFMT_TEST_F(draw_solid_green, kRGB565, (uint16_t)0x07E0);
1652-
SW_PIXFMT_TEST_F(draw_solid_green, kRGBA4444, (uint16_t)0x0F0F);
1653-
SW_PIXFMT_TEST_F(draw_solid_green,
1650+
SW_PIXFMT_TEST_F(RedGray8x36, draw_solid_red, kGray8, (uint8_t)0x36);
1651+
1652+
SW_PIXFMT_TEST_F(GreenRGB565x07E0, draw_solid_green, kRGB565, (uint16_t)0x07E0);
1653+
SW_PIXFMT_TEST_F(GreenRGBA4444x0F0F,
1654+
draw_solid_green,
1655+
kRGBA4444,
1656+
(uint16_t)0x0F0F);
1657+
SW_PIXFMT_TEST_F(GreenRGBA8888x00xFFx00xFF,
1658+
draw_solid_green,
16541659
kRGBA8888,
16551660
(std::vector<uint8_t>{0x00, 0xFF, 0x00, 0xFF}));
1656-
SW_PIXFMT_TEST_F(draw_solid_green,
1661+
SW_PIXFMT_TEST_F(GreenBGRA8888x00xFFx00xFF,
1662+
draw_solid_green,
16571663
kBGRA8888,
16581664
(std::vector<uint8_t>{0x00, 0xFF, 0x00, 0xFF}));
1659-
SW_PIXFMT_TEST_F(draw_solid_green, kGray8, (uint8_t)0xB6);
1660-
1661-
SW_PIXFMT_TEST_F(draw_solid_blue, kRGB565, (uint16_t)0x001F);
1662-
SW_PIXFMT_TEST_F(draw_solid_blue, kRGBA4444, (uint16_t)0x00FF);
1663-
SW_PIXFMT_TEST_F(draw_solid_blue,
1665+
SW_PIXFMT_TEST_F(GreenGray8xB6, draw_solid_green, kGray8, (uint8_t)0xB6);
1666+
1667+
SW_PIXFMT_TEST_F(BlueRGB565x001F, draw_solid_blue, kRGB565, (uint16_t)0x001F);
1668+
SW_PIXFMT_TEST_F(BlueRGBA4444x00FF,
1669+
draw_solid_blue,
1670+
kRGBA4444,
1671+
(uint16_t)0x00FF);
1672+
SW_PIXFMT_TEST_F(BlueRGBA8888x00x00xFFxFF,
1673+
draw_solid_blue,
16641674
kRGBA8888,
16651675
(std::vector<uint8_t>{0x00, 0x00, 0xFF, 0xFF}));
1666-
SW_PIXFMT_TEST_F(draw_solid_blue,
1676+
SW_PIXFMT_TEST_F(BlueBGRA8888xFFx00x00xFF,
1677+
draw_solid_blue,
16671678
kBGRA8888,
16681679
(std::vector<uint8_t>{0xFF, 0x00, 0x00, 0xFF}));
1669-
SW_PIXFMT_TEST_F(draw_solid_blue, kGray8, (uint8_t)0x12);
1680+
SW_PIXFMT_TEST_F(BlueGray8x12, draw_solid_blue, kGray8, (uint8_t)0x12);
16701681

16711682
//------------------------------------------------------------------------------
16721683
// Key Data

0 commit comments

Comments
 (0)