Replace ZipOutputFileManager with the standard filemanager and JimFS

Now that the standard filemanager supports nio, there's a better-supported way
to keep the compilation outputs in memory. ZipOutputFileManager doesn't
implement the full filemanager contract, is not compatible with the latest
javac 9's.

--
PiperOrigin-RevId: 151082823
MOS_MIGRATED_REVID=151082823

1 files changed, 2 insertions, 2 deletions

diff --git a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
index ab68d1886b..1613cae0b5 100644
--- a/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
+++ b/src/java_tools/buildjar/javatests/com/google/devtools/build/java/turbine/javac/JavacTurbineTest.java
@@ -825,7 +825,7 @@ public class JavacTurbineTest {
             new JavacTurbine(new PrintWriter(sw, true), optionsBuilder.build())) {
       Result result = turbine.compile();
       assertThat(result).isEqualTo(Result.ERROR);
-      assertThat(sw.toString()).contains("error reading");
+      assertThat(sw.toString()).contains("unmappable character for encoding UTF-8");
     }
   }
 
@@ -1080,7 +1080,7 @@ public class JavacTurbineTest {
         new JavacTurbine(new PrintWriter(errOutput, true), optionsBuilder.build())) {
       assertThat(turbine.compile()).isEqualTo(Result.ERROR);
     }
-    assertThat(errOutput.toString()).contains("FileNotFoundException: /NO_SUCH_FILE");
+    assertThat(errOutput.toString()).contains("NoSuchFileException: /classes/NO_SUCH_FILE");
   }
 
   @Test