Support circular imports

2 files changed, 11 insertions, 11 deletions

diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerNamespaceTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerNamespaceTests.java
index b5814a8..95ad671 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerNamespaceTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerNamespaceTests.java
@@ -31,9 +31,9 @@ public class TypeCheckerNamespaceTests {
             .build();
         var context = TypeCheckerContextArb.globalContext();
 
-        var typed = TypeChecker.typeCheckNamespace(untyped, context);
+        var typed = TypeChecker.typeCheckNamespaces(List.of(untyped), context);
 
-        assertThat(typed, instanceOf(
+        assertThat(typed, containsExactly(instanceOf(
             TypedNamespaceNode.class,
             has("body", TypedNamespaceNode::body, isSequence(
                 instanceOf(
@@ -45,7 +45,7 @@ public class TypeCheckerNamespaceTests {
                     )
                 )
             ))
-        ));
+        )));
         assertThat(
             context.namespaceFields(NamespaceName.of("a", "b")).orElseThrow().fieldType("X").orElseThrow(),
             isMetaType(new StructType(NamespaceName.of("a", "b"), "X"))
@@ -83,9 +83,9 @@ public class TypeCheckerNamespaceTests {
                 NullSource.INSTANCE
             )));
 
-        var typed = TypeChecker.typeCheckNamespace(untyped, context);
+        var typed = TypeChecker.typeCheckNamespaces(List.of(untyped), context);
 
-        assertThat(typed, instanceOf(
+        assertThat(typed, containsExactly(instanceOf(
             TypedNamespaceNode.class,
             has("body", TypedNamespaceNode::body, isSequence(
                 instanceOf(
@@ -97,7 +97,7 @@ public class TypeCheckerNamespaceTests {
                     )
                 )
             ))
-        ));
+        )));
         assertThat(
             context.toTypesInfo().fieldsOf(new StructType(NamespaceName.of("a", "b"), "X")),
             isOptionalOf(isSequence(
@@ -121,7 +121,7 @@ public class TypeCheckerNamespaceTests {
 
         var error = assertThrows(
             UnknownNamespaceError.class,
-            () -> TypeChecker.typeCheckNamespace(untyped, context)
+            () -> TypeChecker.typeCheckNamespaces(List.of(untyped), context)
         );
 
         assertThat(error.namespaceName(), equalTo(NamespaceName.of("a")));
@@ -143,7 +143,7 @@ public class TypeCheckerNamespaceTests {
 
         var error = assertThrows(
             UnknownNamespaceFieldError.class,
-            () -> TypeChecker.typeCheckNamespace(untyped, context)
+            () -> TypeChecker.typeCheckNamespaces(List.of(untyped), context)
         );
 
         assertThat(error.fieldName(), equalTo("A"));
diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerStructDefinitionTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerStructDefinitionTests.java
index d86fd59..ceb7a9b 100644
--- a/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerStructDefinitionTests.java
+++ b/src/test/java/org/zwobble/hobgoblin/compiler/typechecker/TypeCheckerStructDefinitionTests.java
@@ -150,9 +150,9 @@ public class TypeCheckerStructDefinitionTests {
         var context = TypeCheckerContextArb.globalContext();
         context.addNativeType(int32Type);
 
-        var typed = TypeChecker.typeCheckNamespace(untyped, context);
+        var typed = TypeChecker.typeCheckNamespaces(List.of(untyped), context);
 
-        assertThat(typed, has(
+        assertThat(typed, containsExactly(has(
             "body",
             TypedNamespaceNode::body,
             isSequence(
@@ -193,6 +193,6 @@ public class TypeCheckerStructDefinitionTests {
                     )
                 )
             )
-        ));
+        )));
     }
 }