Migrated ConfigurationTestCase and all of its sub classes to JUnit 4.

--
MOS_MIGRATED_REVID=108848083

2 files changed, 40 insertions, 5 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
index 760056ec27..e88989108c 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
@@ -14,6 +14,11 @@
 package com.google.devtools.build.lib.analysis.config;
 
 import static com.google.common.truth.Truth.assertThat;
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNull;
+import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableSet;
 import com.google.common.collect.Iterables;
@@ -27,14 +32,20 @@ import com.google.devtools.build.lib.testutil.TestConstants;
 import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
 import com.google.devtools.common.options.Options;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
 import java.util.Map;
 import java.util.regex.Pattern;
 
 /**
  * Tests for {@link BuildConfiguration}.
  */
+@RunWith(JUnit4.class)
 public class BuildConfigurationTest extends ConfigurationTestCase {
 
+  @Test
   public void testBasics() throws Exception {
     if (TestConstants.THIS_IS_BAZEL) {
       return;
@@ -56,6 +67,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
                  config.getTestLogsDirectory().getPath().toString());
   }
 
+  @Test
   public void testPlatformSuffix() throws Exception {
     if (TestConstants.THIS_IS_BAZEL) {
       return;
@@ -66,6 +78,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
         config.getOutputDirectory().getPath().toString());
   }
 
+  @Test
   public void testEnvironment() throws Exception {
     if (TestConstants.THIS_IS_BAZEL) {
       return;
@@ -83,6 +96,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     }
   }
 
+  @Test
   public void testHostCpu() throws Exception {
     for (String cpu : new String[] { "piii", "k8" }) {
       BuildConfiguration hostConfig = createHost("--host_cpu=" + cpu);
@@ -90,6 +104,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     }
   }
 
+  @Test
   public void testHostCrosstoolTop() throws Exception {
     if (TestConstants.THIS_IS_BAZEL) {
       return;
@@ -105,11 +120,13 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
         hostConfig.getFragment(CppConfiguration.class).getCcToolchainRuleLabel());
   }
 
+  @Test
   public void testMakeEnvFlags() throws Exception {
     BuildConfiguration config = create();
     assertThat(config.getMakeEnvironment().get("STRIP")).contains("strip");
   }
 
+  @Test
   public void testCaching() throws Exception {
     BuildConfiguration.Options a = Options.getDefaults(BuildConfiguration.Options.class);
     BuildConfiguration.Options b = Options.getDefaults(BuildConfiguration.Options.class);
@@ -128,16 +145,19 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     }
   }
 
+  @Test
   public void testInvalidCpu() throws Exception {
     checkInvalidCpuError("cpu", Pattern.compile(
         "No toolchain found for cpu 'bogus'. Valid cpus are: \\[\n(  [\\w-]+,\n)+]"));
   }
 
+  @Test
   public void testConfigurationsHaveUniqueOutputDirectories() throws Exception {
     assertConfigurationsHaveUniqueOutputDirectories(createCollection());
     assertConfigurationsHaveUniqueOutputDirectories(createCollection("--compilation_mode=opt"));
   }
 
