diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-10-14 15:52:40 +1100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-10-14 15:52:40 +1100 |
| commit | 9fb438c361f8f81c162917462cbc9941189f13b8 (patch) | |
| tree | c47737268db039e044b58e34296180f5d47acd95 /test/junit/scala/collection | |
| parent | 9d3f0777ff883a7c59da3fa7fee156890f51701e (diff) | |
| parent | 6114b7c7f96a68bf950999551a8b6d40c7ea37cc (diff) | |
| download | scala-9fb438c361f8f81c162917462cbc9941189f13b8.tar.gz scala-9fb438c361f8f81c162917462cbc9941189f13b8.tar.bz2 scala-9fb438c361f8f81c162917462cbc9941189f13b8.zip | |
Merge remote-tracking branch 'origin/2.12.0' into merge/2.12.0-to-2.12.x
Diffstat (limited to 'test/junit/scala/collection')
| -rw-r--r-- | test/junit/scala/collection/mutable/BitSetTest.scala | 2 | ||||
| -rw-r--r-- | test/junit/scala/collection/mutable/OpenHashMapTest.scala | 7 |
2 files changed, 3 insertions, 6 deletions
diff --git a/test/junit/scala/collection/mutable/BitSetTest.scala b/test/junit/scala/collection/mutable/BitSetTest.scala index e832194989..84b906e8d5 100644 --- a/test/junit/scala/collection/mutable/BitSetTest.scala +++ b/test/junit/scala/collection/mutable/BitSetTest.scala @@ -1,8 +1,8 @@ package scala.collection.mutable +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 -import org.junit.{Test, Ignore} @RunWith(classOf[JUnit4]) class BitSetTest { diff --git a/test/junit/scala/collection/mutable/OpenHashMapTest.scala b/test/junit/scala/collection/mutable/OpenHashMapTest.scala index 90f6be6ee5..e9f2a52bf6 100644 --- a/test/junit/scala/collection/mutable/OpenHashMapTest.scala +++ b/test/junit/scala/collection/mutable/OpenHashMapTest.scala @@ -1,13 +1,10 @@ package scala.collection.mutable -import org.junit.{Ignore, Test} import org.junit.Assert._ +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 -import org.openjdk.jol.info.GraphLayout -import org.openjdk.jol.info.GraphWalker -import org.openjdk.jol.info.GraphVisitor -import org.openjdk.jol.info.GraphPathRecord +import org.openjdk.jol.info.{GraphPathRecord, GraphVisitor, GraphWalker} /** Tests for [[OpenHashMap]]. */ @RunWith(classOf[JUnit4]) |