Add clang-format to the Java test project

test/arguments/allow_implicit_arrays/build.xml

@@ -24,7 +24,11 @@
         <testCompile testName="allow_implicit_arrays"/>
     </target>
 
-    <target name="spotbugs" depends="compile" if="spotbugs.home_dir">
+    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+        <testClangFormat testName="allow_implicit_arrays"/>
+    </target>
+
+    <target name="spotbugs" depends="clang_format" if="spotbugs.home_dir">
         <testSpotBugs testName="allow_implicit_arrays"/>
     </target>
 

test/arguments/allow_implicit_arrays/java/allow_implicit_arrays/ImplicitArrayBit8Test.java

@@ -1,16 +1,17 @@
 package allow_implicit_arrays;
 
 import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
-import allow_implicit_arrays.implicit_array_bit8.ImplicitArray;
+import org.junit.jupiter.api.Test;
 
 import zserio.runtime.ZserioError;
+import zserio.runtime.io.BitBuffer;
 import zserio.runtime.io.ByteArrayBitStreamWriter;
 import zserio.runtime.io.SerializeUtil;
-import zserio.runtime.io.BitBuffer;
+
+import allow_implicit_arrays.implicit_array_bit8.ImplicitArray;
 
 public class ImplicitArrayBit8Test
 {
@@ -66,8 +67,8 @@ public void writeRead() throws IOException, ZserioError
         ImplicitArray implicitArray = new ImplicitArray(array);
         SerializeUtil.serializeToFile(implicitArray, BLOB_NAME);
 
-        final ImplicitArray readImplicitArray = SerializeUtil.deserializeFromFile(ImplicitArray.class,
-                BLOB_NAME);
+        final ImplicitArray readImplicitArray =
+                SerializeUtil.deserializeFromFile(ImplicitArray.class, BLOB_NAME);
         final short[] readArray = readImplicitArray.getArray();
         assertEquals(numElements, readArray.length);
         for (short i = 0; i < numElements; ++i)

test/arguments/allow_implicit_arrays/java/allow_implicit_arrays/ImplicitArrayFloat16Test.java

@@ -1,16 +1,17 @@
 package allow_implicit_arrays;
 
 import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
-import allow_implicit_arrays.implicit_array_float16.ImplicitArray;
+import org.junit.jupiter.api.Test;
 
 import zserio.runtime.ZserioError;
+import zserio.runtime.io.BitBuffer;
 import zserio.runtime.io.ByteArrayBitStreamWriter;
 import zserio.runtime.io.SerializeUtil;
-import zserio.runtime.io.BitBuffer;
+
+import allow_implicit_arrays.implicit_array_float16.ImplicitArray;
 
 public class ImplicitArrayFloat16Test
 {
@@ -66,8 +67,8 @@ public void writeRead() throws IOException, ZserioError
         ImplicitArray implicitArray = new ImplicitArray(array);
         SerializeUtil.serializeToFile(implicitArray, BLOB_NAME);
 
-        final ImplicitArray readImplicitArray = SerializeUtil.deserializeFromFile(ImplicitArray.class,
-                BLOB_NAME);
+        final ImplicitArray readImplicitArray =
+                SerializeUtil.deserializeFromFile(ImplicitArray.class, BLOB_NAME);
         final float[] readArray = readImplicitArray.getArray();
         assertEquals(numElements, readArray.length);
         for (short i = 0; i < numElements; ++i)

test/arguments/allow_implicit_arrays/java/allow_implicit_arrays/ImplicitArrayInt24Test.java

@@ -1,16 +1,17 @@
 package allow_implicit_arrays;
 
 import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
-import allow_implicit_arrays.implicit_array_int24.ImplicitArray;
+import org.junit.jupiter.api.Test;
 
 import zserio.runtime.ZserioError;
+import zserio.runtime.io.BitBuffer;
 import zserio.runtime.io.ByteArrayBitStreamWriter;
 import zserio.runtime.io.SerializeUtil;
-import zserio.runtime.io.BitBuffer;
+
+import allow_implicit_arrays.implicit_array_int24.ImplicitArray;
 
 public class ImplicitArrayInt24Test
 {
@@ -66,8 +67,8 @@ public void writeRead() throws IOException, ZserioError
         ImplicitArray implicitArray = new ImplicitArray(array);
         SerializeUtil.serializeToFile(implicitArray, BLOB_NAME);
 
-        final ImplicitArray readImplicitArray = SerializeUtil.deserializeFromFile(ImplicitArray.class,
-                BLOB_NAME);
+        final ImplicitArray readImplicitArray =
+                SerializeUtil.deserializeFromFile(ImplicitArray.class, BLOB_NAME);
         final int[] readArray = readImplicitArray.getArray();
         assertEquals(numElements, readArray.length);
         for (int i = 0; i < numElements; ++i)

test/arguments/allow_implicit_arrays/java/allow_implicit_arrays/ImplicitArrayUInt64Test.java

@@ -1,17 +1,18 @@
 package allow_implicit_arrays;
 
 import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 import java.math.BigInteger;
 
-import allow_implicit_arrays.implicit_array_uint64.ImplicitArray;
+import org.junit.jupiter.api.Test;
 
 import zserio.runtime.ZserioError;
+import zserio.runtime.io.BitBuffer;
 import zserio.runtime.io.ByteArrayBitStreamWriter;
 import zserio.runtime.io.SerializeUtil;
-import zserio.runtime.io.BitBuffer;
+
+import allow_implicit_arrays.implicit_array_uint64.ImplicitArray;
 
 public class ImplicitArrayUInt64Test
 {
@@ -67,8 +68,8 @@ public void writeRead() throws IOException, ZserioError
         ImplicitArray implicitArray = new ImplicitArray(array);
         SerializeUtil.serializeToFile(implicitArray, BLOB_NAME);
 
-        final ImplicitArray readImplicitArray = SerializeUtil.deserializeFromFile(ImplicitArray.class,
-                BLOB_NAME);
+        final ImplicitArray readImplicitArray =
+                SerializeUtil.deserializeFromFile(ImplicitArray.class, BLOB_NAME);
         final BigInteger[] readArray = readImplicitArray.getArray();
         assertEquals(numElements, readArray.length);
         for (int i = 0; i < numElements; ++i)

test/arguments/allow_implicit_arrays/java/allow_implicit_arrays/ImplicitArrayUInt8Test.java

@@ -1,16 +1,17 @@
 package allow_implicit_arrays;
 
 import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
 
 import java.io.IOException;
 
-import allow_implicit_arrays.implicit_array_uint8.ImplicitArray;
+import org.junit.jupiter.api.Test;
 
 import zserio.runtime.ZserioError;
+import zserio.runtime.io.BitBuffer;
 import zserio.runtime.io.ByteArrayBitStreamWriter;
 import zserio.runtime.io.SerializeUtil;
-import zserio.runtime.io.BitBuffer;
+
+import allow_implicit_arrays.implicit_array_uint8.ImplicitArray;
 
 public class ImplicitArrayUInt8Test
 {
@@ -66,8 +67,8 @@ public void writeRead() throws IOException, ZserioError
         ImplicitArray implicitArray = new ImplicitArray(array);
         SerializeUtil.serializeToFile(implicitArray, BLOB_NAME);
 
-        final ImplicitArray readImplicitArray = SerializeUtil.deserializeFromFile(ImplicitArray.class,
-                BLOB_NAME);
+        final ImplicitArray readImplicitArray =
+                SerializeUtil.deserializeFromFile(ImplicitArray.class, BLOB_NAME);
         final short[] readArray = readImplicitArray.getArray();
         assertEquals(numElements, readArray.length);
         for (short i = 0; i < numElements; ++i)

test/arguments/allow_implicit_arrays/java/allow_implicit_arrays/LengthOfWithImplicitArrayTest.java

@@ -1,6 +1,7 @@
 package allow_implicit_arrays;
 
 import static org.junit.jupiter.api.Assertions.*;
+
 import org.junit.jupiter.api.Test;
 
 import allow_implicit_arrays.lengthof_with_implicit_array.LengthOfWithImplicitArray;

test/arguments/allow_implicit_arrays/java/allow_implicit_arrays/TableWithImplicitArrayTest.java

@@ -1,26 +1,26 @@
 package allow_implicit_arrays;
 
 import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.AfterEach;
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.BeforeAll;
-import org.junit.jupiter.api.Test;
 
 import java.io.File;
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 
-import test_utils.FileUtil;
-import test_utils.JdbcUtil;
+import org.junit.jupiter.api.AfterEach;
+import org.junit.jupiter.api.BeforeAll;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import zserio.runtime.ZserioError;
 
 import allow_implicit_arrays.table_with_implicit_array.DbWithImplicitArray;
+import allow_implicit_arrays.table_with_implicit_array.StructWithImplicit;
 import allow_implicit_arrays.table_with_implicit_array.TableWithImplicitArray;
 import allow_implicit_arrays.table_with_implicit_array.TableWithImplicitArrayRow;
-import allow_implicit_arrays.table_with_implicit_array.StructWithImplicit;
-
-import zserio.runtime.ZserioError;
+import test_utils.FileUtil;
+import test_utils.JdbcUtil;
 
 public class TableWithImplicitArrayTest
 {

test/arguments/set_top_level_package/build.xml

@@ -24,7 +24,11 @@
         <testCompile testName="set_top_level_package"/>
     </target>
 
-    <target name="spotbugs" depends="compile" if="spotbugs.home_dir">
+    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+        <testClangFormat testName="set_top_level_package"/>
+    </target>
+
+    <target name="spotbugs" depends="clang_format" if="spotbugs.home_dir">
         <testSpotBugs testName="set_top_level_package"/>
     </target>
 

test/arguments/set_top_level_package/java/set_top_level_package/SetTopLevelPackageTest.java

@@ -1,10 +1,11 @@
 package set_top_level_package;
 
 import static org.junit.jupiter.api.Assertions.*;
+
 import org.junit.jupiter.api.Test;
 
-import company.appl.SimpleStructure;
 import company.appl.SimpleChoice;
+import company.appl.SimpleStructure;
 import company.appl.SimpleTemplate_Enumeration;
 
 public class SetTopLevelPackageTest

test/arguments/with_range_check_code/build.xml

@@ -24,7 +24,11 @@
         <testCompile testName="with_range_check_code"/>
     </target>
 
-    <target name="spotbugs" depends="compile" if="spotbugs.home_dir">
+    <target name="clang_format" depends="compile" if="clang_format.exe_file">
+        <testClangFormat testName="with_range_check_code"/>
+    </target>
+
+    <target name="spotbugs" depends="clang_format" if="spotbugs.home_dir">
         <testSpotBugs testName="with_range_check_code"/>
     </target>
 

test/arguments/with_range_check_code/java/with_range_check_code/Bit4RangeCheckTest.java

@@ -1,16 +1,17 @@
 package with_range_check_code;
 
 import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
-
-import with_range_check_code.bit4_range_check.Bit4RangeCheckCompound;
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Test;
+
 import zserio.runtime.ZserioError;
 import zserio.runtime.io.ByteArrayBitStreamReader;
 import zserio.runtime.io.ByteArrayBitStreamWriter;
 
+import with_range_check_code.bit4_range_check.Bit4RangeCheckCompound;
+
 public class Bit4RangeCheckTest
 {
     @Test
@@ -44,8 +45,8 @@ private void checkBit4Value(byte value) throws IOException, ZserioError
         final ByteArrayBitStreamWriter writer = new ByteArrayBitStreamWriter();
         bit4RangeCheckCompound.write(writer);
 
-        final ByteArrayBitStreamReader reader = new ByteArrayBitStreamReader(writer.toByteArray(),
-                writer.getBitPosition());
+        final ByteArrayBitStreamReader reader =
+                new ByteArrayBitStreamReader(writer.toByteArray(), writer.getBitPosition());
         final Bit4RangeCheckCompound readBit4RangeCheckCompound = new Bit4RangeCheckCompound(reader);
         assertEquals(bit4RangeCheckCompound, readBit4RangeCheckCompound);
     }

test/arguments/with_range_check_code/java/with_range_check_code/ChoiceBit4RangeCheckTest.java

@@ -1,16 +1,17 @@
 package with_range_check_code;
 
 import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
-
-import with_range_check_code.choice_bit4_range_check.ChoiceBit4RangeCheckCompound;
 
 import java.io.IOException;
 
+import org.junit.jupiter.api.Test;
+
 import zserio.runtime.ZserioError;
 import zserio.runtime.io.ByteArrayBitStreamReader;
 import zserio.runtime.io.ByteArrayBitStreamWriter;
 
+import with_range_check_code.choice_bit4_range_check.ChoiceBit4RangeCheckCompound;
+
 public class ChoiceBit4RangeCheckTest
 {
     @Test
@@ -45,8 +46,8 @@ private void checkChoiceBit4Value(byte value) throws IOException, ZserioError
         final ByteArrayBitStreamWriter writer = new ByteArrayBitStreamWriter();
         choiceBit4RangeCheckCompound.write(writer);
 
-        final ByteArrayBitStreamReader reader = new ByteArrayBitStreamReader(writer.toByteArray(),
-                writer.getBitPosition());
+        final ByteArrayBitStreamReader reader =
+                new ByteArrayBitStreamReader(writer.toByteArray(), writer.getBitPosition());
         final ChoiceBit4RangeCheckCompound readChoiceBit4RangeCheckCompound =
                 new ChoiceBit4RangeCheckCompound(reader, selector);
         assertEquals(choiceBit4RangeCheckCompound, readChoiceBit4RangeCheckCompound);

test/arguments/with_range_check_code/java/with_range_check_code/DynamicBitRangeCheckTest.java

@@ -1,19 +1,20 @@
 package with_range_check_code;
 
 import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.Disabled;
-
-import with_range_check_code.dynamic_bit_range_check.DynamicBitRangeCheckCompound;
 
 import java.io.IOException;
 import java.math.BigInteger;
 
-import zserio.runtime.ZserioError;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
 import zserio.runtime.BitFieldUtil;
+import zserio.runtime.ZserioError;
 import zserio.runtime.io.ByteArrayBitStreamReader;
 import zserio.runtime.io.ByteArrayBitStreamWriter;
 
+import with_range_check_code.dynamic_bit_range_check.DynamicBitRangeCheckCompound;
+
 public class DynamicBitRangeCheckTest
 {
     @Test
@@ -66,8 +67,8 @@ private void checkDynamicBitValue(short numBits, BigInteger value) throws IOExce
         final ByteArrayBitStreamWriter writer = new ByteArrayBitStreamWriter();
         dynamicBitRangeCheckCompound.write(writer);
 
-        final ByteArrayBitStreamReader reader = new ByteArrayBitStreamReader(writer.toByteArray(),
-                writer.getBitPosition());
+        final ByteArrayBitStreamReader reader =
+                new ByteArrayBitStreamReader(writer.toByteArray(), writer.getBitPosition());
         final DynamicBitRangeCheckCompound readDynamicBitRangeCheckCompound =
                 new DynamicBitRangeCheckCompound(reader);
         assertEquals(dynamicBitRangeCheckCompound, readDynamicBitRangeCheckCompound);

test/arguments/with_range_check_code/java/with_range_check_code/DynamicIntRangeCheckTest.java

@@ -1,17 +1,18 @@
 package with_range_check_code;
 
 import static org.junit.jupiter.api.Assertions.*;
-import org.junit.jupiter.api.Test;
-
-import with_range_check_code.dynamic_int_range_check.DynamicIntRangeCheckCompound;
 
 import java.io.IOException;
 
-import zserio.runtime.ZserioError;
+import org.junit.jupiter.api.Test;
+
 import zserio.runtime.BitFieldUtil;
+import zserio.runtime.ZserioError;
 import zserio.runtime.io.ByteArrayBitStreamReader;
 import zserio.runtime.io.ByteArrayBitStreamWriter;
 
+import with_range_check_code.dynamic_int_range_check.DynamicIntRangeCheckCompound;
+
 public class DynamicIntRangeCheckTest
 {
     @Test
@@ -58,8 +59,8 @@ private void checkDynamicIntValue(short numBits, long value) throws IOException,
         final ByteArrayBitStreamWriter writer = new ByteArrayBitStreamWriter();
         dynamicIntRangeCheckCompound.write(writer);
 
-        final ByteArrayBitStreamReader reader = new ByteArrayBitStreamReader(writer.toByteArray(),
-                writer.getBitPosition());
+        final ByteArrayBitStreamReader reader =
+                new ByteArrayBitStreamReader(writer.toByteArray(), writer.getBitPosition());
         final DynamicIntRangeCheckCompound readDynamicIntRangeCheckCompound =
                 new DynamicIntRangeCheckCompound(reader);
         assertEquals(dynamicIntRangeCheckCompound, readDynamicIntRangeCheckCompound);