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

--
MOS_MIGRATED_REVID=109083735

4 files changed, 10 insertions, 13 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/collect/nestedset/ExpanderTestBase.java b/src/test/java/com/google/devtools/build/lib/collect/nestedset/ExpanderTestBase.java
index f9d1861cc4..aff8e2cb7b 100644
--- a/src/test/java/com/google/devtools/build/lib/collect/nestedset/ExpanderTestBase.java
+++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/ExpanderTestBase.java
@@ -13,16 +13,14 @@
 // limitations under the License.
 package com.google.devtools.build.lib.collect.nestedset;
 
-import static junit.framework.TestCase.assertFalse;
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 
-import junit.framework.TestCase;
-
 import org.junit.Test;
 
 import java.util.Arrays;
@@ -36,7 +34,7 @@ import java.util.List;
  * <p>This class provides test cases for representative nested set structures; the expected
  * results must be provided by overriding the corresponding methods.
  */
-public abstract class ExpanderTestBase extends TestCase  {
+public abstract class ExpanderTestBase  {
 
   /**
    * Returns the type of the expander under test.
diff --git a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetImplTest.java b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetImplTest.java
index 656a134bfc..5ffc7f1609 100644
--- a/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetImplTest.java
+++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/NestedSetImplTest.java
@@ -14,13 +14,15 @@
 package com.google.devtools.build.lib.collect.nestedset;
 
 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 static org.junit.Assert.fail;
 
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import com.google.common.testing.EqualsTester;
 
-import junit.framework.TestCase;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -31,7 +33,7 @@ import java.util.Arrays;
  * Tests for {@link com.google.devtools.build.lib.collect.nestedset.NestedSet}.
  */
 @RunWith(JUnit4.class)
-public class NestedSetImplTest extends TestCase {
+public class NestedSetImplTest {
   @SafeVarargs
   private static NestedSetBuilder<String> nestedSetBuilder(String... directMembers) {
     NestedSetBuilder<String> builder = NestedSetBuilder.stableOrder();
diff --git a/src/test/java/com/google/devtools/build/lib/collect/nestedset/OrderTest.java b/src/test/java/com/google/devtools/build/lib/collect/nestedset/OrderTest.java
index 5ca0af1bed..e714980558 100644
--- a/src/test/java/com/google/devtools/build/lib/collect/nestedset/OrderTest.java
+++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/OrderTest.java
@@ -14,8 +14,7 @@
 package com.google.devtools.build.lib.collect.nestedset;
 
 import static com.google.common.truth.Truth.assertThat;
-
-import junit.framework.TestCase;
+import static org.junit.Assert.fail;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -25,7 +24,7 @@ import org.junit.runners.JUnit4;
  * Tests for {@link com.google.devtools.build.lib.collect.nestedset.Order}.
  */
 @RunWith(JUnit4.class)
-public class OrderTest extends TestCase {
+public class OrderTest {
 
   @Test
   public void testParsing() throws Exception {
diff --git a/src/test/java/com/google/devtools/build/lib/collect/nestedset/RecordingUniqueifierTest.java b/src/test/java/com/google/devtools/build/lib/collect/nestedset/RecordingUniqueifierTest.java
index 6e338591c6..0c4994d545 100644
--- a/src/test/java/com/google/devtools/build/lib/collect/nestedset/RecordingUniqueifierTest.java
+++ b/src/test/java/com/google/devtools/build/lib/collect/nestedset/RecordingUniqueifierTest.java
@@ -18,8 +18,6 @@ import static org.junit.Assert.assertEquals;
 import com.google.common.base.Preconditions;
 import com.google.common.collect.ImmutableList;
 
-import junit.framework.TestCase;
-
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.JUnit4;
@@ -34,7 +32,7 @@ import java.util.Random;
  * Tests for {@link RecordingUniqueifier}.
  */
 @RunWith(JUnit4.class)
-public class RecordingUniqueifierTest extends TestCase {
+public class RecordingUniqueifierTest {
 
   private static final Random RANDOM = new Random();