Removed dependency on BuiltInCheckerSuppliers from ErrorProneTestComp…

…iler

This is breaking a loop in preparation for separating out maven
artifacts for compiling the tests.

RELNOTES: Removed dependency on BuiltInCheckerSuppliers from
ErrorProneTestCompiler

MOE_MIGRATED_REVID=134140791

core/src/test/java/com/google/errorprone/CommandLineFlagTest.java

@@ -27,6 +27,7 @@
 import com.google.errorprone.bugpatterns.BugChecker.ReturnTreeMatcher;
 import com.google.errorprone.bugpatterns.EmptyIfStatement;
 import com.google.errorprone.matchers.Description;
+import com.google.errorprone.scanner.BuiltInCheckerSuppliers;
 import com.google.errorprone.scanner.ScannerSupplier;
 import com.sun.source.tree.ReturnTree;
 import com.sun.tools.javac.main.Main.Result;
@@ -100,9 +101,11 @@ public Description matchReturn(ReturnTree tree, VisitorState state) {
   public void setUp() {
     output = new StringWriter();
     diagnosticHelper = new DiagnosticTestHelper();
-    builder = new ErrorProneTestCompiler.Builder()
-        .listenToDiagnostics(diagnosticHelper.collector)
-        .redirectOutputTo(new PrintWriter(output, true));
+    builder =
+        new ErrorProneTestCompiler.Builder()
+            .report(BuiltInCheckerSuppliers.defaultChecks())
+            .listenToDiagnostics(diagnosticHelper.collector)
+            .redirectOutputTo(new PrintWriter(output, true));
   }
 
 

core/src/test/java/com/google/errorprone/ErrorProneCompilerIntegrationTest.java

@@ -40,6 +40,7 @@
 import com.google.errorprone.bugpatterns.BugChecker.ReturnTreeMatcher;
 import com.google.errorprone.bugpatterns.NonAtomicVolatileUpdate;
 import com.google.errorprone.matchers.Description;
+import com.google.errorprone.scanner.BuiltInCheckerSuppliers;
 import com.google.errorprone.scanner.ScannerSupplier;
 import com.sun.source.tree.ExpressionStatementTree;
 import com.sun.source.tree.IdentifierTree;
@@ -90,10 +91,12 @@ public class ErrorProneCompilerIntegrationTest {
   public void setUp() {
     diagnosticHelper = new DiagnosticTestHelper();
     outputStream = new StringWriter();
-    compilerBuilder = new ErrorProneTestCompiler.Builder()
-        .named("test")
-        .redirectOutputTo(new PrintWriter(outputStream, true))
-        .listenToDiagnostics(diagnosticHelper.collector);
+    compilerBuilder =
+        new ErrorProneTestCompiler.Builder()
+            .named("test")
+            .report(BuiltInCheckerSuppliers.defaultChecks())
+            .redirectOutputTo(new PrintWriter(outputStream, true))
+            .listenToDiagnostics(diagnosticHelper.collector);
     compiler = compilerBuilder.build();
   }
 

core/src/test/java/com/google/errorprone/ErrorProneTestCompiler.java

@@ -34,7 +34,7 @@ public class ErrorProneTestCompiler {
   /** Wraps {@link com.google.errorprone.ErrorProneCompiler.Builder} */
   public static class Builder {
 
-    final ErrorProneCompiler.Builder wrappedCompilerBuilder = ErrorProneCompiler.builder();
+    final BaseErrorProneCompiler.Builder wrappedCompilerBuilder = BaseErrorProneCompiler.builder();
 
     public ErrorProneTestCompiler build() {
       return new ErrorProneTestCompiler(wrappedCompilerBuilder.build());
@@ -61,14 +61,14 @@ public Builder redirectOutputTo(PrintWriter printWriter) {
     }
   }
 
-  private final ErrorProneCompiler compiler;
+  private final BaseErrorProneCompiler compiler;
   private final ErrorProneInMemoryFileManager fileManager = new ErrorProneInMemoryFileManager();
 
   public ErrorProneInMemoryFileManager fileManager() {
     return fileManager;
   }
 
-  private ErrorProneTestCompiler(ErrorProneCompiler compiler) {
+  private ErrorProneTestCompiler(BaseErrorProneCompiler compiler) {
     this.compiler = compiler;
   }