diff options
author | Antoine Gourlay <antoine@gourlay.fr> | 2014-09-29 10:07:40 +0200 |
---|---|---|
committer | Antoine Gourlay <antoine@gourlay.fr> | 2014-09-29 12:31:34 +0200 |
commit | 159ca839b9d63da6c402731342d827f227219323 (patch) | |
tree | 007a40b46b2bc9062812fd39142b2c4d7f3a9181 | |
parent | f62c312a857e1a6cc6646ee60a0f86866e19c01b (diff) | |
download | scala-159ca839b9d63da6c402731342d827f227219323.tar.gz scala-159ca839b9d63da6c402731342d827f227219323.tar.bz2 scala-159ca839b9d63da6c402731342d827f227219323.zip |
Better ant / junit interaction
Currently junit test sources are always rebuilt, that's wasteful. The
second dependency on the junit task is there so that the first can be
skipped if sources haven't changed.
Also normalize package names versus location in the `test/junit` folder:
ant isn't very clever when it comes to selectively recompiling tests, so
now editing a test will only cause that one to be recompiled (instead of
~13 files every time).
This makes TDD with junit even faster.
-rwxr-xr-x | build.xml | 2 | ||||
-rw-r--r-- | test/junit/scala/collection/immutable/PagedSeqTest.scala (renamed from test/junit/scala/collection/PagedSeq.scala) | 0 | ||||
-rw-r--r-- | test/junit/scala/collection/immutable/QueueTest.scala (renamed from test/junit/scala/collection/QueueTest.scala) | 0 | ||||
-rw-r--r-- | test/junit/scala/collection/immutable/RangeConsistencyTest.scala (renamed from test/junit/scala/collection/NumericRangeTest.scala) | 0 | ||||
-rw-r--r-- | test/junit/scala/collection/immutable/StreamTest.scala (renamed from test/junit/scala/collection/StreamTest.scala) | 0 | ||||
-rw-r--r-- | test/junit/scala/collection/mutable/ArraySortingTest.scala (renamed from test/junit/scala/collection/ArraySortingTest.scala) | 0 | ||||
-rw-r--r-- | test/junit/scala/collection/mutable/PriorityQueueTest.scala (renamed from test/junit/scala/collection/PriorityQueueTest.scala) | 0 | ||||
-rw-r--r-- | test/junit/scala/collection/mutable/VectorTest.scala (renamed from test/junit/scala/collection/VectorTest.scala) | 0 | ||||
-rw-r--r-- | test/junit/scala/math/NumericTest.scala | 2 | ||||
-rw-r--r-- | test/junit/scala/reflect/internal/ScopeTest.scala | 2 | ||||
-rw-r--r-- | test/junit/scala/tools/nsc/SampleTest.scala | 1 | ||||
-rw-r--r-- | test/junit/scala/util/SpecVersionTest.scala (renamed from test/junit/scala/util/t7265.scala) | 4 | ||||
-rw-r--r-- | test/junit/scala/util/matching/CharRegexTest.scala (renamed from test/junit/scala/util/matching/regextract-char.scala) | 0 |
13 files changed, 4 insertions, 7 deletions
@@ -1437,7 +1437,7 @@ TODO: <stopwatch name="test.junit.compiler.timer" action="total"/> </target> - <target name="test.junit" depends="test.junit.comp"> + <target name="test.junit" depends="test.junit.comp, test.junit.init"> <stopwatch name="test.junit.timer"/> <mkdir dir="${test.junit.classes}"/> <echo message="Note: details of failed tests will be output to ${build-junit.dir}"/> diff --git a/test/junit/scala/collection/PagedSeq.scala b/test/junit/scala/collection/immutable/PagedSeqTest.scala index 5f83cf6f31..5f83cf6f31 100644 --- a/test/junit/scala/collection/PagedSeq.scala +++ b/test/junit/scala/collection/immutable/PagedSeqTest.scala diff --git a/test/junit/scala/collection/QueueTest.scala b/test/junit/scala/collection/immutable/QueueTest.scala index 9a40d8fc90..9a40d8fc90 100644 --- a/test/junit/scala/collection/QueueTest.scala +++ b/test/junit/scala/collection/immutable/QueueTest.scala diff --git a/test/junit/scala/collection/NumericRangeTest.scala b/test/junit/scala/collection/immutable/RangeConsistencyTest.scala index 3980c31577..3980c31577 100644 --- a/test/junit/scala/collection/NumericRangeTest.scala +++ b/test/junit/scala/collection/immutable/RangeConsistencyTest.scala diff --git a/test/junit/scala/collection/StreamTest.scala b/test/junit/scala/collection/immutable/StreamTest.scala index 6dc1c79a48..6dc1c79a48 100644 --- a/test/junit/scala/collection/StreamTest.scala +++ b/test/junit/scala/collection/immutable/StreamTest.scala diff --git a/test/junit/scala/collection/ArraySortingTest.scala b/test/junit/scala/collection/mutable/ArraySortingTest.scala index 4e54b39ce7..4e54b39ce7 100644 --- a/test/junit/scala/collection/ArraySortingTest.scala +++ b/test/junit/scala/collection/mutable/ArraySortingTest.scala diff --git a/test/junit/scala/collection/PriorityQueueTest.scala b/test/junit/scala/collection/mutable/PriorityQueueTest.scala index a14f1bf4c8..a14f1bf4c8 100644 --- a/test/junit/scala/collection/PriorityQueueTest.scala +++ b/test/junit/scala/collection/mutable/PriorityQueueTest.scala diff --git a/test/junit/scala/collection/VectorTest.scala b/test/junit/scala/collection/mutable/VectorTest.scala index e9c4d44a72..e9c4d44a72 100644 --- a/test/junit/scala/collection/VectorTest.scala +++ b/test/junit/scala/collection/mutable/VectorTest.scala diff --git a/test/junit/scala/math/NumericTest.scala b/test/junit/scala/math/NumericTest.scala index 4f0657f471..9bf7d4f1e4 100644 --- a/test/junit/scala/math/NumericTest.scala +++ b/test/junit/scala/math/NumericTest.scala @@ -1,4 +1,4 @@ - +package scala.math import org.junit.Assert._ import org.junit.Test diff --git a/test/junit/scala/reflect/internal/ScopeTest.scala b/test/junit/scala/reflect/internal/ScopeTest.scala index 5166620189..1ab24facac 100644 --- a/test/junit/scala/reflect/internal/ScopeTest.scala +++ b/test/junit/scala/reflect/internal/ScopeTest.scala @@ -1,4 +1,4 @@ -package symtab +package scala.reflect.internal import scala.tools.nsc.symtab diff --git a/test/junit/scala/tools/nsc/SampleTest.scala b/test/junit/scala/tools/nsc/SampleTest.scala index 8e026da1ea..810c88ef9d 100644 --- a/test/junit/scala/tools/nsc/SampleTest.scala +++ b/test/junit/scala/tools/nsc/SampleTest.scala @@ -1,5 +1,4 @@ package scala.tools.nsc -package test import org.junit.Assert._ import org.junit.Test diff --git a/test/junit/scala/util/t7265.scala b/test/junit/scala/util/SpecVersionTest.scala index 71f085d21d..e3e7a978f2 100644 --- a/test/junit/scala/util/t7265.scala +++ b/test/junit/scala/util/SpecVersionTest.scala @@ -1,14 +1,11 @@ package scala.util -package test import org.junit.Assert._ import org.junit.Test import org.junit.runner.RunWith import org.junit.runners.JUnit4 -import scala.util.PropertiesTrait - /** The java version property uses the spec version * and must work for all "major.minor" and fail otherwise. */ @@ -24,6 +21,7 @@ class SpecVersionTest { override lazy val scalaProps = new java.util.Properties } + // SI-7265 @Test def comparesCorrectly(): Unit = { assert(sut isJavaAtLeast "1.5") diff --git a/test/junit/scala/util/matching/regextract-char.scala b/test/junit/scala/util/matching/CharRegexTest.scala index 50fdcd9d46..50fdcd9d46 100644 --- a/test/junit/scala/util/matching/regextract-char.scala +++ b/test/junit/scala/util/matching/CharRegexTest.scala |