commit 7851a75183d7c0c0b2179c2c0b1b48dfe880eb18
author Jonah Williams <jonahwilliams@google.com> Wed Jun 19 11:43:06 2019 -0700
committer GitHub <noreply@github.com> Wed Jun 19 11:43:06 2019 -0700
tree 8c7127ad182d54099df9de522499f1cf8556f8c1
parent 0d4f4bddb6c2e167621c286385726168df730e50

Fix NPE in flutter tools (#34725)

packages/flutter_tools/test/android/gradle_test.dart

diff --git a/packages/flutter_tools/test/android/gradle_test.dart b/packages/flutter_tools/test/android/gradle_test.dart
index 7aafd64..36e6146 100644
--- a/packages/flutter_tools/test/android/gradle_test.dart
+++ b/packages/flutter_tools/test/android/gradle_test.dart
@@ -41,6 +41,18 @@
       expect(shouldBeToolExit, isToolExit);
     });
 
+    // Regression test for https://github.com/flutter/flutter/issues/34700
+    testUsingContext('Does not return nulls in apk list', () {
+      final GradleProject gradleProject = MockGradleProject();
+      const AndroidBuildInfo buildInfo = AndroidBuildInfo(BuildInfo.debug);
+      when(gradleProject.apkFilesFor(buildInfo)).thenReturn(<String>['not_real']);
+      when(gradleProject.apkDirectory).thenReturn(fs.currentDirectory);
+
+      expect(findApkFiles(gradleProject, buildInfo), <File>[]);
+    }, overrides: <Type, Generator>{
+      FileSystem: () => MemoryFileSystem(),
+    });
+
     test('androidXFailureRegex should match lines with likely AndroidX errors', () {
       final List<String> nonMatchingLines = <String>[
         ':app:preBuild UP-TO-DATE',
@@ -537,3 +549,4 @@
 class MockLocalEngineArtifacts extends Mock implements LocalEngineArtifacts {}
 class MockProcessManager extends Mock implements ProcessManager {}
 class MockXcodeProjectInterpreter extends Mock implements XcodeProjectInterpreter {}
+class MockGradleProject extends Mock implements GradleProject {}