+  @Test
   public void testMultiCpu() throws Exception {
     if (TestConstants.THIS_IS_BAZEL) {
       return;
@@ -154,6 +174,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
    * Check that the cpus are sorted alphabetically regardless of the order in which they are
    * specified.
    */
+  @Test
   public void testMultiCpuSorting() throws Exception {
     if (TestConstants.THIS_IS_BAZEL) {
       return;
@@ -172,6 +193,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     }
   }
 
+  @Test
   public void testTargetEnvironment() throws Exception {
     BuildConfiguration oneEnvConfig = create("--target_environment=//foo");
     assertThat(oneEnvConfig.getTargetEnvironments()).containsExactly(Label.parseAbsolute("//foo"));
@@ -214,6 +236,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     };
   }
 
+  @Test
   public void testCycleInFragments() throws Exception {
     configurationFactory = new ConfigurationFactory(
         getAnalysisMock().createConfigurationCollectionFactory(),
@@ -227,6 +250,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     }
   }
 
+  @Test
   public void testMissingFragment() throws Exception {
     configurationFactory = new ConfigurationFactory(
         getAnalysisMock().createConfigurationCollectionFactory(),
@@ -239,12 +263,14 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     }
   }
 
+  @Test
   public void testGlobalMakeVariableOverride() throws Exception {
     assertThat(create().getMakeEnvironment()).containsEntry("COMPILATION_MODE", "fastbuild");
     BuildConfiguration config = create("--define", "COMPILATION_MODE=fluttershy");
     assertThat(config.getMakeEnvironment()).containsEntry("COMPILATION_MODE", "fluttershy");
   }
 
+  @Test
   public void testGetOptionClass() throws Exception {
     BuildConfiguration config = create();
     // Directly defined option:
@@ -255,6 +281,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     assertNull(config.getOptionClass("do_my_laundry"));
   }
 
+  @Test
   public void testGetOptionValue() throws Exception {
     // Directly defined options:
     assertEquals(CompilationMode.DBG, create("-c", "dbg").getOptionValue("compilation_mode"));
@@ -273,12 +300,14 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     assertNull(create().getOptionValue("test_filter"));
   }
 
+  @Test
   public void testNoDistinctHostConfigurationUnsupportedWithDynamicConfigs() throws Exception {
     checkError(
         "--nodistinct_host_configuration does not currently work with dynamic configurations",
         "--nodistinct_host_configuration", "--experimental_dynamic_configs");
   }
 
+  @Test
   public void testEqualsOrIsSupersetOf() throws Exception {
     BuildConfiguration config = create();
     BuildConfiguration trimmedConfig = config.clone(
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
index 15fd7ad31a..4bf1af43d4 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/ConfigurationTestCase.java
@@ -13,6 +13,8 @@
 // limitations under the License.
 package com.google.devtools.build.lib.analysis.util;
 
+import static org.junit.Assert.fail;
+
 import com.google.common.base.Predicates;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableSet;
@@ -38,7 +40,7 @@ import com.google.devtools.build.lib.skyframe.PrecomputedValue;
 import com.google.devtools.build.lib.skyframe.SequencedSkyframeExecutor;
 import com.google.devtools.build.lib.skyframe.SkyValueDirtinessChecker;
 import com.google.devtools.build.lib.skyframe.SkyframeExecutor;
-import com.google.devtools.build.lib.testutil.FoundationTestCase;
+import com.google.devtools.build.lib.testutil.FoundationTestCaseForJunit4;
 import com.google.devtools.build.lib.testutil.TestConstants;
 import com.google.devtools.build.lib.testutil.TestRuleClassProvider;
 import com.google.devtools.build.lib.util.BlazeClock;
@@ -51,6 +53,10 @@ import com.google.devtools.common.options.Options;
 import com.google.devtools.common.options.OptionsBase;
 import com.google.devtools.common.options.OptionsParser;
 
+import org.junit.Before;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
 import java.lang.reflect.Field;
 import java.util.Collection;
 import java.util.HashMap;
@@ -61,7 +67,8 @@ import java.util.UUID;
 /**
  * Testing framework for tests which check ConfigurationFactory.
  */
-public abstract class ConfigurationTestCase extends FoundationTestCase {
+@RunWith(JUnit4.class)
+public abstract class ConfigurationTestCase extends FoundationTestCaseForJunit4 {
 
   public static final class TestOptions extends OptionsBase {
     @Option(name = "multi_cpu",
@@ -78,9 +85,8 @@ public abstract class ConfigurationTestCase extends FoundationTestCase {
   protected Path workspace;
   protected ImmutableList<Class<? extends FragmentOptions>> buildOptionClasses;
 
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
+  @Before
+  public final void initializeSkyframeExecutor() throws Exception {
     workspace = rootDirectory;
     ConfiguredRuleClassProvider ruleClassProvider = TestRuleClassProvider.getRuleClassProvider();
     PathPackageLocator pkgLocator =