Fix Files test expectations (Now more consistent)
Fix 24 red bot
Change-Id: If835f5ffba675e1ad1c4b66a8d3b546bf027d2d4
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 9508e8c..4508cc1 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
@@ -50,19 +50,10 @@
"null",
"true",
"unsupported",
- "j$.nio.file.attribute");
- private static final String EXPECTED_RESULT_DESUGARING_FILE_SYSTEM_PLATFORM_CHANNEL =
- StringUtils.lines(
- "bytes written: 11",
- "String written: Hello World",
- "bytes read: 11",
- "String read: Hello World",
- "unsupported",
- "unsupported",
- "null",
- "true",
- "unsupported",
- "j$.nio.file.attribute");
+ "j$.nio.file.attribute",
+ "tmp",
+ "/",
+ "true");
private static final String EXPECTED_RESULT_PLATFORM_FILE_SYSTEM_DESUGARING =
StringUtils.lines(
"bytes written: 11",
@@ -120,9 +111,7 @@
? EXPECTED_RESULT_PLATFORM_FILE_SYSTEM_DESUGARING
: EXPECTED_RESULT_PLATFORM_FILE_SYSTEM;
}
- return libraryDesugaringSpecification.hasNioChannelDesugaring(parameters)
- ? EXPECTED_RESULT_DESUGARING_FILE_SYSTEM
- : EXPECTED_RESULT_DESUGARING_FILE_SYSTEM_PLATFORM_CHANNEL;
+ return EXPECTED_RESULT_DESUGARING_FILE_SYSTEM;
}
@Test
