diff options
Diffstat (limited to 'src/test/java/org/zwobble')
4 files changed, 10 insertions, 8 deletions
diff --git a/src/test/java/org/zwobble/couscous/tests/BackendMethodTests.java b/src/test/java/org/zwobble/couscous/tests/BackendMethodTests.java index 0fa4972..2fe7648 100644 --- a/src/test/java/org/zwobble/couscous/tests/BackendMethodTests.java +++ b/src/test/java/org/zwobble/couscous/tests/BackendMethodTests.java @@ -2,7 +2,6 @@ package org.zwobble.couscous.tests; import org.junit.Test; import org.zwobble.couscous.ast.ClassNode; -import org.zwobble.couscous.ast.ExpressionStatementNode; import org.zwobble.couscous.ast.LiteralNode; import org.zwobble.couscous.ast.MethodNode; import org.zwobble.couscous.ast.ReturnNode; @@ -13,6 +12,7 @@ import org.zwobble.couscous.values.StringValue; import static java.util.Arrays.asList; import static org.junit.Assert.assertEquals; import static org.zwobble.couscous.ast.AssignmentNode.assign; +import static org.zwobble.couscous.ast.ExpressionStatementNode.expressionStatement; import static org.zwobble.couscous.ast.FormalArgumentNode.formalArg; import static org.zwobble.couscous.ast.LiteralNode.literal; import static org.zwobble.couscous.ast.LocalVariableDeclarationNode.localVariableDeclaration; @@ -57,7 +57,7 @@ public abstract class BackendMethodTests { val arg = formalArg(var(ANY_ID, "x", StringValue.REF)); val method = staticMethod("hello") .argument(arg) - .statement(new ExpressionStatementNode(assign(reference(arg), LiteralNode.literal("[updated value]")))) + .statement(expressionStatement(assign(reference(arg), LiteralNode.literal("[updated value]")))) .statement(new ReturnNode(reference(arg))); val result = runMethod(method, value("[initial value]")); @@ -82,7 +82,7 @@ public abstract class BackendMethodTests { ANY_ID, "x", StringValue.REF, LiteralNode.literal("[initial value]")); val method = staticMethod("hello") .statement(localVariableDeclaration) - .statement(new ExpressionStatementNode(assign(reference(localVariableDeclaration), LiteralNode.literal("[updated value]")))) + .statement(expressionStatement(assign(reference(localVariableDeclaration), LiteralNode.literal("[updated value]")))) .statement(new ReturnNode(reference(localVariableDeclaration))); val result = runMethod(method); diff --git a/src/test/java/org/zwobble/couscous/tests/ValueObjectTests.java b/src/test/java/org/zwobble/couscous/tests/ValueObjectTests.java index 6396423..1c3dcd3 100644 --- a/src/test/java/org/zwobble/couscous/tests/ValueObjectTests.java +++ b/src/test/java/org/zwobble/couscous/tests/ValueObjectTests.java @@ -19,6 +19,7 @@ import org.zwobble.couscous.ast.ClassNode; import org.zwobble.couscous.ast.ConstructorCallNode; import org.zwobble.couscous.ast.ConstructorNode; import org.zwobble.couscous.ast.ExpressionNode; +import org.zwobble.couscous.ast.ExpressionStatementNode; import org.zwobble.couscous.ast.LiteralNode; import org.zwobble.couscous.ast.VariableDeclaration; import org.zwobble.couscous.ast.VariableReferenceNode; @@ -49,6 +50,7 @@ public class ValueObjectTests { {ClassNode.class}, {ConstructorCallNode.class}, {ConstructorNode.class}, + {ExpressionStatementNode.class}, {VariableDeclaration.class} }); } diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java index 74dec1a..5f30eb5 100644 --- a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java +++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaReaderTests.java @@ -6,7 +6,6 @@ import java.util.List; import org.junit.Test; import org.zwobble.couscous.ast.ClassNode; import org.zwobble.couscous.ast.ExpressionNode; -import org.zwobble.couscous.ast.ExpressionStatementNode; import org.zwobble.couscous.ast.LocalVariableDeclarationNode; import org.zwobble.couscous.ast.ReturnNode; import org.zwobble.couscous.ast.StatementNode; @@ -24,6 +23,7 @@ import static org.zwobble.couscous.ast.AnnotationNode.annotation; import static org.zwobble.couscous.ast.AssignmentNode.assign; import static org.zwobble.couscous.ast.AssignmentNode.assignStatement; import static org.zwobble.couscous.ast.ConstructorCallNode.constructorCall; +import static org.zwobble.couscous.ast.ExpressionStatementNode.expressionStatement; import static org.zwobble.couscous.ast.FieldAccessNode.fieldAccess; import static org.zwobble.couscous.ast.FieldDeclarationNode.field; import static org.zwobble.couscous.ast.LiteralNode.literal; @@ -202,7 +202,7 @@ public class JavaReaderTests { @Test public void canReadExpressionStatements() { assertEquals( - new ExpressionStatementNode( + expressionStatement( staticMethodCall( TypeName.of("java.lang.Integer"), "parseInt", diff --git a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java index 9ef64d2..c11b76a 100644 --- a/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java +++ b/src/test/java/org/zwobble/couscous/tests/interpreter/InterpreterMethodTests.java @@ -5,7 +5,6 @@ import java.util.stream.Collectors; import org.junit.Test; import org.zwobble.couscous.ast.ClassNode; -import org.zwobble.couscous.ast.ExpressionStatementNode; import org.zwobble.couscous.ast.LiteralNode; import org.zwobble.couscous.ast.ReturnNode; import org.zwobble.couscous.ast.TypeName; @@ -24,6 +23,7 @@ import org.zwobble.couscous.values.StringValue; import static org.junit.Assert.assertEquals; import static org.zwobble.couscous.ast.AssignmentNode.assign; +import static org.zwobble.couscous.ast.ExpressionStatementNode.expressionStatement; import static org.zwobble.couscous.ast.FormalArgumentNode.formalArg; import static org.zwobble.couscous.ast.LiteralNode.literal; import static org.zwobble.couscous.ast.LocalVariableDeclarationNode.localVariableDeclaration; @@ -52,7 +52,7 @@ public class InterpreterMethodTests extends BackendMethodTests { val arg = formalArg(var(ANY_ID, "x", StringValue.REF)); val method = staticMethod("hello") .argument(arg) - .statement(new ExpressionStatementNode(assign(reference(arg), literal(0)))); + .statement(expressionStatement(assign(reference(arg), literal(0)))); val exception = assertThrows(UnexpectedValueType.class, () -> runMethod(method, value(""))); @@ -65,7 +65,7 @@ public class InterpreterMethodTests extends BackendMethodTests { val localVariableDeclaration = localVariableDeclaration( ANY_ID, "x", StringValue.REF, literal("")); val method = staticMethod("hello") - .statement(new ExpressionStatementNode(assign(reference(localVariableDeclaration), LiteralNode.literal("[updated value]")))); + .statement(expressionStatement(assign(reference(localVariableDeclaration), LiteralNode.literal("[updated value]")))); val exception = assertThrows(VariableNotInScope.class, () -> runMethod(method)); |