From cf12234c6f3d022c5e0882a26e6cfd39b45e0abf Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Tue, 29 Sep 2015 23:43:45 +0100 Subject: Add builtin method calls with no arguments --- .../couscous/tests/interpreter/EvaluatorTests.java | 8 ++++++++ .../couscous/tests/interpreter/InterpreterTests.java | 16 ++++++++-------- 2 files changed, 16 insertions(+), 8 deletions(-) (limited to 'src/test/java') diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java index dbf20f8..6aee7d5 100644 --- a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java +++ b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java @@ -13,6 +13,7 @@ import com.google.common.collect.ImmutableMap; import static org.junit.Assert.assertEquals; import static org.zwobble.couscous.ast.Assignment.assign; import static org.zwobble.couscous.ast.LiteralNode.literal; +import static org.zwobble.couscous.ast.MethodCallNode.methodCall; import static org.zwobble.couscous.interpreter.Evaluator.eval; import static org.zwobble.couscous.tests.util.ExtraAsserts.assertThrows; @@ -49,6 +50,13 @@ public class EvaluatorTests { assertEquals(new ConditionMustBeBoolean(new IntegerValue(1)), exception); } + @Test + public void canCallMethodWithNoArgumentsOnBuiltin() { + val result = eval(emptyEnvironment(), + methodCall(literal("hello"), "length")); + assertEquals(new IntegerValue(5), result); + } + private static Environment emptyEnvironment() { return new Environment(ImmutableMap.of()); } diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java index 54abd8a..bfdadf8 100644 --- a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java +++ b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterTests.java @@ -28,6 +28,14 @@ import static org.zwobble.couscous.values.UnitValue.UNIT; import lombok.val; public class InterpreterTests { + @Test + public void methodWithNoStatementsReturnsUnit() { + val method = staticMethod("hello"); + val result = runMethod(method); + + assertEquals(UNIT, result); + } + @Test public void canReturnLiteralValue() { val method = staticMethod("hello") @@ -69,14 +77,6 @@ public class InterpreterTests { assertEquals(new StringValue("[updated value]"), result); } - - @Test - public void methodWithNoStatementsReturnsUnit() { - val method = staticMethod("hello"); - val result = runMethod(method); - - assertEquals(UNIT, result); - } private InterpreterValue runMethod(MethodNode.MethodNodeBuilder methodBuilder, InterpreterValue... arguments) { val method = methodBuilder.build(); -- cgit v1.2.3