Move simple_render_tree into tests as render_flex

R=ianh@google.com

Review URL: https://codereview.chromium.org/1146123003

sdk/lib/framework/layout2.dart

@@ -825,19 +825,19 @@ class RenderBlock extends RenderDecoratedBox with ContainerRenderNodeMixin<Rende
 
   void performLayout() {
     assert(constraints is BoxConstraints);
-    size.width = constraints.constrainWidth(constraints.maxWidth);
-    assert(size.width < double.INFINITY);
+    double width = constraints.constrainWidth(constraints.maxWidth);
     double y = 0.0;
-    double innerWidth = size.width;
     RenderBox child = firstChild;
     while (child != null) {
-      child.layout(new BoxConstraints(minWidth: innerWidth, maxWidth: innerWidth), parentUsesSize: true);
+      child.layout(new BoxConstraints(minWidth: width, maxWidth: width), parentUsesSize: true);
       assert(child.parentData is BlockParentData);
       child.parentData.position = new sky.Point(0.0, y);
       y += child.size.height;
       child = child.parentData.nextSibling;
     }
-    size.height = constraints.constrainHeight(y);
+    size = new sky.Size(width, constraints.constrainHeight(y));
+    assert(size.width < double.INFINITY);
+    assert(size.height < double.INFINITY);
   }
 
   void hitTestChildren(HitTestResult result, { sky.Point position }) {

tests/raw/render_flex-expected.txt

+CONSOLE: unittest-suite-wait-for-done
+CONSOLE: PASS: should flex
+CONSOLE: 
+CONSOLE: All 1 tests passed.
+CONSOLE: unittest-suite-success
+DONE

examples/raw/simple_render_tree.dart → tests/raw/render_flex.dart

@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:sky';
+import '../resources/third_party/unittest/unittest.dart';
+import '../resources/unit.dart';
+import 'dart:sky' as sky;
 import 'package:sky/framework/app.dart';
 import 'package:sky/framework/layout2.dart';
 
 class RenderSolidColor extends RenderDecoratedBox {
-  final Size desiredSize;
+  final sky.Size desiredSize;
   final int backgroundColor;
 
   RenderSolidColor(int backgroundColor, { this.desiredSize: const sky.Size.infinite() })
@@ -25,7 +27,7 @@ class RenderSolidColor extends RenderDecoratedBox {
     size = constraints.constrain(desiredSize);
   }
 
-  void handlePointer(PointerEvent event) {
+  void handlePointer(sky.PointerEvent event) {
     if (event.type == 'pointerdown')
       decoration = new BoxDecoration(backgroundColor: 0xFFFF0000);
     else if (event.type == 'pointerup')
@@ -36,41 +38,48 @@ class RenderSolidColor extends RenderDecoratedBox {
 AppView app;
 
 void main() {
-  var root = new RenderFlex(
-      direction: FlexDirection.Vertical,
-      decoration: new BoxDecoration(backgroundColor: 0xFF000000));
-
-  void addFlexChild(RenderFlex parent, int backgroundColor, { int flex: 0 }) {
-    RenderNode child = new RenderSolidColor(backgroundColor);
-    parent.add(child);
-    child.parentData.flex = flex;
-  }
+  initUnit();
+
+  test("should flex", () {
+    var root = new RenderFlex(
+        direction: FlexDirection.Vertical,
+        decoration: new BoxDecoration(backgroundColor: 0xFF000000));
+
+    void addFlexChild(RenderFlex parent, int backgroundColor, { int flex: 0 }) {
+      RenderNode child = new RenderSolidColor(backgroundColor);
+      parent.add(child);
+      child.parentData.flex = flex;
+    }
 
-  // Yellow bar at top
-  addFlexChild(root, 0xFFFFFF00, flex: 1);
+    // Yellow bar at top
+    addFlexChild(root, 0xFFFFFF00, flex: 1);
 
-  // Turquoise box
-  root.add(new RenderSolidColor(0x7700FFFF, desiredSize: new Size(100.0, 100.0)));
+    // Turquoise box
+    root.add(new RenderSolidColor(0x7700FFFF, desiredSize: new sky.Size(100.0, 100.0)));
 
-  // Green and cyan render block with padding
-  var renderBlock = new RenderBlock(decoration: new BoxDecoration(backgroundColor: 0xFFFFFFFF));
+    // Green and cyan render block with padding
+    var renderBlock = new RenderBlock(decoration: new BoxDecoration(backgroundColor: 0xFFFFFFFF));
 
-  renderBlock.add(new RenderSolidColor(0xFF00FF00, desiredSize: new Size(100.0, 50.0)));
-  renderBlock.add(new RenderSolidColor(0x7700FFFF, desiredSize: new Size(50.0, 100.0)));
+    renderBlock.add(new RenderSolidColor(0xFF00FF00, desiredSize: new sky.Size(100.0, 50.0)));
+    renderBlock.add(new RenderSolidColor(0x7700FFFF, desiredSize: new sky.Size(50.0, 100.0)));
 
-  root.add(new RenderPadding(const EdgeDims(10.0, 10.0, 10.0, 10.0), renderBlock));
+    root.add(new RenderPadding(const EdgeDims(10.0, 10.0, 10.0, 10.0), renderBlock));
 
-  var row = new RenderFlex(
-    direction: FlexDirection.Horizontal,
-    decoration: new BoxDecoration(backgroundColor: 0xFF333333));
+    var row = new RenderFlex(
+      direction: FlexDirection.Horizontal,
+      decoration: new BoxDecoration(backgroundColor: 0xFF333333));
 
-  // Purple and blue cells
-  addFlexChild(row, 0x77FF00FF, flex: 1);
-  addFlexChild(row, 0xFF0000FF, flex: 2);
+    // Purple and blue cells
+    addFlexChild(row, 0x77FF00FF, flex: 1);
+    addFlexChild(row, 0xFF0000FF, flex: 2);
 
-  root.add(row);
-  row.parentData.flex = 3;
+    root.add(row);
+    row.parentData.flex = 3;
 
-  app = new AppView(root);
+    app = new AppView(root);
 
+    expect(root.size.width, equals(sky.view.width));
+    expect(root.size.height, equals(sky.view.height));
+    expect(renderBlock.size.width, equals(sky.view.width - 20.0));
+  });
 }