Initial implementation of generics for C#

3 files changed, 5 insertions, 10 deletions

diff --git a/src/test/java/org/zwobble/couscous/tests/ValueObjectTests.java b/src/test/java/org/zwobble/couscous/tests/ValueObjectTests.java
index f0780d5..7e17104 100644
--- a/src/test/java/org/zwobble/couscous/tests/ValueObjectTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/ValueObjectTests.java
@@ -7,8 +7,7 @@ import org.junit.runners.Parameterized;
 import org.junit.runners.Parameterized.Parameters;
 import org.zwobble.couscous.ast.*;
 import org.zwobble.couscous.ast.identifiers.Identifier;
-import org.zwobble.couscous.ast.types.ScalarType;
-import org.zwobble.couscous.ast.types.Type;
+import org.zwobble.couscous.ast.types.*;
 import org.zwobble.couscous.util.ExtraArrays;
 import org.zwobble.couscous.values.PrimitiveValue;
 import org.zwobble.couscous.values.StringValue;
@@ -44,6 +43,7 @@ public class ValueObjectTests {
         return asList(new Object[][] {
             {AnnotationNode.class},
             {AssignmentNode.class},
+            {BoundTypeParameter.class},
             {CastNode.class},
             {ClassNode.class},
             {ConstructorCallNode.class},
@@ -61,12 +61,14 @@ public class ValueObjectTests {
             {MethodCallNode.class},
             {MethodNode.class},
             {OperationNode.class},
+            {ParameterizedType.class},
             {ReturnNode.class},
             {ScalarType.class},
             {StaticReceiver.class},
             {TernaryConditionalNode.class},
             {ThisReferenceNode.class},
             {TypeCoercionNode.class},
+            {TypeParameter.class},
             {ScalarType.class},
             {VariableDeclaration.class},
             {VariableReferenceNode.class},
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 68d270d..ad0da0b 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,7 +1,5 @@
 package org.zwobble.couscous.tests.backends.csharp;
 
-import org.junit.Ignore;
-import org.junit.Test;
 import org.zwobble.couscous.CouscousCompiler;
 import org.zwobble.couscous.ast.types.ScalarType;
 import org.zwobble.couscous.backends.csharp.CsharpBackend;
@@ -18,11 +16,6 @@ import static org.zwobble.couscous.tests.util.ExtraFiles.deleteRecursively;
 import static org.zwobble.couscous.util.ExtraLists.list;
 
 public class JavaToCsharpTests extends CompilerTests {
-    @Test
-    @Ignore
-    public void genericInterfaces() throws Exception {
-    }
-
     protected PrimitiveValue execProgram(
         Path directory,
         ScalarType type,
diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java
index e73b63b..7756215 100644
--- a/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/ExpressionReadingTests.java
@@ -38,7 +38,7 @@ public class ExpressionReadingTests {
         assertEquals(literal(false), readBooleanExpression("false"));
         assertEquals(literal(42), readIntExpression("42"));
         assertEquals(literal('h'), readIntExpression("'h'"));
-        assertEquals(literal(StringValue.REF), readExpression("Class<?>", "String.class"));
+        assertEquals(literal(StringValue.REF), readExpression("Class<String>", "String.class"));
     }
 
     @Test