Skip to content

Commit 87960d8

Browse files
jason-simmonsjason-simmons
authored
Fix typo in embedder unit tests (#23783)
1 parent d4132ea commit 87960d8

File tree

5 files changed

+27
-27
lines changed

5 files changed

+27
-27
lines changed

‎shell/platform/embedder/tests/embedder_test_compositor_gl.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ bool EmbedderTestCompositorGL::UpdateOffscrenComposition(
4949
for (size_t i = 0; i < layers_count; ++i) {
5050
const auto* layer = layers[i];
5151

52-
sk_sp<SkImage> platform_renderered_contents;
52+
sk_sp<SkImage> platform_rendered_contents;
5353

5454
sk_sp<SkImage> layer_image;
5555
SkIPoint canvas_offset = SkIPoint::Make(0, 0);

‎shell/platform/embedder/tests/embedder_test_compositor_software.cc‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ bool EmbedderTestCompositorSoftware::UpdateOffscrenComposition(
4040
for (size_t i = 0; i < layers_count; ++i) {
4141
const auto* layer = layers[i];
4242

43-
sk_sp<SkImage> platform_renderered_contents;
43+
sk_sp<SkImage> platform_rendered_contents;
4444

4545
sk_sp<SkImage> layer_image;
4646
SkIPoint canvas_offset = SkIPoint::Make(0, 0);

‎shell/platform/embedder/tests/embedder_unittests.cc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -948,7 +948,7 @@ TEST_F(EmbedderTest, VerifyB143464703WithSoftwareBackend) {
948948
kSuccess);
949949
ASSERT_TRUE(engine.is_valid());
950950

951-
auto renderered_scene = context.GetNextSceneImage();
951+
auto rendered_scene = context.GetNextSceneImage();
952952

953953
latch.Wait();
954954

@@ -957,8 +957,8 @@ TEST_F(EmbedderTest, VerifyB143464703WithSoftwareBackend) {
957957
#if !defined(OS_LINUX)
958958
GTEST_SKIP() << "Skipping golden tests on non-Linux OSes";
959959
#endif // OS_LINUX
960-
ASSERT_TRUE(ImageMatchesFixture("verifyb143464703_soft_noxform.png",
961-
renderered_scene));
960+
ASSERT_TRUE(
961+
ImageMatchesFixture("verifyb143464703_soft_noxform.png", rendered_scene));
962962
}
963963

964964
TEST_F(EmbedderTest, CanSendLowMemoryNotification) {

‎shell/platform/embedder/tests/embedder_unittests_gl.cc‎

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1171,7 +1171,7 @@ TEST_F(EmbedderTest, CanRenderSceneWithoutCustomCompositor) {
11711171
builder.SetDartEntrypoint("can_render_scene_without_custom_compositor");
11721172
builder.SetOpenGLRendererConfig(SkISize::Make(800, 600));
11731173

1174-
auto renderered_scene = context.GetNextSceneImage();
1174+
auto rendered_scene = context.GetNextSceneImage();
11751175

11761176
auto engine = builder.LaunchEngine();
11771177
ASSERT_TRUE(engine.is_valid());
@@ -1186,7 +1186,7 @@ TEST_F(EmbedderTest, CanRenderSceneWithoutCustomCompositor) {
11861186
kSuccess);
11871187

11881188
ASSERT_TRUE(ImageMatchesFixture("scene_without_custom_compositor.png",
1189-
renderered_scene));
1189+
rendered_scene));
11901190
}
11911191

11921192
TEST_F(EmbedderTest, CanRenderSceneWithoutCustomCompositorWithTransformation) {
@@ -1202,7 +1202,7 @@ TEST_F(EmbedderTest, CanRenderSceneWithoutCustomCompositorWithTransformation) {
12021202
builder.SetDartEntrypoint("can_render_scene_without_custom_compositor");
12031203
builder.SetOpenGLRendererConfig(SkISize::Make(600, 800));
12041204

1205-
auto renderered_scene = context.GetNextSceneImage();
1205+
auto rendered_scene = context.GetNextSceneImage();
12061206

12071207
auto engine = builder.LaunchEngine();
12081208
ASSERT_TRUE(engine.is_valid());
@@ -1219,7 +1219,7 @@ TEST_F(EmbedderTest, CanRenderSceneWithoutCustomCompositorWithTransformation) {
12191219
kSuccess);
12201220

12211221
ASSERT_TRUE(ImageMatchesFixture(
1222-
"scene_without_custom_compositor_with_xform.png", renderered_scene));
1222+
"scene_without_custom_compositor_with_xform.png", rendered_scene));
12231223
}
12241224

12251225
TEST_F(EmbedderTest, CanRenderGradientWithoutCompositor) {
@@ -1230,7 +1230,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithoutCompositor) {
12301230
builder.SetDartEntrypoint("render_gradient");
12311231
builder.SetOpenGLRendererConfig(SkISize::Make(800, 600));
12321232

1233-
auto renderered_scene = context.GetNextSceneImage();
1233+
auto rendered_scene = context.GetNextSceneImage();
12341234

12351235
auto engine = builder.LaunchEngine();
12361236
ASSERT_TRUE(engine.is_valid());
@@ -1244,7 +1244,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithoutCompositor) {
12441244
ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
12451245
kSuccess);
12461246

1247-
ASSERT_TRUE(ImageMatchesFixture("gradient.png", renderered_scene));
1247+
ASSERT_TRUE(ImageMatchesFixture("gradient.png", rendered_scene));
12481248
}
12491249

12501250
TEST_F(EmbedderTest, CanRenderGradientWithoutCompositorWithXform) {
@@ -1262,7 +1262,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithoutCompositorWithXform) {
12621262
builder.SetDartEntrypoint("render_gradient");
12631263
builder.SetOpenGLRendererConfig(surface_size);
12641264

1265-
auto renderered_scene = context.GetNextSceneImage();
1265+
auto rendered_scene = context.GetNextSceneImage();
12661266

12671267
auto engine = builder.LaunchEngine();
12681268
ASSERT_TRUE(engine.is_valid());
@@ -1277,7 +1277,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithoutCompositorWithXform) {
12771277
ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
12781278
kSuccess);
12791279

1280-
ASSERT_TRUE(ImageMatchesFixture("gradient_xform.png", renderered_scene));
1280+
ASSERT_TRUE(ImageMatchesFixture("gradient_xform.png", rendered_scene));
12811281
}
12821282

12831283
TEST_F(EmbedderTest, CanRenderGradientWithCompositor) {
@@ -1291,7 +1291,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositor) {
12911291
builder.SetRenderTargetType(
12921292
EmbedderTestBackingStoreProducer::RenderTargetType::kOpenGLFramebuffer);
12931293

1294-
auto renderered_scene = context.GetNextSceneImage();
1294+
auto rendered_scene = context.GetNextSceneImage();
12951295

12961296
auto engine = builder.LaunchEngine();
12971297
ASSERT_TRUE(engine.is_valid());
@@ -1305,7 +1305,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositor) {
13051305
ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
13061306
kSuccess);
13071307

1308-
ASSERT_TRUE(ImageMatchesFixture("gradient.png", renderered_scene));
1308+
ASSERT_TRUE(ImageMatchesFixture("gradient.png", rendered_scene));
13091309
}
13101310

