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

[Windows] Reduce warnings produced by unit tests #47724

Merged
merged 3 commits into from
Nov 7, 2023
Merged

[Windows] Reduce warnings produced by unit tests #47724

merged 3 commits into from
Nov 7, 2023

Conversation

loic-sharma
Copy link
Member

@loic-sharma loic-sharma commented Nov 6, 2023 •
edited
Loading

This PR contains no functional changes but improves existing unit tests to reduce the number of warnings output when the tests are ran:

  1. Replaced ON_CALL with EXPECT_CALL for expected method calls
  2. Added some missing mocks

Pre-launch Checklist

  • I read the Contributor Guide and followed the process outlined there for submitting PRs.
  • I read the Tree Hygiene wiki page, which explains my responsibilities.
  • I read and followed the Flutter Style Guide and the C++, Objective-C, Java style guides.
  • I listed at least one issue that this PR fixes in the description above.
  • I added new tests to check the change I am making or feature I am adding, or the PR is test-exempt. See testing the engine for instructions on writing and running engine tests.
  • I updated/added relevant documentation (doc comments with ///).
  • I signed the CLA.
  • All existing and new tests are passing.

If you need help, consider asking for advice on the #hackers-new channel on Discord.

loic-sharma
loic-sharma commented Nov 6, 2023
View reviewed changes
shell/platform/windows/flutter_windows_view_unittests.cc
EXPECT_CALL(*surface_manager.get(), SetVSyncEnabled(true)).Times(1);
EXPECT_CALL(*surface_manager.get(), MakeCurrent).WillOnce(Return(true));
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was making a GL context current, thereby causing other tests to complain that a GL context was unexpectedly current.

@loic-sharma loic-sharma changed the title [Windows] Reduce warnings produces by unit tests [Windows] Reduce warnings produced by unit tests Nov 6, 2023
@loic-sharma loic-sharma force-pushed the windows_mock_expectations branch from e7632f2 to 0769d11 Compare November 6, 2023 23:21
loic-sharma
loic-sharma commented Nov 6, 2023
View reviewed changes
shell/platform/windows/flutter_window_unittests.cc
win32window.FlutterWindow::OnWindowStateEvent(event);
});
EXPECT_CALL(win32window, OnResize).Times(AnyNumber());

win32window.SetView(&delegate);
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was moved down as it also calls OnWindowStateEvent.

@loic-sharma loic-sharma marked this pull request as ready for review November 6, 2023 23:23
cbracken
cbracken reviewed Nov 7, 2023
View reviewed changes
shell/platform/windows/flutter_windows_engine_unittests.cc Outdated
return &delegate;
});
EXPECT_CALL(*window_binding_handler, GetAlertDelegate)
.WillOnce(Return(&delegate));
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Similar question here and a couple other places below.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Fixed!

cbracken
cbracken approved these changes Nov 7, 2023
View reviewed changes
Copy link
Member

@cbracken cbracken left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome -- thanks for cleaning these up! lgtm!

