Skip to content

Commit e6c8861

Browse files
committed
Merge pull request scala#4818 from som-snytt/issue/4950-tweak
SI-4950 Test reduction
2 parents ba17316 + 212da3d commit e6c8861

File tree

2 files changed

+18
-13
lines changed

2 files changed

+18
-13
lines changed

test/files/run/t4950.check

Lines changed: 0 additions & 7 deletions
This file was deleted.

test/files/run/t4950.scala

Lines changed: 18 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,24 @@
1-
import scala.tools.partest.ReplTest
1+
import scala.tools.partest.SessionTest
2+
import scala.PartialFunction.{ cond => when }
3+
4+
object Elision {
5+
val elideMsg = """ ... \d+ elided""".r
6+
}
7+
8+
object Test extends SessionTest {
9+
import Elision._
210

3-
object Test extends ReplTest {
411
// Filter out the abbreviated stacktrace "... X elided"
512
// because the number seems to differ between versions/platforms/...
6-
override def show = eval() filterNot (_ contains "elided") foreach println
7-
def code =
13+
def elided(s: String) = when(s) { case elideMsg() => true }
14+
override def eval() = super.eval() filterNot elided
15+
def session =
816
"""
9-
val 1 = 2
10-
val List(1) = List(1)
17+
scala> val 1 = 2
18+
scala.MatchError: 2 (of class java.lang.Integer)
19+
20+
scala> val List(1) = List(1)
21+
22+
scala> :quit
1123
"""
1224
}

0 commit comments

Comments
 (0)