diff --git a/packages/flutter_driver/lib/src/driver/vmservice_driver.dart b/packages/flutter_driver/lib/src/driver/vmservice_driver.dart index 2b760158ef5..1924f415f02 100644 --- a/packages/flutter_driver/lib/src/driver/vmservice_driver.dart +++ b/packages/flutter_driver/lib/src/driver/vmservice_driver.dart @@ -86,22 +86,22 @@ class VMServiceFlutterDriver extends FlutterDriver { _log('Connecting to Flutter application at $dartVmServiceUrl'); final vms.VmService client = await vmServiceConnectFunction(dartVmServiceUrl, headers); - Future _waitForRootIsolate() async { - bool _checkIsolate(vms.IsolateRef ref) => ref.number == isolateNumber.toString(); + Future waitForRootIsolate() async { + bool checkIsolate(vms.IsolateRef ref) => ref.number == isolateNumber.toString(); while (true) { final vms.VM vm = await client.getVM(); - if (vm.isolates!.isEmpty || (isolateNumber != null && !vm.isolates!.any(_checkIsolate))) { + if (vm.isolates!.isEmpty || (isolateNumber != null && !vm.isolates!.any(checkIsolate))) { await Future.delayed(_kPauseBetweenReconnectAttempts); continue; } return isolateNumber == null ? vm.isolates!.first - : vm.isolates!.firstWhere(_checkIsolate); + : vm.isolates!.firstWhere(checkIsolate); } } final vms.IsolateRef isolateRef = (await _warnIfSlow( - future: _waitForRootIsolate(), + future: waitForRootIsolate(), timeout: kUnusuallyLongTimeout, message: isolateNumber == null ? 'The root isolate is taking an unusually long time to start.' diff --git a/packages/flutter_driver/test/src/real_tests/timeline_summary_test.dart b/packages/flutter_driver/test/src/real_tests/timeline_summary_test.dart index 0c0c9409806..3fec56866f3 100644 --- a/packages/flutter_driver/test/src/real_tests/timeline_summary_test.dart +++ b/packages/flutter_driver/test/src/real_tests/timeline_summary_test.dart @@ -101,7 +101,7 @@ void main() { }, }; - List> _genGC(String name, int count, int startTime, int timeDiff) { + List> genGC(String name, int count, int startTime, int timeDiff) { int ts = startTime; bool begin = true; final List> ret = >[]; @@ -125,11 +125,11 @@ void main() { } List> newGenGC(int count, int startTime, int timeDiff) { - return _genGC('CollectNewGeneration', count, startTime, timeDiff); + return genGC('CollectNewGeneration', count, startTime, timeDiff); } List> oldGenGC(int count, int startTime, int timeDiff) { - return _genGC('CollectOldGeneration', count, startTime, timeDiff); + return genGC('CollectOldGeneration', count, startTime, timeDiff); } List> rasterizeTimeSequenceInMillis(List sequence) { @@ -756,14 +756,14 @@ void main() { group('RefreshRateSummarizer tests', () { const double kCompareDelta = 0.01; - RefreshRateSummary _summarize(List> traceEvents) { + RefreshRateSummary summarizeRefresh(List> traceEvents) { final Timeline timeline = Timeline.fromJson({ 'traceEvents': traceEvents, }); return RefreshRateSummary(vsyncEvents: timeline.events!); } - List> _populateEvents({required int numberOfEvents, required int startTime, required int interval, required int margin}) { + List> populateEvents({required int numberOfEvents, required int startTime, required int interval, required int margin}) { final List> events = >[]; int startTimeInNanoseconds = startTime; for (int i = 0; i < numberOfEvents; i ++) { @@ -780,12 +780,12 @@ void main() { const int intervalInNanoseconds = 33333333; // allow some margins const int margin = 3000000; - final List> events = _populateEvents(numberOfEvents: 100, + final List> events = populateEvents(numberOfEvents: 100, startTime: startTimeInNanoseconds, interval: intervalInNanoseconds, margin: margin, ); - final RefreshRateSummary summary = _summarize(events); + final RefreshRateSummary summary = summarizeRefresh(events); expect(summary.percentageOf30HzFrames, closeTo(100, kCompareDelta)); expect(summary.percentageOf60HzFrames, 0); expect(summary.percentageOf90HzFrames, 0); @@ -798,13 +798,13 @@ void main() { const int intervalInNanoseconds = 16666666; // allow some margins const int margin = 1200000; - final List> events = _populateEvents(numberOfEvents: 100, + final List> events = populateEvents(numberOfEvents: 100, startTime: startTimeInNanoseconds, interval: intervalInNanoseconds, margin: margin, ); - final RefreshRateSummary summary = _summarize(events); + final RefreshRateSummary summary = summarizeRefresh(events); expect(summary.percentageOf30HzFrames, 0); expect(summary.percentageOf60HzFrames, closeTo(100, kCompareDelta)); expect(summary.percentageOf90HzFrames, 0); @@ -817,13 +817,13 @@ void main() { const int intervalInNanoseconds = 11111111; // allow some margins const int margin = 500000; - final List> events = _populateEvents(numberOfEvents: 100, + final List> events = populateEvents(numberOfEvents: 100, startTime: startTimeInNanoseconds, interval: intervalInNanoseconds, margin: margin, ); - final RefreshRateSummary summary = _summarize(events); + final RefreshRateSummary summary = summarizeRefresh(events); expect(summary.percentageOf30HzFrames, 0); expect(summary.percentageOf60HzFrames, 0); expect(summary.percentageOf90HzFrames, closeTo(100, kCompareDelta)); @@ -836,12 +836,12 @@ void main() { const int intervalInNanoseconds = 8333333; // allow some margins const int margin = 300000; - final List> events = _populateEvents(numberOfEvents: 100, + final List> events = populateEvents(numberOfEvents: 100, startTime: startTimeInNanoseconds, interval: intervalInNanoseconds, margin: margin, ); - final RefreshRateSummary summary = _summarize(events); + final RefreshRateSummary summary = summarizeRefresh(events); expect(summary.percentageOf30HzFrames, 0); expect(summary.percentageOf60HzFrames, 0); expect(summary.percentageOf90HzFrames, 0); @@ -852,12 +852,12 @@ void main() { test('Identify illegal refresh rates.', () async { const int startTimeInNanoseconds = 2750850055430; const int intervalInNanoseconds = 10000000; - final List> events = _populateEvents(numberOfEvents: 1, + final List> events = populateEvents(numberOfEvents: 1, startTime: startTimeInNanoseconds, interval: intervalInNanoseconds, margin: 0, ); - final RefreshRateSummary summary = _summarize(events); + final RefreshRateSummary summary = summarizeRefresh(events); expect(summary.percentageOf30HzFrames, 0); expect(summary.percentageOf60HzFrames, 0); expect(summary.percentageOf90HzFrames, 0); @@ -878,48 +878,48 @@ void main() { const int totalFrames = num30Hz + num60Hz + num80Hz + num90Hz + num120Hz + numIllegal; // Add 30hz frames - events.addAll(_populateEvents(numberOfEvents: num30Hz, + events.addAll(populateEvents(numberOfEvents: num30Hz, startTime: 0, interval: 32000000, margin: 0, )); // Add 60hz frames - events.addAll(_populateEvents(numberOfEvents: num60Hz, + events.addAll(populateEvents(numberOfEvents: num60Hz, startTime: 0, interval: 16000000, margin: 0, )); // Add 80hz frames - events.addAll(_populateEvents(numberOfEvents: num80Hz, + events.addAll(populateEvents(numberOfEvents: num80Hz, startTime: 0, interval: 12000000, margin: 0, )); // Add 90hz frames - events.addAll(_populateEvents(numberOfEvents: num90Hz, + events.addAll(populateEvents(numberOfEvents: num90Hz, startTime: 0, interval: 11000000, margin: 0, )); // Add 120hz frames - events.addAll(_populateEvents(numberOfEvents: num120Hz, + events.addAll(populateEvents(numberOfEvents: num120Hz, startTime: 0, interval: 8000000, margin: 0, )); // Add illegal refresh rate frames - events.addAll(_populateEvents(numberOfEvents: numIllegal, + events.addAll(populateEvents(numberOfEvents: numIllegal, startTime: 0, interval: 60000, margin: 0, )); - final RefreshRateSummary summary = _summarize(events); + final RefreshRateSummary summary = summarizeRefresh(events); expect(summary.percentageOf30HzFrames, closeTo(num30Hz/totalFrames*100, kCompareDelta)); expect(summary.percentageOf60HzFrames, closeTo(num60Hz/totalFrames*100, kCompareDelta));