Switch to using SourceLocation universally in service protocol.

runtime/observatory/tests/service/debugger_location_test.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 // VMOptions=--compile-all --error_on_bad_type --error_on_bad_override
 
 import 'package:observatory/service_io.dart';
 import 'package:observatory/debugger.dart';
 import 'package:unittest/unittest.dart';
 import 'test_helper.dart';
 import 'dart:async';
 
 void testFunction() {
   int i = 0;
   while (true) {
     if (++i % 100000000 == 0) {  // line 15
       print(i);
     }
   }
 }
 
 class TestDebugger extends Debugger {
   TestDebugger(this.isolate, this.stack);
 
   VM get vm => isolate.vm;
   Isolate isolate;
   ServiceMap stack;
   int currentFrame = 0;
 }
 
-void source_location_dummy_function() {
+void debugger_location_dummy_function() {
 }
 
-class SourceLocationTestFoo {
-  SourceLocationTestFoo(this.field);
-  SourceLocationTestFoo.named();
+class DebuggerLocationTestFoo {
+  DebuggerLocationTestFoo(this.field);
+  DebuggerLocationTestFoo.named();
 
   void method() {}
   void madness() {}
 
   int field;
 }
 
-class SourceLocationTestBar {
+class DebuggerLocationTestBar {
 }
 
 Future<Debugger> initDebugger(Isolate isolate) {
   return isolate.getStack().then((stack) {
     return new TestDebugger(isolate, stack);
   });
 }
 
 var tests = [
 
@@ skipping 12 matching lines @@
       var script = isolate.rootLibrary.scripts[0];
       return isolate.addBreakpoint(script, 15).then((ServiceObject bpt) {
           return completer.future;  // Wait for breakpoint events.
       });
     });
 },
 
 // Parse '' => current position
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, '').then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, '').then((DebuggerLocation loc) {
       expect(loc.valid, isTrue);
-      expect(loc.toString(), equals('source_location_test.dart:15'));
+      expect(loc.toString(), equals('debugger_location_test.dart:15'));
     });
   });
 },
 
 // Parse line
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, '16').then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, '16').then((DebuggerLocation loc) {
       expect(loc.valid, isTrue);
-      expect(loc.toString(), equals('source_location_test.dart:16'));
+      expect(loc.toString(), equals('debugger_location_test.dart:16'));
     });
   });
 },
 
 // Parse line + col
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, '16:11').then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, '16:11').then((DebuggerLocation loc) {
       expect(loc.valid, isTrue);
-      expect(loc.toString(), equals('source_location_test.dart:16:11'));
+      expect(loc.toString(), equals('debugger_location_test.dart:16:11'));
     });
   });
 },
 
 // Parse script + line
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, 'unittest.dart:15')
-      .then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, 'unittest.dart:15')
+      .then((DebuggerLocation loc) {
         expect(loc.valid, isTrue);
         expect(loc.toString(), equals('unittest.dart:15'));
       });
   });
 },
 
 // Parse script + line + col
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, 'unittest.dart:15:10')
-      .then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, 'unittest.dart:15:10')
+      .then((DebuggerLocation loc) {
         expect(loc.valid, isTrue);
         expect(loc.toString(), equals('unittest.dart:15:10'));
       });
   });
 },
 
 // Parse bad script
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, 'bad.dart:15')
-      .then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, 'bad.dart:15')
+      .then((DebuggerLocation loc) {
         expect(loc.valid, isFalse);
         expect(loc.toString(), equals(
             'invalid source location (Script \'bad.dart\' not found)'));
       });
   });
 },
 
 // Parse function
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, 'testFunction')
-      .then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, 'testFunction')
+      .then((DebuggerLocation loc) {
         expect(loc.valid, isTrue);
         expect(loc.toString(), equals('testFunction'));
       });
   });
 },
 
 // Parse bad function
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, 'doesNotReallyExit')
-      .then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, 'doesNotReallyExit')
+      .then((DebuggerLocation loc) {
         expect(loc.valid, isFalse);
         expect(loc.toString(), equals(
             'invalid source location (Function \'doesNotReallyExit\' not found)'));
       });
   });
 },
 
 // Parse constructor
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, 'SourceLocationTestFoo')
-      .then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, 'DebuggerLocationTestFoo')
+      .then((DebuggerLocation loc) {
         expect(loc.valid, isTrue);
         // TODO(turnidge): Printing a constructor currently adds
         // another class qualifier at the front.  Do we want to change
         // this to be more consistent?
         expect(loc.toString(), equals(
-            'SourceLocationTestFoo.SourceLocationTestFoo'));
+            'DebuggerLocationTestFoo.DebuggerLocationTestFoo'));
       });
   });
 },
 
 // Parse named constructor
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, 'SourceLocationTestFoo.named')
-      .then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, 'DebuggerLocationTestFoo.named')
+      .then((DebuggerLocation loc) {
         expect(loc.valid, isTrue);
         // TODO(turnidge): Printing a constructor currently adds
         // another class qualifier at the front.  Do we want to change
         // this to be more consistent?
         expect(loc.toString(), equals(
-            'SourceLocationTestFoo.SourceLocationTestFoo.named'));
+            'DebuggerLocationTestFoo.DebuggerLocationTestFoo.named'));
       });
   });
 },
 
 // Parse method
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, 'SourceLocationTestFoo.method')
-      .then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, 'DebuggerLocationTestFoo.method')
+      .then((DebuggerLocation loc) {
         expect(loc.valid, isTrue);
-        expect(loc.toString(), equals('SourceLocationTestFoo.method'));
+        expect(loc.toString(), equals('DebuggerLocationTestFoo.method'));
       });
   });
 },
 
 // Parse method
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, 'SourceLocationTestFoo.field=')
-      .then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, 'DebuggerLocationTestFoo.field=')
+      .then((DebuggerLocation loc) {
         expect(loc.valid, isTrue);
-        expect(loc.toString(), equals('SourceLocationTestFoo.field='));
+        expect(loc.toString(), equals('DebuggerLocationTestFoo.field='));
       });
   });
 },
 
 // Parse bad method
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.parse(debugger, 'SourceLocationTestFoo.missing')
-      .then((SourceLocation loc) {
+    return DebuggerLocation.parse(debugger, 'DebuggerLocationTestFoo.missing')
+      .then((DebuggerLocation loc) {
         expect(loc.valid, isFalse);
         expect(loc.toString(), equals(
             'invalid source location '
-            '(Function \'SourceLocationTestFoo.missing\' not found)'));
+            '(Function \'DebuggerLocationTestFoo.missing\' not found)'));
       });
   });
 },
 
 // Complete function + script
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.complete(debugger, 'source_loc')
+    return DebuggerLocation.complete(debugger, 'debugger_loc')
       .then((List<String> completions) {
         expect(completions.toString(), equals(
-            '[source_location_dummy_function, '
-             'source_location.dart:, source_location_test.dart:]'));
+            '[debugger_location_dummy_function, '
+             'debugger_location.dart:, debugger_location_test.dart:]'));
       });
   });
 },
 
 // Complete class
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.complete(debugger, 'SourceLocationTe')
+    return DebuggerLocation.complete(debugger, 'DebuggerLocationTe')
       .then((List<String> completions) {
         expect(completions.toString(), equals(
-            '[SourceLocationTestBar, SourceLocationTestFoo]'));
+            '[DebuggerLocationTestBar, DebuggerLocationTestFoo]'));
       });
   });
 },
 
 // No completions: unqualified name
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.complete(debugger, 'source_locXYZZY')
+    return DebuggerLocation.complete(debugger, 'debugger_locXYZZY')
       .then((List<String> completions) {
         expect(completions.toString(), equals('[]'));
       });
   });
 },
 
 // Complete method
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.complete(debugger, 'SourceLocationTestFoo.m')
+    return DebuggerLocation.complete(debugger, 'DebuggerLocationTestFoo.m')
       .then((List<String> completions) {
         expect(completions.toString(), equals(
-            '[SourceLocationTestFoo.madness, SourceLocationTestFoo.method]'));
+          '[DebuggerLocationTestFoo.madness, DebuggerLocationTestFoo.method]'));
       });
   });
 },
 
 // No completions: qualified name
 (Isolate isolate) {
   return initDebugger(isolate).then((debugger) {
-    return SourceLocation.complete(debugger, 'SourceLocationTestFoo.q')
+    return DebuggerLocation.complete(debugger, 'DebuggerLocationTestFoo.q')
       .then((List<String> completions) {
         expect(completions.toString(), equals('[]'));
       });
   });
 },
 
 ];
 
 main(args) => runIsolateTests(args, tests, testeeConcurrent: testFunction);