Matching of top-level functions, methods and accessors.

pkg/analyzer/test/generated/incremental_resolver_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 engine.incremental_resolver_test;
 
 import 'package:analyzer/src/generated/ast.dart';
 import 'package:analyzer/src/generated/element.dart';
 import 'package:analyzer/src/generated/engine.dart';
 import 'package:analyzer/src/generated/error.dart';
@@ skipping 84 matching lines @@
   T f;
 }
 ''', r'''
 class A {}
 class B<T> {
   T f;
 }
 ''');
   }
 
+  void test_false_classMemberAccessor_list_add() {
+    _assertCompilationUnitMatches(false, r'''
+class A {
+  get a => 1;
+  get b => 2;
+}
+''', r'''
+class A {
+  get a => 1;
+  get b => 2;
+  get c => 3;
+}
+''');
+  }
+
+  void test_false_classMemberAccessor_list_remove() {
+    _assertCompilationUnitMatches(false, r'''
+class A {
+  get a => 1;
+  get b => 2;
+  get c => 3;
+}
+''', r'''
+class A {
+  get a => 1;
+  get b => 2;
+}
+''');
+  }
+
+  void test_false_classMemberAccessor_wasGetter() {
+    _assertCompilationUnitMatches(false, r'''
+class A {
+  get a => 1;
+}
+''', r'''
+class A {
+  set a(x) {}
+}
+''');
+  }
+
+  void test_false_classMemberAccessor_wasInstance() {
+    _assertCompilationUnitMatches(false, r'''
+class A {
+  get a => 1;
+}
+''', r'''
+class A {
+  static get a => 1;
+}
+''');
+  }
+
+  void test_false_classMemberAccessor_wasSetter() {
+    _assertCompilationUnitMatches(false, r'''
+class A {
+  set a(x) {}
+}
+''', r'''
+class A {
+  get a => 1;
+}
+''');
+  }
+
+  void test_false_classMemberAccessor_wasStatic() {
+    _assertCompilationUnitMatches(false, r'''
+class A {
+  static get a => 1;
+}
+''', r'''
+class A {
+  get a => 1;
+}
+''');
+  }
+
   void test_false_classTypeAlias_list_add() {
     _assertCompilationUnitMatches(false, r'''
 class M {}
 class A = Object with M;
 ''', r'''
 class M {}
 class A = Object with M;
 class B = Object with M;
 ''');
   }
@@ skipping 416 matching lines @@
   }
 
   void test_false_import_show_remove() {
     _assertCompilationUnitMatches(false, r'''
 import 'dart:async' show Future, Stream;
 ''', r'''
 import 'dart:async' show Future;
 ''');
   }
 
+  void test_false_method_list_add() {
+    _assertCompilationUnitMatches(false, r'''
+class A {
+  a() {}
+  b() {}
+}
+''', r'''
+class A {
+  a() {}
+  b() {}
+  c() {}
+}
+''');
+  }
+
+  void test_false_method_list_remove() {
+    _assertCompilationUnitMatches(false, r'''
+class A {
+  a() {}
+  b() {}
+  c() {}
+}
+''', r'''
+class A {
+  a() {}
+  b() {}
+}
+''');
+  }
+
+  void test_false_method_returnType_edit() {
+    _assertCompilationUnitMatches(false, r'''
+class A {
+  int m() {}
+}
+''', r'''
+class A {
+  String m() {}
+}
+''');
+  }
+
   void test_false_part_list_add() {
     addNamedSource('/unitA.dart', 'part of lib; class A {}');
     addNamedSource('/unitB.dart', 'part of lib; class B {}');
     _assertCompilationUnitMatches(false, r'''
 library lib;
 part 'unitA.dart';
 ''', r'''
 library lib;
 part 'unitA.dart';
 part 'unitB.dart';
 ''');
   }
 
   void test_false_part_list_remove() {
     addNamedSource('/unitA.dart', 'part of lib; class A {}');
     addNamedSource('/unitB.dart', 'part of lib; class B {}');
     _assertCompilationUnitMatches(false, r'''
 library lib;
 part 'unitA.dart';
 part 'unitB.dart';
 ''', r'''
 library lib;
 part 'unitA.dart';
 ''');
   }
 
+  void test_false_topLevelAccessor_list_add() {
+    _assertCompilationUnitMatches(false, r'''
+get a => 1;
+get b => 2;
+''', r'''
+get a => 1;
+get b => 2;
+get c => 3;
+''');
+  }
+
+  void test_false_topLevelAccessor_list_remove() {
+    _assertCompilationUnitMatches(false, r'''
+get a => 1;
+get b => 2;
+get c => 3;
+''', r'''
+get a => 1;
+get b => 2;
+''');
+  }
+
+  void test_false_topLevelAccessor_wasGetter() {
+    _assertCompilationUnitMatches(false, r'''
+get a => 1;
+''', r'''
+set a(x) {}
+''');
+  }
+
+  void test_false_topLevelAccessor_wasSetter() {
+    _assertCompilationUnitMatches(false, r'''
+set a(x) {}
+''', r'''
+get a => 1;
+''');
+  }
+
+  void test_false_topLevelFunction_list_add() {
+    _assertCompilationUnitMatches(false, r'''
+a() {}
+b() {}
+''', r'''
+a() {}
+b() {}
+c() {}
+''');
+  }
+
+  void test_false_topLevelFunction_list_remove() {
+    _assertCompilationUnitMatches(false, r'''
+a() {}
+b() {}
+c() {}
+''', r'''
+a() {}
+b() {}
+''');
+  }
+
+  void test_false_topLevelFunction_parameters_list_add() {
+    _assertCompilationUnitMatches(false, r'''
+main(int a, int b) {
+}
+''', r'''
+main(int a, int b, int c) {
+}
+''');
+  }
+
+  void test_false_topLevelFunction_parameters_list_remove() {
+    _assertCompilationUnitMatches(false, r'''
+main(int a, int b, int c) {
+}
+''', r'''
+main(int a, int b) {
+}
+''');
+  }
+
+  void test_false_topLevelFunction_parameters_type_edit() {
+    _assertCompilationUnitMatches(false, r'''
+main(int a, int b, int c) {
+}
+''', r'''
+main(int a, String b, int c) {
+}
+''');
+  }
+
+  void test_false_topLevelFunction_returnType_edit() {
+    _assertCompilationUnitMatches(false, r'''
+int a() {}
+''', r'''
+String a() {}
+''');
+  }
+
   void test_false_topLevelVariable_list_add() {
     _assertCompilationUnitMatches(false, r'''
 const int A = 1;
 const int C = 3;
 ''', r'''
 const int A = 1;
 const int B = 2;
 const int C = 3;
 ''');
   }
@@ skipping 122 matching lines @@
   }
 
   void test_true_class_typeParameters_same() {
     _assertCompilationUnitMatches(true, r'''
 class A<T> {}
 ''', r'''
 class A<T> {}
 ''');
   }
 
+  void test_true_classMemberAccessor_list_reorder() {
+    _assertCompilationUnitMatches(true, r'''
+class A {
+  get a => 1;
+  get b => 2;
+  get c => 3;
+}
+''', r'''
+class A {
+  get c => 3;
+  get a => 1;
+  get b => 2;
+}
+''');
+  }
+
+  void test_true_classMemberAccessor_list_same() {
+    _assertCompilationUnitMatches(true, r'''
+class A {
+  get a => 1;
+  get b => 2;
+  get c => 3;
+}
+''', r'''
+class A {
+  get a => 1;
+  get b => 2;
+  get c => 3;
+}
+''');
+  }
+
   void test_true_classTypeAlias_list_reorder() {
     _assertCompilationUnitMatches(true, r'''
 class M {}
 class A = Object with M;
 class B = Object with M;
 class C = Object with M;
 ''', r'''
 class M {}
 class C = Object with M;
 class A = Object with M;