13111311
TEST_F(EmbedderTest, CanRenderGradientWithCompositorWithXform) {
@@ -1327,7 +1327,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorWithXform) {
13271327
builder.SetRenderTargetType(
13281328
EmbedderTestBackingStoreProducer::RenderTargetType::kOpenGLFramebuffer);
13291329

1330-
auto renderered_scene = context.GetNextSceneImage();
1330+
auto rendered_scene = context.GetNextSceneImage();
13311331

13321332
auto engine = builder.LaunchEngine();
13331333
ASSERT_TRUE(engine.is_valid());
@@ -1342,7 +1342,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorWithXform) {
13421342
ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
13431343
kSuccess);
13441344

1345-
ASSERT_TRUE(ImageMatchesFixture("gradient_xform.png", renderered_scene));
1345+
ASSERT_TRUE(ImageMatchesFixture("gradient_xform.png", rendered_scene));
13461346
}
13471347

13481348
TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayer) {
@@ -1433,7 +1433,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayer) {
14331433
return surface->makeImageSnapshot();
14341434
});
14351435

1436-
auto renderered_scene = context.GetNextSceneImage();
1436+
auto rendered_scene = context.GetNextSceneImage();
14371437

14381438
auto engine = builder.LaunchEngine();
14391439
ASSERT_TRUE(engine.is_valid());
@@ -1447,7 +1447,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayer) {
14471447
ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
14481448
kSuccess);
14491449

