summaryrefslogtreecommitdiff
path: root/src/partest
diff options
context:
space:
mode:
authorSom Snytt <som.snytt@gmail.com>2013-04-11 09:16:50 -0700
committerPaul Phillips <paulp@improving.org>2013-04-30 08:18:22 -0700
commitb4d54beb87316440475e0cda03a81fa88bbcb7d0 (patch)
tree923cdfd0c1e1f3efa50542ab4211eda6c6be2dd2 /src/partest
parente4f62c00f2c5820f6eb6750e1098a5fb6c28cc0d (diff)
downloadscala-b4d54beb87316440475e0cda03a81fa88bbcb7d0.tar.gz
scala-b4d54beb87316440475e0cda03a81fa88bbcb7d0.tar.bz2
scala-b4d54beb87316440475e0cda03a81fa88bbcb7d0.zip
Partest testnum field width is sensitive to total tests
Allow the hyphens to line up on a column within the output for a test category or "kind". ``` $ partest files/neg/t4134.scala --run Selected 1348 tests drawn from 1 named test categories, specified tests & starting 1 test in neg ok 1 - neg/t4134.scala & starting 1347 tests in run ok 1 - run/absoverride.scala ok 2 - run/amp.scala ok 3 - run/adding-growing-set.scala ```
Diffstat (limited to 'src/partest')
-rw-r--r--src/partest/scala/tools/partest/nest/DirectRunner.scala2
-rw-r--r--src/partest/scala/tools/partest/nest/NestUI.scala11
2 files changed, 9 insertions, 4 deletions
diff --git a/src/partest/scala/tools/partest/nest/DirectRunner.scala b/src/partest/scala/tools/partest/nest/DirectRunner.scala
index 49dd39c344..d38bdd62c8 100644
--- a/src/partest/scala/tools/partest/nest/DirectRunner.scala
+++ b/src/partest/scala/tools/partest/nest/DirectRunner.scala
@@ -31,7 +31,7 @@ trait DirectRunner {
)
def runTestsForFiles(kindFiles: List[File], kind: String): List[TestState] = {
- NestUI.resetTestNumber()
+ NestUI.resetTestNumber(kindFiles.size)
val allUrls = PathSettings.scalaCheck.toURL :: fileManager.latestUrls
val parentClassLoader = ScalaClassLoader fromURLs allUrls
diff --git a/src/partest/scala/tools/partest/nest/NestUI.scala b/src/partest/scala/tools/partest/nest/NestUI.scala
index 2e203bfd91..f562c50015 100644
--- a/src/partest/scala/tools/partest/nest/NestUI.scala
+++ b/src/partest/scala/tools/partest/nest/NestUI.scala
@@ -27,9 +27,14 @@ class Colors(enabled: => Boolean) {
object NestUI {
private val testNum = new java.util.concurrent.atomic.AtomicInteger(1)
+ @volatile private var testNumberFmt = "%3d"
// @volatile private var testNumber = 1
- private def testNumber = "%3d" format testNum.getAndIncrement()
- def resetTestNumber() = testNum set 1
+ private def testNumber = testNumberFmt format testNum.getAndIncrement()
+ def resetTestNumber(max: Int = -1) {
+ testNum set 1
+ val width = if (max > 0) max.toString.length else 3
+ testNumberFmt = s"%${width}d"
+ }
var colorEnabled = sys.props contains "partest.colors"
val color = new Colors(colorEnabled)
@@ -62,7 +67,7 @@ object NestUI {
else if (isOk) green("ok")
else red("!!")
)
- word + f" $testNumber%3s - $testIdent%-40s$reasonString"
+ f"$word $testNumber - $testIdent%-40s$reasonString"
}
def reportTest(state: TestState) = {