@@ skipping 257 matching lines @@
   }
 
   void test_true_import_show_reorder() {
     _assertCompilationUnitMatches(true, r'''
 import 'dart:async' show Future, Stream;
 ''', r'''
 import 'dart:async' show Stream, Future;
 ''');
   }
 
+  void test_true_method_list_reorder() {
+    _assertCompilationUnitMatches(true, r'''
+class A {
+  a() {}
+  b() {}
+  c() {}
+}
+''', r'''
+class A {
+  c() {}
+  a() {}
+  b() {}
+}
+''');
+  }
+
+  void test_true_method_list_same() {
+    _assertCompilationUnitMatches(true, r'''
+class A {
+  a() {}
+  b() {}
+  c() {}
+}
+''', r'''
+class A {
+  a() {}
+  b() {}
+  c() {}
+}
+''');
+  }
+
+  void test_true_method_operator_minus() {
+    _assertCompilationUnitMatches(true, r'''
+class A {
+  operator -(other) {}
+}
+''', r'''
+class A {
+  operator -(other) {}
+}
+''');
+  }
+
+  void test_true_method_operator_minusUnary() {
+    _assertCompilationUnitMatches(true, r'''
+class A {
+  operator -() {}
+}
+''', r'''
+class A {
+  operator -() {}
+}
+''');
+  }
+
+  void test_true_method_operator_plus() {
+    _assertCompilationUnitMatches(true, r'''
+class A {
+  operator +(other) {}
+}
+''', r'''
+class A {
+  operator +(other) {}
+}
+''');
+  }
+
   void test_true_part_list_reorder() {
     addNamedSource('/unitA.dart', 'part of lib; class A {}');
     addNamedSource('/unitB.dart', 'part of lib; class B {}');
     _assertCompilationUnitMatches(true, r'''
 library lib;
 part 'unitA.dart';
 part 'unitB.dart';
 ''', r'''
 library lib;
 part 'unitB.dart';
 part 'unitA.dart';
 ''');
   }
 
   void test_true_part_list_same() {
     addNamedSource('/unitA.dart', 'part of lib; class A {}');
     addNamedSource('/unitB.dart', 'part of lib; class B {}');
     _assertCompilationUnitMatches(true, r'''
 library lib;
 part 'unitA.dart';
 part 'unitB.dart';
 ''', r'''
 library lib;
 part 'unitA.dart';
 part 'unitB.dart';
 ''');
   }
 
