Trim unused TestCompiler members, rename javaTestSettings

Author: jupblb

build.sbt

@@ -591,7 +591,7 @@ lazy val snapshots = project
   .in(file("tests/snapshots"))
   .settings(
     javaOnlySettings,
-    javaJUnitTestSettings,
+    javaTestSettings,
     Compile / mainClass := Some("tests.SaveSnapshots"),
     Compile / run / fork := true,
     Test / javaOptions ++= snapshotPathOptions.value,
@@ -609,14 +609,13 @@ lazy val javaOnlySettings = List[Def.Setting[_]](
   Compile / javacOptions ++= Seq("--release", "11")
 )
 
-lazy val javaJUnitTestSettings = List[Def.Setting[_]](
+lazy val javaTestSettings = List[Def.Setting[_]](
   (publish / skip) := true,
   autoScalaLibrary := false,
   crossPaths := false,
   Test / fork := true,
-  // Open the JDK-internal javac packages to in-process tests that drive
-  // javac via reflection (e.g. JavacClassesDirectoryTest, TestCompiler).
-  // On JDK 17+ this is required or the reflective access fails.
+  // Open the JDK-internal javac packages to the in-process javac the tests
+  // drive; on JDK 17+ this is required or the reflective access fails.
   Test / javaOptions ++= javacModuleOptions.map(_.stripPrefix("-J")),
   // Pin the JDK version embedded in stdlib SCIP symbols (e.g. `jdk 11
   // java/lang/String#`) so snapshots are stable across JDK 11/17/21.

scip-javac/src/test/java/com/sourcegraph/scip_javac/SimpleClassFile.java

@@ -22,6 +22,4 @@ public OutputStream openOutputStream() throws IOException {
   public byte[] getCompiledBinaries() {
     return out.toByteArray();
   }
-
-  // getters
 }

scip-javac/src/test/java/com/sourcegraph/scip_javac/TestCompiler.java

@@ -3,14 +3,11 @@
 import java.io.IOException;
 import java.io.StringWriter;
 import java.io.UncheckedIOException;
-import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.Path;
 import java.util.ArrayList;
-import java.util.Collections;
 import java.util.List;
 import java.util.stream.Collectors;
-import java.util.stream.Stream;
 import javax.tools.JavaCompiler;
 import javax.tools.JavaFileObject;
 import javax.tools.ToolProvider;
@@ -39,31 +36,6 @@ public TestCompiler(
         new SimpleFileManager(compiler.getStandardFileManager(null, null, null), targetroot);
   }
 
-  public TestCompiler(String classpath, List<String> javacOptions, Path targetroot) {
-    this(classpath, javacOptions, targetroot, createTempDir());
-  }
-
-  public TestCompiler(Path targetroot) {
-    this(PROCESSOR_PATH, Collections.emptyList(), targetroot);
-  }
-
-  public CompileResult compileScipDirectory(Path dir) {
-    return compileScip(inputsFromDirectory(dir));
-  }
-
-  public CompileResult compileScip(List<VirtualFile> inputs) {
-    return compile(
-        inputs,
-        Collections.singletonList(
-            String.format(
-                "-Xplugin:scip -verbose -text:on -sourceroot:%s -targetroot:%s",
-                sourceroot, targetroot)));
-  }
-
-  public CompileResult compile(List<VirtualFile> inputs) {
-    return compile(inputs, Collections.emptyList());
-  }
-
   public CompileResult compile(List<VirtualFile> inputs, List<String> extraJavacOptions) {
     List<VirtualFile> javacInputs =
         inputs.stream().filter(i -> i.path.endsWith(".java")).collect(Collectors.toList());
@@ -108,33 +80,4 @@ private CompileResult compileJavac(List<VirtualFile> inputs, List<String> extraJ
     }
     return new CompileResult(bytecode, output.toString(), docs, isSuccess);
   }
-
-  private List<VirtualFile> inputsFromDirectory(Path dir) {
-    try (Stream<Path> paths = Files.walk(dir)) {
-      return paths
-          .filter(Files::isRegularFile)
-          .filter(p -> p.getFileName().toString().endsWith(".java"))
-          .map(
-              p -> {
-                try {
-                  return new VirtualFile(
-                      dir.relativize(p).toString(),
-                      new String(Files.readAllBytes(p), StandardCharsets.UTF_8));
-                } catch (IOException e) {
-                  throw new UncheckedIOException(e);
-                }
-              })
-          .collect(Collectors.toList());
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
-  }
-
-  private static Path createTempDir() {
-    try {
-      return Files.createTempDirectory("scip-javac");
-    } catch (IOException e) {
-      throw new UncheckedIOException(e);
-    }
-  }
 }