From fda193aa5d45b657295345fa2cc1107512d24f15 Mon Sep 17 00:00:00 2001
From: Danny Tuppeny <danny@tuppeny.com>
Date: Tue, 15 Jan 2019 15:39:35 +0000
Subject: [PATCH] Fix+unskip `flutter test` expression eval tests (#26579)

* Fix `flutter test`e xpression eval tests

We weren't passing `beforeStart` through so the breakpoints were never being set, which means the evaluations were happening while the code was running.

* Ensure we wait for breakpoints before trying to evaluate
---
 .../test/integration/expression_evaluation_test.dart         | 5 ++++-
 .../test/integration/test_data/tests_project.dart            | 2 +-
 packages/flutter_tools/test/integration/test_driver.dart     | 2 +-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/packages/flutter_tools/test/integration/expression_evaluation_test.dart b/packages/flutter_tools/test/integration/expression_evaluation_test.dart
index 5e18459728..5118a2707f 100644
--- a/packages/flutter_tools/test/integration/expression_evaluation_test.dart
+++ b/packages/flutter_tools/test/integration/expression_evaluation_test.dart
@@ -102,6 +102,7 @@ void main() {
         withDebugger: true,
         beforeStart: () => _flutter.addBreakpoint(_project.breakpointUri, _project.breakpointLine),
       );
+      await _flutter.waitForPause();
       await evaluateTrivialExpressions(_flutter);
     });
 
@@ -110,6 +111,7 @@ void main() {
         withDebugger: true,
         beforeStart: () => _flutter.addBreakpoint(_project.breakpointUri, _project.breakpointLine),
       );
+      await _flutter.waitForPause();
       await evaluateComplexExpressions(_flutter);
     });
 
@@ -118,10 +120,11 @@ void main() {
         withDebugger: true,
         beforeStart: () => _flutter.addBreakpoint(_project.breakpointUri, _project.breakpointLine),
       );
+      await _flutter.waitForPause();
       await evaluateComplexReturningExpressions(_flutter);
     });
     // Skipped due to https://github.com/flutter/flutter/issues/26518
-  }, timeout: const Timeout.factor(6), skip: true);
+  }, timeout: const Timeout.factor(6));
 }
 
 Future<void> evaluateTrivialExpressions(FlutterTestDriver flutter) async {
diff --git a/packages/flutter_tools/test/integration/test_data/tests_project.dart b/packages/flutter_tools/test/integration/test_data/tests_project.dart
index f5067aff49..c98d28036a 100644
--- a/packages/flutter_tools/test/integration/test_data/tests_project.dart
+++ b/packages/flutter_tools/test/integration/test_data/tests_project.dart
@@ -51,5 +51,5 @@ class TestsProject extends Project {
   Uri get breakpointUri => Uri.file(testFilePath);
 
   @override
-  int get breakpointLine => lineContaining(main, '// BREAKPOINT');
+  int get breakpointLine => lineContaining(testContent, '// BREAKPOINT');
 }
diff --git a/packages/flutter_tools/test/integration/test_driver.dart b/packages/flutter_tools/test/integration/test_driver.dart
index bb10ec9097..74b6cab100 100644
--- a/packages/flutter_tools/test/integration/test_driver.dart
+++ b/packages/flutter_tools/test/integration/test_driver.dart
@@ -521,7 +521,7 @@ class FlutterTestTestDriver extends FlutterTestDriver {
         '--machine',
         '-d',
         'flutter-tester'
-    ], script: testFile, withDebugger: withDebugger, pauseOnExceptions: pauseOnExceptions, pidFile: pidFile);
+    ], script: testFile, withDebugger: withDebugger, pauseOnExceptions: pauseOnExceptions, pidFile: pidFile, beforeStart: beforeStart);
   }
 
   @override