From 77959af7d24286addc555aa02c774aa26cecdcbf Mon Sep 17 00:00:00 2001
From: Michael Williamson <mike@zwobble.org>
Date: Mon, 11 Apr 2016 20:36:19 +0100
Subject: Add test for capturing type parameters in anonymous classes

---
 .../couscous/frontends/java/JavaExpressionReader.java  |  4 ++--
 .../java/org/zwobble/couscous/tests/CompilerTests.java | 12 ++++++++++++
 .../zwobble/couscous/tests/JavaToInterpreterTests.java |  5 +++++
 .../tests/backends/csharp/JavaToCsharpTests.java       |  7 +++++++
 .../com/example/AnonymousClass.java                    | 18 ++++++++++++++++++
 .../com/example/Supplier.java                          |  5 +++++
 6 files changed, 49 insertions(+), 2 deletions(-)
 create mode 100644 src/test/resources/java/anonymous-class-type-capture/com/example/AnonymousClass.java
 create mode 100644 src/test/resources/java/anonymous-class-type-capture/com/example/Supplier.java

diff --git a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
index 290b6d7..f3a4a1f 100644
--- a/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
+++ b/src/main/java/org/zwobble/couscous/frontends/java/JavaExpressionReader.java
@@ -6,7 +6,6 @@ import org.zwobble.couscous.ast.*;
 import org.zwobble.couscous.types.ScalarType;
 import org.zwobble.couscous.types.Type;
 import org.zwobble.couscous.types.Types;
-import org.zwobble.couscous.util.InsertionOrderSet;
 
 import java.util.List;
 import java.util.stream.Collectors;
@@ -27,7 +26,8 @@ import static org.zwobble.couscous.ast.TypeCoercionNode.coerce;
 import static org.zwobble.couscous.frontends.java.JavaOperators.readOperator;
 import static org.zwobble.couscous.frontends.java.JavaTypes.typeOf;
 import static org.zwobble.couscous.types.Types.erasure;
-import static org.zwobble.couscous.util.ExtraLists.*;
+import static org.zwobble.couscous.util.ExtraLists.eagerMap;
+import static org.zwobble.couscous.util.ExtraLists.list;
 import static org.zwobble.couscous.util.Fold.foldLeft;
 
 public class JavaExpressionReader {
diff --git a/src/test/java/org/zwobble/couscous/tests/CompilerTests.java b/src/test/java/org/zwobble/couscous/tests/CompilerTests.java
index ea8865a..235c7d5 100644
--- a/src/test/java/org/zwobble/couscous/tests/CompilerTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/CompilerTests.java
@@ -168,6 +168,18 @@ public abstract class CompilerTests {
                 Types.INT));
     }
 
+    @Test
+    public void anonymousClassesWithTypeCapture() throws Exception {
+        assertEquals(
+            value("Hello"),
+            execTestProgram(
+                "anonymous-class-type-capture",
+                ScalarType.of("com.example.AnonymousClass"),
+                "value",
+                list(),
+                Types.STRING));
+    }
+
     @Test
     public void lambdasWithoutCapture() throws Exception {
         assertEquals(
diff --git a/src/test/java/org/zwobble/couscous/tests/JavaToInterpreterTests.java b/src/test/java/org/zwobble/couscous/tests/JavaToInterpreterTests.java
index 209aaa8..34c637c 100644
--- a/src/test/java/org/zwobble/couscous/tests/JavaToInterpreterTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/JavaToInterpreterTests.java
@@ -22,6 +22,11 @@ import static com.google.common.collect.Iterables.transform;
 import static org.zwobble.couscous.util.ExtraLists.list;
 
 public class JavaToInterpreterTests extends CompilerTests {
+    @Test
+    @Ignore("WIP")
+    public void anonymousClassesWithTypeCapture() throws Exception {
+    }
+
     @Test
     @Ignore("WIP")
     public void forEach() throws Exception {
diff --git a/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java b/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java
index bda974e..da41dc6 100644
--- a/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/backends/csharp/JavaToCsharpTests.java
@@ -1,5 +1,7 @@
 package org.zwobble.couscous.tests.backends.csharp;
 
+import org.junit.Ignore;
+import org.junit.Test;
 import org.zwobble.couscous.CouscousCompiler;
 import org.zwobble.couscous.backends.csharp.CsharpBackend;
 import org.zwobble.couscous.frontends.java.JavaFrontend;
@@ -16,6 +18,11 @@ import static org.zwobble.couscous.tests.util.ExtraFiles.deleteRecursively;
 import static org.zwobble.couscous.util.ExtraLists.list;
 
 public class JavaToCsharpTests extends CompilerTests {
+    @Test
+    @Ignore("WIP")
+    public void anonymousClassesWithTypeCapture() throws Exception {
+    }
+
     protected PrimitiveValue execProgram(
         Path directory,
         ScalarType type,
diff --git a/src/test/resources/java/anonymous-class-type-capture/com/example/AnonymousClass.java b/src/test/resources/java/anonymous-class-type-capture/com/example/AnonymousClass.java
new file mode 100644
index 0000000..ea097bb
--- /dev/null
+++ b/src/test/resources/java/anonymous-class-type-capture/com/example/AnonymousClass.java
@@ -0,0 +1,18 @@
+package com.example;
+
+public class AnonymousClass {
+    public static String value() {
+        return get("Hello");
+    }
+    
+    private static <T> T get(T value) {
+        Supplier<T> supplier = new Supplier<T>() {
+            @Override
+            public T get() {
+                return value;
+            }
+        };
+        
+        return supplier.get();
+    }
+}
diff --git a/src/test/resources/java/anonymous-class-type-capture/com/example/Supplier.java b/src/test/resources/java/anonymous-class-type-capture/com/example/Supplier.java
new file mode 100644
index 0000000..6c6da60
--- /dev/null
+++ b/src/test/resources/java/anonymous-class-type-capture/com/example/Supplier.java
@@ -0,0 +1,5 @@
+package com.example;
+
+public interface Supplier<T> {
+    T get();
+}
-- 
cgit v1.2.3