From e6f463257720bee91a1b4954d97684dbb3398cbf Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Tue, 6 Oct 2015 16:24:37 +0100
Subject: Add support for constructors and fields

---
 .../zwobble/couscous/tests/BackendEvalTests.java   | 28 ++++++++++++++++++++++
 .../couscous/tests/interpreter/EvaluatorTests.java |  4 ++++
 2 files changed, 32 insertions(+)

(limited to 'src/test/java')

diff --git a/src/test/java/org/zwobble/couscous/tests/BackendEvalTests.java b/src/test/java/org/zwobble/couscous/tests/BackendEvalTests.java
index d1d72c0..765be9c 100644
--- a/src/test/java/org/zwobble/couscous/tests/BackendEvalTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/BackendEvalTests.java
@@ -16,7 +16,9 @@ import com.google.common.collect.ImmutableList;
 
 import static java.util.Arrays.asList;
 import static org.junit.Assert.assertEquals;
+import static org.zwobble.couscous.ast.AssignmentNode.assignStatement;
 import static org.zwobble.couscous.ast.ConstructorCallNode.constructorCall;
+import static org.zwobble.couscous.ast.FieldAccessNode.fieldAccess;
 import static org.zwobble.couscous.ast.FormalArgumentNode.formalArg;
 import static org.zwobble.couscous.ast.LiteralNode.literal;
 import static org.zwobble.couscous.ast.MethodCallNode.methodCall;
@@ -120,6 +122,32 @@ public abstract class BackendEvalTests {
         assertEquals(value(42), result);
     }
     
+    @Test
+    public void constructorIsExecutedOnConstruction() {
+        val argument = formalArg(var(42, "x", IntegerValue.REF));
+        val classNode = ClassNode.builder("com.example.Example")
+            .field("value", IntegerValue.REF)
+            .constructor(constructor -> constructor
+                .argument(argument)
+                .statement(assignStatement(
+                    fieldAccess(constructor.thisReference(), "value", IntegerValue.REF),
+                    reference(argument))))
+            .method("main", method -> method
+                .statement(new ReturnNode(
+                    fieldAccess(method.thisReference(), "value", IntegerValue.REF))))
+            .build();
+        
+        val result = evalExpression(
+            asList(classNode),
+            methodCall(
+                constructorCall(classNode.getName(), asList(literal(42))),
+                "main",
+                asList(),
+                IntegerValue.REF));
+        
+        assertEquals(value(42), result);
+    }
+    
     protected PrimitiveValue evalExpression(ExpressionNode expression) {
         return evalExpression(ImmutableList.of(), expression);
     }
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 4ec8428..9cf87a4 100644
--- a/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/interpreter/EvaluatorTests.java
@@ -1,6 +1,7 @@
 package org.zwobble.couscous.tests.interpreter;
 
 import java.util.List;
+import java.util.Optional;
 
 import org.junit.Test;
 import org.zwobble.couscous.JavaProject;
@@ -42,6 +43,7 @@ public class EvaluatorTests extends BackendEvalTests {
         val arg = formalArg(var(42, "x", StringValue.REF));
         val environment = new Environment(
             new MapBackedProject(ImmutableMap.of()),
+            Optional.empty(),
             new StackFrameBuilder().declare(arg, value("[initial value]")).build());
         val result = eval(environment, assign(arg, literal("[updated value]")));
         assertEquals(new StringInterpreterValue("[updated value]"), result);
@@ -94,6 +96,7 @@ public class EvaluatorTests extends BackendEvalTests {
     private static Environment emptyEnvironment() {
         return new Environment(
             JavaProject.builder().build(),
+            Optional.empty(),
             ImmutableMap.of());
     }
 
@@ -104,6 +107,7 @@ public class EvaluatorTests extends BackendEvalTests {
         
         val environment = new Environment(
             JavaProject.of(classes),
+            Optional.empty(),
             ImmutableMap.of());
         return eval(environment, expression).toPrimitiveValue().get();
     }
-- 
cgit v1.2.3