aboutsummaryrefslogtreecommitdiffhomepage
path: root/src/test
diff options
context:
space:
mode:
authorGravatar Florian Weikert <fwe@google.com>2015-11-26 15:42:35 +0000
committerGravatar Kristina Chodorow <kchodorow@google.com>2015-11-30 18:25:42 +0000
commit1a13c4eeca07e696f6dec74f7df13cbfbd0075b2 (patch)
tree783ff2729f9d23ac53a5e54f9d2fc041f4962eec /src/test
parent79bd237e1110502c2492b8f1b9a2a4a1eee28ee4 (diff)
Migrated DuplicateActionTest to JUnit 4.
-- MOS_MIGRATED_REVID=108794609
Diffstat (limited to 'src/test')
-rw-r--r--src/test/java/com/google/devtools/build/lib/analysis/DuplicateActionTest.java20
1 files changed, 15 insertions, 5 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/DuplicateActionTest.java b/src/test/java/com/google/devtools/build/lib/analysis/DuplicateActionTest.java
index 89020e235c..575ce3c1e7 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/DuplicateActionTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/DuplicateActionTest.java
@@ -14,12 +14,21 @@
package com.google.devtools.build.lib.analysis;
-import com.google.devtools.build.lib.analysis.util.AnalysisTestCase;
+import static org.junit.Assert.assertFalse;
+
+import com.google.devtools.build.lib.analysis.util.AnalysisTestCaseForJunit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
/**
* Tests for duplicate action detection and handling when incremental analysis is enabled.
*/
-public class DuplicateActionTest extends AnalysisTestCase {
+@RunWith(JUnit4.class)
+public class DuplicateActionTest extends AnalysisTestCaseForJunit4 {
+
+ @Test
public void testDuplicateBuildInfoHeaderAction() throws Exception {
scratch.file("a/stamp.cc",
"// Empty."
@@ -36,11 +45,12 @@ public class DuplicateActionTest extends AnalysisTestCase {
/**
* Same test with loading phase disabled.
*/
+ @RunWith(JUnit4.class)
public static class DuplicateActionTestWithoutLoading extends DuplicateActionTest {
+
@Override
- public void setUp() throws Exception {
- disableLoading();
- super.setUp();
+ protected boolean isLoadingEnabled() {
+ return false;
}
}
}