From 9cacda725dcfe5bf30cbb98ee56b04cce055d709 Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Sat, 8 Aug 2026 21:35:17 +0100 Subject: Add type parameters to Java interface declaration --- .../compiler/output/lang/java/JavaWriterTests.java | 24 +++++++++++++ .../java/ast/JavaInterfaceDeclarationMatcher.java | 6 ++++ .../lang/java/ast/JavaTypeParameterMatcher.java | 41 ++++++++++++++++++++++ 3 files changed, 71 insertions(+) create mode 100644 src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTypeParameterMatcher.java (limited to 'src/test') diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java index 269b490..7158062 100644 --- a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/JavaWriterTests.java @@ -244,6 +244,7 @@ public class JavaWriterTests { JavaInterfaceOpenness.OPEN, List.of(), List.of(), + List.of(), DocComment.EMPTY ); @@ -264,6 +265,7 @@ public class JavaWriterTests { JavaInterfaceOpenness.SEALED, List.of(), List.of(), + List.of(), DocComment.EMPTY ); @@ -277,11 +279,31 @@ public class JavaWriterTests { )); } + @Test + public void sealedInterfaceDeclarationWithTypeParameters() throws IOException { + var java = JavaInterfaceDeclaration.arbitrary() + .withType(JavaTypeRef.topLevel(JavaPackageName.EMPTY, JavaIdentifier.of("X"))) + .withOpenness(JavaInterfaceOpenness.OPEN) + .addTypeParameter(JavaTypeParameter.arbitrary().withName(JavaIdentifier.of("T1"))) + .addTypeParameter(JavaTypeParameter.arbitrary().withName(JavaIdentifier.of("T2"))) + .build(); + + var string = write(writer -> writer.writeTypeDeclaration(java)); + + assertThat(string, equalTo(""" + public interface X { + // Custom area start: X body + // Custom area end: X body + }""" + )); + } + @Test public void sealedInterfaceDeclarationWithPermitsTypes() throws IOException { var java = new JavaInterfaceDeclaration( JavaTypeRef.topLevel(JavaPackageName.EMPTY, JavaIdentifier.of("Shape")), JavaInterfaceOpenness.SEALED, + List.of(), List.of( JavaTypeRef.topLevel(JavaPackageName.of("abc", "def"), JavaIdentifier.of("One")), JavaTypeRef.topLevel(JavaPackageName.of("abc", "def"), JavaIdentifier.of("Two")) @@ -307,6 +329,7 @@ public class JavaWriterTests { JavaInterfaceOpenness.OPEN, List.of(), List.of(), + List.of(), new DocComment("A 2D shape.") ); @@ -327,6 +350,7 @@ public class JavaWriterTests { JavaTypeRef.topLevel(JavaPackageName.EMPTY, JavaIdentifier.of("Shape")), JavaInterfaceOpenness.OPEN, List.of(), + List.of(), List.of( JavaMethodDeclaration.arbitrary() .withName(JavaIdentifier.of("a")) diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInterfaceDeclarationMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInterfaceDeclarationMatcher.java index e8c039b..046489a 100644 --- a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInterfaceDeclarationMatcher.java +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaInterfaceDeclarationMatcher.java @@ -42,6 +42,12 @@ public final class JavaInterfaceDeclarationMatcher implements org.zwobble.precis return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclarationMatcher(submatchers); } + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclarationMatcher withTypeParameters(org.zwobble.precisely.Matcher> typeParameters) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("typeParameters", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclaration::typeParameters, typeParameters)); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclarationMatcher(submatchers); + } + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclarationMatcher withPermitsTypes(org.zwobble.precisely.Matcher> permitsTypes) { var submatchers = new java.util.ArrayList>(this.submatchers); submatchers.add(org.zwobble.precisely.Matchers.has("permitsTypes", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaInterfaceDeclaration::permitsTypes, permitsTypes)); diff --git a/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTypeParameterMatcher.java b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTypeParameterMatcher.java new file mode 100644 index 0000000..031dc63 --- /dev/null +++ b/src/test/java/org/zwobble/hobgoblin/compiler/output/lang/java/ast/JavaTypeParameterMatcher.java @@ -0,0 +1,41 @@ +// Generated by hobgoblin. + +package org.zwobble.hobgoblin.compiler.output.lang.java.ast; + +// Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher imports +// Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher imports + +public final class JavaTypeParameterMatcher implements org.zwobble.precisely.Matcher { + public static org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher isJavaTypeParameter() { + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher(java.util.List.of()); + } + + private final java.util.List> submatchers; + + private JavaTypeParameterMatcher( + java.util.List> submatchers + ) { + this.submatchers = submatchers; + } + + public org.zwobble.precisely.MatchResult match(java.lang.Object actual) { + return this.toMatcher().match(actual); + } + + public org.zwobble.precisely.TextTree describe() { + return this.toMatcher().describe(); + } + + private org.zwobble.precisely.Matcher toMatcher() { + return org.zwobble.precisely.Matchers.instanceOf(org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameter.class, this.submatchers); + } + + public org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher withName(org.zwobble.precisely.Matcher name) { + var submatchers = new java.util.ArrayList>(this.submatchers); + submatchers.add(org.zwobble.precisely.Matchers.has("name", org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameter::name, name)); + return new org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher(submatchers); + } + + // Custom area start: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher body + // Custom area end: org.zwobble.hobgoblin.compiler.output.lang.java.ast.JavaTypeParameterMatcher body +} -- cgit v1.2.3