1450-
ASSERT_TRUE(ImageMatchesFixture("gradient.png", renderered_scene));
1450+
ASSERT_TRUE(ImageMatchesFixture("gradient.png", rendered_scene));
14511451
}
14521452

14531453
TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayerWithXform) {
@@ -1546,7 +1546,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayerWithXform) {
15461546
return surface->makeImageSnapshot();
15471547
});
15481548

1549-
auto renderered_scene = context.GetNextSceneImage();
1549+
auto rendered_scene = context.GetNextSceneImage();
15501550

15511551
auto engine = builder.LaunchEngine();
15521552
ASSERT_TRUE(engine.is_valid());
@@ -1561,7 +1561,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithCompositorOnNonRootLayerWithXform) {
15611561
ASSERT_EQ(FlutterEngineSendWindowMetricsEvent(engine.get(), &event),
15621562
kSuccess);
15631563

1564-
ASSERT_TRUE(ImageMatchesFixture("gradient_xform.png", renderered_scene));
1564+
ASSERT_TRUE(ImageMatchesFixture("gradient_xform.png", rendered_scene));
15651565
}
15661566

15671567
TEST_F(EmbedderTest, VerifyB141980393) {
@@ -1811,7 +1811,7 @@ TEST_F(EmbedderTest,
18111811

18121812
fml::CountDownLatch latch(1);
18131813

1814-
auto renderered_scene = context.GetNextSceneImage();
1814+
auto rendered_scene = context.GetNextSceneImage();
18151815

18161816
context.GetCompositor().SetNextPresentCallback(
18171817
[&](const FlutterLayer** layers, size_t layers_count) {
@@ -1884,7 +1884,7 @@ TEST_F(EmbedderTest,
18841884

18851885
latch.Wait();
18861886

1887-
ASSERT_TRUE(ImageMatchesFixture("dpr_noxform.png", renderered_scene));
1887+
ASSERT_TRUE(ImageMatchesFixture("dpr_noxform.png", rendered_scene));
18881888
}
18891889

18901890
TEST_F(
@@ -1905,7 +1905,7 @@ TEST_F(
19051905

19061906
context.SetRootSurfaceTransformation(root_surface_transformation);
19071907

1908-
auto renderered_scene = context.GetNextSceneImage();
1908+
auto rendered_scene = context.GetNextSceneImage();
19091909
fml::CountDownLatch latch(1);
19101910

19111911
context.GetCompositor().SetNextPresentCallback(
@@ -1979,7 +1979,7 @@ TEST_F(
19791979

19801980
latch.Wait();
19811981

1982-
ASSERT_TRUE(ImageMatchesFixture("dpr_xform.png", renderered_scene));
1982+
ASSERT_TRUE(ImageMatchesFixture("dpr_xform.png", rendered_scene));
19831983
}
19841984

19851985
TEST_F(EmbedderTest,

‎shell/platform/embedder/tests/embedder_unittests_metal.cc‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithMetal) {
2929
builder.SetDartEntrypoint("render_gradient");
3030
builder.SetMetalRendererConfig(SkISize::Make(800, 600));
3131

32-
auto renderered_scene = context.GetNextSceneImage();
32+
auto rendered_scene = context.GetNextSceneImage();
3333

3434
auto engine = builder.LaunchEngine();
3535
ASSERT_TRUE(engine.is_valid());
@@ -45,7 +45,7 @@ TEST_F(EmbedderTest, CanRenderGradientWithMetal) {
4545

4646
// TODO (https://github.com/flutter/flutter/issues/73590): re-enable once
4747
// we are able to figure out why this fails on the bots.
48-
// ASSERT_TRUE(ImageMatchesFixture("gradient_metal.png", renderered_scene));
48+
// ASSERT_TRUE(ImageMatchesFixture("gradient_metal.png", rendered_scene));
4949
}
5050

5151
} // namespace testing

0 commit comments

Comments
 (0)