[DE-436] reuse code in shaded integration tests

Author: rashtao

.github/workflows/test.yml

@@ -129,7 +129,7 @@ jobs:
       - name: Info
         run: mvn -version
       - name: Test
-        run: mvn -e --no-transfer-progress -am -pl driver test -Dtest=com.arangodb.util.UnicodeUtilsTest -Dsurefire.failIfNoSpecifiedTests=false
+        run: mvn -e --no-transfer-progress -am -pl driver test -Dtest=graalvm.UnicodeUtilsTest -Dsurefire.failIfNoSpecifiedTests=false
 
   test-jwt:
     timeout-minutes: 20

driver/pom.xml

@@ -157,12 +157,6 @@
             <version>22.3.0</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>ru.lanwen.verbalregex</groupId>
-            <artifactId>java-verbal-expressions</artifactId>
-            <version>1.8</version>
-            <scope>test</scope>
-        </dependency>
         <dependency>
             <groupId>io.smallrye.config</groupId>
             <artifactId>smallrye-config-core</artifactId>

driver/src/test/java/com/arangodb/PackageVersionTest.java

@@ -5,31 +5,16 @@
 import org.junit.jupiter.params.ParameterizedTest;
 import org.junit.jupiter.params.provider.EnumSource;
 
-import static ru.lanwen.verbalregex.VerbalExpression.regex;
-
-import ru.lanwen.verbalregex.VerbalExpression;
-
 import static org.assertj.core.api.Assertions.assertThat;
 import static org.junit.jupiter.api.Assumptions.assumeTrue;
 
 class PackageVersionTest extends BaseJunit5 {
 
+    private static final String EXPECTED_VERSION = "7.0.0-ALPHA.2";
+
     @Test
     void packageVersion() {
-        VerbalExpression testRegex = regex()
-                .startOfLine()
-                // major
-                .digit().atLeast(1)
-                .then(".")
-                // minor
-                .digit().atLeast(1)
-                .then(".")
-                // patch
-                .digit().atLeast(1)
-                .maybe(regex().anything())
-                .endOfLine()
-                .build();
-        assertThat(PackageVersion.VERSION).matches(testRegex.toString());
+        assertThat(PackageVersion.VERSION).isEqualTo(EXPECTED_VERSION);
     }
 
     @ParameterizedTest

driver/src/test/java/com/arangodb/config/ConfigUtils.java

@@ -1,27 +1,7 @@
 package com.arangodb.config;
 
-import io.smallrye.config.PropertiesConfigSourceProvider;
-import io.smallrye.config.SmallRyeConfig;
-import io.smallrye.config.SmallRyeConfigBuilder;
-
 public class ConfigUtils {
 
-    public static ArangoConfigProperties loadConfigMP() {
-        return loadConfigMP("arangodb.properties");
-    }
-
-    public static ArangoConfigProperties loadConfigMP(final String location) {
-        return loadConfigMP(location, "arangodb");
-    }
-
-    public static ArangoConfigProperties loadConfigMP(final String location, final String prefix) {
-        SmallRyeConfig cfg = new SmallRyeConfigBuilder()
-                .withSources(new PropertiesConfigSourceProvider(location, ConfigUtils.class.getClassLoader(), false))
-                .withMapping(ArangoConfigPropertiesMPImpl.class, prefix)
-                .build();
-        return cfg.getConfigMapping(ArangoConfigPropertiesMPImpl.class, prefix);
-    }
-
     public static ArangoConfigProperties loadConfig() {
         return ArangoConfigProperties.fromFile();
     }

driver/src/test/java/com/arangodb/util/UnicodeUtilsTest.java renamed to driver/src/test/java/graalvm/UnicodeUtilsTest.java

@@ -1,6 +1,8 @@
-package com.arangodb.util;
+package graalvm;
 
 import com.arangodb.internal.util.EncodeUtils;
+import com.arangodb.util.TestUtils;
+import com.arangodb.util.UnicodeUtils;
 import org.graalvm.home.Version;
 import org.graalvm.nativeimage.ImageInfo;
 import org.graalvm.polyglot.Context;

driver/src/test/java/com/arangodb/config/ArangoConfigPropertiesMPImpl.java renamed to driver/src/test/java/mp/ArangoConfigPropertiesMPImpl.java

@@ -1,6 +1,8 @@
-package com.arangodb.config;
+package mp;
 
 import com.arangodb.Protocol;
+import com.arangodb.config.ArangoConfigProperties;
+import com.arangodb.config.HostDescription;
 import com.arangodb.entity.LoadBalancingStrategy;
 
 import java.util.List;

driver/src/test/java/com/arangodb/config/ConfigDefaultsTest.java renamed to driver/src/test/java/mp/ConfigMPDefaultsTest.java

@@ -1,16 +1,17 @@
-package com.arangodb.config;
+package mp;
 
+import com.arangodb.config.ArangoConfigProperties;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.condition.DisabledInNativeImage;
 
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DisabledInNativeImage
-class ConfigDefaultsTest {
+class ConfigMPDefaultsTest {
 
     @Test
     void defaultValues() {
-        ArangoConfigProperties config = ConfigUtils.loadConfigMP("arangodb.properties", "wrong");
+        ArangoConfigProperties config = ConfigUtilsMP.loadConfigMP("arangodb.properties", "wrong");
         checkResult(config);
     }
 

driver/src/test/java/com/arangodb/config/ConfigTest.java renamed to driver/src/test/java/mp/ConfigMPTest.java

@@ -1,6 +1,8 @@
-package com.arangodb.config;
+package mp;
 
 import com.arangodb.Protocol;
+import com.arangodb.config.ArangoConfigProperties;
+import com.arangodb.config.HostDescription;
 import com.arangodb.entity.LoadBalancingStrategy;
 import org.assertj.core.api.InstanceOfAssertFactories;
 import org.junit.jupiter.api.Test;
@@ -9,7 +11,7 @@
 import static org.assertj.core.api.Assertions.assertThat;
 
 @DisabledInNativeImage
-class ConfigTest {
+class ConfigMPTest {
     private final HostDescription hostA = new HostDescription("aaa", 1111);
     private final HostDescription hostB = new HostDescription("bbb", 2222);
     private final Protocol protocol = Protocol.HTTP_VPACK;
@@ -30,7 +32,7 @@ class ConfigTest {
 
     @Test
     void readConfig() {
-        ArangoConfigProperties config = ConfigUtils.loadConfigMP("arangodb-config-test.properties", "adb");
+        ArangoConfigProperties config = ConfigUtilsMP.loadConfigMP("arangodb-config-test.properties", "adb");
         checkResult(config);
     }
 

driver/src/test/java/mp/ConfigUtilsMP.java

@@ -0,0 +1,26 @@
+package mp;
+
+import com.arangodb.config.ArangoConfigProperties;
+import io.smallrye.config.PropertiesConfigSourceProvider;
+import io.smallrye.config.SmallRyeConfig;
+import io.smallrye.config.SmallRyeConfigBuilder;
+
+public class ConfigUtilsMP {
+
+    public static ArangoConfigProperties loadConfigMP() {
+        return loadConfigMP("arangodb.properties");
+    }
+
+    public static ArangoConfigProperties loadConfigMP(final String location) {
+        return loadConfigMP(location, "arangodb");
+    }
+
+    public static ArangoConfigProperties loadConfigMP(final String location, final String prefix) {
+        SmallRyeConfig cfg = new SmallRyeConfigBuilder()
+                .withSources(new PropertiesConfigSourceProvider(location, ConfigUtilsMP.class.getClassLoader(), false))
+                .withMapping(ArangoConfigPropertiesMPImpl.class, prefix)
+                .build();
+        return cfg.getConfigMapping(ArangoConfigPropertiesMPImpl.class, prefix);
+    }
+
+}