Skip to content

Commit a03f59c

Browse files
pqpq
authored
[flutter_driver] rename local functions with _s (#102689)
1 parent 401df0e commit a03f59c

File tree

2 files changed

+27
-27
lines changed

2 files changed

+27
-27
lines changed

‎packages/flutter_driver/lib/src/driver/vmservice_driver.dart

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -86,22 +86,22 @@ class VMServiceFlutterDriver extends FlutterDriver {
8686
_log('Connecting to Flutter application at $dartVmServiceUrl');
8787
final vms.VmService client = await vmServiceConnectFunction(dartVmServiceUrl, headers);
8888

89-
Future<vms.IsolateRef?> _waitForRootIsolate() async {
90-
bool _checkIsolate(vms.IsolateRef ref) => ref.number == isolateNumber.toString();
89+
Future<vms.IsolateRef?> waitForRootIsolate() async {
90+
bool checkIsolate(vms.IsolateRef ref) => ref.number == isolateNumber.toString();
9191
while (true) {
9292
final vms.VM vm = await client.getVM();
93-
if (vm.isolates!.isEmpty || (isolateNumber != null && !vm.isolates!.any(_checkIsolate))) {
93+
if (vm.isolates!.isEmpty || (isolateNumber != null && !vm.isolates!.any(checkIsolate))) {
9494
await Future<void>.delayed(_kPauseBetweenReconnectAttempts);
9595
continue;
9696
}
9797
return isolateNumber == null
9898
? vm.isolates!.first
99-
: vm.isolates!.firstWhere(_checkIsolate);
99+
: vm.isolates!.firstWhere(checkIsolate);
100100
}
101101
}
102102

103103
final vms.IsolateRef isolateRef = (await _warnIfSlow<vms.IsolateRef?>(
104-
future: _waitForRootIsolate(),
104+
future: waitForRootIsolate(),
105105
timeout: kUnusuallyLongTimeout,
106106
message: isolateNumber == null
107107
? 'The root isolate is taking an unusually long time to start.'

‎packages/flutter_driver/test/src/real_tests/timeline_summary_test.dart

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ void main() {
101101
},
102102
};
103103

104-
List<Map<String, dynamic>> _genGC(String name, int count, int startTime, int timeDiff) {
104+
List<Map<String, dynamic>> genGC(String name, int count, int startTime, int timeDiff) {
105105
int ts = startTime;
106106
bool begin = true;
107107
final List<Map<String, dynamic>> ret = <Map<String, dynamic>>[];
@@ -125,11 +125,11 @@ void main() {
125125
}
126126

127127
List<Map<String, dynamic>> newGenGC(int count, int startTime, int timeDiff) {
128-
return _genGC('CollectNewGeneration', count, startTime, timeDiff);
128+
return genGC('CollectNewGeneration', count, startTime, timeDiff);
129129
}
130130

131131
List<Map<String, dynamic>> oldGenGC(int count, int startTime, int timeDiff) {
132-
return _genGC('CollectOldGeneration', count, startTime, timeDiff);
132+
return genGC('CollectOldGeneration', count, startTime, timeDiff);
133133
}
134134

135135
List<Map<String, dynamic>> rasterizeTimeSequenceInMillis(List<int> sequence) {
@@ -756,14 +756,14 @@ void main() {
756756
group('RefreshRateSummarizer tests', () {
757757

758758
const double kCompareDelta = 0.01;
759-
RefreshRateSummary _summarize(List<Map<String, dynamic>> traceEvents) {
759+
RefreshRateSummary summarizeRefresh(List<Map<String, dynamic>> traceEvents) {
760760
final Timeline timeline = Timeline.fromJson(<String, dynamic>{
761761
'traceEvents': traceEvents,
762762
});
763763
return RefreshRateSummary(vsyncEvents: timeline.events!);
764764
}
765765

766-
List<Map<String, dynamic>> _populateEvents({required int numberOfEvents, required int startTime, required int interval, required int margin}) {
766+
List<Map<String, dynamic>> populateEvents({required int numberOfEvents, required int startTime, required int interval, required int margin}) {
767767
final List<Map<String, dynamic>> events = <Map<String, dynamic>>[];
768768
int startTimeInNanoseconds = startTime;
769769
for (int i = 0; i < numberOfEvents; i ++) {
@@ -780,12 +780,12 @@ void main() {
780780
const int intervalInNanoseconds = 33333333;
781781
// allow some margins
782782
const int margin = 3000000;
783-
final List<Map<String, dynamic>> events = _populateEvents(numberOfEvents: 100,
783+
final List<Map<String, dynamic>> events = populateEvents(numberOfEvents: 100,
784784
startTime: startTimeInNanoseconds,
785785
interval: intervalInNanoseconds,
786786
margin: margin,
787787
);
788-
final RefreshRateSummary summary = _summarize(events);
788+
final RefreshRateSummary summary = summarizeRefresh(events);
789789
expect(summary.percentageOf30HzFrames, closeTo(100, kCompareDelta));
790790
expect(summary.percentageOf60HzFrames, 0);
791791
expect(summary.percentageOf90HzFrames, 0);
@@ -798,13 +798,13 @@ void main() {
798798
const int intervalInNanoseconds = 16666666;
799799
// allow some margins
800800
const int margin = 1200000;
801-
final List<Map<String, dynamic>> events = _populateEvents(numberOfEvents: 100,
801+
final List<Map<String, dynamic>> events = populateEvents(numberOfEvents: 100,
802802
startTime: startTimeInNanoseconds,
803803
interval: intervalInNanoseconds,
804804
margin: margin,
805805
);
806806

807-
final RefreshRateSummary summary = _summarize(events);
807+
final RefreshRateSummary summary = summarizeRefresh(events);
808808
expect(summary.percentageOf30HzFrames, 0);
809809
expect(summary.percentageOf60HzFrames, closeTo(100, kCompareDelta));
810810
expect(summary.percentageOf90HzFrames, 0);
@@ -817,13 +817,13 @@ void main() {
817817
const int intervalInNanoseconds = 11111111;
818818
// allow some margins
819819
const int margin = 500000;
820-
final List<Map<String, dynamic>> events = _populateEvents(numberOfEvents: 100,
820+
final List<Map<String, dynamic>> events = populateEvents(numberOfEvents: 100,
821821
startTime: startTimeInNanoseconds,
822822
interval: intervalInNanoseconds,
823823
margin: margin,
824824
);
825825

826-
final RefreshRateSummary summary = _summarize(events);
826+
final RefreshRateSummary summary = summarizeRefresh(events);
827827
expect(summary.percentageOf30HzFrames, 0);
828828
expect(summary.percentageOf60HzFrames, 0);
829829
expect(summary.percentageOf90HzFrames, closeTo(100, kCompareDelta));
@@ -836,12 +836,12 @@ void main() {
836836
const int intervalInNanoseconds = 8333333;
837837
// allow some margins
838838
const int margin = 300000;
839-
final List<Map<String, dynamic>> events = _populateEvents(numberOfEvents: 100,
839+
final List<Map<String, dynamic>> events = populateEvents(numberOfEvents: 100,
840840
startTime: startTimeInNanoseconds,
841841
interval: intervalInNanoseconds,
842842
margin: margin,
843843
);
844-
final RefreshRateSummary summary = _summarize(events);
844+
final RefreshRateSummary summary = summarizeRefresh(events);
845845
expect(summary.percentageOf30HzFrames, 0);
846846
expect(summary.percentageOf60HzFrames, 0);
847847
expect(summary.percentageOf90HzFrames, 0);
@@ -852,12 +852,12 @@ void main() {
852852
test('Identify illegal refresh rates.', () async {
853853
const int startTimeInNanoseconds = 2750850055430;
854854
const int intervalInNanoseconds = 10000000;
855-
final List<Map<String, dynamic>> events = _populateEvents(numberOfEvents: 1,
855+
final List<Map<String, dynamic>> events = populateEvents(numberOfEvents: 1,
856856
startTime: startTimeInNanoseconds,
857857
interval: intervalInNanoseconds,
858858
margin: 0,
859859
);
860-
final RefreshRateSummary summary = _summarize(events);
860+
final RefreshRateSummary summary = summarizeRefresh(events);
861861
expect(summary.percentageOf30HzFrames, 0);
862862
expect(summary.percentageOf60HzFrames, 0);
863863
expect(summary.percentageOf90HzFrames, 0);
@@ -878,48 +878,48 @@ void main() {
878878
const int totalFrames = num30Hz + num60Hz + num80Hz + num90Hz + num120Hz + numIllegal;
879879

880880
// Add 30hz frames
881-
events.addAll(_populateEvents(numberOfEvents: num30Hz,
881+
events.addAll(populateEvents(numberOfEvents: num30Hz,
882882
startTime: 0,
883883
interval: 32000000,
884884
margin: 0,
885885
));
886886

887887
// Add 60hz frames
888-
events.addAll(_populateEvents(numberOfEvents: num60Hz,
888+
events.addAll(populateEvents(numberOfEvents: num60Hz,
889889
startTime: 0,
890890
interval: 16000000,
891891
margin: 0,
892892
));
893893

894894
// Add 80hz frames
895-
events.addAll(_populateEvents(numberOfEvents: num80Hz,
895+
events.addAll(populateEvents(numberOfEvents: num80Hz,
896896
startTime: 0,
897897
interval: 12000000,
898898
margin: 0,
899899
));
900900

901901
// Add 90hz frames
902-
events.addAll(_populateEvents(numberOfEvents: num90Hz,
902+
events.addAll(populateEvents(numberOfEvents: num90Hz,
903903
startTime: 0,
904904
interval: 11000000,
905905
margin: 0,
906906
));
907907

908908
// Add 120hz frames
909-
events.addAll(_populateEvents(numberOfEvents: num120Hz,
909+
events.addAll(populateEvents(numberOfEvents: num120Hz,
910910
startTime: 0,
911911
interval: 8000000,
912912
margin: 0,
913913
));
914914

915915
// Add illegal refresh rate frames
916-
events.addAll(_populateEvents(numberOfEvents: numIllegal,
916+
events.addAll(populateEvents(numberOfEvents: numIllegal,
917917
startTime: 0,
918918
interval: 60000,
919919
margin: 0,
920920
));
921921

922-
final RefreshRateSummary summary = _summarize(events);
922+
final RefreshRateSummary summary = summarizeRefresh(events);
923923

924924
expect(summary.percentageOf30HzFrames, closeTo(num30Hz/totalFrames*100, kCompareDelta));
925925
expect(summary.percentageOf60HzFrames, closeTo(num60Hz/totalFrames*100, kCompareDelta));

0 commit comments

Comments
 (0)