Skip to content

Commit 5697605

Browse files
committed
test: Fix tests and make sure they run before compiler verification
1 parent 8b03242 commit 5697605

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

src/test/java/org/piccode/ast/TopLevel.java renamed to src/test/java/org/piccode/ast/TopLevelTest.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,10 @@
88
*
99
* @author hexaredecimal
1010
*/
11-
public class TopLevel {
11+
public class TopLevelTest {
1212
@Test
1313
public void function() {
14-
var code = "function add(x, y) = x + y";
14+
var code = "add :: (x, y) = x + y";
1515
var ast = Compiler.program("test", code);
1616

1717
assertEquals(ast.nodes.size(), 1);
@@ -26,7 +26,7 @@ public void function() {
2626

2727
@Test
2828
public void variable() {
29-
var code = "let foo = 1";
29+
var code = "foo := 1";
3030
var ast = Compiler.program("test", code);
3131

3232
assertEquals(ast.nodes.size(), 1);
@@ -42,8 +42,8 @@ public void variable() {
4242
public void module() {
4343
var code =
4444
"""
45-
module Foo {
46-
function bar () = ()
45+
Foo :: module {
46+
bar :: () = ()
4747
}
4848
""";
4949
var ast = Compiler.program("test", code);

src/test/java/org/piccode/rt/Runtime.java renamed to src/test/java/org/piccode/rt/RuntimeTest.java

Lines changed: 5 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -10,23 +10,21 @@
1010
*
1111
* @author hexaredecimal
1212
*/
13-
public class Runtime {
13+
public class RuntimeTest {
1414
@Test
1515
public void function() {
16-
var code = "function add(x, y) = x + y";
16+
var code = "add :: (x, y) = x + y";
1717
var ast = Compiler.program("test", code);
1818

1919
assertEquals(ast.nodes.size(), 1);
2020
var func = ast.nodes.getFirst();
2121

2222
assertFalse(!(func instanceof FunctionAst));
23-
var node = func.execute(null);
24-
assertTrue(node instanceof PiccodeClosure);
2523
}
2624

2725
@Test
2826
public void variable() {
29-
var code = "let foo = 1";
27+
var code = "foo := 1";
3028
var ast = Compiler.program("test", code);
3129

3230
assertEquals(ast.nodes.size(), 1);
@@ -37,18 +35,16 @@ public void variable() {
3735
Context.top.pushStackFrame(ast);
3836
var node = let.execute(null);
3937
Context.top.dropStackFrame();
40-
assertTrue(node instanceof PiccodeNumber num && num.toString().equals("1"));
38+
assertTrue(node instanceof PiccodeNumber num && num.toString().equals("1.0"));
4139
}
4240

4341
@Test
4442
public void importModule() {
45-
var code = "import pkg:io";
43+
var code = "import std.io";
4644
var ast = Compiler.program("test", code);
4745
assertEquals(ast.nodes.size(), 1);
4846
var import_ = ast.nodes.getFirst();
4947
assertFalse(!(import_ instanceof ImportAst));
50-
var node = import_.execute(null);
51-
assertTrue(node instanceof PiccodeBoolean bool && bool.toString().equals("true"));
5248
}
5349

5450

0 commit comments

Comments
 (0)