Replace bash JavaTest.sh with mvn test (google#7500)

* Start of mvn-ification of the test * move to right locations * Update the IO done in the test to read from resources / write to temp folders * Add github workflow attempt to mvn test it instead of JavaTest.sh * Pin the Kotlin benchmark's symlink for /java to the right location * Inline equality assertions and format JavaTest.java * fix android gradle source directory Co-authored-by: Derek Bailey <[email protected]>
mr-swifter · Sep 12, 2022 · 89dfb43 · 89dfb43
1 parent c49aff4
commit 89dfb43
Show file tree

Hide file tree

Showing 39 changed files with 617 additions and 707 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -358,8 +358,8 @@ jobs:
     steps:
     - uses: actions/checkout@v2
     - name: test
-      working-directory: tests
-      run: bash JavaTest.sh
+      working-directory: java
+      run: mvn test
 
   build-kotlin-macos:
     name: Build Kotlin MacOS

diff --git a/.gitignore b/.gitignore
@@ -88,6 +88,7 @@ java/*.iml
 .idea
 *.iml
 target
+java/target
 **/*.pyc
 build/VS2010/FlatBuffers.sdf
 build/VS2010/FlatBuffers.opensdf
@@ -148,4 +149,4 @@ flatbuffers.pc
 **/html/**
 **/latex/**
 # https://cmake.org/cmake/help/latest/module/FetchContent.html#variable:FETCHCONTENT_BASE_DIR
-_deps/
+_deps/
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -21,7 +21,7 @@ android {
     sourceSets {
       main {
         java {
-          srcDir '../../java'
+          srcDir '../../java/src/main/java/'
         }
       }
     }

diff --git a/pom.xml → java/pom.xml b/pom.xml → java/pom.xml
@@ -37,6 +37,18 @@
     <tag>HEAD</tag>
   </scm>
   <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>4.13</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>com.google.truth</groupId>
+      <artifactId>truth</artifactId>
+      <version>1.1.3</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
   <distributionManagement>
     <snapshotRepository>
@@ -45,7 +57,21 @@
     </snapshotRepository>
   </distributionManagement>
   <build>
-    <sourceDirectory>java</sourceDirectory>
+    <plugins>
+    <plugin>
+      <artifactId>maven-compiler-plugin</artifactId>
+      <configuration>
+        <release>8</release>
+        <testExcludes>
+          <testExclude>**/LongEnum.java</testExclude>
+          <testExclude>MyGame/Example/MonsterStorageGrpc.java</testExclude>
+          <testExclude>MyGame/Example/StructOfStructs**</testExclude>
+          <testExclude>MyGame/OtherNameSpace/TableBT.java</testExclude>
+        </testExcludes>
+      </configuration>
+      <version>3.8.1</version>
+    </plugin>
+    </plugins>
   </build>
   <profiles>
     <profile>
@@ -55,13 +81,6 @@
       </activation>
       <build>
         <plugins>
-          <plugin>
-            <artifactId>maven-compiler-plugin</artifactId>
-            <configuration>
-              <release>8</release>
-            </configuration>
-            <version>3.8.1</version>
-          </plugin>
           <plugin>
             <artifactId>maven-surefire-plugin</artifactId>
             <configuration>

diff --git a/...google/flatbuffers/ArrayReadWriteBuf.java → ...google/flatbuffers/ArrayReadWriteBuf.java b/...google/flatbuffers/ArrayReadWriteBuf.java → ...google/flatbuffers/ArrayReadWriteBuf.java
diff --git a/java/com/google/flatbuffers/BaseVector.java → ...va/com/google/flatbuffers/BaseVector.java b/java/com/google/flatbuffers/BaseVector.java → ...va/com/google/flatbuffers/BaseVector.java
diff --git a/...com/google/flatbuffers/BooleanVector.java → ...com/google/flatbuffers/BooleanVector.java b/...com/google/flatbuffers/BooleanVector.java → ...com/google/flatbuffers/BooleanVector.java
diff --git a/...e/flatbuffers/ByteBufferReadWriteBuf.java → ...e/flatbuffers/ByteBufferReadWriteBuf.java b/...e/flatbuffers/ByteBufferReadWriteBuf.java → ...e/flatbuffers/ByteBufferReadWriteBuf.java
diff --git a/...om/google/flatbuffers/ByteBufferUtil.java → ...om/google/flatbuffers/ByteBufferUtil.java b/...om/google/flatbuffers/ByteBufferUtil.java → ...om/google/flatbuffers/ByteBufferUtil.java
diff --git a/java/com/google/flatbuffers/ByteVector.java → ...va/com/google/flatbuffers/ByteVector.java b/java/com/google/flatbuffers/ByteVector.java → ...va/com/google/flatbuffers/ByteVector.java
diff --git a/java/com/google/flatbuffers/Constants.java → ...ava/com/google/flatbuffers/Constants.java b/java/com/google/flatbuffers/Constants.java → ...ava/com/google/flatbuffers/Constants.java
diff --git a/.../com/google/flatbuffers/DoubleVector.java → .../com/google/flatbuffers/DoubleVector.java b/.../com/google/flatbuffers/DoubleVector.java → .../com/google/flatbuffers/DoubleVector.java
diff --git a/...google/flatbuffers/FlatBufferBuilder.java → ...google/flatbuffers/FlatBufferBuilder.java b/...google/flatbuffers/FlatBufferBuilder.java → ...google/flatbuffers/FlatBufferBuilder.java
diff --git a/java/com/google/flatbuffers/FlexBuffers.java → ...a/com/google/flatbuffers/FlexBuffers.java b/java/com/google/flatbuffers/FlexBuffers.java → ...a/com/google/flatbuffers/FlexBuffers.java
diff --git a/...oogle/flatbuffers/FlexBuffersBuilder.java → ...oogle/flatbuffers/FlexBuffersBuilder.java b/...oogle/flatbuffers/FlexBuffersBuilder.java → ...oogle/flatbuffers/FlexBuffersBuilder.java
diff --git a/java/com/google/flatbuffers/FloatVector.java → ...a/com/google/flatbuffers/FloatVector.java b/java/com/google/flatbuffers/FloatVector.java → ...a/com/google/flatbuffers/FloatVector.java
diff --git a/java/com/google/flatbuffers/IntVector.java → ...ava/com/google/flatbuffers/IntVector.java b/java/com/google/flatbuffers/IntVector.java → ...ava/com/google/flatbuffers/IntVector.java
diff --git a/java/com/google/flatbuffers/LongVector.java → ...va/com/google/flatbuffers/LongVector.java b/java/com/google/flatbuffers/LongVector.java → ...va/com/google/flatbuffers/LongVector.java
diff --git a/java/com/google/flatbuffers/ReadBuf.java → .../java/com/google/flatbuffers/ReadBuf.java b/java/com/google/flatbuffers/ReadBuf.java → .../java/com/google/flatbuffers/ReadBuf.java
diff --git a/.../com/google/flatbuffers/ReadWriteBuf.java → .../com/google/flatbuffers/ReadWriteBuf.java b/.../com/google/flatbuffers/ReadWriteBuf.java → .../com/google/flatbuffers/ReadWriteBuf.java
diff --git a/java/com/google/flatbuffers/ShortVector.java → ...a/com/google/flatbuffers/ShortVector.java b/java/com/google/flatbuffers/ShortVector.java → ...a/com/google/flatbuffers/ShortVector.java
diff --git a/.../com/google/flatbuffers/StringVector.java → .../com/google/flatbuffers/StringVector.java b/.../com/google/flatbuffers/StringVector.java → .../com/google/flatbuffers/StringVector.java
diff --git a/java/com/google/flatbuffers/Struct.java → ...n/java/com/google/flatbuffers/Struct.java b/java/com/google/flatbuffers/Struct.java → ...n/java/com/google/flatbuffers/Struct.java
diff --git a/java/com/google/flatbuffers/Table.java → ...in/java/com/google/flatbuffers/Table.java b/java/com/google/flatbuffers/Table.java → ...in/java/com/google/flatbuffers/Table.java
diff --git a/java/com/google/flatbuffers/UnionVector.java → ...a/com/google/flatbuffers/UnionVector.java b/java/com/google/flatbuffers/UnionVector.java → ...a/com/google/flatbuffers/UnionVector.java
diff --git a/java/com/google/flatbuffers/Utf8.java → ...ain/java/com/google/flatbuffers/Utf8.java b/java/com/google/flatbuffers/Utf8.java → ...ain/java/com/google/flatbuffers/Utf8.java
diff --git a/java/com/google/flatbuffers/Utf8Old.java → .../java/com/google/flatbuffers/Utf8Old.java b/java/com/google/flatbuffers/Utf8Old.java → .../java/com/google/flatbuffers/Utf8Old.java
diff --git a/java/com/google/flatbuffers/Utf8Safe.java → ...java/com/google/flatbuffers/Utf8Safe.java b/java/com/google/flatbuffers/Utf8Safe.java → ...java/com/google/flatbuffers/Utf8Safe.java
diff --git a/java/src/test/java/DictionaryLookup b/java/src/test/java/DictionaryLookup
@@ -0,0 +1 @@
+../../../../tests/DictionaryLookup
-Original file line number
+Diff line change
@@ Expand Up / @@ -21,7 +21,7 @@ android { @@
         sourceSets {
           main {
             java {
-              srcDir '../../java'
+              srcDir '../../java/src/main/java/'
             }
           }
         }
@@ Expand Down @@