Move language version to 2.12 in the test_package (#2551)

jcollins-g · web-flow · commit 562273a586e9 · 2021-03-02T09:23:45.000-08:00
diff --git a/test/end2end/model_test.dart b/test/end2end/model_test.dart
@@ -119,8 +119,8 @@ void main() {
       expect(inferredTypeSet.modelType.name, equals('Set'));
       expect(
           inferredTypeSet.modelType.typeArguments.map((a) => a.name).toList(),
-          equals(['num']));
-      expect(inferredTypeSet.constantValue, equals('const {1, 2.5, 3}'));
+          equals(['int']));
+      expect(inferredTypeSet.constantValue, equals('const {1, 3, 5}'));
       expect(specifiedSet.modelType.name, equals('Set'));
       expect(specifiedSet.modelType.typeArguments.map((a) => a.name).toList(),
           equals(['int']));
@@ -3001,12 +3001,6 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
           withGenericSub.inheritedFields.where((p) => p.name == 'prop').length,
           equals(1));
     });
-
-    test('has abstract kind', () {
-      Field abstractField = UnusualProperties.allModelElements
-          .firstWhere((e) => e.name == 'abstractProperty');
-      expect(abstractField.fullkind, 'abstract property');
-    });
   });
 
   group('Accessor', () {
diff --git a/testing/test_package/bin/drill.dart b/testing/test_package/bin/drill.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// @dart=2.9
+
 // This is a sample "tool" used to test external tool integration into dartdoc.
 // It has no practical purpose other than that.
 
diff --git a/testing/test_package/bin/print_macro.dart b/testing/test_package/bin/print_macro.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// @dart=2.9
+
 // This is a sample "tool" used to test external tool integration into dartdoc.
 // It has no other purpose.
 
diff --git a/testing/test_package/bin/setup.dart b/testing/test_package/bin/setup.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// @dart=2.9
+
 // This is a sample setup "tool" used to test external tool integration into
 // dartdoc. It has no practical purpose other than that.
 
diff --git a/testing/test_package/lib/anonymous_library.dart b/testing/test_package/lib/anonymous_library.dart
@@ -1,3 +1,5 @@
 // DO NOT give this library a name
 
+// @dart=2.9
+
 String doesStuff() => 'hi';
diff --git a/testing/test_package/lib/another_anonymous_lib.dart b/testing/test_package/lib/another_anonymous_lib.dart
@@ -1,3 +1,5 @@
 // DO NOT give this library a name
 
+// @dart=2.9
+
 String greeting() => "Hello";
diff --git a/testing/test_package/lib/base_class.dart b/testing/test_package/lib/base_class.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library base_class;
 
 /// Abstract class Constraints
diff --git a/testing/test_package/lib/code_in_comments.dart b/testing/test_package/lib/code_in_comments.dart
@@ -10,4 +10,7 @@
 ///   - "value"
 ///   - 3.14
 /// ```
+
+// @dart=2.9
+
 library code_in_comments;
diff --git a/testing/test_package/lib/completely_empty_lib.dart b/testing/test_package/lib/completely_empty_lib.dart
@@ -0,0 +1 @@
+// @dart=2.9
diff --git a/testing/test_package/lib/css.dart b/testing/test_package/lib/css.dart
@@ -1,6 +1,9 @@
 /// Testing that a library name doesn't conflict
 /// with directories created by dartdoc.
 /// {@category Other}
+
+// @dart=2.9
+
 library css;
 
 String theOnlyThingInTheLibrary = 'hello';
diff --git a/testing/test_package/lib/csspub.dart b/testing/test_package/lib/csspub.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library csspub;
 
 String theOnlyThingInTheLibrary = 'hello';
diff --git a/testing/test_package/lib/example.dart b/testing/test_package/lib/example.dart
@@ -1,5 +1,8 @@
 /// a library. testing string escaping: `var s = 'a string'` <cool>
 /// {@category Real Libraries}
+
+// @dart=2.9
+
 library ex;
 
 import 'dart:async';
@@ -198,7 +201,7 @@ class Apple {
   /**
    * fieldWithTypedef docs here
    */
-  final ParameterizedTypedef<bool> fieldWithTypedef;
+  final ParameterizedTypedef<bool> fieldWithTypedef = (bool a, int b) => 'hello, ${a} ${b}';
 }
 
 /// Extension on Apple
@@ -301,15 +304,15 @@ class Dog implements Cat, E {
   @deprecated
   int deprecatedField;
 
-  final int aFinalField;
+  final int aFinalField = 42;
 
   static const String aStaticConstField = "A Constant Dog";
 
   /// Verify link substitution in constants (#1535)
   static const ShortName aName = ExtendedShortName("hello there");
 
   @protected
-  final int aProtectedFinalField;
+  final int aProtectedFinalField = 84;
 
   Dog() {
     testMethod([]);
@@ -347,11 +350,11 @@ class Dog implements Cat, E {
   }
 
   /// A tasty static + final property.
-  static final int somethingTasty;
+  static final int somethingTasty = 12;
 
   static int __staticbacker = 0;
   static int get staticGetterSetter => __staticbacker;
-  static int set staticGetterSetter(x) {
+  static void set staticGetterSetter(x) {
     __staticbacker = x;
   }
 
diff --git a/testing/test_package/lib/excluded.dart b/testing/test_package/lib/excluded.dart
@@ -1,6 +1,9 @@
 /// This library is excluded from the documentation
 /// even though it is located in the lib folder by
 /// using the <nodoc> tag
+
+// @dart=2.9
+
 library excluded;
 
 export 'example.dart' show Apple;
diff --git a/testing/test_package/lib/fake.dart b/testing/test_package/lib/fake.dart
@@ -44,13 +44,16 @@
 /// * <http://myfakepackage.com/buthidethisone>
 ///
 /// [pkg]: http://example.org
+
+// @dart=2.9
+
 library fake;
 
 import 'dart:async';
 import 'dart:collection';
 // Make sure dartdoc ignores invalid prefixes imports (#1896)
 // ignore: uri_does_not_exist
-import 'dart:json' as invalidPrefix;
+//import 'dart:json' as invalidPrefix;
 import 'package:meta/meta.dart' show Required;
 import 'csspub.dart' as css;
 import 'csspub.dart' as renamedLib2;
@@ -329,9 +332,9 @@ class NotAMixin {
   String get superString => "A string that's clearly important";
 }
 
-class AMixinCallingSuper extends NotAMixin {
+class AMixinCallingSuper extends Object {
   @override
-  String get superString => "${super.superString} but not as important as this";
+  String get superString => "${super.toString()} but not as important as this";
 }
 
 /// I am a new style mixin using the new mixin syntax.
@@ -503,7 +506,7 @@ class ImplicitProperties {
 ///
 /// Or rather, dartdoc used to think they didn't exist.  Check the variations
 /// on inheritance and overrides here.
-class ClassWithUnusualProperties extends ImplicitProperties {
+abstract class ClassWithUnusualProperties extends ImplicitProperties {
   /// This getter is documented, so we should see a read-only property here.
   @override
   String get documentedPartialFieldInSubclassOnly => "overridden getter";
@@ -554,9 +557,6 @@ class ClassWithUnusualProperties extends ImplicitProperties {
   /// This property has some docs, too.
   final Set finalProperty = Set();
 
-  /// This property has docs.
-  abstract Set abstractProperty;
-
   Map implicitReadWrite;
 
   /// Hey there, more things not to warn about: [f], [x], or [q].
@@ -1230,7 +1230,7 @@ class _Super5 implements _Super2 {}
 class Super6 implements _Super5 {}
 
 
-abstract class IntermediateAbstract implements Object {
+abstract class IntermediateAbstract extends Object {
   /// This is an override.
   @override
   bool operator==(Object other) {}
diff --git a/testing/test_package/lib/gadget_extender.dart b/testing/test_package/lib/gadget_extender.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// @dart=2.9
+
 import 'src/gadget.dart';
 
 class GadgetExtender extends Gadget {}
diff --git a/testing/test_package/lib/implementors.dart b/testing/test_package/lib/implementors.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// @dart=2.9
+
 // A library useful to check implementer chain edge cases.
 library implementors;
 
diff --git a/testing/test_package/lib/is_deprecated.dart b/testing/test_package/lib/is_deprecated.dart
@@ -1,3 +1,6 @@
 /// This lib is deprecated. It never had a chance
+
+// @dart=2.9
+
 @deprecated
 library is_deprecated;
diff --git a/testing/test_package/lib/mylibpub.dart b/testing/test_package/lib/mylibpub.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library mylibpub;
 
 void helperFunction(String message, int i) => print(message);
diff --git a/testing/test_package/lib/override_class.dart b/testing/test_package/lib/override_class.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 import 'base_class.dart';
 
 class BoxConstraints extends Constraints {
diff --git a/testing/test_package/lib/reexport_one.dart b/testing/test_package/lib/reexport_one.dart
@@ -1,6 +1,9 @@
 /// {@canonicalFor reexport.somelib.SomeOtherClass}
 /// {@canonicalFor reexport.somelib.AUnicornClass}
 /// {@category Unreal}
+
+// @dart=2.9
+
 library reexport_one;
 
 export 'src/somelib.dart';
diff --git a/testing/test_package/lib/reexport_three.dart b/testing/test_package/lib/reexport_three.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library reexport_three;
 
 // Test show/hide handling.
diff --git a/testing/test_package/lib/reexport_two.dart b/testing/test_package/lib/reexport_two.dart
@@ -3,6 +3,9 @@
 /// {@canonicalFor something.ThatDoesntExist}
 /// {@canonicalFor reexport.somelib.DocumentThisExtensionOnce}
 /// {@category Unreal}
+
+// @dart=2.9
+
 library reexport_two;
 
 // Intentionally create some duplicates via reexporting.
diff --git a/testing/test_package/lib/set_literals.dart b/testing/test_package/lib/set_literals.dart
@@ -1,4 +1,6 @@
-const inferredTypeSet = {1, 2.5, 3};
+// @dart=2.9
+
+const inferredTypeSet = {1, 3, 5};
 const Set<int> specifiedSet = {};
 const untypedMap = {};
 const typedSet = <String>{};
@@ -8,10 +10,6 @@ class AClassContainingLiterals {
   final int value2;
 
   const AClassContainingLiterals(this.value1, this.value2);
-
-  @override
-  bool operator ==(Object other) =>
-      other is AClassContainingLiterals && value1 == other.value1;
 }
 
 const aComplexSet = {AClassContainingLiterals(3, 5)};
diff --git a/testing/test_package/lib/src/base.dart b/testing/test_package/lib/src/base.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library two_exports.src.base;
 
 import '../fake.dart';
diff --git a/testing/test_package/lib/src/extending.dart b/testing/test_package/lib/src/extending.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library two_exports.src.extending;
 
 import 'base.dart';
diff --git a/testing/test_package/lib/src/gadget.dart b/testing/test_package/lib/src/gadget.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// @dart=2.9
+
 class _GadgetBase {
   int get gadgetGetter => 5;
 }
diff --git a/testing/test_package/lib/src/import_unusual.dart b/testing/test_package/lib/src/import_unusual.dart
@@ -1,2 +1,5 @@
 /// This library exists only to be imported with an unusual URI.
+
+// @dart=2.9
+
 library import_unusual;
diff --git a/testing/test_package/lib/src/intermediate_implements.dart b/testing/test_package/lib/src/intermediate_implements.dart
@@ -2,6 +2,8 @@
 // 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.
 
+// @dart=2.9
+
 // A src-private library for intermediate classes to implement.
 library intermediate_implements;
 
diff --git a/testing/test_package/lib/src/mixins.dart b/testing/test_package/lib/src/mixins.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library mixins;
 
 export 'mixins_base.dart';
diff --git a/testing/test_package/lib/src/mixins_base.dart b/testing/test_package/lib/src/mixins_base.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library mixins_base;
 
 mixin AMixin {}
diff --git a/testing/test_package/lib/src/mylib.dart b/testing/test_package/lib/src/mylib.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library src.mylib;
 
 void helperFunction(String message) => print(message);
diff --git a/testing/test_package/lib/src/nodocme.dart b/testing/test_package/lib/src/nodocme.dart
@@ -2,6 +2,9 @@
 /// The library nodocme should never have any members documented, even if
 /// reexported, due to dartdoc_options.yaml in the package root.
 ///
+
+// @dart=2.9
+
 library nodocme;
 
 /// I should not appear in documentation.
diff --git a/testing/test_package/lib/src/reexport_this.dart b/testing/test_package/lib/src/reexport_this.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 
 library reexport_this;
 
diff --git a/testing/test_package/lib/src/shadow_lib.dart b/testing/test_package/lib/src/shadow_lib.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library shadow_lib;
 
 class ADuplicateClass {
diff --git a/testing/test_package/lib/src/shadowing_lib.dart b/testing/test_package/lib/src/shadowing_lib.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library shadowing_lib;
 
 class ADuplicateClass {
diff --git a/testing/test_package/lib/src/somelib.dart b/testing/test_package/lib/src/somelib.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library reexport.somelib;
 
 class SomeClass {}
diff --git a/testing/test_package/lib/src/tool.dart b/testing/test_package/lib/src/tool.dart
@@ -1,3 +1,5 @@
+// @dart=2.9
+
 library test_package.tool;
 
 abstract class PrivateLibraryToolUser {
diff --git a/testing/test_package/lib/two_exports.dart b/testing/test_package/lib/two_exports.dart
@@ -1,5 +1,8 @@
 /// {@category Real Libraries}
 /// {@category Misc}
+
+// @dart=2.9
+
 library two_exports;
 
 export 'src/base.dart';
diff --git a/testing/test_package/lib/unrelated_factories.dart b/testing/test_package/lib/unrelated_factories.dart
diff --git a/testing/test_package/pubspec.yaml b/testing/test_package/pubspec.yaml

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+// @dart=2.9`
	`2`	`+`
`1`	`3`	`library base_class;`
`2`	`4`
`3`	`5`	`/// Abstract class Constraints`