Additional service tests

runtime/observatory/tests/service/next_through_for_each_loop_test.dart

Index: runtime/observatory/tests/service/next_through_for_each_loop_test.dart
diff --git a/runtime/observatory/tests/service/next_through_for_each_loop_test.dart b/runtime/observatory/tests/service/next_through_for_each_loop_test.dart
index 20d26bb428a8da955ca143c02ab5cc74ae1f9e47..2b06723c0ea417bdd91dd6904217d4b8f4ea16ab 100644
--- a/runtime/observatory/tests/service/next_through_for_each_loop_test.dart
+++ b/runtime/observatory/tests/service/next_through_for_each_loop_test.dart
@@ -5,12 +5,12 @@
 import 'test_helper.dart';
 import 'service_test_common.dart';
 
-const int LINE_A = 12;
+const int LINE = 12;
 const String file = "next_through_for_each_loop_test.dart";
 
 code() {
   List<int> data = [1, 2, 3, 4];
-  for(int datapoint in data) {
+  for (int datapoint in data) {
     print(datapoint);
   }
 }
@@ -18,42 +18,44 @@ code() {
 List<String> stops = [];
 List<String> expected = [
   // Initialize data (on '[')
-  "$file:${LINE_A+0}:20",
+  "$file:${LINE+0}:20",
 
-  // Twice for some reason on data (on 'data')
-  "$file:${LINE_A+1}:24",
+  // Twice on data (probably for 'create iterator' and 'moveNext' on iterator)
+  // (on 'data')
+  "$file:${LINE+1}:25",
 
-  // An iteration of the loop apparently is "data", "{", then inside loop
+  // An iteration of the loop is "data", "{", then inside loop
   // (on call to 'print')
-  "$file:${LINE_A+1}:24",
-  "$file:${LINE_A+1}:30",
-  "$file:${LINE_A+2}:5",
+  "$file:${LINE+1}:25",
+  "$file:${LINE+1}:31",
+  "$file:${LINE+2}:5",
 
   // Iteration 2
-  "$file:${LINE_A+1}:24",
-  "$file:${LINE_A+1}:30",
-  "$file:${LINE_A+2}:5",
+  "$file:${LINE+1}:25",
+  "$file:${LINE+1}:31",
+  "$file:${LINE+2}:5",
 
   // Iteration 3
-  "$file:${LINE_A+1}:24",
-  "$file:${LINE_A+1}:30",
-  "$file:${LINE_A+2}:5",
+  "$file:${LINE+1}:25",
+  "$file:${LINE+1}:31",
+  "$file:${LINE+2}:5",
 
   // Iteration 4
-  "$file:${LINE_A+1}:24",
-  "$file:${LINE_A+1}:30",
-  "$file:${LINE_A+2}:5",
+  "$file:${LINE+1}:25",
+  "$file:${LINE+1}:31",
+  "$file:${LINE+2}:5",
 
   // End: Apparently we go to data again, then on the final "}"
-  "$file:${LINE_A+1}:24",
-  "$file:${LINE_A+4}:1"
+  "$file:${LINE+1}:25",
+  "$file:${LINE+4}:1"
 ];
 
 var tests = [
   hasPausedAtStart,
-  setBreakpointAtLine(LINE_A),
+  setBreakpointAtLine(LINE),
   runStepThroughProgramRecordingStops(stops),
-  checkRecordedStops(stops, expected)
+  checkRecordedStops(stops, expected,
+      debugPrint: true, debugPrintFile: file, debugPrintLine: LINE)
 ];
 
 main(args) {