firka/flutter
3
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Look up breakpoints rather than relying on magic numbers (#19708)

Browse Source 
* Look up breakpoints rather than relying on magic numbers

* Make breakpoint comment more obvious
This commit is contained in:
Danny Tuppeny
2018-07-25 15:31:57 +01:00
committed by GitHub
parent bdf0dd466d
commit 2a679bd858
2 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
packages/flutter_tools/test/integration/test_data/basic_project.dart
View File

@@ -26,7 +26,7 @@ class BasicProject extends TestProject {
@override
Widget build(BuildContext context) {
topLevelFunction();
return new MaterialApp(
return new MaterialApp( // BREAKPOINT
title: 'Flutter Demo',
home: new Container(),
);
@@ -34,18 +34,13 @@ class BasicProject extends TestProject {
}
topLevelFunction() {
print("test");
print("topLevelFunction"); // TOP LEVEL BREAKPOINT
}
''';
@override
String get breakpointFile => buildMethodBreakpointFile;
@override
int get breakpointLine => buildMethodBreakpointLine;
String get buildMethodBreakpointFile => fs.path.join(dir.path, 'lib', 'main.dart');
int get buildMethodBreakpointLine => 9;
String get buildMethodBreakpointFile => breakpointFile;
int get buildMethodBreakpointLine => breakpointLine;
String get topLevelFunctionBreakpointFile => fs.path.join(dir.path, 'lib', 'main.dart');
int get topLevelFunctionBreakpointLine => 17;
int get topLevelFunctionBreakpointLine => lineContaining(main, '// TOP LEVEL BREAKPOINT');
}

11
packages/flutter_tools/test/integration/test_data/test_project.dart
View File

@@ -16,8 +16,8 @@ abstract class TestProject {
String get main;
// Valid locations for a breakpoint for tests that just need to break somewhere.
String get breakpointFile;
int get breakpointLine;
String get breakpointFile => fs.path.join(dir.path, 'lib', 'main.dart');
int get breakpointLine => lineContaining(main, '// BREAKPOINT');
Future<void> setUpIn(Directory dir) async {
this.dir = dir;
@@ -29,4 +29,11 @@ abstract class TestProject {
void cleanup() {
dir?.deleteSync(recursive: true);
}
int lineContaining(String contents, String search) {
final int index = contents.split('\n').indexWhere((String l) => l.contains(search));
if (index == -1)
throw new Exception("Did not find '$search' inside the file");
return index;
}
}