Migrate the testing/ packages

analysis_options.yaml

@@ -14,8 +14,21 @@ analyzer:
     - 'lib/src/third_party/pkg/**'
     - 'lib/templates/*.html'
     - 'pub.dartlang.org/**'
-    - 'testing/**'
+    # These have a lot of lint.
+    - 'testing/test_package/**'
+    - 'testing/test_package_custom_templates/**'
+    - 'testing/test_package_experiments/**'
+    - 'testing/test_package_export_error/**'
+    - 'testing/test_package_extensions/**'
+    - 'testing/test_package_import_export_error/**'
+    - 'testing/test_package_imported/**'
+    - 'testing/test_package_options/**'
+    # This package imports flutter, which is perhaps not found by the base `dart analyze` tool.
     - 'testing/flutter_packages/test_package_flutter_plugin/**'
+    # This package is meant to mock the sky_engine package.
+    - 'testing/sky_engine/**'
+    # These packages have compile-time errors.
+    - 'testing/test_package_bad/**'
     - 'testing/test_package_export_error/**'
 linter:
   rules:

analysis_options_presubmit.yaml

@@ -19,9 +19,21 @@ analyzer:
     - 'lib/src/third_party/pkg/**'
     - 'lib/templates/*.html'
     - 'pub.dartlang.org/**'
-    - 'testing/**'
-    - 'testing/flutter_packages/test_package_flutter_plugin/**'
+    # These have a lot of lint.
+    - 'testing/test_package/**'
+    - 'testing/test_package_custom_templates/**'
+    - 'testing/test_package_experiments/**'
     - 'testing/test_package_export_error/**'
+    - 'testing/test_package_extensions/**'
+    - 'testing/test_package_import_export_error/**'
+    - 'testing/test_package_imported/**'
+    - 'testing/test_package_options/**'
+    # This package imports flutter, which is perhaps not found by the base `dart analyze` tool.
+    - 'testing/flutter_packages/test_package_flutter_plugin/**'
+    # This package is meant to mock the sky_engine package.
+    - 'testing/sky_engine/**'
+    # These packages have compile-time errors.
+    - 'testing/test_package_bad/**'
 linter:
   rules:
     - always_declare_return_types

test/end2end/model_test.dart

