Fix string literals and add support for static methods in smoke.

pkg/smoke/test/codegen/recorder_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 smoke.test.codegen.recorder_test;
 
 import 'package:analyzer/src/generated/element.dart';
 import 'package:smoke/codegen/generator.dart';
 import 'package:smoke/codegen/recorder.dart';
 import 'package:unittest/unittest.dart';
@@ skipping 104 matching lines @@
             '      smoke_0.D: _M0,\n'
             '      smoke_0.E2: smoke_0.E,\n'
             '      smoke_0.F2: smoke_0.F,\n'
             '      smoke_0.H: smoke_0.G,\n'
             '      int: num,\n'
             '      _M0: smoke_0.C,\n'
             '    }));\n');
     });
   });
 
+  test('add static method, no declaration', () {
+    var lib = provider.libraryFor('/common.dart');
+    recorder.addStaticMethod(lib.getType('A'), 'sM');
+    checkResults(generator,
+        imports: [
+          "import '/common.dart' as smoke_0;",
+        ],
+        initCall:
+          'useGeneratedCode(new StaticConfiguration(\n'
+          '    checkedMode: false,\n'
+          '    staticMethods: {\n'
+          '      smoke_0.A: {\n'
+          '        #sM: smoke_0.A.sM,\n'
+          '      },\n'
+          '    }));\n');
+  });
+
   group('lookup member', () {
     var lib;
     setUp(() {
       lib = provider.libraryFor('/common.dart');
     });
 
     test('missing declaration', () {
       recorder.lookupMember(lib.getType('A'), 'q', includeAccessors: false);
       checkResults(generator,
           imports: [
@@ skipping 16 matching lines @@
           initCall:
             'useGeneratedCode(new StaticConfiguration(\n'
             '    checkedMode: false,\n'
             '    declarations: {\n'
             '      smoke_0.A: {\n'
             '        #i: const Declaration(#i, int),\n'
             '      },\n'
             '    }));\n');
     });
 
+    test('sattic field declaration', () {
+      recorder.lookupMember(lib.getType('A'), 'sI', includeAccessors: false);
+      checkResults(generator,
+          imports: [
+            "import '/common.dart' as smoke_0;",
+          ],
+          initCall:
+            'useGeneratedCode(new StaticConfiguration(\n'
+            '    checkedMode: false,\n'
+            '    declarations: {\n'
+            '      smoke_0.A: {\n'
+            '        #sI: const Declaration(#sI, int, isStatic: true),\n'
+            '      },\n'
+            '    }));\n');
+    });
+
     test('property declaration', () {
       recorder.lookupMember(lib.getType('A'), 'j2', includeAccessors: false);
       checkResults(generator,
           imports: [
             "import '/common.dart' as smoke_0;",
           ],
           initCall:
             'useGeneratedCode(new StaticConfiguration(\n'
             '    checkedMode: false,\n'
             '    declarations: {\n'
             '      smoke_0.A: {\n'
             '        #j2: const Declaration(#j2, int, kind: PROPERTY),\n'
             '      },\n'
             '    }));\n');
     });
 
+    test('static property declaration', () {
+      recorder.lookupMember(lib.getType('A'), 'sJ', includeAccessors: false);
+      final details = 'kind: PROPERTY, isFinal: true, isStatic: true';
+      checkResults(generator,
+          imports: [
+            "import '/common.dart' as smoke_0;",
+          ],
+          initCall:
+            'useGeneratedCode(new StaticConfiguration(\n'
+            '    checkedMode: false,\n'
+            '    declarations: {\n'
+            '      smoke_0.A: {\n'
+            '        #sJ: const Declaration(#sJ, int, $details),\n'
+            '      },\n'
+            '    }));\n');
+    });
+
     test('field and property of dynamic type', () {
       recorder.lookupMember(lib.getType('I'), 'i1', includeAccessors: false);
       recorder.lookupMember(lib.getType('I'), 'i2', includeAccessors: false);
       checkResults(generator,
           imports: [
             "import '/common.dart' as smoke_0;",
           ],
           initCall:
             'useGeneratedCode(new StaticConfiguration(\n'
             '    checkedMode: false,\n'
@@ skipping 31 matching lines @@
           initCall:
             'useGeneratedCode(new StaticConfiguration(\n'
             '    checkedMode: false,\n'
             '    declarations: {\n'
             '      smoke_0.A: {\n'
             '        #inc0: const Declaration(#inc0, Function, kind: METHOD),\n'
             '      },\n'
             '    }));\n');
     });
 
+    test('static method declaration', () {
+      recorder.lookupMember(lib.getType('A'), 'sM', includeAccessors: false);
+      const details = 'kind: METHOD, isStatic: true';
+      checkResults(generator,
+          imports: [
+            "import '/common.dart' as smoke_0;",
+          ],
+          initCall:
+            'useGeneratedCode(new StaticConfiguration(\n'
+            '    checkedMode: false,\n'
+            '    declarations: {\n'
+            '      smoke_0.A: {\n'
+            '        #sM: const Declaration(#sM, Function, $details),\n'
+            '      },\n'
+            '    }));\n');
+    });
+
     test('inherited field - not recursive', () {
       recorder.lookupMember(lib.getType('D'), 'i', includeAccessors: false);
       checkResults(generator,
           imports: [
             "import '/common.dart' as smoke_0;",
           ],
           initCall:
             'useGeneratedCode(new StaticConfiguration(\n'
             '    checkedMode: false,\n'
             '    declarations: {\n'
@@ skipping 226 matching lines @@
             '    }));\n');
     });
   });
 
   group('with accessors', () {
     test('lookup member', () {
       var lib = provider.libraryFor('/common.dart');
       recorder.lookupMember(lib.getType('I'), 'i1');
       recorder.lookupMember(lib.getType('I'), 'i2');
       recorder.lookupMember(lib.getType('I'), 'i3');
+      recorder.lookupMember(lib.getType('I'), 'm4');
       checkResults(generator,
           imports: [
             "import '/common.dart' as smoke_0;",
           ],
           initCall:
             'useGeneratedCode(new StaticConfiguration(\n'
             '    checkedMode: false,\n'
             '    getters: {\n'
             '      #i1: (o) => o.i1,\n'
             '      #i2: (o) => o.i2,\n'
             '      #i3: (o) => o.i3,\n'
+            '      #m4: (o) => o.m4,\n'
             '    },\n'
             '    setters: {\n' // #i3 is final
             '      #i1: (o, v) { o.i1 = v; },\n'
             '      #i2: (o, v) { o.i2 = v; },\n'
             '    },\n'
             '    declarations: {\n'
             '      smoke_0.I: {\n'
             '        #i1: const Declaration(#i1, dynamic),\n'
             '        #i2: const Declaration(#i2, dynamic, kind: PROPERTY),\n'
             '        #i3: const Declaration(#i3, smoke_0.G, kind: PROPERTY, '
                                            'isFinal: true),\n'
+            '        #m4: const Declaration(#m4, Function, kind: METHOD),\n'
             '      },\n'
             '    },\n'
             '    names: {\n'
-            '      #i1: \'i1\',\n'
-            '      #i2: \'i2\',\n'
-            '      #i3: \'i3\',\n'
+            '      #i1: r\'i1\',\n'
+            '      #i2: r\'i2\',\n'
+            '      #i3: r\'i3\',\n'
+            '      #m4: r\'m4\',\n'
             '    }));\n');
     });
 
+    test('static members', () {
+      var lib = provider.libraryFor('/common.dart');
+      recorder.lookupMember(lib.getType('A'), 'sI');
+      recorder.lookupMember(lib.getType('A'), 'sJ');
+      recorder.lookupMember(lib.getType('A'), 'sM');
+      final pDetails = 'kind: PROPERTY, isFinal: true, isStatic: true';
+      const mDetails = 'kind: METHOD, isStatic: true';
+      checkResults(generator,
+          imports: [
+            "import '/common.dart' as smoke_0;",
+          ],
+          initCall:
+            'useGeneratedCode(new StaticConfiguration(\n'
+            '    checkedMode: false,\n'
+            '    declarations: {\n'
+            '      smoke_0.A: {\n'
+            '        #sI: const Declaration(#sI, int, isStatic: true),\n'
+            '        #sJ: const Declaration(#sJ, int, $pDetails),\n'
+            '        #sM: const Declaration(#sM, Function, $mDetails),\n'
+            '      },\n'
+            '    },\n'
+            '    staticMethods: {\n'
+            '      smoke_0.A: {\n'
+            '        #sM: smoke_0.A.sM,\n'
+            '      },\n'
+            '    },\n'
+            '    names: {\n'
+            '      #sM: r\'sM\',\n'
+            '    }));\n');
+    });
+
     test('query', () {
       var lib = provider.libraryFor('/common.dart');
       var options = new QueryOptions(includeInherited: true,
           withAnnotations: [lib.getType('Annot')]);
       recorder.runQuery(lib.getType('H'), options);
       final a1Annot = 'annotations: const [smoke_0.a1]';
       final a3Annot = 'annotations: const [smoke_0.a3]';
       final exprAnnot = 'annotations: const [const smoke_0.Annot(1)]';
       checkResults(generator,
           imports: [
@@ skipping 24 matching lines @@
             '        #b: const Declaration(#b, int, $a1Annot),\n'
             '      },\n'
             '      smoke_0.H: {\n'
             '        #f: const Declaration(#f, int, $a1Annot),\n'
             '        #g: const Declaration(#g, int, $a1Annot),\n'
             '        #i: const Declaration(#i, int, $a3Annot),\n'
             '        #j: const Declaration(#j, int, $exprAnnot),\n'
             '      },\n'
             '    },\n'
             '    names: {\n'
-            '      #b: \'b\',\n'
-            '      #f: \'f\',\n'
-            '      #g: \'g\',\n'
-            '      #i: \'i\',\n'
-            '      #j: \'j\',\n'
+            '      #b: r\'b\',\n'
+            '      #f: r\'f\',\n'
+            '      #g: r\'g\',\n'
+            '      #i: r\'i\',\n'
+            '      #j: r\'j\',\n'
             '    }));\n');
     });
   });
 }
 
 const _SOURCES = const {
   '/a.dart': '''
       library a;
       import '/b.dart';
 
@@ skipping 28 matching lines @@
       library common;
 
       class A {
         int i = 42;
         int j = 44;
         int get j2 => j;
         void set j2(int v) { j = v; }
         void inc0() { i++; }
         void inc1(int v) { i = i + (v == null ? -10 : v); }
         void inc2([int v]) { i = i + (v == null ? -10 : v); }
+        static int sI;
+        static int get sJ => 0;
+        static void sM() {}
       }
 
       class B {
         final int f = 3;
         int _w;
         int get w => _w;
         set w(int v) { _w = v; }
 
         String z;
         A a;
@@ skipping 60 matching lines @@
         @a2 int h;
         @a3 int i;
         @Annot(1) int j;
       }
 
       class I {
         dynamic i1;
         get i2 => null;
         set i2(v) {}
         G get i3;
+        G m4() {};
       }
       '''
 };
 
 resolveImportUrl(LibraryElement lib) =>
     lib.isDartCore ? 'dart:core' : '/${lib.displayName}.dart';