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

--
MOS_MIGRATED_REVID=109067086

1 files changed, 14 insertions, 3 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
index 9c4b29bfb3..c9adfac551 100644
--- a/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skylark/SkylarkAspectsTest.java
@@ -23,17 +23,23 @@ import com.google.devtools.build.lib.analysis.BuildView.AnalysisResult;
 import com.google.devtools.build.lib.analysis.ConfiguredTarget;
 import com.google.devtools.build.lib.analysis.SkylarkProviders;
 import com.google.devtools.build.lib.analysis.ViewCreationFailedException;
-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.Label;
 import com.google.devtools.build.lib.skyframe.AspectValue;
 import com.google.devtools.build.lib.syntax.SkylarkNestedSet;
 
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.JUnit4;
+
 import javax.annotation.Nullable;
 
 /**
  * Tests for Skylark aspects
  */
-public class SkylarkAspectsTest extends BuildViewTestCase {
+@RunWith(JUnit4.class)
+public class SkylarkAspectsTest extends BuildViewTestCaseForJunit4 {
+  @Test
   public void testAspect() throws Exception {
     scratch.file(
         "test/aspect.bzl",
@@ -78,6 +84,7 @@ public class SkylarkAspectsTest extends BuildViewTestCase {
         .containsExactly("//test:aspect.bzl%MyAspect(//test:xxx)");
   }
 
+  @Test
   public void testAspectPropagating() throws Exception {
     scratch.file(
         "test/aspect.bzl",
@@ -141,7 +148,7 @@ public class SkylarkAspectsTest extends BuildViewTestCase {
         .containsExactly("//test:xxx", "//test:yyy");
   }
 
-
+  @Test
   public void testAspectsFromSkylarkRules() throws Exception {
     scratch.file(
         "test/aspect.bzl",
@@ -216,6 +223,7 @@ public class SkylarkAspectsTest extends BuildViewTestCase {
         .containsExactly("//test:yyy");
   }
 
+  @Test
   public void testAspectFailingExecution() throws Exception {
     scratch.file(
         "test/aspect.bzl",
@@ -247,6 +255,7 @@ public class SkylarkAspectsTest extends BuildViewTestCase {
             + "integer division by zero");
   }
 
+  @Test
   public void testAspectFailingReturnsNotAStruct() throws Exception {
     scratch.file(
         "test/aspect.bzl",
@@ -271,6 +280,7 @@ public class SkylarkAspectsTest extends BuildViewTestCase {
     assertContainsEvent("Aspect implementation doesn't return a struct");
   }
 
+  @Test
   public void testAspectFailingReturnsUnsafeObject() throws Exception {
     scratch.file(
         "test/aspect.bzl",
@@ -301,6 +311,7 @@ public class SkylarkAspectsTest extends BuildViewTestCase {
         + "/workspace/test/aspect.bzl:4:11: Value of provider 'x' is of an illegal type: function");
   }
 
+  @Test
   public void testAspectFailingOrphanArtifacts() throws Exception {
     scratch.file(
         "test/aspect.bzl",