diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2016-01-25 11:58:34 +0100 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2016-01-25 12:15:49 +0100 |
commit | 983894f24b6c79934af757173d9e44faecd34069 (patch) | |
tree | 4ce0d9afde8d2c44e0920d276661b0e57ca6d6bb /test/junit/scala | |
parent | ec8436306eba91635d022707166c1541e68ffb2c (diff) | |
download | scala-983894f24b6c79934af757173d9e44faecd34069.tar.gz scala-983894f24b6c79934af757173d9e44faecd34069.tar.bz2 scala-983894f24b6c79934af757173d9e44faecd34069.zip |
Rename junit tests to end in *Test to make them run in ANT
Our ANT script only runs junit tests that match *Test.class.
https://github.com/scala/scala/blob/1081e718f8f8e174dbf615e42b157e187d3d3886/build.xml#L1467
Diffstat (limited to 'test/junit/scala')
-rw-r--r-- | test/junit/scala/collection/immutable/SetTest.scala (renamed from test/junit/scala/collection/immutable/SetTests.scala) | 2 | ||||
-rw-r--r-- | test/junit/scala/issues/BytecodeTest.scala (renamed from test/junit/scala/issues/BytecodeTests.scala) | 9 | ||||
-rw-r--r-- | test/junit/scala/reflect/ClassTagTest.scala (renamed from test/junit/scala/reflect/ClassTag.scala) | 0 | ||||
-rw-r--r-- | test/junit/scala/sys/process/t7350.scala | 1 |
4 files changed, 5 insertions, 7 deletions
diff --git a/test/junit/scala/collection/immutable/SetTests.scala b/test/junit/scala/collection/immutable/SetTest.scala index 28c7864359..4029c98009 100644 --- a/test/junit/scala/collection/immutable/SetTests.scala +++ b/test/junit/scala/collection/immutable/SetTest.scala @@ -6,7 +6,7 @@ import org.junit.runner.RunWith import org.junit.runners.JUnit4 @RunWith(classOf[JUnit4]) -class SetTests { +class SetTest { @Test def test_SI8346_toSet_soundness(): Unit = { val any2stringadd = "Disabled string conversions so as not to get confused!" diff --git a/test/junit/scala/issues/BytecodeTests.scala b/test/junit/scala/issues/BytecodeTest.scala index 7c446894df..7260f43c87 100644 --- a/test/junit/scala/issues/BytecodeTests.scala +++ b/test/junit/scala/issues/BytecodeTest.scala @@ -11,15 +11,15 @@ import scala.collection.JavaConverters._ import scala.tools.partest.ASMConverters._ import scala.tools.testing.ClearAfterClass -object BytecodeTests extends ClearAfterClass.Clearable { +object BytecodeTest extends ClearAfterClass.Clearable { var compiler = newCompiler() def clear(): Unit = { compiler = null } } @RunWith(classOf[JUnit4]) -class BytecodeTests extends ClearAfterClass { - ClearAfterClass.stateToClear = BytecodeTests - val compiler = BytecodeTests.compiler +class BytecodeTest extends ClearAfterClass { + ClearAfterClass.stateToClear = BytecodeTest + val compiler = BytecodeTest.compiler @Test def t8731(): Unit = { @@ -107,7 +107,6 @@ class BytecodeTests extends ClearAfterClass { import Opcodes._ val expected = List( - LineNumber(3, Label(0)), LineNumber(4, Label(0)), LineNumber(5, Label(5)), Jump(IFNE, Label(11)), diff --git a/test/junit/scala/reflect/ClassTag.scala b/test/junit/scala/reflect/ClassTagTest.scala index 90cc981fc1..90cc981fc1 100644 --- a/test/junit/scala/reflect/ClassTag.scala +++ b/test/junit/scala/reflect/ClassTagTest.scala diff --git a/test/junit/scala/sys/process/t7350.scala b/test/junit/scala/sys/process/t7350.scala index 3c0e5145e6..9fdcac8ccc 100644 --- a/test/junit/scala/sys/process/t7350.scala +++ b/test/junit/scala/sys/process/t7350.scala @@ -1,4 +1,3 @@ - package scala.sys.process import org.junit.runner.RunWith |