diff options
author | Florian Weikert <fwe@google.com> | 2015-12-03 15:38:30 +0000 |
---|---|---|
committer | Kristina Chodorow <kchodorow@google.com> | 2015-12-03 18:38:53 +0000 |
commit | e89ee4e62fbe2f83f7aa037a16d468b0312b4bb0 (patch) | |
tree | f150e18107de23258b8a455b82560e3ab28c5bea /src/test | |
parent | 5e34a3d4ea30525971e320ce283ba8cd67c74e3c (diff) |
Migrated tests in devtools/build/lib/runtime to JUnit 4.
--
MOS_MIGRATED_REVID=109307285
Diffstat (limited to 'src/test')
3 files changed, 5 insertions, 4 deletions
diff --git a/src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTest.java index 67bdd44036..efb2768bfb 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/InvocationPolicyEnforcerTest.java @@ -118,7 +118,7 @@ public class InvocationPolicyEnforcerTest { private OptionsParser parser; @Before - public void setUp() throws Exception { + public final void setParser() throws Exception { parser = OptionsParser.newOptionsParser(TestOptions.class); } diff --git a/src/test/java/com/google/devtools/build/lib/runtime/TestResultAnalyzerTest.java b/src/test/java/com/google/devtools/build/lib/runtime/TestResultAnalyzerTest.java index 05c94c1538..7e2baafc3b 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/TestResultAnalyzerTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/TestResultAnalyzerTest.java @@ -47,7 +47,7 @@ public class TestResultAnalyzerTest { private TestResultAnalyzer underTest; @Before - public void setUp() { + public final void createMocks() throws Exception { Path mockPath = mock(Path.class); OptionsParser testSpecificOptions = OptionsParser.newOptionsParser( TestSummaryOptions.class, ExecutionOptions.class); diff --git a/src/test/java/com/google/devtools/build/lib/runtime/TestSummaryTest.java b/src/test/java/com/google/devtools/build/lib/runtime/TestSummaryTest.java index e08df35db2..2a412bd57d 100644 --- a/src/test/java/com/google/devtools/build/lib/runtime/TestSummaryTest.java +++ b/src/test/java/com/google/devtools/build/lib/runtime/TestSummaryTest.java @@ -20,8 +20,8 @@ import static org.junit.Assert.assertSame; import static org.junit.Assert.assertTrue; import static org.mockito.AdditionalMatchers.find; import static org.mockito.AdditionalMatchers.not; -import static org.mockito.Mockito.verify; import static org.mockito.Matchers.contains; +import static org.mockito.Mockito.verify; import static org.mockito.Mockito.when; import com.google.common.collect.ImmutableList; @@ -36,6 +36,7 @@ import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem; import com.google.devtools.build.lib.view.test.TestStatus.BlazeTestStatus; import com.google.devtools.build.lib.view.test.TestStatus.FailedTestCasesStatus; import com.google.devtools.build.lib.view.test.TestStatus.TestCase; + import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -63,7 +64,7 @@ public class TestSummaryTest { private TestSummary.Builder basicBuilder; @Before - public void setUp() throws Exception { + public final void createFileSystem() throws Exception { fs = new InMemoryFileSystem(BlazeClock.instance()); stubTarget = stubTarget(); basicBuilder = getTemplateBuilder(); |