Introduce CompletionTarget to take the place of the Node being completed.

pkg/analysis_server/test/completion_test.dart

 // Copyright (c) 2014, 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.
 
 library test.completion.support;
 
 import 'dart:async';
 import 'dart:collection';
 
 import 'package:unittest/unittest.dart';
 
 import 'completion_test_support.dart';
 
+/**
+ * Assigning the name of a single test to this string causes just that test to
+ * be run.  Assigning null to this string causes all tests to be run.
+ */
+const String SOLO_TEST = null;
+
 main() {
   CompletionTestBuilder builder = new CompletionTestBuilder();
   builder.buildAll();
 }
 
 /**
+ * Type of functions used to create tests.
+ */
+typedef void _Tester(String spec, TestFunction body);
+
+/**
  * A builder that builds the completion tests.
  */
 class CompletionTestBuilder {
   /**
    * Number of tests that have been built that are expected to pass.
    */
   int expectedPassCount = 0;
 
   /**
    * Number of tests that have been built that are expected to fail.
@@ skipping 56 matching lines @@
 
     // space, char, eol are important
     buildTests('testCommentSnippets011', '''
 class x implements M!1{}''', <String>["1+Map"]);
 
     // space, char, eol are important
     buildTests('testCommentSnippets012', '''
 class x implements M!1\n{}''', <String>["1+Map"]);
 
     buildTests('testCommentSnippets013', '''
-class x !2{!1}!3''', <String>["1+num", "2-num", "3-num"], failingTests: '3');
+class x !2{!1}!3''', <String>["1+num", "2-num", "3+num"]);
 
     // trailing space is important
     buildTests('testCommentSnippets014', '''
 typedef n!1 ;''', <String>["1+num"]);
 
     buildTests('testCommentSnippets015', '''
 class D {f(){} g(){f!1(f!2);}}''', <String>["1+f", "2+f"]);
 
     buildTests('testCommentSnippets016', '''
 class F {m() { m(); !1}}''', <String>["1+m"]);
@@ skipping 120 matching lines @@
 
     buildTests('testCommentSnippets044', '''
 class List{}class XXX {XXX.fisk();}main() {main(); new !1}}''',
         <String>["1+List", "1+XXX.fisk"],
         failingTests: '1');
 
     buildTests('testCommentSnippets047', '''
 f(){int x;int y=!1;}''', <String>["1+x"]);
 
     buildTests('testCommentSnippets048', '''
-import 'dart:convert' as json;f() {var x=new js!1}''',
-        <String>["1+json"]);
+import 'dart:convert' as json;f() {var x=new js!1}''', <String>["1+json"]);
 
     buildTests('testCommentSnippets049', '''
 import 'dart:convert' as json;
 import 'dart:convert' as jxx;
 class JsonDecoderX{}
 f1() {var x=new !2j!1s!3}''',
         <String>[
             "1+json",
             "1+jxx",
             "2+json",
@@ skipping 578 matching lines @@
 
 main(A p) {
   var v = p.as!1;
 }''', <String>["1+asVisible"]);
 
     buildTests('testCompletion_as_incompleteStatement', '''
 class MyClass {}
 main(p) {
   var justSomeVar;
   var v = p as !1
-}''', <String>["1+MyClass", "1-justSomeVar"], failingTests: '1');
+}''', <String>["1+MyClass", "1-justSomeVar"]);
 
     buildTests('testCompletion_cascade', '''
 class A {
   aaa() {}
 }
 
 
 main(A a) {
   a..!1 aaa();
 }''', <String>["1+aaa", "1-main"]);
@@ skipping 133 matching lines @@
 class B {}
 /**
  * [!3] some text
  */
 class C {}''',
         <String>["1+double", "1-int", "2+int", "2+String", "3+int", "3+String"]);
 
     buildTests('testCompletion_double_inFractionPart', '''
 main() {
   1.0!1
-}''', <String>["1-abs", "1-main"], failingTests: '1');
+}''', <String>["1-abs", "1-main"]);
 
     buildTests('testCompletion_enum', '''
 enum MyEnum {A, B, C}
 main() {
   MyEnum.!1;
 }''', <String>["1+values", "1+A", "1+B", "1+C"], failingTests: '1');
 
     buildTests('testCompletion_exactPrefix_hasHigherRelevance', '''
 var STR;
 main(p) {
@@ skipping 197 matching lines @@
 main(A p) {
   var v1 = p.is!1;
   var v2 = p.is!2
 }''', <String>["1+isVisible", "2+isVisible"]);
 
     buildTests('testCompletion_is_incompleteStatement1', '''
 class MyClass {}
 main(p) {
   var justSomeVar;
   var v = p is !1
-}''', <String>["1+MyClass", "1-justSomeVar"], failingTests: '1');
+}''', <String>["1+MyClass", "1-justSomeVar"]);
 
     buildTests('testCompletion_is_incompleteStatement2', '''
 class MyClass {}
 main(p) {
   var isVariable;
   var v = p is!1
 }''', <String>["1+is", "1-isVariable"], failingTests: '1');
 
     buildTests('testCompletion_keyword_in', '''
 class Foo { int input = 7; mth() { if (in!1) {}}}''', <String>["1+input"]);
 
     buildTests('testCompletion_keyword_syntheticIdentifier', '''
 main() {
   var caseVar;
   var otherVar;
   var v = case!1
 }''', <String>["1+caseVar", "1-otherVar"]);
 
     buildTests('testCompletion_libraryIdentifier_atEOF', '''
