Make dartdev test_all.dart test all and work.

This corrects some tests that just weren't working for myself and
others while disabling a small number that don't work anymore or
are blocked on a bug.

Bug: #51707
Change-Id: Ib537d210e80baa3bb80578f0fcccc063a2029173
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/288623
Auto-Submit: Janice Collins <[email protected]>
Reviewed-by: Ben Konyi <[email protected]>
Commit-Queue: Janice Collins <[email protected]>

Author: jcollins-g

pkg/dartdev/lib/src/templates/web.dart

@@ -53,7 +53,8 @@ dependencies:
   # path: ^1.8.0
 
 dev_dependencies:
-  build_runner: ^2.3.0
+  build_daemon: ">=2.0.0 <4.0.0"
+  build_runner: ^2.4.0
   build_web_compilers: ^4.0.0
   lints: ^2.0.0
 ''';

pkg/dartdev/test/analytics_test.dart

@@ -19,7 +19,8 @@ List<Map> extractAnalytics(ProcessResult result) {
       .toList();
 }
 
-Future<void> main() async {
+void main() {
+  final experiments = experimentsWithValidation();
   group('DisabledAnalytics', disabledAnalyticsObject);
 
   group('VM -> CLI --analytics flag smoke test:', () {
@@ -67,7 +68,6 @@ Future<void> main() async {
 '''));
   });
 
-  final experiments = await experimentsWithValidation();
   group('Sending analytics', () {
     test('help', () async {
       final p = project(logAnalytics: true);

pkg/dartdev/test/commands/compile_test.dart

@@ -389,7 +389,10 @@ void defineCompileTests() {
     expect(result.stdout, contains('I love AOT'));
     expect(result.stderr, isEmpty);
     expect(result.exitCode, 0);
-  }, skip: isRunningOnIA32);
+  },
+      skip: isRunningOnIA32 ||
+          // Allow on MacOS after dart-lang/sdk#51707 is fixed.
+          Platform.isMacOS);
 
   test('Compile and run kernel snapshot', () async {
     final p = project(mainSrc: 'void main() { print("I love kernel"); }');
@@ -1281,6 +1284,9 @@ void main() {
       // Now perform the same basic compile and run test with the signed
       // dartaotruntime.
       await basicCompileTest();
-    }, skip: isRunningOnIA32);
+    },
+        skip: isRunningOnIA32 ||
+            // Allow on MacOS after dart-lang/sdk#51707 is fixed.
+            Platform.isMacOS);
   }
 }

pkg/dartdev/test/commands/fix_test.dart

@@ -4,7 +4,6 @@
 
 import 'dart:io';
 
-import 'package:cli_util/cli_logging.dart';
 import 'package:path/path.dart' as path;
 import 'package:test/test.dart';
 
@@ -17,13 +16,27 @@ void main() {
 /// Enable to run from local source (useful in development).
 const runFromSource = false;
 
+final bullet = '•';
+final nonAnsiBullet = '-';
+
+/// Allow for different bullets; depending on how the test harness is run,
+/// subprocesses may decide to give us ansi bullets or normal bullets.
+/// TODO(jcollins): find a way to detect which one we should be expecting.
+Matcher stringContainsInOrderWithVariableBullets(List<String> substrings) {
+  var substitutedSubstrings = substrings;
+  if (substrings.any((s) => s.contains(bullet))) {
+    substitutedSubstrings =
+        substrings.map((s) => s.replaceAll(bullet, nonAnsiBullet)).toList();
+  }
+  return anyOf(stringContainsInOrder(substrings),
+      stringContainsInOrder(substitutedSubstrings));
+}
+
 void defineFix() {
   TestProject? p;
 
   late ProcessResult result;
 
-  final bullet = Logger.standard().ansi.bullet;
-
   setUp(() => p = null);
 
   tearDown(() async => await p?.dispose());
@@ -136,7 +149,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             'Applying fixes...',
             'lib${Platform.pathSeparator}main.dart',
             '  prefer_single_quotes $bullet 1 fix',
@@ -166,7 +179,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             '3 proposed fixes in 1 file.',
             'lib${Platform.pathSeparator}main.dart',
             '  annotate_overrides $bullet 1 fix',
@@ -201,7 +214,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             '1 proposed fix in 1 file.',
             'lib${Platform.pathSeparator}main.dart',
             '  prefer_single_quotes $bullet 1 fix',
@@ -229,7 +242,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             "Unable to compute fixes: The diagnostic '_undefined_' is not defined by the analyzer.",
           ]));
     });
@@ -251,7 +264,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             'Applying fixes...',
             'main.dart',
             '  prefer_single_quotes $bullet 1 fix',
@@ -281,7 +294,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             'Applying fixes...',
             'lib${Platform.pathSeparator}main.dart',
             '  prefer_single_quotes $bullet 1 fix',
@@ -299,7 +312,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             "Unable to compute fixes: The diagnostic '_undefined_' is not defined by the analyzer.",
           ]));
     });
@@ -323,7 +336,8 @@ linter:
           workingDir: p!.dirPath);
       expect(result.exitCode, 0);
       expect(result.stderr, isEmpty);
-      expect(result.stdout, stringContainsInOrder(['Nothing to fix!']));
+      expect(result.stdout,
+          stringContainsInOrderWithVariableBullets(['Nothing to fix!']));
     });
 
     test('--apply --code=(multiple: one undefined)', () async {
@@ -353,7 +367,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             "Unable to compute fixes: The diagnostic '_undefined_' is not defined by the analyzer.",
           ]));
     });
@@ -385,7 +399,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             'Applying fixes...',
             'lib${Platform.pathSeparator}main.dart',
             '  prefer_single_quotes $bullet 1 fix',
@@ -416,7 +430,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             'Applying fixes...',
             'lib${Platform.pathSeparator}main.dart',
             '  prefer_single_quotes $bullet 1 fix',
@@ -441,7 +455,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             'Applying fixes...',
             'lib${Platform.pathSeparator}main.dart',
             '  prefer_single_quotes $bullet 1 fix',
@@ -466,7 +480,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             'Applying fixes...',
             'lib${Platform.pathSeparator}main.dart',
             '  prefer_double_quotes $bullet 2 fixes',
@@ -531,7 +545,7 @@ linter:
       expect(result.stderr, isEmpty);
       expect(
           result.stdout,
-          stringContainsInOrder([
+          stringContainsInOrderWithVariableBullets([
             'Applying fixes...',
             'lib${Platform.pathSeparator}main.dart',
             '  prefer_single_quotes $bullet 1 fix',

pkg/dartdev/test/commands/info_windows_test.dart

@@ -4,6 +4,8 @@
 
 @TestOn('windows')
 
+import 'dart:io';
+
 import 'package:dartdev/src/processes.dart';
 import 'package:test/test.dart';
 
@@ -35,7 +37,7 @@ void main() {
       // 233384kb == 227MB
       expect(result.memoryMb, 227);
     });
-  });
+  }, skip: !Platform.isWindows);
 
   group('info windows', () {
     late TestProject p;
@@ -56,5 +58,5 @@ void main() {
       expect(output, contains('| Memory'));
       expect(output, contains('| dart.exe '));
     });
-  }, timeout: longTimeout);
+  }, timeout: longTimeout, skip: !Platform.isWindows);
 }