Rollback r41807.

pkg/analysis_server/test/services/index/store/codec_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.services.src.index.store.codec;
 
 import 'package:analysis_server/src/services/index/index.dart';
 import 'package:analysis_server/src/services/index/store/codec.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:unittest/unittest.dart';
 
 import '../../../abstract_single_unit.dart';
 import '../../../mocks.dart';
 import '../../../reflective_tests.dart';
 
 
 main() {
   groupSep = ' | ';
   runReflectiveTests(_ContextCodecTest);
   runReflectiveTests(_ElementCodecTest);
-  runReflectiveTests(_ElementKindCodecTest);
   runReflectiveTests(_RelationshipCodecTest);
   runReflectiveTests(_StringCodecTest);
 }
 
 
 @ReflectiveTestCase()
 class _ContextCodecTest {
   ContextCodec codec = new ContextCodec();
 
   void test_encode_decode() {
@@ skipping 107 matching lines @@
     {
       LocalVariableElement element = findNodeElementAtString('bar; // A', null);
       int id = codec.encode(element, false);
       expect(codec.decode(context, id), element);
     }
     {
       LocalVariableElement element = findNodeElementAtString('bar; // B', null);
       int id = codec.encode(element, false);
       expect(codec.decode(context, id), element);
     }
-    // check strings, only source encoding
-    expect(stringCodec.nameToIndex, hasLength(1));
+    // check strings, "foo" as a single string, no "foo@17" or "bar@35"
+    expect(stringCodec.nameToIndex, hasLength(4));
     expect(stringCodec.nameToIndex, containsPair('file:///test.dart', 0));
+    expect(stringCodec.nameToIndex, containsPair('main', 1));
+    expect(stringCodec.nameToIndex, containsPair('foo', 2));
+    expect(stringCodec.nameToIndex, containsPair('bar', 3));
   }
 
   void test_localVariable() {
     resolveTestUnit('''
 main() {
   {
     int foo; // A
   }
   {
     int foo; // B
   }
 }
 ''');
     {
       LocalVariableElement element = findNodeElementAtString('foo; // A', null);
       int id = codec.encode(element, false);
       expect(codec.decode(context, id), element);
     }
     {
       LocalVariableElement element = findNodeElementAtString('foo; // B', null);
       int id = codec.encode(element, false);
       expect(codec.decode(context, id), element);
     }
-    // check strings, only source encoding
-    expect(stringCodec.nameToIndex, hasLength(1));
+    // check strings, "foo" as a single string, no "foo@21" or "foo@47"
+    expect(stringCodec.nameToIndex, hasLength(3));
     expect(stringCodec.nameToIndex, containsPair('file:///test.dart', 0));
-  }
-
-  void test_name() {
-    Element element = new NameElement('myName');
-    int id = codec.encode(element, false);
-    // we don't need decoding - it is never used as a location
-    expect(codec.decode(null, id), null);
+    expect(stringCodec.nameToIndex, containsPair('main', 1));
+    expect(stringCodec.nameToIndex, containsPair('foo', 2));
   }
 
   void test_notLocal() {
     resolveTestUnit('''
 main() {
   int foo;
 }
 ''');
     LocalVariableElement element = findElement('foo');
     int id = codec.encode(element, false);
     expect(codec.encode(element, false), id);
     expect(codec.decode(context, id), element);
     // check strings
-    expect(stringCodec.nameToIndex, hasLength(1));
+    expect(stringCodec.nameToIndex, hasLength(3));
     expect(stringCodec.nameToIndex, containsPair('file:///test.dart', 0));
+    expect(stringCodec.nameToIndex, containsPair('main', 1));
+    expect(stringCodec.nameToIndex, containsPair('foo', 2));
   }
 }
 
-
-@ReflectiveTestCase()
-class _ElementKindCodecTest {
-  ElementKindCodec codec = new ElementKindCodec();
-
-  void test_decode_unknown() {
-    expect(codec.decode(1 << 20), isNull);
-  }
-
-  void test_encodeDecode() {
-    int idClass = codec.encode(ElementKind.CLASS);
-    int idMethod = codec.encode(ElementKind.METHOD);
-    expect(idClass, isNot(idMethod));
-  }
-}
-
 
 @ReflectiveTestCase()
 class _RelationshipCodecTest {
   StringCodec stringCodec = new StringCodec();
   RelationshipCodec codec;
 
   void setUp() {
     codec = new RelationshipCodec(stringCodec);
   }
 
   void test_all() {
     Relationship relationship = Relationship.getRelationship('my-relationship');
     int id = codec.encode(relationship);
     expect(codec.decode(id), relationship);
   }
 }
 
 
 @ReflectiveTestCase()
 class _StringCodecTest {
   StringCodec codec = new StringCodec();
 
   void test_all() {
     int idA = codec.encode('aaa');
     int idB = codec.encode('bbb');
     expect(codec.decode(idA), 'aaa');
     expect(codec.decode(idB), 'bbb');
   }
 }