Skip to content

F
Front-End
Unverified Commit a03f59cd authored by Phil Quitslund's avatar Phil Quitslund Committed by GitHub
Browse files
Options

[flutter_driver] rename local functions with `_`s (#102689)

parent 401df0eb
Show whitespace changes
Inline Side-by-side
Showing with 27 additions and 27 deletions
packages/flutter_driver/lib/src/driver/vmservice_driver.dart
View file @ a03f59cd
...@@ -86,22 +86,22 @@ class VMServiceFlutterDriver extends FlutterDriver { ...@@ -86,22 +86,22 @@ class VMServiceFlutterDriver extends FlutterDriver {
_log('Connecting to Flutter application at $dartVmServiceUrl'); _log('Connecting to Flutter application at $dartVmServiceUrl');
final vms.VmService client = await vmServiceConnectFunction(dartVmServiceUrl, headers); final vms.VmService client = await vmServiceConnectFunction(dartVmServiceUrl, headers);
Future<vms.IsolateRef?> _waitForRootIsolate() async { Future<vms.IsolateRef?> waitForRootIsolate() async {
bool _checkIsolate(vms.IsolateRef ref) => ref.number == isolateNumber.toString(); bool checkIsolate(vms.IsolateRef ref) => ref.number == isolateNumber.toString();
while (true) { while (true) {
final vms.VM vm = await client.getVM(); 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<void>.delayed(_kPauseBetweenReconnectAttempts); await Future<void>.delayed(_kPauseBetweenReconnectAttempts);
continue; continue;
} }
return isolateNumber == null return isolateNumber == null
? vm.isolates!.first ? vm.isolates!.first
: vm.isolates!.firstWhere(_checkIsolate); : vm.isolates!.firstWhere(checkIsolate);
} }
} }
final vms.IsolateRef isolateRef = (await _warnIfSlow<vms.IsolateRef?>( final vms.IsolateRef isolateRef = (await _warnIfSlow<vms.IsolateRef?>(
future: _waitForRootIsolate(), future: waitForRootIsolate(),
timeout: kUnusuallyLongTimeout, timeout: kUnusuallyLongTimeout,
message: isolateNumber == null message: isolateNumber == null
? 'The root isolate is taking an unusually long time to start.' ? 'The root isolate is taking an unusually long time to start.'
......
packages/flutter_driver/test/src/real_tests/timeline_summary_test.dart
View file @ a03f59cd
...@@ -101,7 +101,7 @@ void main() { ...@@ -101,7 +101,7 @@ void main() {
}, },
}; };
List<Map<String, dynamic>> _genGC(String name, int count, int startTime, int timeDiff) { List<Map<String, dynamic>> genGC(String name, int count, int startTime, int timeDiff) {
int ts = startTime; int ts = startTime;
bool begin = true; bool begin = true;
final List<Map<String, dynamic>> ret = <Map<String, dynamic>>[]; final List<Map<String, dynamic>> ret = <Map<String, dynamic>>[];
...@@ -125,11 +125,11 @@ void main() { ...@@ -125,11 +125,11 @@ void main() {
} }
List<Map<String, dynamic>> newGenGC(int count, int startTime, int timeDiff) { List<Map<String, dynamic>> newGenGC(int count, int startTime, int timeDiff) {
return _genGC('CollectNewGeneration', count, startTime, timeDiff); return genGC('CollectNewGeneration', count, startTime, timeDiff);
} }
List<Map<String, dynamic>> oldGenGC(int count, int startTime, int timeDiff) { List<Map<String, dynamic>> oldGenGC(int count, int startTime, int timeDiff) {
return _genGC('CollectOldGeneration', count, startTime, timeDiff); return genGC('CollectOldGeneration', count, startTime, timeDiff);
} }
List<Map<String, dynamic>> rasterizeTimeSequenceInMillis(List<int> sequence) { List<Map<String, dynamic>> rasterizeTimeSequenceInMillis(List<int> sequence) {
...@@ -756,14 +756,14 @@ void main() { ...@@ -756,14 +756,14 @@ void main() {
group('RefreshRateSummarizer tests', () { group('RefreshRateSummarizer tests', () {
const double kCompareDelta = 0.01; const double kCompareDelta = 0.01;
RefreshRateSummary _summarize(List<Map<String, dynamic>> traceEvents) { RefreshRateSummary summarizeRefresh(List<Map<String, dynamic>> traceEvents) {
final Timeline timeline = Timeline.fromJson(<String, dynamic>{ final Timeline timeline = Timeline.fromJson(<String, dynamic>{
'traceEvents': traceEvents, 'traceEvents': traceEvents,
}); });
return RefreshRateSummary(vsyncEvents: timeline.events!); return RefreshRateSummary(vsyncEvents: timeline.events!);
} }
List<Map<String, dynamic>> _populateEvents({required int numberOfEvents, required int startTime, required int interval, required int margin}) { List<Map<String, dynamic>> populateEvents({required int numberOfEvents, required int startTime, required int interval, required int margin}) {
final List<Map<String, dynamic>> events = <Map<String, dynamic>>[]; final List<Map<String, dynamic>> events = <Map<String, dynamic>>[];
int startTimeInNanoseconds = startTime; int startTimeInNanoseconds = startTime;
for (int i = 0; i < numberOfEvents; i ++) { for (int i = 0; i < numberOfEvents; i ++) {
...@@ -780,12 +780,12 @@ void main() { ...@@ -780,12 +780,12 @@ void main() {
const int intervalInNanoseconds = 33333333; const int intervalInNanoseconds = 33333333;
// allow some margins // allow some margins
const int margin = 3000000; const int margin = 3000000;
final List<Map<String, dynamic>> events = _populateEvents(numberOfEvents: 100, final List<Map<String, dynamic>> events = populateEvents(numberOfEvents: 100,
startTime: startTimeInNanoseconds, startTime: startTimeInNanoseconds,
interval: intervalInNanoseconds, interval: intervalInNanoseconds,
margin: margin, margin: margin,
); );
final RefreshRateSummary summary = _summarize(events); final RefreshRateSummary summary = summarizeRefresh(events);
expect(summary.percentageOf30HzFrames, closeTo(100, kCompareDelta)); expect(summary.percentageOf30HzFrames, closeTo(100, kCompareDelta));
expect(summary.percentageOf60HzFrames, 0); expect(summary.percentageOf60HzFrames, 0);
expect(summary.percentageOf90HzFrames, 0); expect(summary.percentageOf90HzFrames, 0);
...@@ -798,13 +798,13 @@ void main() { ...@@ -798,13 +798,13 @@ void main() {
const int intervalInNanoseconds = 16666666; const int intervalInNanoseconds = 16666666;
// allow some margins // allow some margins
const int margin = 1200000; const int margin = 1200000;
final List<Map<String, dynamic>> events = _populateEvents(numberOfEvents: 100, final List<Map<String, dynamic>> events = populateEvents(numberOfEvents: 100,
startTime: startTimeInNanoseconds, startTime: startTimeInNanoseconds,
interval: intervalInNanoseconds, interval: intervalInNanoseconds,
margin: margin, margin: margin,
); );
final RefreshRateSummary summary = _summarize(events); final RefreshRateSummary summary = summarizeRefresh(events);
expect(summary.percentageOf30HzFrames, 0); expect(summary.percentageOf30HzFrames, 0);
expect(summary.percentageOf60HzFrames, closeTo(100, kCompareDelta)); expect(summary.percentageOf60HzFrames, closeTo(100, kCompareDelta));
expect(summary.percentageOf90HzFrames, 0); expect(summary.percentageOf90HzFrames, 0);
...@@ -817,13 +817,13 @@ void main() { ...@@ -817,13 +817,13 @@ void main() {
const int intervalInNanoseconds = 11111111; const int intervalInNanoseconds = 11111111;
// allow some margins // allow some margins
const int margin = 500000; const int margin = 500000;
final List<Map<String, dynamic>> events = _populateEvents(numberOfEvents: 100, final List<Map<String, dynamic>> events = populateEvents(numberOfEvents: 100,
startTime: startTimeInNanoseconds, startTime: startTimeInNanoseconds,
interval: intervalInNanoseconds, interval: intervalInNanoseconds,
margin: margin, margin: margin,
); );
final RefreshRateSummary summary = _summarize(events); final RefreshRateSummary summary = summarizeRefresh(events);
expect(summary.percentageOf30HzFrames, 0); expect(summary.percentageOf30HzFrames, 0);
expect(summary.percentageOf60HzFrames, 0); expect(summary.percentageOf60HzFrames, 0);
expect(summary.percentageOf90HzFrames, closeTo(100, kCompareDelta)); expect(summary.percentageOf90HzFrames, closeTo(100, kCompareDelta));
...@@ -836,12 +836,12 @@ void main() { ...@@ -836,12 +836,12 @@ void main() {
const int intervalInNanoseconds = 8333333; const int intervalInNanoseconds = 8333333;
// allow some margins // allow some margins
const int margin = 300000; const int margin = 300000;
final List<Map<String, dynamic>> events = _populateEvents(numberOfEvents: 100, final List<Map<String, dynamic>> events = populateEvents(numberOfEvents: 100,
startTime: startTimeInNanoseconds, startTime: startTimeInNanoseconds,
interval: intervalInNanoseconds, interval: intervalInNanoseconds,
margin: margin, margin: margin,
); );
final RefreshRateSummary summary = _summarize(events); final RefreshRateSummary summary = summarizeRefresh(events);
expect(summary.percentageOf30HzFrames, 0); expect(summary.percentageOf30HzFrames, 0);
expect(summary.percentageOf60HzFrames, 0); expect(summary.percentageOf60HzFrames, 0);
expect(summary.percentageOf90HzFrames, 0); expect(summary.percentageOf90HzFrames, 0);
...@@ -852,12 +852,12 @@ void main() { ...@@ -852,12 +852,12 @@ void main() {
test('Identify illegal refresh rates.', () async { test('Identify illegal refresh rates.', () async {
const int startTimeInNanoseconds = 2750850055430; const int startTimeInNanoseconds = 2750850055430;
const int intervalInNanoseconds = 10000000; const int intervalInNanoseconds = 10000000;
final List<Map<String, dynamic>> events = _populateEvents(numberOfEvents: 1, final List<Map<String, dynamic>> events = populateEvents(numberOfEvents: 1,
startTime: startTimeInNanoseconds, startTime: startTimeInNanoseconds,
interval: intervalInNanoseconds, interval: intervalInNanoseconds,
margin: 0, margin: 0,
); );
final RefreshRateSummary summary = _summarize(events); final RefreshRateSummary summary = summarizeRefresh(events);
expect(summary.percentageOf30HzFrames, 0); expect(summary.percentageOf30HzFrames, 0);
expect(summary.percentageOf60HzFrames, 0); expect(summary.percentageOf60HzFrames, 0);
expect(summary.percentageOf90HzFrames, 0); expect(summary.percentageOf90HzFrames, 0);
...@@ -878,48 +878,48 @@ void main() { ...@@ -878,48 +878,48 @@ void main() {
const int totalFrames = num30Hz + num60Hz + num80Hz + num90Hz + num120Hz + numIllegal; const int totalFrames = num30Hz + num60Hz + num80Hz + num90Hz + num120Hz + numIllegal;
// Add 30hz frames // Add 30hz frames
events.addAll(_populateEvents(numberOfEvents: num30Hz, events.addAll(populateEvents(numberOfEvents: num30Hz,
startTime: 0, startTime: 0,
interval: 32000000, interval: 32000000,
margin: 0, margin: 0,
)); ));
// Add 60hz frames // Add 60hz frames
events.addAll(_populateEvents(numberOfEvents: num60Hz, events.addAll(populateEvents(numberOfEvents: num60Hz,
startTime: 0, startTime: 0,
interval: 16000000, interval: 16000000,
margin: 0, margin: 0,
)); ));
// Add 80hz frames // Add 80hz frames
events.addAll(_populateEvents(numberOfEvents: num80Hz, events.addAll(populateEvents(numberOfEvents: num80Hz,
startTime: 0, startTime: 0,
interval: 12000000, interval: 12000000,
margin: 0, margin: 0,
)); ));
// Add 90hz frames // Add 90hz frames
events.addAll(_populateEvents(numberOfEvents: num90Hz, events.addAll(populateEvents(numberOfEvents: num90Hz,
startTime: 0, startTime: 0,
interval: 11000000, interval: 11000000,
margin: 0, margin: 0,
)); ));
// Add 120hz frames // Add 120hz frames
events.addAll(_populateEvents(numberOfEvents: num120Hz, events.addAll(populateEvents(numberOfEvents: num120Hz,
startTime: 0, startTime: 0,
interval: 8000000, interval: 8000000,
margin: 0, margin: 0,
)); ));
// Add illegal refresh rate frames // Add illegal refresh rate frames
events.addAll(_populateEvents(numberOfEvents: numIllegal, events.addAll(populateEvents(numberOfEvents: numIllegal,
startTime: 0, startTime: 0,
interval: 60000, interval: 60000,
margin: 0, margin: 0,
)); ));
final RefreshRateSummary summary = _summarize(events); final RefreshRateSummary summary = summarizeRefresh(events);
expect(summary.percentageOf30HzFrames, closeTo(num30Hz/totalFrames*100, kCompareDelta)); expect(summary.percentageOf30HzFrames, closeTo(num30Hz/totalFrames*100, kCompareDelta));
expect(summary.percentageOf60HzFrames, closeTo(num60Hz/totalFrames*100, kCompareDelta)); expect(summary.percentageOf60HzFrames, closeTo(num60Hz/totalFrames*100, kCompareDelta));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

HIAST - GitLab