commit edb150c82339f9043f21f2d74d343859e463c9d2
author janakr <janakr@google.com> Mon Dec 06 07:20:19 2021 -0800
committer Copybara-Service <copybara-worker@google.com> Mon Dec 06 07:21:57 2021 -0800
tree 2116f3885af3fbd2cdbbb897fc8624b0b196c689
parent 5738a1c735a1c94d15f81bfda49526880e07071d

Use @TestParameterInjector in LoadingPhaseRunnerTest.

PiperOrigin-RevId: 414434816

src/test/java/com/google/devtools/build/lib/pkgcache/BUILD

diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/BUILD b/src/test/java/com/google/devtools/build/lib/pkgcache/BUILD
index 7c37fae..36a98a7 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/BUILD
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/BUILD
@@ -264,6 +264,7 @@
         "//third_party:guava",
         "//third_party:junit4",
         "//third_party:truth",
+        "@com_google_testparameterinjector//:testparameterinjector",
     ],
 )
 

src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
index 11f87ca..64f8f03 100644
--- a/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/pkgcache/LoadingPhaseRunnerTest.java
@@ -71,6 +71,8 @@
 import com.google.devtools.common.options.Options;
 import com.google.devtools.common.options.OptionsParser;
 import com.google.devtools.common.options.OptionsParsingException;
+import com.google.testing.junit.testparameterinjector.TestParameter;
+import com.google.testing.junit.testparameterinjector.TestParameterInjector;
 import java.io.IOException;
 import java.io.InputStream;
 import java.util.ArrayList;
@@ -84,10 +86,9 @@
 import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.JUnit4;
 
 /** Tests for {@link SkyframeExecutor#loadTargetPatternsWithFilters}. */
-@RunWith(JUnit4.class)
+@RunWith(TestParameterInjector.class)
 public final class LoadingPhaseRunnerTest {
 
   private LoadingPhaseTester tester;
@@ -1295,17 +1296,20 @@
     runTestPackageFileInconsistencyError(false, "//...");
   }
 
-  private void runTestExtensionLoadingError(boolean keepGoing, String... patterns)
+  @Test
+  public void extensionLoadingError(
+      @TestParameter boolean keepGoing,
+      @TestParameter({"//bad:BUILD", "//bad:all", "//bad/...", "//..."}) String pattern)
       throws Exception {
     tester.addFile("bad/f1.bzl", "nope");
     tester.addFile("bad/BUILD", "load(\":f1.bzl\", \"not_a_symbol\")");
     if (keepGoing) {
-      TargetPatternPhaseValue value = tester.loadKeepGoing(patterns);
+      TargetPatternPhaseValue value = tester.loadKeepGoing(pattern);
       assertThat(value.hasError()).isTrue();
       tester.assertContainsWarning("Target pattern parsing failed");
     } else {
       TargetParsingException exn =
-          assertThrows(TargetParsingException.class, () -> tester.load(patterns));
+          assertThrows(TargetParsingException.class, () -> tester.load(pattern));
       assertThat(exn).hasCauseThat().isInstanceOf(BuildFileContainsErrorsException.class);
       assertThat(exn)
           .hasCauseThat()
@@ -1319,50 +1323,6 @@
     tester.assertContainsError("/workspace/bad/f1.bzl:1:1: name 'nope' is not defined");
   }
 
-  @Test
-  public void testExtensionLoadingError_keepGoing_explicitTarget() throws Exception {
-    runTestExtensionLoadingError(/*keepGoing=*/ true, "//bad:BUILD");
-  }
-
-  @Test
-  public void testExtensionLoadingError_noKeepGoing_explicitTarget() throws Exception {
-    runTestExtensionLoadingError(/*keepGoing=*/ false, "//bad:BUILD");
-  }
-
-  @Test
-  public void testExtensionLoadingError_keepGoing_targetsInPackage() throws Exception {
-    runTestExtensionLoadingError(/*keepGoing=*/ true, "//bad:all");
-  }
-
-  @Test
-  public void testExtensionLoadingError_noKeepGoing_targetsInPackage() throws Exception {
-    runTestExtensionLoadingError(/*keepGoing=*/ false, "//bad:all");
-  }
-
-  @Test
-  public void testExtensionLoadingError_keepGoing_targetsBeneathDirectory() throws Exception {
-    runTestExtensionLoadingError(/*keepGoing=*/ true, "//bad/...");
-  }
-
-  @Test
-  public void testExtensionLoadingError_noKeepGoing_targetsBeneathDirectory() throws Exception {
-    runTestExtensionLoadingError(/*keepGoing=*/ false, "//bad/...");
-  }
-
-  @Test
-  public void testExtensionLoadingError_keepGoing_someGoodTargetsBeneathDirectory()
-      throws Exception {
-    tester.addFile("good/BUILD", "sh_library(name = 't')\n");
-    runTestExtensionLoadingError(/*keepGoing=*/ true, "//...");
-  }
-
-  @Test
-  public void testExtensionLoadingError_noKeepGoing_someGoodTargetsBeneathDirectory()
-      throws Exception {
-    tester.addFile("good/BUILD", "sh_library(name = 't')\n");
-    runTestExtensionLoadingError(/*keepGoing=*/ false, "//...");
-  }
-
   private static final class LoadingPhaseTester {
     private final ManualClock clock = new ManualClock();
     private final CustomInMemoryFs fs = new CustomInMemoryFs(clock);