Skip to content

Commit

Permalink
Update bracket-push to match latest canonical json.
Browse files Browse the repository at this point in the history
  • Loading branch information
ricemery committed Feb 17, 2018
1 parent 44795a6 commit 2c6f93d
Show file tree
Hide file tree
Showing 2 changed files with 18 additions and 16 deletions.
32 changes: 17 additions & 15 deletions exercises/bracket-push/src/test/scala/BracketPushTest.scala
Original file line number Diff line number Diff line change
@@ -1,74 +1,76 @@
import org.scalatest.{Matchers, FunSuite}

/** @version 1.1.0 */
/** @version 1.2.0 */
class BracketPushTest extends FunSuite with Matchers {

test("paired square brackets") {
BracketPush.isPaired("[]") should be (true)
BracketPush.isPaired("[]") should be(true)
}

test("empty string") {
pending
BracketPush.isPaired("") should be (true)
BracketPush.isPaired("") should be(true)
}

test("unpaired brackets") {
pending
BracketPush.isPaired("[[") should be (false)
BracketPush.isPaired("[[") should be(false)
}

test("wrong ordered brackets") {
pending
BracketPush.isPaired("}{") should be (false)
BracketPush.isPaired("}{") should be(false)
}

test("wrong closing bracket") {
pending
BracketPush.isPaired("{]") should be (false)
BracketPush.isPaired("{]") should be(false)
}

test("paired with whitespace") {
pending
BracketPush.isPaired("{ }") should be (true)
BracketPush.isPaired("{ }") should be(true)
}

test("simple nested brackets") {
pending
BracketPush.isPaired("{[]}") should be (true)
BracketPush.isPaired("{[]}") should be(true)
}

test("several paired brackets") {
pending
BracketPush.isPaired("{}[]") should be (true)
BracketPush.isPaired("{}[]") should be(true)
}

test("paired and nested brackets") {
pending
BracketPush.isPaired("([{}({}[])])") should be (true)
BracketPush.isPaired("([{}({}[])])") should be(true)
}

test("unopened closing brackets") {
pending
BracketPush.isPaired("{[)][]}") should be (false)
BracketPush.isPaired("{[)][]}") should be(false)
}

test("unpaired and nested brackets") {
pending
BracketPush.isPaired("([{])") should be (false)
BracketPush.isPaired("([{])") should be(false)
}

test("paired and wrong nested brackets") {
pending
BracketPush.isPaired("[({]})") should be (false)
BracketPush.isPaired("[({]})") should be(false)
}

test("math expression") {
pending
BracketPush.isPaired("(((185 + 223.85) * 15) - 543)/2") should be (true)
BracketPush.isPaired("(((185 + 223.85) * 15) - 543)/2") should be(true)
}

test("complex latex expression") {
pending
BracketPush.isPaired("\\\\left(\\\\begin{array}{cc} \\\\frac{1}{3} & x\\\\\\\\ \\\\mathrm{e}^{x} &... x^2 \\\\end{array}\\\\right)") should be (true)
BracketPush.isPaired(
"\\left(\\begin{array}{cc} \\frac{1}{3} & x\\ \\mathrm{e}^{x} &... x^2 \\end{array}\\right)") should be(
true)
}
}
2 changes: 1 addition & 1 deletion testgen/src/main/scala/BracketPushTestGenerator.scala
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ object BracketPushTestGenerator {
def main(args: Array[String]): Unit = {
val file = new File("src/main/resources/bracket-push.json")

val code = TestSuiteBuilder.build(file, fromLabeledTest("input"))
val code = TestSuiteBuilder.build(file, fromLabeledTestFromInput("value"))
println(s"-------------")
println(code)
println(s"-------------")
Expand Down

0 comments on commit 2c6f93d

Please sign in to comment.