aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test
diff options
context:
space:
mode:
authorGravatar Florian Weikert <fwe@google.com>2015-11-27 10:53:25 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2015-11-30 18:29:57 +0000
commitab523f9222d5c98c648ff377f215d6096c9bd3d7 (patch)
tree3ca4ab0b5a71286637f46fde034f8b73cb70afde /src/test
parent0faac653a51dfe3f329395aceb5c0c127c034a24 (diff)
Migrated CompileOnlyTestCase and all of its sub classes to JUnit 4.
-- MOS_MIGRATED_REVID=108845009
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java2
-rw-r--r--src/test/java/com/google/devtools/build/lib/rules/cpp/CcCompileOnlyTest.java10
2 files changed, 11 insertions, 1 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java b/src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java
index 583d33adc5..b8aa0ab22c 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/util/CompileOnlyTestCase.java
@@ -20,7 +20,7 @@ import com.google.devtools.build.lib.analysis.OutputGroupProvider;
/**
* Common code for unit tests that validate --compile_only behavior.
*/
-public abstract class CompileOnlyTestCase extends BuildViewTestCase {
+public abstract class CompileOnlyTestCase extends BuildViewTestCaseForJunit4 {
protected Artifact getArtifactByExecPathSuffix(ConfiguredTarget target, String path) {
for (Artifact artifact : getOutputGroup(target, OutputGroupProvider.FILES_TO_COMPILE)) {
diff --git a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCompileOnlyTest.java b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCompileOnlyTest.java
index 4537fa2925..4c62ac5448 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCompileOnlyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/cpp/CcCompileOnlyTest.java
@@ -13,13 +13,23 @@
// limitations under the License.
package com.google.devtools.build.lib.rules.cpp;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
+
import com.google.devtools.build.lib.analysis.ConfiguredTarget;
import com.google.devtools.build.lib.analysis.util.CompileOnlyTestCase;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
/**
* Unit tests that validate --compile_only behavior.
*/
+@RunWith(JUnit4.class)
public class CcCompileOnlyTest extends CompileOnlyTestCase {
+
+ @Test
public void testCcCompileOnly() throws Exception {
scratch.file("package/BUILD",
"cc_binary(name='foo', srcs=['foo.cc', ':bar'], deps = [':foolib'])",