Skip to content

Commit

Permalink
DirectTest checks compiler options
Browse files Browse the repository at this point in the history
Previously, a bad compiler option was ignored.

Add a common idiom to StreamCapture to set stdout;
the idiom may be suboptimal for testing.

Convert a partest to junit for regex, and eliminate
one check file.

(cherry picked from commit 580ed07)
  • Loading branch information
som-snytt authored and dwijnand committed Oct 16, 2020
1 parent 577780f commit 6ee01f2
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 51 deletions.
47 changes: 0 additions & 47 deletions test/files/run/ReplacementMatching.scala

This file was deleted.

1 change: 0 additions & 1 deletion test/files/run/t6178.check

This file was deleted.

6 changes: 3 additions & 3 deletions test/files/run/t6178.scala
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ import scala.reflect.runtime.universe._
import scala.reflect.runtime.{currentMirror => cm}

object Test extends App {
val plus = typeOf[java.lang.String].member(TermName("$plus")).asMethod
println(cm.reflect("").reflectMethod(plus).apply("2"))
}
val plusMethod = typeOf[java.lang.String].member(TermName("$plus")).asMethod
assert(cm.reflect("").reflectMethod(plusMethod).apply("2") == "2")
}
31 changes: 31 additions & 0 deletions test/junit/scala/util/matching/RegexTest.scala
Original file line number Diff line number Diff line change
Expand Up @@ -176,4 +176,35 @@ class RegexTest {
assertEquals("aaaaa", aes)
}
}

@Test def replacementMatching(): Unit = {
val regex = """\$\{(.+?)\}""".r
val replaced = regex.replaceAllIn("Replacing: ${main}. And another method: ${foo}.",
(m: util.matching.Regex.Match) => {
val identifier = m.group(1)
identifier
})
assertEquals("Replacing: main. And another method: foo.", replaced)

val regex3 = """\$\{(.+?)\}""".r
val replaced3 = regex3.replaceSomeIn("Replacing: ${main}. And another: ${foo}.", (m: util.matching.Regex.Match) => {
val id = m.group(1)
if (id.startsWith("m")) Some(id) else None
})
assertEquals("Replacing: main. And another: ${foo}.", replaced3)
}

@Test def groupsMatching(): Unit = {
val Date = """(\d+)/(\d+)/(\d+)""".r
for (Regex.Groups(a, b, c) <- Date findFirstMatchIn "1/1/2001 marks the start of the millennium. 31/12/2000 doesn't.") {
assertEquals("1", a)
assertEquals("1", b)
assertEquals("2001", c)
}
for (Regex.Groups(a, b, c) <- Date.findAllIn("1/1/2001 marks the start of the millennium. 31/12/2000 doesn't.").matchData) {
assert(a == "1" || a == "31")
assert(b == "1" || b == "12")
assert(c == "2001" || c == "2000")
}
}
}

0 comments on commit 6ee01f2

Please sign in to comment.