++

Author: matanlurey

testing/scenario_app/README.md

@@ -18,7 +18,7 @@ See also:
 - [`ios/`](ios/), the iOS-side native code and tests.
 - [`android/`](android/), the Android-side native code and tests.
 
-[file_issue]: https://github.com/flutter/flutter/issues/new?labels=e:%20scenario-app,engine,platform-android,fyi-android,team-engine
+[file_issue]: https://github.com/flutter/flutter/issues/new?labels=e:%20scenario-app,engine,team-engine
 
 ## Running a smoke test on Firebase TestLab
 

testing/scenario_app/bin/README.md

@@ -5,6 +5,13 @@ This directory contains code specific to running Android integration tests.
 The tests are uploaded and run on the device using `adb`, and screenshots are
 captured and compared using Skia Gold (if available, for example on CI).
 
+See also:
+
+- [File an issue][file_issue] with the `e: scenario-app, platform-android`
+  labels.
+
+[file_issue]: https://github.com/flutter/flutter/issues/new?labels=e:%20scenario-app,engine,platform-android,fyi-android,team-engine
+
 ## Usage
 
 ```sh

testing/scenario_app/bin/utils/adb_logcat_filtering.dart

@@ -77,23 +77,23 @@ extension type const AdbLogLine._(Match _match) {
   }
 
   @visibleForTesting
-  static const Set<String> kKnownNoiseTags = <String>{
+  static const Set<String> knownNoiseTags = <String>{
     'MonitoringInstr',
     'ResourceExtractor',
-    'THREAD_STATE',
     'ziparchive',
   };
 
   @visibleForTesting
-  static const Set<String> kKnownUsefulGeneralTags = <String>{
+  static const Set<String> knownUsefulTags = <String>{
     'utter.scenario',
     'utter.scenarios',
     'TestRunner',
   };
 
   @visibleForTesting
-  static const Set<String> kKnownUsefulErrorTags = <String>{
+  static const Set<String> knownUsefulErrorTags = <String>{
     'androidemu',
+    'THREAD_STATE',
   };
 
   /// Returns `true` if the log line is verbose.
@@ -109,15 +109,15 @@ extension type const AdbLogLine._(Match _match) {
       return false;
     }
 
-    if (kKnownNoiseTags.contains(name)) {
+    if (knownNoiseTags.contains(name)) {
       return false;
     }
 
-    if (kKnownUsefulGeneralTags.contains(name)) {
+    if (knownUsefulTags.contains(name)) {
       return true;
     }
 
-    if (severity == 'E' && kKnownUsefulErrorTags.contains(name)) {
+    if (severity == 'E' && knownUsefulErrorTags.contains(name)) {
       return true;
     }
 

testing/scenario_app/test/adb_log_filter_test.dart

@@ -32,7 +32,7 @@ void main() {
   test('should never retain debug logs', () {
     final FakeAdbLogcat logcat = FakeAdbLogcat();
     final FakeAdbProcess process = logcat.withProcess();
-    final String tag = AdbLogLine.kKnownNoiseTags.first;
+    final String tag = AdbLogLine.knownNoiseTags.first;
     process.debug(tag, 'A debug message');
 
     final Iterable<String> filtered = filter(logcat.drain());
@@ -42,7 +42,7 @@ void main() {
   test('should never retain logs from known "noise" tags', () {
     final FakeAdbLogcat logcat = FakeAdbLogcat();
     final FakeAdbProcess process = logcat.withProcess();
-    final String tag = AdbLogLine.kKnownNoiseTags.first;
+    final String tag = AdbLogLine.knownNoiseTags.first;
     process.info(tag, 'Flutter flutter flutter');
 
     final Iterable<String> filtered = filter(logcat.drain());
@@ -52,7 +52,7 @@ void main() {
   test('should always retain logs from known "useful" tags', () {
     final FakeAdbLogcat logcat = FakeAdbLogcat();
     final FakeAdbProcess process = logcat.withProcess();
-    final String tag = AdbLogLine.kKnownUsefulGeneralTags.first;
+    final String tag = AdbLogLine.knownUsefulTags.first;
     process.info(tag, 'A useful message');
 
     final Iterable<String> filtered = filter(logcat.drain());
@@ -83,7 +83,7 @@ void main() {
   test('should retain E-level flags from known "useful" error tags', () {
     final FakeAdbLogcat logcat = FakeAdbLogcat();
     final FakeAdbProcess process = logcat.withProcess();
-    final String tag = AdbLogLine.kKnownUsefulErrorTags.first;
+    final String tag = AdbLogLine.knownUsefulErrorTags.first;
     process.error(tag, 'An error message');
     process.info(tag, 'An info message');