[DE-50] tests refactoring (#425)

*    migration from Hamcrest to AssertJ
*    migration from Junit4 to Junit5
*    native image tests

Author: rashtao

.github/workflows/maven.yml

@@ -54,37 +54,18 @@ jobs:
         with:
           java-version: ${{matrix.java-version}}
           distribution: 'adopt'
+          cache: maven
       - name: Start Database
         run: ./docker/start_db.sh
         env:
           ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
           STARTER_MODE: ${{matrix.topology}}
           DOCKER_IMAGE: ${{matrix.docker-img}}
           DATABASE_EXTENDED_NAMES: ${{matrix.db-ext-names}}
-      - name: Cache local Maven repository
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
       - name: Info
         run: mvn -version
       - name: Test
         run: mvn --no-transfer-progress test -DargLine="-Duser.language=${{matrix.user-language}}"
-      - name: Collect docker logs on failure
-        if: ${{ cancelled() || failure() }}
-        uses: jwalton/gh-docker-logs@v1
-        with:
-          dest: './logs'
-      - name: Tar logs
-        if: ${{ cancelled() || failure() }}
-        run: tar cvzf ./logs.tgz ./logs
-      - name: Upload logs to GitHub
-        if: ${{ cancelled() || failure() }}
-        uses: actions/upload-artifact@master
-        with:
-          name: logs-${{github.job}}.tgz
-          path: ./logs.tgz
 
   # test encodeURIComponent() and normalize('NFC') comparing to Javascript behavior
   test-graalvm:
@@ -128,19 +109,14 @@ jobs:
         with:
           java-version: ${{matrix.java-version}}
           distribution: 'adopt'
+          cache: maven
       - name: Start Database
         run: ./docker/start_db.sh
         env:
           ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
           STARTER_MODE: ${{matrix.topology}}
           DOCKER_IMAGE: ${{matrix.docker-img}}
           DATABASE_EXTENDED_NAMES: ${{matrix.db-ext-names}}
-      - name: Cache local Maven repository
-        uses: actions/cache@v2
-        with:
-          path: ~/.m2/repository
-          key: ${{ runner.os }}-maven-${{ hashFiles('**/pom.xml') }}
-          restore-keys: ${{ runner.os }}-maven-
       - name: Set JWT
         run: |
           ENDPOINT=$(./docker/find_active_endpoint.sh)
@@ -152,17 +128,3 @@ jobs:
         run: mvn -version
       - name: Test
         run: mvn --no-transfer-progress test -DargLine="-Duser.language=${{matrix.user-language}}"
-      - name: Collect docker logs on failure
-        if: ${{ cancelled() || failure() }}
-        uses: jwalton/gh-docker-logs@v1
-        with:
-          dest: './logs'
-      - name: Tar logs
-        if: ${{ cancelled() || failure() }}
-        run: tar cvzf ./logs.tgz ./logs
-      - name: Upload logs to GitHub
-        if: ${{ cancelled() || failure() }}
-        uses: actions/upload-artifact@master
-        with:
-          name: logs.tgz
-          path: ./logs.tgz

.github/workflows/native.yml

@@ -0,0 +1,43 @@
+name: Native Tests
+
+on:
+  workflow_dispatch:
+  push:
+    tags: [ v** ]
+
+jobs:
+  test-native:
+    timeout-minutes: 20
+    runs-on: ubuntu-latest
+
+    strategy:
+      fail-fast: false
+      matrix:
+        docker-img:
+          - docker.io/arangodb/enterprise:3.9.0
+        topology:
+          - cluster
+        db-ext-names:
+          - false
+        java-version:
+          - 11
+
+    steps:
+      - uses: actions/checkout@v2
+      - uses: graalvm/setup-graalvm@v1
+        with:
+          version: 'latest'
+          java-version: ${{matrix.java-version}}
+          github-token: ${{ secrets.GITHUB_TOKEN }}
+          components: 'native-image'
+      - name: Start Database
+        run: ./docker/start_db.sh
+        env:
+          ARANGO_LICENSE_KEY: ${{ secrets.ARANGO_LICENSE_KEY }}
+          STARTER_MODE: ${{matrix.topology}}
+          DOCKER_IMAGE: ${{matrix.docker-img}}
+          DATABASE_EXTENDED_NAMES: ${{matrix.db-ext-names}}
+      - name: Info
+        run: mvn -version
+      - name: Test Native
+        run: mvn -Pnative --no-transfer-progress test

.gitignore

@@ -10,3 +10,4 @@
 /docker/jwtSecret
 
 /docker/data
+/test-results-native/

dev-README.md

@@ -3,3 +3,16 @@
 ## native image reflection configuration
 
 To generate reflection configuration run `helper.NativeImageHelper` and copy the generated json to `src/main/resources/META-INF/native-image/com.arangodb/arangodb-java-driver/reflect-config.json`.
+
+
+## test native
+
+```shell
+mvn -Pnative test
+```
+
+## test ssl
+
+```shell
+mvn test -Dtest=com.arangodb.ArangoSslTest -DSslTest=true
+```

pom.xml

@@ -58,6 +58,40 @@
                 <doclint>none</doclint>
             </properties>
         </profile>
+        <profile>
+            <id>native</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.maven.plugins</groupId>
+                        <artifactId>maven-surefire-plugin</artifactId>
+                        <version>3.0.0-M5</version>
+                    </plugin>
+                    <plugin>
+                        <groupId>org.graalvm.buildtools</groupId>
+                        <artifactId>native-maven-plugin</artifactId>
+                        <version>0.9.11</version>
+                        <extensions>true</extensions>
+                        <executions>
+                            <execution>
+                                <id>test-native</id>
+                                <goals>
+                                    <goal>generateTestResourceConfig</goal>
+                                    <goal>test</goal>
+                                </goals>
+                                <phase>test</phase>
+                            </execution>
+                        </executions>
+                        <configuration>
+                            <skip>false</skip>
+                            <buildArgs>
+                                <buildArg>--no-fallback</buildArg>
+                            </buildArgs>
+                        </configuration>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
     </profiles>
 
     <build>
@@ -145,7 +179,7 @@
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
-                <version>2.22.2</version>
+                <version>3.0.0-M5</version>
                 <configuration>
                     <includes>
                         <include>**/*Test.java</include>
@@ -214,13 +248,14 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.junit.vintage</groupId>
-            <artifactId>junit-vintage-engine</artifactId>
+            <groupId>org.junit.jupiter</groupId>
+            <artifactId>junit-jupiter-params</artifactId>
             <scope>test</scope>
         </dependency>
         <dependency>
-            <groupId>org.hamcrest</groupId>
-            <artifactId>hamcrest-all</artifactId>
+            <groupId>org.assertj</groupId>
+            <artifactId>assertj-core</artifactId>
+            <version>3.22.0</version>
             <scope>test</scope>
         </dependency>
         <dependency>
@@ -232,7 +267,7 @@
         <dependency>
             <groupId>org.graalvm.sdk</groupId>
             <artifactId>graal-sdk</artifactId>
-            <version>21.2.0</version>
+            <version>22.0.0.2</version>
             <scope>test</scope>
         </dependency>
     </dependencies>
@@ -286,11 +321,6 @@
                 <type>pom</type>
                 <scope>import</scope>
             </dependency>
-            <dependency>
-                <groupId>org.hamcrest</groupId>
-                <artifactId>hamcrest-all</artifactId>
-                <version>1.3</version>
-            </dependency>
         </dependencies>
     </dependencyManagement>
 

src/main/java/com/arangodb/entity/EdgeDefinition.java

@@ -78,7 +78,7 @@ public EdgeDefinition satellites(final String... satellites) {
         return this;
     }
 
-    private static class Options {
+    public static class Options {
         private Collection<String> satellites;
     }
 }

src/main/java/com/arangodb/entity/arangosearch/AnalyzerEntity.java

@@ -20,6 +20,8 @@
 
 package com.arangodb.entity.arangosearch;
 
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
@@ -30,7 +32,7 @@
 @Deprecated
 public class AnalyzerEntity {
 
-    private Set<AnalyzerFeature> features;
+    private Collection<AnalyzerFeature> features;
     private AnalyzerType type;
     private String name;
     private Map<String, Object> properties;
@@ -39,7 +41,7 @@ public AnalyzerEntity() {
     }
 
     public Set<AnalyzerFeature> getFeatures() {
-        return features;
+        return features != null ? new HashSet<>(features) : null;
     }
 
     public void setFeatures(Set<AnalyzerFeature> features) {

src/main/java/com/arangodb/entity/arangosearch/ConsolidationPolicy.java

@@ -25,17 +25,20 @@
  */
 public class ConsolidationPolicy {
 
-    private final ConsolidationType type;
+    private ConsolidationType type;
     private Double threshold;
     private Long segmentThreshold;
 
-    private ConsolidationPolicy(final ConsolidationType type) {
-        super();
-        this.type = type;
+    public ConsolidationPolicy() {
     }
 
     public static ConsolidationPolicy of(final ConsolidationType type) {
-        return new ConsolidationPolicy(type);
+        return new ConsolidationPolicy().type(type);
+    }
+
+    public ConsolidationPolicy type(final ConsolidationType type) {
+        this.type = type;
+        return this;
     }
 
     /**

src/main/java/com/arangodb/entity/arangosearch/analyzer/SearchAnalyzer.java

@@ -25,6 +25,8 @@
 import com.arangodb.entity.arangosearch.AnalyzerFeature;
 import com.arangodb.entity.arangosearch.AnalyzerType;
 
+import java.util.Collection;
+import java.util.HashSet;
 import java.util.Objects;
 import java.util.Set;
 
@@ -34,7 +36,7 @@
 public abstract class SearchAnalyzer implements Entity {
     private String name;
     private AnalyzerType type;
-    private Set<AnalyzerFeature> features;
+    private Collection<AnalyzerFeature> features;
 
     /**
      * @return The Analyzer name.
@@ -62,7 +64,7 @@ public void setType(AnalyzerType type) {
      * @return The set of features to set on the Analyzer generated fields.
      */
     public Set<AnalyzerFeature> getFeatures() {
-        return features;
+        return features != null ? new HashSet<>(features) : null;
     }
 
     public void setFeatures(Set<AnalyzerFeature> features) {
@@ -73,10 +75,10 @@ public void setFeatures(Set<AnalyzerFeature> features) {
     public boolean equals(Object o) {
         if (this == o) return true;
         if (o == null || getClass() != o.getClass()) return false;
-        SearchAnalyzer analyzer = (SearchAnalyzer) o;
-        return Objects.equals(name, analyzer.name) &&
-                type == analyzer.type &&
-                Objects.equals(features, analyzer.features);
+        SearchAnalyzer that = (SearchAnalyzer) o;
+        return Objects.equals(getName(), that.getName())
+                && getType() == that.getType()
+                && Objects.equals(getFeatures(), that.getFeatures());
     }
 
     @Override

src/main/java/com/arangodb/model/AqlQueryExplainOptions.java

@@ -114,7 +114,7 @@ private Options getOptions() {
         return options;
     }
 
-    private static class Options {
+    public static class Options {
         private Optimizer optimizer;
         private Integer maxNumberOfPlans;
         private Boolean allPlans;
@@ -127,7 +127,7 @@ protected Optimizer getOptimizer() {
         }
     }
 
-    private static class Optimizer {
+    public static class Optimizer {
         private Collection<String> rules;
     }
 }

src/main/java/com/arangodb/model/AqlQueryOptions.java

@@ -410,7 +410,7 @@ private Options getOptions() {
         return options;
     }
 
-    private static class Options implements Serializable {
+    public static class Options implements Serializable {
 
         private static final long serialVersionUID = 1L;
 
@@ -446,7 +446,7 @@ protected Collection<String> getShardIds() {
 
     }
 
-    private static class Optimizer {
+    public static class Optimizer {
         private Collection<String> rules;
     }
 

src/main/java/com/arangodb/model/VertexCollectionCreateOptions.java

@@ -65,7 +65,7 @@ public VertexCollectionCreateOptions satellites(final String... satellites) {
         return this;
     }
 
-    private static class Options {
+    public static class Options {
         private Collection<String> satellites;
     }