Use Identifier instead of ScalarType in TypeParameter

2 files changed, 7 insertions, 4 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 4a05385..971ddd9 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
@@ -2,6 +2,7 @@ package org.zwobble.couscous.tests.frontends.java;
 
 import org.junit.Test;
 import org.zwobble.couscous.ast.*;
+import org.zwobble.couscous.ast.identifiers.Identifier;
 import org.zwobble.couscous.types.ScalarType;
 import org.zwobble.couscous.types.Types;
 
@@ -92,8 +93,9 @@ public class JavaReaderTests {
 
         MethodNode method = classNode.getMethods().get(0);
         assertThat(method.getTypeParameters(), contains(isFormalTypeParameter("T")));
-        // TODO: typeParameter should be declared on method, not class
-        assertThat(method.getArguments(), contains(isFormalArgument("value", typeParameter(classNode.getName(), "T"))));
+        assertThat(
+            method.getArguments(),
+            contains(isFormalArgument("value", typeParameter(Identifier.TOP.extend("com.example.Example").extend("identity"), "T"))));
     }
     
     @Test
diff --git a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaTypesTests.java b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaTypesTests.java
index d450b6f..329ccc7 100644
--- a/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaTypesTests.java
+++ b/src/test/java/org/zwobble/couscous/tests/frontends/java/JavaTypesTests.java
@@ -1,6 +1,7 @@
 package org.zwobble.couscous.tests.frontends.java;
 
 import org.junit.Test;
+import org.zwobble.couscous.ast.identifiers.Identifier;
 import org.zwobble.couscous.frontends.java.JavaTypes;
 import org.zwobble.couscous.types.ScalarType;
 import org.zwobble.couscous.types.TypeParameter;
@@ -23,7 +24,7 @@ public class JavaTypesTests {
 
     @Test
     public void bindingTypeToGenericTypeParameterReturnsBoundTypeParameter() {
-        TypeParameter typeParameter = typeParameter(ScalarType.of("List"), "T");
+        TypeParameter typeParameter = typeParameter(Identifier.TOP.extend("List"), "T");
         assertEquals(
             boundTypeParameter(typeParameter, INT_TYPE),
             JavaTypes.bind(typeParameter, INT_TYPE));
@@ -32,7 +33,7 @@ public class JavaTypesTests {
     @Test
     public void bindingTypeToParameterizedTypeBindsParameters() {
         ScalarType rawList = ScalarType.of("List");
-        TypeParameter typeParameter = typeParameter(rawList, "T");
+        TypeParameter typeParameter = typeParameter(Identifier.TOP.extend("List"), "T");
         assertEquals(
             parameterizedType(rawList, list(boundTypeParameter(typeParameter, INT_TYPE))),
             JavaTypes.bind(