From bece8f933669ed6d83e99ba22a4829480470a3eb Mon Sep 17 00:00:00 2001 From: Michael Williamson Date: Mon, 27 Jul 2026 20:14:34 +0100 Subject: Reorder tests to match AST definitions --- .../compiler/output/lang/java/JavaWriterTests.java | 82 +++++++++++----------- 1 file changed, 42 insertions(+), 40 deletions(-) (limited to 'src/test/java/org') 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 8b60341..80c145d 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 @@ -1267,7 +1267,7 @@ public class JavaWriterTests { // == Expressions == - // === Binary operations === + // === Array accesses === @Test public void arrayAccess() throws IOException { @@ -1281,6 +1281,8 @@ public class JavaWriterTests { assertThat(string, equalTo("x[42]")); } + // === Binary operations === + @Test public void binaryOperationAdd() throws IOException { var java = new JavaBinaryOperation( @@ -1307,6 +1309,32 @@ public class JavaWriterTests { assertThat(string, equalTo("x = 42")); } + @Test + public void binaryOperationBitwiseAnd() throws IOException { + var java = JavaBinaryOperation.arbitrary() + .withOperator(JavaBinaryOperator.BITWISE_AND) + .withLeft(JavaRef.arbitrary().withName(JavaIdentifier.of("x"))) + .withRight(JavaRef.arbitrary().withName(JavaIdentifier.of("y"))) + .build(); + + var string = write(writer -> writer.writeTopLevelExpression(java)); + + assertThat(string, equalTo("x & y")); + } + + @Test + public void binaryOperationBitwiseOr() throws IOException { + var java = JavaBinaryOperation.arbitrary() + .withOperator(JavaBinaryOperator.BITWISE_OR) + .withLeft(JavaRef.arbitrary().withName(JavaIdentifier.of("x"))) + .withRight(JavaRef.arbitrary().withName(JavaIdentifier.of("y"))) + .build(); + + var string = write(writer -> writer.writeTopLevelExpression(java)); + + assertThat(string, equalTo("x | y")); + } + @Test public void binaryOperationEqualTo() throws IOException { var java = new JavaBinaryOperation( @@ -1320,6 +1348,19 @@ public class JavaWriterTests { assertThat(string, equalTo("x == y")); } + @Test + public void binaryOperationLeftShift() throws IOException { + var java = JavaBinaryOperation.arbitrary() + .withOperator(JavaBinaryOperator.LEFT_SHIFT) + .withLeft(JavaRef.arbitrary().withName(JavaIdentifier.of("x"))) + .withRight(JavaRef.arbitrary().withName(JavaIdentifier.of("y"))) + .build(); + + var string = write(writer -> writer.writeTopLevelExpression(java)); + + assertThat(string, equalTo("x << y")); + } + @Test public void binaryOperationLessThan() throws IOException { var java = new JavaBinaryOperation( @@ -1359,19 +1400,6 @@ public class JavaWriterTests { assertThat(string, equalTo("x != y")); } - @Test - public void binaryOperationUnsignedLeftShift() throws IOException { - var java = JavaBinaryOperation.arbitrary() - .withOperator(JavaBinaryOperator.LEFT_SHIFT) - .withLeft(JavaRef.arbitrary().withName(JavaIdentifier.of("x"))) - .withRight(JavaRef.arbitrary().withName(JavaIdentifier.of("y"))) - .build(); - - var string = write(writer -> writer.writeTopLevelExpression(java)); - - assertThat(string, equalTo("x << y")); - } - @Test public void binaryOperationUnsignedRightShift() throws IOException { var java = JavaBinaryOperation.arbitrary() @@ -1385,32 +1413,6 @@ public class JavaWriterTests { assertThat(string, equalTo("x >>> y")); } - @Test - public void binaryOperationBitwiseAnd() throws IOException { - var java = JavaBinaryOperation.arbitrary() - .withOperator(JavaBinaryOperator.BITWISE_AND) - .withLeft(JavaRef.arbitrary().withName(JavaIdentifier.of("x"))) - .withRight(JavaRef.arbitrary().withName(JavaIdentifier.of("y"))) - .build(); - - var string = write(writer -> writer.writeTopLevelExpression(java)); - - assertThat(string, equalTo("x & y")); - } - - @Test - public void binaryOperationBitwiseOr() throws IOException { - var java = JavaBinaryOperation.arbitrary() - .withOperator(JavaBinaryOperator.BITWISE_OR) - .withLeft(JavaRef.arbitrary().withName(JavaIdentifier.of("x"))) - .withRight(JavaRef.arbitrary().withName(JavaIdentifier.of("y"))) - .build(); - - var string = write(writer -> writer.writeTopLevelExpression(java)); - - assertThat(string, equalTo("x | y")); - } - // === Boolean literals === @Test -- cgit v1.2.3