From 8cde68d79f77ff56aeffca357bd2b7fe6c73ff03 Mon Sep 17 00:00:00 2001
From: Adam Barth <github@adambarth.com>
Date: Fri, 10 Feb 2017 14:50:36 -0800
Subject: [PATCH] Migrate some tests from Block to ListView (#8055)

---
 .../flutter/test/widgets/drawer_test.dart     |  4 +--
 ...ock_test.dart => list_view_misc_test.dart} | 29 +++++++++----------
 2 files changed, 16 insertions(+), 17 deletions(-)
 rename packages/flutter/test/widgets/{block_test.dart => list_view_misc_test.dart} (81%)

diff --git a/packages/flutter/test/widgets/drawer_test.dart b/packages/flutter/test/widgets/drawer_test.dart
index d468f758d4..75d929b72b 100644
--- a/packages/flutter/test/widgets/drawer_test.dart
+++ b/packages/flutter/test/widgets/drawer_test.dart
@@ -78,7 +78,7 @@ void main() {
         home: new Scaffold(
           key: scaffoldKey,
           drawer: new Drawer(
-            child: new Block(
+            child: new ListView(
               children: <Widget>[
                 new Text('drawer'),
                 new Container(
@@ -115,7 +115,7 @@ void main() {
     await tester.pump(const Duration(milliseconds: 10));
     expect(textBox.localToGlobal(Point.origin).x, equals(textLeft));
 
-    await gesture.moveBy(const Offset(0.0, -50.0));
+    await gesture.moveBy(const Offset(0.0, 50.0));
     // drawer should be returning to visible
     await tester.pump();
     await tester.pump(const Duration(seconds: 1));
diff --git a/packages/flutter/test/widgets/block_test.dart b/packages/flutter/test/widgets/list_view_misc_test.dart
similarity index 81%
rename from packages/flutter/test/widgets/block_test.dart
rename to packages/flutter/test/widgets/list_view_misc_test.dart
index 6fd513428b..399377bdf6 100644
--- a/packages/flutter/test/widgets/block_test.dart
+++ b/packages/flutter/test/widgets/list_view_misc_test.dart
@@ -62,19 +62,19 @@ void main() {
     await gesture.up();
   });
 
-  testWidgets('Scroll anchor', (WidgetTester tester) async {
+  testWidgets('ListView reverse', (WidgetTester tester) async {
     int first = 0;
     int second = 0;
 
-    Widget buildBlock(ViewportAnchor scrollAnchor) {
-      return new Block(
+    Widget buildBlock({ bool reverse: false }) {
+      return new ListView(
         key: new UniqueKey(),
-        scrollAnchor: scrollAnchor,
+        reverse: reverse,
         children: <Widget>[
           new GestureDetector(
             onTap: () { ++first; },
             child: new Container(
-              height: 2000.0, // more than 600, the height of the test area
+              height: 350.0, // more than half the height of the test area
               decoration: const BoxDecoration(
                 backgroundColor: const Color(0xFF00FF00)
               )
@@ -83,7 +83,7 @@ void main() {
           new GestureDetector(
             onTap: () { ++second; },
             child: new Container(
-              height: 2000.0, // more than 600, the height of the test area
+              height: 350.0, // more than half the height of the test area
               decoration: const BoxDecoration(
                 backgroundColor: const Color(0xFF0000FF)
               )
@@ -93,32 +93,31 @@ void main() {
       );
     }
 
-    await tester.pumpWidget(buildBlock(ViewportAnchor.end));
+    await tester.pumpWidget(buildBlock(reverse: true));
 
     Point target = const Point(200.0, 200.0);
     await tester.tapAt(target);
     expect(first, equals(0));
     expect(second, equals(1));
 
-    await tester.pumpWidget(buildBlock(ViewportAnchor.start));
+    await tester.pumpWidget(buildBlock(reverse: false));
 
     await tester.tapAt(target);
     expect(first, equals(1));
     expect(second, equals(1));
   });
 
-  testWidgets('Block scrollableKey', (WidgetTester tester) async {
-    // Regression test for https://github.com/flutter/flutter/issues/4046
-    // The Block's scrollableKey needs to become its Scrollable descendant's key.
-    final GlobalKey<ScrollableState<Scrollable>> key = new GlobalKey<ScrollableState<Scrollable>>();
+  testWidgets('ListView controller', (WidgetTester tester) async {
+    ScrollController controller = new ScrollController();
+
     Widget buildBlock() {
-      return new Block(
-        scrollableKey: key,
+      return new ListView(
+        controller: controller,
         children: <Widget>[new Text("A"), new Text("B"), new Text("C")]
       );
     }
     await tester.pumpWidget(buildBlock());
-    expect(key.currentState.scrollOffset, 0.0);
+    expect(controller.offset, equals(0.0));
   });
 
   testWidgets('SliverBlockChildListDelegate.estimateMaxScrollOffset hits end', (WidgetTester tester) async {