commit 92b22366a6a7bace048b48e56931c8c1ea111045
author Florian Weikert <fwe@google.com> Thu Dec 03 10:17:18 2015 +0000
committer Kristina Chodorow <kchodorow@google.com> Thu Dec 03 18:37:43 2015 +0000
tree 9cc8797b8f3ac5267870db5df86690c9dc19af02
parent 2dbe1baf752339c9c4dc6baee929507ce4007e33

Migrated tests in devtools/build/lib/skyframe to JUnit 4.

--
MOS_MIGRATED_REVID=109286530

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

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgKeyTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgKeyTest.java
index 4c312db..2e5df9e 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgKeyTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/RecursivePkgKeyTest.java
@@ -13,8 +13,10 @@
 // limitations under the License.
 package com.google.devtools.build.lib.skyframe;
 
+import static org.junit.Assert.fail;
+
 import com.google.common.collect.ImmutableSet;
-import com.google.devtools.build.lib.analysis.util.BuildViewTestCase;
+import com.google.devtools.build.lib.analysis.util.BuildViewTestCaseForJunit4;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier;
 import com.google.devtools.build.lib.cmdline.PackageIdentifier.RepositoryName;
 import com.google.devtools.build.lib.skyframe.RecursivePkgValue.RecursivePkgKey;
@@ -22,8 +24,13 @@
 import com.google.devtools.build.lib.vfs.RootedPath;
 import com.google.devtools.build.skyframe.SkyKey;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
 /** Tests for {@link RecursivePkgKey}. */
-public class RecursivePkgKeyTest extends BuildViewTestCase {
+@RunWith(JUnit4.class)
+public class RecursivePkgKeyTest extends BuildViewTestCaseForJunit4 {
 
   private SkyKey buildRecursivePkgKey(
       RepositoryName repository,
@@ -43,6 +50,7 @@
     }
   }
 
+  @Test
   public void testValidRecursivePkgKeys() throws Exception {
     buildRecursivePkgKey(
         PackageIdentifier.DEFAULT_REPOSITORY_NAME,
@@ -72,6 +80,7 @@
         ImmutableSet.of(new PathFragment("a/b/c")));
   }
 
+  @Test
   public void testInvalidRecursivePkgKeys() throws Exception {
     invalidHelper(new PathFragment(""), ImmutableSet.of(new PathFragment("")));
     invalidHelper(new PathFragment("a"), ImmutableSet.of(new PathFragment("a")));