DEV/flutter_flutter
1
0
Fork 0
mirror of https://github.com/flutter/flutter.git synced 2026-02-20 02:29:02 +08:00
Code Issues Packages Projects Releases Wiki Activity

Clean up the tests to be more maintainable.

Browse Source 
- removes the unit testing framework from tests that don't use it
- use 'async' where that makes the code less convoluted

R=abarth@chromium.org

Review URL: https://codereview.chromium.org/1192003003.
This commit is contained in:
Hixie 2015-06-17 15:10:06 -07:00
parent 7de9c4b795
commit 98b91daaa7
5 changed files with 16 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
engine/src/flutter/tests/raw/box_layout-expected.txt
View File

@ -1,4 +1,3 @@
CONSOLE: unittest-suite-wait-for-done
CONSOLE: TestRenderView enabled
CONSOLE:
PAINT FOR FRAME #1 ----------------------------------------------
@ -12,8 +11,4 @@ PAINT FOR FRAME #1 ----------------------------------------------
1 | | | | TestDisplayList() constructor: 800.0 x 600.0
1 | | | | drawRect(Rect.fromLTRB(0.0, 0.0, 700.0, 100.0), Paint(Color(0xff00ff00)))
------------------------------------------------------------------------
CONSOLE: PASS: padding
CONSOLE:
CONSOLE: All 1 tests passed.
CONSOLE: unittest-suite-success
DONE
PAINTED 1 FRAMES

18
engine/src/flutter/tests/raw/box_layout.dart
View File

@ -7,18 +7,12 @@ import 'package:sky/rendering/box.dart';
import 'package:sky/rendering/object.dart';
import '../resources/display_list.dart';
import '../resources/third_party/unittest/unittest.dart';
import '../resources/unit.dart';
void main() {
initUnit();
test("padding", () {
var size = new RenderConstrainedBox(additionalConstraints: new BoxConstraints().applyHeight(100.0));
var inner = new RenderDecoratedBox(decoration: new BoxDecoration(backgroundColor: const sky.Color(0xFF00FF00)), child: size);
var padding = new RenderPadding(padding: new EdgeDims.all(50.0), child: inner);
var block = new RenderBlock(children: [padding]);
var outer = new RenderDecoratedBox(decoration: new BoxDecoration(backgroundColor: const sky.Color(0xFF0000FF)), child: block);
new TestRenderView(outer);
});
var size = new RenderConstrainedBox(additionalConstraints: new BoxConstraints().applyHeight(100.0));
var inner = new RenderDecoratedBox(decoration: new BoxDecoration(backgroundColor: const sky.Color(0xFF00FF00)), child: size);
var padding = new RenderPadding(padding: new EdgeDims.all(50.0), child: inner);
var block = new RenderBlock(children: [padding]);
var outer = new RenderDecoratedBox(decoration: new BoxDecoration(backgroundColor: const sky.Color(0xFF0000FF)), child: block);
new TestRenderView(outer).endTest();
}

2
engine/src/flutter/tests/widgets/buttons.dart
View File

@ -24,5 +24,5 @@ main() async {
return new Center(child: new FloatingActionButton(child: new Text("+")));
});
await tester.endTest();
tester.endTest();
}

2
engine/src/flutter/tests/widgets/dialog.dart
View File

@ -18,5 +18,5 @@ main() async {
);
});
await tester.endTest();
tester.endTest();
}

20
engine/src/flutter/tests/widgets/syncs1.dart
View File

@ -81,20 +81,14 @@ class FiddleApp extends App {
}
}
main() {
main() async {
TestRenderView renderViewOverride = new TestRenderView();
FiddleApp app = new FiddleApp();
runApp(app, renderViewOverride: renderViewOverride);
new Future.microtask(() {
renderViewOverride.checkFrame();
app.toggle();
new Future.microtask(() {
renderViewOverride.checkFrame();
app.toggle();
new Future.microtask(() {
renderViewOverride.checkFrame();
renderViewOverride.endTest();
});
});
});
await renderViewOverride.checkFrame();
app.toggle();
await renderViewOverride.checkFrame();
app.toggle();
await renderViewOverride.checkFrame();
renderViewOverride.endTest();
}