diff --git a/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart b/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart index 5069023b60..509ea1efc7 100644 --- a/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart +++ b/packages/flutter_tools/test/commands.shard/hermetic/run_test.dart @@ -469,7 +469,7 @@ void main() { Usage: () => usage, }); - testUsingContext('passes device target platform to usage', () async { + testUsingContext('passes device target platform to analytics', () async { final RunCommand command = RunCommand(); final FakeDevice mockDevice = FakeDevice(sdkNameAndVersion: 'iOS 13') ..startAppSuccess = false; @@ -485,14 +485,6 @@ void main() { '--no-hot', ]), isNull); - expect(usage.commands, contains( - TestUsageCommand('run', parameters: CustomDimensions.fromMap({ - 'cd3': 'false', 'cd4': 'ios', 'cd22': 'iOS 13', - 'cd23': 'debug', 'cd18': 'false', 'cd15': 'swift', 'cd31': 'true', - 'cd57': 'usb', - 'cd58': 'false', - }) - ))); expect( fakeAnalytics.sentEvents, contains( @@ -522,7 +514,7 @@ void main() { analytics.Analytics: () => fakeAnalytics, }); - testUsingContext('correctly reports tests to usage', () async { + testUsingContext('correctly reports tests to analytics', () async { fs.currentDirectory.childDirectory('test').childFile('widget_test.dart').createSync(recursive: true); fs.currentDirectory.childDirectory('ios').childFile('AppDelegate.swift').createSync(recursive: true); final RunCommand command = RunCommand(); @@ -538,14 +530,6 @@ void main() { 'test/widget_test.dart', ]), isNull); - expect(usage.commands, contains( - TestUsageCommand('run', parameters: CustomDimensions.fromMap({ - 'cd3': 'false', 'cd4': 'ios', 'cd22': 'iOS 13', - 'cd23': 'debug', 'cd18': 'false', 'cd15': 'swift', 'cd31': 'true', - 'cd57': 'usb', - 'cd58': 'true', - })), - )); expect( fakeAnalytics.sentEvents, contains( diff --git a/packages/flutter_tools/test/src/context.dart b/packages/flutter_tools/test/src/context.dart index a4b3c7161f..8207b601da 100644 --- a/packages/flutter_tools/test/src/context.dart +++ b/packages/flutter_tools/test/src/context.dart @@ -126,6 +126,7 @@ void testUsingContext( TemplateRenderer: () => const MustacheTemplateRenderer(), BuildTargets: () => const BuildTargetsImpl(), Analytics: () => const NoOpAnalytics(), + Stdio: () => FakeStdio(), }, body: () { // To catch all errors thrown by the test, even uncaught async errors, we use a zone. diff --git a/packages/flutter_tools/test/src/fakes.dart b/packages/flutter_tools/test/src/fakes.dart index d473e5b57c..ff6f6deebc 100644 --- a/packages/flutter_tools/test/src/fakes.dart +++ b/packages/flutter_tools/test/src/fakes.dart @@ -254,7 +254,7 @@ class FakeStdio extends Stdio { } @override - bool hasTerminal = true; + bool hasTerminal = false; List get writtenToStdout => _stdout.writes.map(_stdout.encoding.decode).toList(); List get writtenToStderr => _stderr.writes.map(_stderr.encoding.decode).toList(); @@ -281,6 +281,9 @@ class FakeStdin extends Fake implements Stdin { @override bool lineMode = true; + @override + bool hasTerminal = false; + @override Stream transform(StreamTransformer, S> transformer) { return controller.stream.transform(transformer);