+  void test_true_topLevelAccessor_list_reorder() {
+    _assertCompilationUnitMatches(true, r'''
+set a(x) {}
+set b(x) {}
+set c(x) {}
+''', r'''
+set c(x) {}
+set a(x) {}
+set b(x) {}
+''');
+  }
+
+  void test_true_topLevelAccessor_list_same() {
+    _assertCompilationUnitMatches(true, r'''
+get a => 1;
+get b => 2;
+get c => 3;
+''', r'''
+get a => 1;
+get b => 2;
+get c => 3;
+''');
+  }
+
+  void test_true_topLevelFunction_list_reorder() {
+    _assertCompilationUnitMatches(true, r'''
+a() {}
+b() {}
+c() {}
+''', r'''
+c() {}
+a() {}
+b() {}
+''');
+  }
+
+  void test_true_topLevelFunction_list_same() {
+    _assertCompilationUnitMatches(true, r'''
+a() {}
+b() {}
+c() {}
+''', r'''
+a() {}
+b() {}
+c() {}
+''');
+  }
+
   void test_true_topLevelVariable_list_reorder() {
     _assertCompilationUnitMatches(true, r'''
 const int A = 1;
 const int B = 2;
 const int C = 3;
 ''', r'''
 const int C = 3;
 const int A = 1;
 const int B = 2;
 ''');
@@ skipping 1394 matching lines @@
     _visitList(node.metadata, other.metadata);
     _visitNode(node.identifier, other.identifier);
   }
 
   static void assertSameResolution(CompilationUnit actual,
       CompilationUnit expected) {
     _SameResolutionValidator validator = new _SameResolutionValidator(expected);
     actual.accept(validator);
   }
 }