-library int.!1''', <String>["1-parse", "1-bool"], failingTests: '1');
+library int.!1''', <String>["1-parse", "1-bool"]);
 
     buildTests('testCompletion_libraryIdentifier_notEOF', '''
-library int.!1''', <String>["1-parse", "1-bool"], failingTests: '1');
+library int.!1''', <String>["1-parse", "1-bool"]);
 
     buildTests('testCompletion_methodRef_asArg_incompatibleFunctionType', '''
 foo( f(int p) ) {}
 class Functions {
   static myFuncInt(int p) {}
   static myFuncDouble(double p) {}
 }
 bar(p) {}
 main(p) {
   foo( Functions.!1; );
@@ skipping 181 matching lines @@
 
     buildTests('testCompletion_return_withIdentifierPrefix', '''
 f() { var vvv = 42; return v!1 }''', <String>["1+vvv"]);
 
     buildTests('testCompletion_return_withoutExpression', '''
 f() { var vvv = 42; return !1 }''', <String>["1+vvv"]);
 
     buildTests('testCompletion_staticField1', '''
 class num{}class Sunflower {static final n!2um MAX_D = 300;nu!3m xc, yc;Sun!4flower() {x!Xc = y!Yc = MA!1 }}''',
         <String>["1+MAX_D", "X+xc", "Y+yc", "2+num", "3+num", "4+Sunflower"],
-        failingTests: '234');
+        failingTests: '23');
 
     buildTests('testCompletion_super_superType', '''
 class A {
   var fa;
   ma() {}
 }
 class B extends A {
   var fb;
   mb() {}
   main() {
@@ skipping 156 matching lines @@
         <String>["1-_f", "1+f"],
         extraFiles: sources,
         failingTests: '1');
 
     sources.clear();
     sources["/firth.dart"] = '''
 library firth;
 class SerializationException {
   const SerializationException();
 }''';
-    buildTests('test001', '''
+    buildTests('testLibrary001', '''
 import 'firth.dart';
 main() {
 throw new Seria!1lizationException();}''',
         <String>["1+SerializationException"],
         extraFiles: sources,
         failingTests: '1');
 
     // Type propagation.
     // TODO Include corelib analysis (this works in the editor)
     buildTests(
-        'test002',
+        'testLibrary002',
         '''t2() {var q=[0],z=q.!1length;q.!2clear();}''',
         <String>["1+length", "1+isEmpty", "2+clear"],
         failingTests: '1');
 
     // TODO Include corelib analysis
     buildTests(
-        'test003',
+        'testLibrary003',
         '''class X{var q; f() {q.!1a!2}}''',
         <String>["1+end", "2+abs", "2-end"],
         failingTests: '12');
 
     // TODO Include corelib analysis
     // Resolving dart:html takes between 2.5s and 30s; json, about 0.12s
-    buildTests('test004', '''
+    buildTests('testLibrary004', '''
             library foo;
             import 'dart:convert' as json;
             class JsonDecoderX{}
             f1() {var x=new json.!1}
             f2() {var x=new json.JsonDe!2}
             f3() {var x=new json.JsonDecoder!3}''',
         <String>[
             "1+JsonDecoder",
             "1-JsonDecoderX",
             "2+JsonDecoder",
             "2-JsonDecoderX",
             "3+JsonDecoder",
             "3-JsonDecoderX"]);
 
     // TODO Enable after type propagation is implemented. Not yet.
     // TODO Include corelib analysis
     buildTests(
-        'test005',
+        'testLibrary005',
         '''var PHI;main(){PHI=5.3;PHI.abs().!1 Object x;}''',
         <String>["1+abs"],
         failingTests: '1');
 
     // Exercise import and export handling.
     // Libraries are defined in partial order of increasing dependency.
     sources.clear();
     sources["/exp2a.dart"] = '''
 library exp2a;
 e2a() {}''';
     sources["/exp1b.dart"] = '''
 library exp1b;",
 e1b() {}''';
     sources["/exp1a.dart"] = '''
 library exp1a;",
 export 'exp1b.dart';",
 e1a() {}''';
     sources["/imp1.dart"] = '''
 library imp1;
 export 'exp1a.dart';
 i1() {}''';
     sources["/imp2.dart"] = '''
 library imp2;
 export 'exp2a.dart';
 i2() {}''';
-    buildTests('test006', '''
+    buildTests('testLibrary006', '''
 import 'imp1.dart';
 import 'imp2.dart';
 main() {!1
   i1();
   i2();
   e1a();
   e1b();
   e2a();
 }''',
         <String>["1+i1", "1+i2", "1+e1a", "1+e2a", "1+e1b"],
         extraFiles: sources,
         failingTests: '1');
 
     // Exercise import and export handling.
     // Libraries are defined in partial order of increasing dependency.
     sources.clear();
     sources["/l1.dart"] = '''
 library l1;
 var _l1t; var l1t;''';
-    buildTests('test007', '''
+    buildTests('testLibrary007', '''
 import 'l1.dart';
 main() {
   var x = l!1
   var y = _!2
 }''',
         <String>["1+l1t", "1-_l1t", "2-_l1t"],
         extraFiles: sources,
         failingTests: '1');
 
     // Check private library exclusion
     sources.clear();
     sources["/public.dart"] = '''
 library public;
 class NonPrivate {
   void publicMethod() {
   }
 }''';
     sources["/private.dart"] = '''
 library _private;
 import 'public.dart';
 class Private extends NonPrivate {
   void privateMethod() {
   }
 }''';
-    buildTests('test008', '''
+    buildTests('testLibrary008', '''
 import 'private.dart';
 import 'public.dart';
 class Test {
   void test() {
     NonPrivate x = new NonPrivate();
     x.!1 //publicMethod but not privateMethod should appear
   }
 }''',
         <String>["1-privateMethod", "1+publicMethod"],
         extraFiles: sources,
         failingTests: '1');
 
     // Exercise library prefixes.
     sources.clear();
     sources["/lib.dart"] = '''
 library lib;
 int X = 1;
 void m(){}
 class Y {}''';
-    buildTests('test009', '''
+    buildTests('testLibrary009', '''
 import 'lib.dart' as Q;
 void a() {
   var x = Q.!1
 }
 void b() {
   var x = [Q.!2]
 }
 void c() {
   var x = new List([Q.!3])
 }
@@ skipping 138 matching lines @@
             "4-dynamic",
             "5+TestFn2",
             "6+num",
             "7+typedef"],
         failingTests: '12347');
 
     buildTests('test010', '''
 class test !8<!1t !2 !3extends String,!4 List,!5 !6>!7 {}
 class tezetst !9<!BString,!C !DList>!A {}''',
         <String>[
-            "1+String",
-            "1+List",
+            "1-String",
+            "1-List",
             "1-test",
             "2-String",
             "2-test",
             "3+extends",
-            "4+tezetst",
+            "4-tezetst",
             "4-test",
-            "5+String",
-            "6+List",
+            "5-String",
+            "6-List",
             "7-List",
             "8-List",
             "9-String",
             "A-String",
-            "B+String",
-            "C+List",
+            "B-String",
+            "C-List",
             "C-tezetst",
-            "D+List",
-            "D+test"],
-        failingTests: '12345C');
+            "D-List",
+            "D-test"],
+        failingTests: '23');
 
     // name generation with conflicts
     buildTests(
         'test011',
         '''r2(var object, Object object1, Object !1);''',
         <String>["1+object2"],
         failingTests: '1');
 
     // reserved words
     buildTests('test012', '''
@@ skipping 424 matching lines @@
         completionTests.map((LocationSpec spec) => spec.id).toSet();
     for (String id in failingTests.split('')) {
       if (!allSpecIds.contains(id)) {
         test("$baseName-$id", () {
           fail(
               "Test case '$id' included in failingTests, but this id does not exist.");
         });
       }
     }
     for (LocationSpec spec in completionTests) {
+      String testName = '$baseName-${spec.id}';
+      _Tester tester = testName == SOLO_TEST ? solo_test : test;
       if (failingTests.contains(spec.id)) {
         ++expectedFailCount;
-        test("$baseName-${spec.id} (expected failure)", () {
+        tester("$testName (expected failure $expectedFailCount)", () {
           CompletionTestCase test = new CompletionTestCase();
           return new Future(() => test.runTest(spec, extraFiles)).then((_) {
             fail('Test passed - expected to fail.');
           }, onError: (_) {});
         });
       } else {
         ++expectedPassCount;
-        test("$baseName-${spec.id}", () {
+        tester(testName, () {
           CompletionTestCase test = new CompletionTestCase();
           return test.runTest(spec, extraFiles);
         });
       }
     }
   }
 }