From 36f027133169e98e616e3f2c9841d0879d821537 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Mon, 10 Aug 2020 11:34:39 -0700 Subject: [PATCH 1/3] [e2e] Use new FrameTiming constructor. A new FrameTiming constructor was introduced here: https://github.com/flutter/engine/commit/409a5e5963497ccf5d4b248db26058d9d7111e81, so we need to update the test for it to run in newer versions of flutter. --- packages/e2e/CHANGELOG.md | 4 ++++ packages/e2e/pubspec.yaml | 2 +- packages/e2e/test/frame_timing_summarizer_test.dart | 7 ++++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/packages/e2e/CHANGELOG.md b/packages/e2e/CHANGELOG.md index e48b95d099a7..7ce8573ed70d 100644 --- a/packages/e2e/CHANGELOG.md +++ b/packages/e2e/CHANGELOG.md @@ -1,3 +1,7 @@ +## 0.6.3+1 + +* Update test to use new `FrameTiming` constructor. + ## 0.6.3 * Add customizable `flutter_driver` adaptor. diff --git a/packages/e2e/pubspec.yaml b/packages/e2e/pubspec.yaml index e4e476d146d3..fd9085de5e27 100644 --- a/packages/e2e/pubspec.yaml +++ b/packages/e2e/pubspec.yaml @@ -1,6 +1,6 @@ name: e2e description: Runs tests that use the flutter_test API as integration tests. -version: 0.6.3 +version: 0.6.3+1 homepage: https://github.com/flutter/plugins/tree/master/packages/e2e environment: diff --git a/packages/e2e/test/frame_timing_summarizer_test.dart b/packages/e2e/test/frame_timing_summarizer_test.dart index f3a12850122d..687719363196 100644 --- a/packages/e2e/test/frame_timing_summarizer_test.dart +++ b/packages/e2e/test/frame_timing_summarizer_test.dart @@ -16,7 +16,12 @@ void main() { rasterTimes = rasterTimes.reversed.toList(); List inputData = [ for (int i = 0; i < 100; i += 1) - FrameTiming([0, buildTimes[i], 500, rasterTimes[i]]), + FrameTiming( + buildStart: 0, + buildFinish: buildTimes[i], + rasterStart: 500, + rasterFinish: rasterTimes[i], + ), ]; FrameTimingSummarizer summary = FrameTimingSummarizer(inputData); expect(summary.averageFrameBuildTime.inMicroseconds, 50500); From e7cdc567defa4fa0e8f102e37fd67839f904ace7 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Mon, 10 Aug 2020 12:01:11 -0700 Subject: [PATCH 2/3] Add vsyncStart to the constructor, but the summarizer never uses it. --- packages/e2e/test/frame_timing_summarizer_test.dart | 2 ++ 1 file changed, 2 insertions(+) diff --git a/packages/e2e/test/frame_timing_summarizer_test.dart b/packages/e2e/test/frame_timing_summarizer_test.dart index 687719363196..3053d46f39cc 100644 --- a/packages/e2e/test/frame_timing_summarizer_test.dart +++ b/packages/e2e/test/frame_timing_summarizer_test.dart @@ -17,6 +17,8 @@ void main() { List inputData = [ for (int i = 0; i < 100; i += 1) FrameTiming( + // TODO: Add vsyncStart to the FrameTimingSummarizer (?) + vsyncStart: 0, buildStart: 0, buildFinish: buildTimes[i], rasterStart: 500, From ba0534ac8c0101ad6f888d239c35d774f6ba2b85 Mon Sep 17 00:00:00 2001 From: David Iglesias Teixeira Date: Mon, 10 Aug 2020 12:05:36 -0700 Subject: [PATCH 3/3] Link to issue --- packages/e2e/test/frame_timing_summarizer_test.dart | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/e2e/test/frame_timing_summarizer_test.dart b/packages/e2e/test/frame_timing_summarizer_test.dart index 3053d46f39cc..7af08c6b25e3 100644 --- a/packages/e2e/test/frame_timing_summarizer_test.dart +++ b/packages/e2e/test/frame_timing_summarizer_test.dart @@ -17,7 +17,7 @@ void main() { List inputData = [ for (int i = 0; i < 100; i += 1) FrameTiming( - // TODO: Add vsyncStart to the FrameTimingSummarizer (?) + // TODO: Add vsyncStart to the FrameTimingSummarizer (https://github.com/flutter/flutter/issues/63415) vsyncStart: 0, buildStart: 0, buildFinish: buildTimes[i],