diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-09-28 15:13:45 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-09-30 11:06:07 +0200 |
commit | 924634899003ceca8fcf132cc09047aa2b37e933 (patch) | |
tree | b036698ee90a854ade991c9b617f6ccc51134dda | |
parent | 96fe4c334589aaf9e5de4288cd140d3d01794dc5 (diff) | |
download | scala-924634899003ceca8fcf132cc09047aa2b37e933.tar.gz scala-924634899003ceca8fcf132cc09047aa2b37e933.tar.bz2 scala-924634899003ceca8fcf132cc09047aa2b37e933.zip |
re-enable two tests (starr is up to date now)
6 files changed, 12 insertions, 20 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]) diff --git a/test/junit/scala/tools/nsc/backend/jvm/DirectCompileTest.scala b/test/junit/scala/tools/nsc/backend/jvm/DirectCompileTest.scala index 38285fbce1..a28599cd92 100644 --- a/test/junit/scala/tools/nsc/backend/jvm/DirectCompileTest.scala +++ b/test/junit/scala/tools/nsc/backend/jvm/DirectCompileTest.scala @@ -1,9 +1,7 @@ package scala.tools.nsc.backend.jvm -import java.nio.file.{Files, Paths} - import org.junit.Assert._ -import org.junit.{Ignore, Test} +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/BTypesFromClassfileTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/BTypesFromClassfileTest.scala index c23c60f7ad..42a2c417a0 100644 --- a/test/junit/scala/tools/nsc/backend/jvm/opt/BTypesFromClassfileTest.scala +++ b/test/junit/scala/tools/nsc/backend/jvm/opt/BTypesFromClassfileTest.scala @@ -2,7 +2,7 @@ package scala.tools.nsc package backend.jvm package opt -import org.junit.{Ignore, Test} +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 @@ -83,9 +83,7 @@ class BTypesFromClassfileTest extends BytecodeTesting { sameBType(fromSymbol, fromClassfile) } - // Can be enabled when using 2.12.0-M5 as starr. This test works under a full boostrap, but not - // when compiled with M4. - @Test @Ignore + @Test def compareClassBTypes(): Unit = { // Note that not only these classes are tested, but also all their parents and all nested // classes in their InnerClass attributes. diff --git a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala index 9999cdb376..5bc10bc226 100644 --- a/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala +++ b/test/junit/scala/tools/nsc/backend/jvm/opt/InlinerTest.scala @@ -3,7 +3,7 @@ package backend.jvm package opt import org.junit.Assert._ -import org.junit.{Ignore, Test} +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 @@ -1486,9 +1486,7 @@ class InlinerTest extends BytecodeTesting { assertSameSummary(getMethod(c, "t"), List(NEW, "<init>", ICONST_1, IRETURN)) // ICONST_1, U.f is inlined (not T.f) } - // Can be enabled when using 2.12.0-M5 as starr. This test works under a full boostrap, but not - // when compiled with M4. - @Test @Ignore + @Test def inlineArrayForeach(): Unit = { val code = """class C { diff --git a/test/junit/scala/tools/nsc/symtab/StdNamesTest.scala b/test/junit/scala/tools/nsc/symtab/StdNamesTest.scala index 91f94e09b6..5949008d8a 100644 --- a/test/junit/scala/tools/nsc/symtab/StdNamesTest.scala +++ b/test/junit/scala/tools/nsc/symtab/StdNamesTest.scala @@ -2,16 +2,17 @@ package scala.tools.nsc package symtab import org.junit.Assert._ -import scala.tools.testing.AssertUtil._ -import org.junit.{Ignore, Test} +import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 +import scala.tools.testing.AssertUtil._ + @RunWith(classOf[JUnit4]) class StdNamesTest { object symbolTable extends SymbolTableForUnitTesting import symbolTable._ - import nme.{SPECIALIZED_SUFFIX, unspecializedName, splitSpecializedName} + import nme.{SPECIALIZED_SUFFIX, splitSpecializedName, unspecializedName} @Test def testNewTermNameInvalid(): Unit = { |