Skip to content

Commit 84e4edb

Browse files
committed
リソースとテストパッケージの構成を変更しました。
1 parent 3240317 commit 84e4edb

11 files changed

Lines changed: 37 additions & 27 deletions

File tree

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.

src/test/kotlin/xyz/javecs/tools/text2expr/test/kotlin/Text2ExprTest.kt

Lines changed: 1 addition & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -7,40 +7,14 @@ import xyz.javecs.tools.text2expr.utils.read
77
import kotlin.test.assertEquals
88

99
class Text2ExprTest {
10-
11-
val text2Expr = Text2Expr()
12-
1310
@Test fun parser1() {
1411
val source = read("parsers/parser1.txt")
1512
val parser = parser(source)
1613
assertEquals("Text2Expr.g4", parser.grammarFileName)
1714
}
1815

1916
@Test fun eval1() {
20-
assertEquals("1", text2Expr.eval("1"))
21-
}
22-
23-
@Test fun eval2() {
24-
assertEquals("15", text2Expr.eval("3 掛ける 5"))
25-
assertEquals("16", text2Expr.eval("4 かける 4"))
26-
assertEquals("60", text2Expr.eval("30 × 2"))
27-
assertEquals("120", text2Expr.eval("24 x 5"))
28-
}
29-
30-
@Test fun eval3() {
31-
assertEquals("2.5", text2Expr.eval("5 割る 2"))
32-
assertEquals("15", text2Expr.eval("30 わる 2"))
33-
assertEquals("7.5", text2Expr.eval("15 ÷ 2"))
34-
}
35-
36-
@Test fun eval4() {
37-
assertEquals("3", text2Expr.eval("1 足す 2"))
38-
assertEquals("6", text2Expr.eval("3+3"))
39-
}
40-
41-
@Test fun eval5() {
42-
assertEquals("-3", text2Expr.eval("2 引く 5"))
43-
assertEquals("0", text2Expr.eval("3−3"))
17+
assertEquals("1", Text2Expr().eval("1"))
4418
}
4519

4620
}

0 commit comments

Comments
 (0)