From 98b91daaa77f0d5f35eb6e4442909cec0189747d Mon Sep 17 00:00:00 2001 From: Hixie Date: Wed, 17 Jun 2015 15:10:06 -0700 Subject: [PATCH] Clean up the tests to be more maintainable. - 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. --- .../flutter/tests/raw/box_layout-expected.txt | 7 +------ engine/src/flutter/tests/raw/box_layout.dart | 18 ++++++----------- engine/src/flutter/tests/widgets/buttons.dart | 2 +- engine/src/flutter/tests/widgets/dialog.dart | 2 +- engine/src/flutter/tests/widgets/syncs1.dart | 20 +++++++------------ 5 files changed, 16 insertions(+), 33 deletions(-) diff --git a/engine/src/flutter/tests/raw/box_layout-expected.txt b/engine/src/flutter/tests/raw/box_layout-expected.txt index 87801ba731b..e179521b77b 100644 --- a/engine/src/flutter/tests/raw/box_layout-expected.txt +++ b/engine/src/flutter/tests/raw/box_layout-expected.txt @@ -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 diff --git a/engine/src/flutter/tests/raw/box_layout.dart b/engine/src/flutter/tests/raw/box_layout.dart index c30fc41604c..bf11645c6f2 100644 --- a/engine/src/flutter/tests/raw/box_layout.dart +++ b/engine/src/flutter/tests/raw/box_layout.dart @@ -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(); } diff --git a/engine/src/flutter/tests/widgets/buttons.dart b/engine/src/flutter/tests/widgets/buttons.dart index 0b5de6e71bb..767d6c1794e 100644 --- a/engine/src/flutter/tests/widgets/buttons.dart +++ b/engine/src/flutter/tests/widgets/buttons.dart @@ -24,5 +24,5 @@ main() async { return new Center(child: new FloatingActionButton(child: new Text("+"))); }); - await tester.endTest(); + tester.endTest(); } diff --git a/engine/src/flutter/tests/widgets/dialog.dart b/engine/src/flutter/tests/widgets/dialog.dart index ed254b0e87b..b51891bfb68 100644 --- a/engine/src/flutter/tests/widgets/dialog.dart +++ b/engine/src/flutter/tests/widgets/dialog.dart @@ -18,5 +18,5 @@ main() async { ); }); - await tester.endTest(); + tester.endTest(); } diff --git a/engine/src/flutter/tests/widgets/syncs1.dart b/engine/src/flutter/tests/widgets/syncs1.dart index 14750eb3981..f1e33c5c4d0 100644 --- a/engine/src/flutter/tests/widgets/syncs1.dart +++ b/engine/src/flutter/tests/widgets/syncs1.dart @@ -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(); }