diff options
author | Florian Weikert <fwe@google.com> | 2015-12-07 09:56:38 +0000 |
---|---|---|
committer | David Chen <dzc@google.com> | 2015-12-07 21:17:13 +0000 |
commit | cca703a9d74e865240ca46ce162937aa74820507 (patch) | |
tree | 054014b4a4eaf56470e33cf1fa5d6b08e93da2d9 /src/test/java/com/google/devtools/build/lib/analysis/config | |
parent | 7c0b995fefaed48edb7284ffd29c9c1728df3949 (diff) |
Migrated base test classes to JUnit 4 and deleted their temporary *ForJunit4 versions:
devtools/build/lib/analysis/util/AnalysisTestCase.java
devtools/build/lib/analysis/util/BuildViewTestCase.java
devtools/build/lib/packages/util/PackageLoadingTestCase.java
devtools/build/lib/testutil/FoundationTestCase.java
--
MOS_MIGRATED_REVID=109560679
Diffstat (limited to 'src/test/java/com/google/devtools/build/lib/analysis/config')
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java | 4 | ||||
-rw-r--r-- | src/test/java/com/google/devtools/build/lib/analysis/config/StampTest.java | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java index 0c80a1d1d5..41b1ba4d1f 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/ConfigSettingTest.java @@ -23,7 +23,7 @@ import static org.junit.Assert.assertTrue; import com.google.common.collect.ImmutableMap; import com.google.devtools.build.lib.Constants; import com.google.devtools.build.lib.analysis.config.ConfigRuleClasses.ConfigSettingRule; -import com.google.devtools.build.lib.analysis.util.BuildViewTestCaseForJunit4; +import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.cmdline.Label; import com.google.devtools.build.lib.packages.Rule; import com.google.devtools.build.lib.rules.cpp.CppConfiguration; @@ -42,7 +42,7 @@ import java.util.Map; * Tests for {@link ConfigSetting}. */ @RunWith(JUnit4.class) -public class ConfigSettingTest extends BuildViewTestCaseForJunit4 { +public class ConfigSettingTest extends BuildViewTestCase { private void writeSimpleExample() throws Exception { scratch.file("pkg/BUILD", diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/StampTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/StampTest.java index 1b60b034bc..28a887f01d 100644 --- a/src/test/java/com/google/devtools/build/lib/analysis/config/StampTest.java +++ b/src/test/java/com/google/devtools/build/lib/analysis/config/StampTest.java @@ -15,7 +15,7 @@ package com.google.devtools.build.lib.analysis.config; import static org.junit.Assert.assertEquals; -import com.google.devtools.build.lib.analysis.util.BuildViewTestCaseForJunit4; +import com.google.devtools.build.lib.analysis.util.BuildViewTestCase; import com.google.devtools.build.lib.packages.BuildType; import com.google.devtools.build.lib.packages.RuleClass; import com.google.devtools.build.lib.packages.RuleFactory; @@ -31,7 +31,7 @@ import org.junit.runners.JUnit4; * Tests for link stamping. */ @RunWith(JUnit4.class) -public class StampTest extends BuildViewTestCaseForJunit4 { +public class StampTest extends BuildViewTestCase { /** * Tests that link stamping is disabled for all tests that support it. */ |