Read static field accesses and static constructors in Java frontend

1 files changed, 46 insertions, 0 deletions

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 6bc0816..13484c2 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
@@ -99,6 +99,32 @@ public class JavaReaderTests {
                 StringValue.REF),
             returnNode.getValue());
     }
+
+    @Test
+    public void canReadExplicitStaticFieldReference() {
+        canReadStaticFieldReference("this.name");
+    }
+
+    @Test
+    public void canReadImplicitStaticFieldReference() {
+        canReadStaticFieldReference("name");
+    }
+
+    private void canReadStaticFieldReference(String expression) {
+        ClassNode classNode = readClass(
+            "private static String name;" +
+            "public String getName() {" +
+            "    return " + expression + ";" +
+            "}");
+
+        ReturnNode returnNode = (ReturnNode) classNode.getMethods().get(0).getBody().get(0);
+        assertEquals(
+            fieldAccess(
+                TypeName.of("com.example.Example"),
+                "name",
+                StringValue.REF),
+            returnNode.getValue());
+    }
     
     @Test
     public void canReadInstanceMethodCalls() {
@@ -610,6 +636,26 @@ public class JavaReaderTests {
                 literal("Flaws"))),
             constructor.getBody());
     }
+
+    @Test
+    public void canDeclareStaticConstructor() {
+        ClassNode classNode = readClass(
+            "private static final String name;" +
+            "static {" +
+            "    name = \"Flaws\";" +
+            "}");
+
+        List<StatementNode> staticConstructor = classNode.getStaticConstructor();
+
+        assertEquals(
+            list(assignStatement(
+                fieldAccess(
+                    TypeName.of("com.example.Example"),
+                    "name",
+                    StringValue.REF),
+                literal("Flaws"))),
+            staticConstructor);
+    }
     
     @Test
     public void canDeclareStaticMethodWithAnnotation() {