@loic-sharma loic-sharma force-pushed the windows_mock_expectations branch from 7754495 to c974af2 Compare November 7, 2023 18:00
@loic-sharma loic-sharma added the autosubmit Merge PR when tree becomes green via auto submit App label Nov 7, 2023
@auto-submit auto-submit bot merged commit 295a532 into flutter:main Nov 7, 2023
@loic-sharma loic-sharma deleted the windows_mock_expectations branch November 7, 2023 21:33
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Nov 8, 2023
Closed
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 8, 2023
@engine-flutter-autoroll
295a5321c [Windows] Reduce warnings produced by unit tests (flutter/e…
81e62b4 
…ngine#47724)
@engine-flutter-autoroll engine-flutter-autoroll mentioned this pull request Nov 8, 2023
Merged
engine-flutter-autoroll added a commit to engine-flutter-autoroll/flutter that referenced this pull request Nov 8, 2023
@engine-flutter-autoroll
295a5321c [Windows] Reduce warnings produced by unit tests (flutter/e…
c41ee61 
…ngine#47724)
auto-submit bot pushed a commit to flutter/flutter that referenced this pull request Nov 8, 2023
@engine-flutter-autoroll
Roll Flutter Engine from 3e3be5e33bda to 117d47aa3f88 (20 revisions) (#…
dbb79e6 
…138091)

flutter/engine@3e3be5e...117d47a

2023-11-08 skia-flutter-autoroll@skia.org Roll Skia from fce71a80b0a2 to a4cce5236dcf (1 revision) (flutter/engine#47807)
2023-11-08 chris@bracken.jp [macOS] Clean up resources in ViewController tests (flutter/engine#47792)
2023-11-08 skia-flutter-autoroll@skia.org Roll Skia from f3d250126ba9 to fce71a80b0a2 (1 revision) (flutter/engine#47796)
2023-11-08 skia-flutter-autoroll@skia.org Roll Skia from b4fa927468e6 to f3d250126ba9 (1 revision) (flutter/engine#47793)
2023-11-08 flar@google.com [Impeller] Add Rect::GetNormalizingTransform to handle UV coordinate conversion (flutter/engine#47775)
2023-11-08 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Remove Fuchsia Mac SDK from DEPS" (flutter/engine#47791)
2023-11-08 yjbanov@google.com [web] fix clicks on merged semantic nodes (attempt #2) (flutter/engine#47360)
2023-11-08 skia-flutter-autoroll@skia.org Roll Skia from 0f78e5f765d3 to b4fa927468e6 (1 revision) (flutter/engine#47788)
2023-11-08 skia-flutter-autoroll@skia.org Roll Fuchsia Linux SDK from VcFEJiUUTYwkhEAlJ... to sD8HRA4JmXczujkqO... (flutter/engine#47785)
2023-11-08 jiahaog@users.noreply.github.com Fix narrowing conversion lint (flutter/engine#47740)
2023-11-08 chris@bracken.jp [macOS] Bail out of tests if engine not running (flutter/engine#47771)
2023-11-08 skia-flutter-autoroll@skia.org Roll Skia from f91d39395e85 to 0f78e5f765d3 (1 revision) (flutter/engine#47776)
2023-11-08 chris@bracken.jp [testing] Extract StreamCapture test utility (flutter/engine#47774)
2023-11-08 98614782+auto-submit[bot]@users.noreply.github.com Reverts "Promote fuchsia build v2 to prod." (flutter/engine#47779)
2023-11-08 aam@google.com Include updated locations for dart third_party components into license ignore-list. (flutter/engine#47770)
2023-11-07 chillers@google.com Remove Fuchsia Mac SDK from DEPS (flutter/engine#47700)
2023-11-07 skia-flutter-autoroll@skia.org Roll Skia from 030e21befbc9 to f91d39395e85 (6 revisions) (flutter/engine#47769)
2023-11-07 chinmaygarde@google.com [Impeller] Support static thread safety analysis with condition variables. (flutter/engine#47763)
2023-11-07 godofredoc@google.com Promote fuchsia build v2 to prod. (flutter/engine#47729)
2023-11-07 737941+loic-sharma@users.noreply.github.com [Windows] Reduce warnings produced by unit tests (flutter/engine#47724)

Also rolling transitive DEPS:
  fuchsia/sdk/core/linux-amd64 from VcFEJiUUTYwk to sD8HRA4JmXcz

If this roll has caused a breakage, revert this CL and stop the roller
using the controls here:
https://autoroll.skia.org/r/flutter-engine-flutter-autoroll
Please CC bdero@google.com,rmistry@google.com,zra@google.com on the revert to ensure that a human
is aware of the problem.

To file a bug in Flutter: https://github.com/flutter/flutter/issues/new/choose

To report a problem with the AutoRoller itself, please file a bug:
https://issues.skia.org/issues/new?component=1389291&template=1850622

Documentation for the AutoRoller is here:
https://skia.googlesource.com/buildbot/+doc/main/autoroll/README.md
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Reviewers

@cbracken cbracken cbracken approved these changes

@yaakovschectman yaakovschectman yaakovschectman approved these changes

Assignees
No one assigned
Labels
affects: desktop autosubmit Merge PR when tree becomes green via auto submit App platform-windows
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@loic-sharma @cbracken @yaakovschectman