commit 3b2eae3935c41cf940f3aeb177e25dc7fdcabeeb
author Han-Wen Nienhuys <hanwen@google.com> Wed Oct 28 16:35:08 2015 +0000
committer Laszlo Csomor <laszlocsomor@google.com> Thu Oct 29 07:46:13 2015 +0000
tree 9e168bd24798ed7474468de44f074c61b30e2e71
parent eb71eccefb02ca17a87ff25435f2a8e170e03c6b

Use JUnit4 for some of the skyframe tests.

--
MOS_MIGRATED_REVID=106504113

src/test/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManagerTest.java

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManagerTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManagerTest.java
index bd28c33..1ade3d4 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManagerTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/DiffAwarenessManagerTest.java
@@ -14,6 +14,9 @@
 package com.google.devtools.build.lib.skyframe;
 
 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.assertTrue;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
@@ -26,7 +29,10 @@
 import com.google.devtools.build.lib.vfs.PathFragment;
 import com.google.devtools.build.lib.vfs.inmemoryfs.InMemoryFileSystem;
 
-import junit.framework.TestCase;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
 
 import java.util.List;
 import java.util.Map;
@@ -37,21 +43,23 @@
  * Unit tests for {@link DiffAwarenessManager}, especially of the fact that it works in a sequential
  * manner and of its correctness in the presence of unprocesed diffs.
  */
-public class DiffAwarenessManagerTest extends TestCase {
+@RunWith(JUnit4.class)
+public class DiffAwarenessManagerTest {
 
   private FileSystem fs;
   private Path root;
   protected EventCollectionApparatus events;
 
-  @Override
-  protected void setUp() throws Exception {
-    super.setUp();
+  @Before
+  public void setUp() throws Exception {
+    
     fs = new InMemoryFileSystem();
     root = fs.getRootDirectory();
     events = new EventCollectionApparatus();
     events.setFailFast(false);
   }
 
+  @Test
   public void testEverythingModifiedIfNoDiffAwareness() throws Exception {
     Path pathEntry = root.getRelative("pathEntry");
     DiffAwarenessFactoryStub factory = new DiffAwarenessFactoryStub();
@@ -63,6 +71,7 @@
     events.assertNoWarningsOrErrors();
   }
 
+  @Test
   public void testResetAndSetPathEntriesCallClose() throws Exception {
     Path pathEntry = root.getRelative("pathEntry");
     ModifiedFileSet diff = ModifiedFileSet.NOTHING_MODIFIED;
@@ -81,6 +90,7 @@
     events.assertNoWarningsOrErrors();
   }
 
+  @Test
   public void testHandlesUnprocessedDiffs() throws Exception {
     Path pathEntry = root.getRelative("pathEntry");
     ModifiedFileSet diff1 = ModifiedFileSet.builder().modify(new PathFragment("file1")).build();
@@ -110,6 +120,7 @@
     events.assertContainsWarning("error");
   }
 
+  @Test
   public void testHandlesBrokenDiffs() throws Exception {
     Path pathEntry = root.getRelative("pathEntry");
     DiffAwarenessFactoryStub factory1 = new DiffAwarenessFactoryStub();