Fix Directory stream to be lazier
Bug: b/262190079
Change-Id: Id5dbfa6a0a3a68174cf38ab9a772419c72f480eb
diff --git a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/FilesTest.java b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/FilesTest.java
index aacd779..347e0a9 100644
--- a/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/FilesTest.java
+++ b/src/test/java/com/android/tools/r8/desugar/desugaredlibrary/jdk11/FilesTest.java
@@ -60,7 +60,8 @@
"/",
"true",
"tmpFile",
- "%sclass java.nio.file.DirectoryIteratorException::java.io.IOException: Here",
+ "DirectoryStream created: class"
+ + " java.nio.file.DirectoryIteratorException::java.io.IOException: Here",
"%s",
"This",
"is",
@@ -111,10 +112,6 @@
List<String> strings = new ArrayList<>();
strings.add(
libraryDesugaringSpecification.usesPlatformFileSystem(parameters)
- ? "DirectoryStream created: "
- : "");
- strings.add(
- libraryDesugaringSpecification.usesPlatformFileSystem(parameters)
&& libraryDesugaringSpecification.hasNioFileDesugaring(parameters)
? "fail"
: "npe caught");