@@ -936,7 +936,9 @@ void main() {
     });
 
     test('does not have a null safety label if not null safe', () {
-      expect(exLibrary.isNullSafety, isFalse);
+      var optOutLibrary = packageGraph.libraries
+          .firstWhere((lib) => lib.name == 'opt_out_of_nnbd');
+      expect(optOutLibrary.isNullSafety, isFalse);
     });
 
     test('has a line number and column', () {
@@ -3381,7 +3383,7 @@ void main() {
       expect(
           thisIsFutureOrT.modelType.returnType.linkedName,
           equals(
-              'FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span>'));
+              'FutureOr<span class="signature">&lt;<wbr><span class="type-parameter">T</span>&gt;</span>?'));
     });
 
     test('function with a parameter having type FutureOr<Null>', () {
@@ -3417,7 +3419,7 @@ void main() {
     test('has source code', () {
       expect(topLevelFunction.sourceCode, startsWith('@deprecated'));
       expect(topLevelFunction.sourceCode, endsWith('''
-String topLevelFunction(int param1, bool param2, Cool coolBeans,
+String? topLevelFunction(int param1, bool param2, Cool coolBeans,
     [double optionalPositional = 0.0]) {
   return null;
 }'''));
@@ -3486,15 +3488,19 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     test('parameterized type from field is correctly displayed', () {
       var aField = TemplatedInterface.instanceFields
           .singleWhere((f) => f.name == 'aField');
-      expect(aField.modelType.linkedName,
-          '<a href="${htmlBasePlaceholder}ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">Stream<span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>&gt;</span>');
+      expect(
+          aField.modelType.linkedName,
+          '<a href="${htmlBasePlaceholder}ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a>'
+          '<span class="signature">&lt;<wbr><span class="type-parameter">Stream<span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span></span>&gt;</span>?');
     });
 
     test('parameterized type from inherited field is correctly displayed', () {
       var aInheritedField = TemplatedInterface.inheritedFields
           .singleWhere((f) => f.name == 'aInheritedField');
-      expect(aInheritedField.modelType.linkedName,
-          '<a href="${htmlBasePlaceholder}ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a><span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span>');
+      expect(
+          aInheritedField.modelType.linkedName,
+          '<a href="${htmlBasePlaceholder}ex/AnotherParameterizedClass-class.html">AnotherParameterizedClass</a>'
+          '<span class="signature">&lt;<wbr><span class="type-parameter">List<span class="signature">&lt;<wbr><span class="type-parameter">int</span>&gt;</span></span>&gt;</span>?');
     });
 
     test(
@@ -3751,7 +3757,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
 
     test('method source code indents correctly', () {
       expect(convertToMap.sourceCode,
-          'Map&lt;X, Y&gt; convertToMap() =&gt; null;');
+          'Map&lt;X, Y&gt;? convertToMap() =&gt; null;');
     });
   });
 
@@ -4283,7 +4289,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           genericTypedefCombo.modelType.linkedName,
           equals(
-              '<a href="%%__HTMLBASE_dartdoc_internal__%%fake/NewGenericTypedef.html">NewGenericTypedef</a>'));
+              '<a href="%%__HTMLBASE_dartdoc_internal__%%fake/NewGenericTypedef.html">NewGenericTypedef</a>?'));
     });
 
     test('Verify that final and late show up (or not) appropriately', () {
@@ -4323,7 +4329,8 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
       expect(
           complicatedReturn.modelType.linkedName,
           equals(
-              '<a href="${htmlBasePlaceholder}fake/ATypeTakingClass-class.html">ATypeTakingClass</a><span class="signature">&lt;<wbr><span class="type-parameter">String Function<span class="signature">(<span class="parameter" id="param-"><span class="type-annotation">int</span></span>)</span></span>&gt;</span>'));
+              '<a href="${htmlBasePlaceholder}fake/ATypeTakingClass-class.html">ATypeTakingClass</a>'
+              '<span class="signature">&lt;<wbr><span class="type-parameter">String Function<span class="signature">(<span class="parameter" id="param-"><span class="type-annotation">int</span></span>)</span></span>&gt;</span>?'));
     });
 
     test('@nodoc on simple property works', () {
@@ -4878,7 +4885,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
 
     test('param with annotations', () {
       var method =
-          fakeLibrary.functions.firstWhere((f) => f.name == 'paintImage1');
+          fakeLibrary.functions.firstWhere((f) => f.name == 'paintImage2');
       var params =
           ParameterRendererHtml().renderLinkedParams(method.parameters);
       expect(
@@ -5104,16 +5111,18 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
     });
 
     test('Property fields are terminated with semicolon', () {
-      expect(finalProperty.sourceCode.trim(), endsWith('List&lt;int&gt;();'));
-      expect(simpleProperty.sourceCode.trim(), endsWith('List&lt;int&gt;();'));
+      expect(finalProperty.sourceCode.trim(),
+          endsWith('List&lt;int&gt;.filled(1, 1);'));
+      expect(simpleProperty.sourceCode.trim(),
+          endsWith('List&lt;int&gt;.filled(1, 1);'));
       expect(forInheriting.sourceCode.trim(), endsWith('forInheriting;'));
     });
 
     test('Arrow accessors are terminated with semicolon', () {
       expect(explicitGetterImplicitSetter.getter.sourceCode.trim(),
-          endsWith('List&lt;int&gt;();'));
+          endsWith('List&lt;int&gt;.filled(1, 1);'));
       expect(explicitGetterSetter.getter.sourceCode.trim(),
-          endsWith('List&lt;int&gt;();'));
+          endsWith('List&lt;int&gt;.filled(1, 1);'));
     });
 
     test('Traditional accessors are not terminated with semicolon', () {
@@ -5124,7 +5133,7 @@ String topLevelFunction(int param1, bool param2, Cool coolBeans,
 
     test('Whole declaration is visible when declaration spans many lines', () {
       expect(ensureWholeDeclarationIsVisible.sourceCode,
-          contains('List&lt;int&gt; '));
+          contains('List&lt;int&gt;? '));
     });
   });
 

testing/test_package/bin/drill.dart

@@ -2,8 +2,6 @@
 // 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.
 

testing/test_package/bin/print_macro.dart

@@ -2,8 +2,6 @@
 // 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.
 

testing/test_package/bin/setup.dart

@@ -2,8 +2,6 @@
 // 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.
 

testing/test_package/lib/anonymous_library.dart

@@ -1,5 +1,3 @@
 // DO NOT give this library a name
 
-// @dart=2.9
-
 String doesStuff() => 'hi';

testing/test_package/lib/another_anonymous_lib.dart

@@ -1,5 +1,3 @@
 // DO NOT give this library a name
 
-// @dart=2.9
-
 String greeting() => "Hello";

testing/test_package/lib/base_class.dart

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 library base_class;
 
 /// Abstract class Constraints

testing/test_package/lib/code_in_comments.dart

@@ -11,6 +11,4 @@
 ///   - 3.14
 /// ```
 
-// @dart=2.9
-
 library code_in_comments;

testing/test_package/lib/completely_empty_lib.dart

@@ -1 +1 @@
-// @dart=2.9
+

testing/test_package/lib/css.dart

@@ -2,8 +2,6 @@
 /// with directories created by dartdoc.
 /// {@category Other}
 
-// @dart=2.9
-
 library css;
 
 String theOnlyThingInTheLibrary = 'hello';

testing/test_package/lib/csspub.dart

@@ -1,5 +1,3 @@
-// @dart=2.9
-
 library csspub;
 
 String theOnlyThingInTheLibrary = 'hello';