Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.
Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixed tidy
  • Loading branch information
gaaclarke committed Nov 15, 2024
commit bd255e44b00b6e606bc494397930dab9ddaef89f
11 changes: 6 additions & 5 deletions shell/platform/android/android_context_gl_impeller_unittests.cc
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,10 @@ TEST_F(AndroidContextGLImpellerTest, FallbackForEmulator) {
auto display = std::make_unique<MockDisplay>();
EXPECT_CALL(*display, IsValid).WillRepeatedly(Return(true));
std::unique_ptr<Config> first_result;
auto second_result =
std::make_unique<Config>(ConfigDescriptor(), window_egl_config);
std::unique_ptr<Config> second_result;
auto third_result =
std::make_unique<Config>(ConfigDescriptor(), window_egl_config);
auto fourth_result =
std::make_unique<Config>(ConfigDescriptor(), pbuffer_egl_config);
EXPECT_CALL(
*display,
Expand All @@ -116,18 +117,18 @@ TEST_F(AndroidContextGLImpellerTest, FallbackForEmulator) {
Field(&ConfigDescriptor::samples, impeller::egl::Samples::kFour),
Field(&ConfigDescriptor::surface_type,
impeller::egl::SurfaceType::kWindow)))))
.WillOnce(Return(ByMove(std::move(first_result))));
.WillOnce(Return(ByMove(std::move(second_result))));
EXPECT_CALL(
*display,
ChooseConfig(Matcher<ConfigDescriptor>(
AllOf(Field(&ConfigDescriptor::samples, impeller::egl::Samples::kOne),
Field(&ConfigDescriptor::surface_type,
impeller::egl::SurfaceType::kWindow)))))
.WillOnce(Return(ByMove(std::move(second_result))));
.WillOnce(Return(ByMove(std::move(third_result))));
EXPECT_CALL(*display, ChooseConfig(Matcher<ConfigDescriptor>(
Field(&ConfigDescriptor::surface_type,
impeller::egl::SurfaceType::kPBuffer))))
.WillOnce(Return(ByMove(std::move(third_result))));
.WillOnce(Return(ByMove(std::move(fourth_result))));
ON_CALL(*display, ChooseConfig(_))
.WillByDefault(Return(ByMove(std::unique_ptr<Config>())));
auto context =
Expand Down