From 5730e6e612ef92f08a6f598ec937516ea97aec60 Mon Sep 17 00:00:00 2001
From: Nir Ozery <nir.ozery@treeverse.io>
Date: Wed, 21 Feb 2024 22:11:34 +0200
Subject: [PATCH] Add test jar to deployment

---
 clients/hadoopfs/pom.xml                      | 87 +++++++++++--------
 .../src/test/java/io/lakefs/FSTestBase.java   |  4 +-
 .../src/test/java/io/lakefs/S3FSTestBase.java |  2 +-
 3 files changed, 53 insertions(+), 40 deletions(-)

diff --git a/clients/hadoopfs/pom.xml b/clients/hadoopfs/pom.xml
index 6b7afca754c..dba0e8a47eb 100644
--- a/clients/hadoopfs/pom.xml
+++ b/clients/hadoopfs/pom.xml
@@ -250,7 +250,18 @@ To export to S3:
                     </testExcludes>
                 </configuration>
             </plugin>
-
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-jar-plugin</artifactId>
+                <version>2.4</version>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>test-jar</goal>
+                        </goals>
+                    </execution>
+                </executions>
+            </plugin>
             <plugin>
                 <groupId>com.gkatzioura.maven.cloud</groupId>
                 <artifactId>s3-storage-wagon</artifactId>
@@ -283,7 +294,6 @@ To export to S3:
             <artifactId>commons-lang3</artifactId>
             <version>3.12.0</version>
         </dependency>
-
         <dependency>
             <groupId>org.apache.hadoop</groupId>
             <artifactId>hadoop-common</artifactId>
@@ -329,42 +339,41 @@ To export to S3:
             <version>2.0.0</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+          <groupId>org.testcontainers</groupId>
+          <artifactId>testcontainers</artifactId>
+          <version>1.16.3</version>
+          <scope>test</scope>
+        </dependency>
+        <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/mockwebserver -->
+        <dependency>
+            <groupId>com.squareup.okhttp3</groupId>
+            <artifactId>mockwebserver</artifactId>
+            <version>4.10.0</version>
+            <scope>test</scope>
+        </dependency>
 
-	<dependency>
-	  <groupId>org.testcontainers</groupId>
-	  <artifactId>testcontainers</artifactId>
-	  <version>1.16.0</version>
-	  <scope>test</scope>
-	</dependency>
-    <!-- https://mvnrepository.com/artifact/com.squareup.okhttp3/mockwebserver -->
-    <dependency>
-        <groupId>com.squareup.okhttp3</groupId>
-        <artifactId>mockwebserver</artifactId>
-        <version>4.10.0</version>
-        <scope>test</scope>
-    </dependency>
-
-	<!--
+	    <!--
 	     https://stackoverflow.com/questions/35569092/java-lang-classnotfoundexception-com-fasterxml-jackson-annotation-jsonincludev
 	     says to keep all of these on the same versions -->
-	<dependency>
-	  <groupId>com.fasterxml.jackson.core</groupId>
-	  <artifactId>jackson-databind</artifactId>
-	  <version>2.13.4.2</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>com.fasterxml.jackson.core</groupId>
-	  <artifactId>jackson-core</artifactId>
-	  <version>2.12.3</version>
-	  <scope>test</scope>
-	</dependency>
-	<dependency>
-	  <groupId>com.fasterxml.jackson.core</groupId>
-	  <artifactId>jackson-annotations</artifactId>
-	  <version>2.12.3</version>
-	  <scope>test</scope>
-	</dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-databind</artifactId>
+          <version>2.13.4.2</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-core</artifactId>
+          <version>2.12.3</version>
+          <scope>test</scope>
+        </dependency>
+        <dependency>
+          <groupId>com.fasterxml.jackson.core</groupId>
+          <artifactId>jackson-annotations</artifactId>
+          <version>2.12.3</version>
+          <scope>test</scope>
+        </dependency>
 
         <dependency>
             <groupId>org.mock-server</groupId>
@@ -372,14 +381,18 @@ To export to S3:
             <version>5.14.0</version>
             <scope>test</scope>
         </dependency>
-
+        <dependency>
+            <groupId>org.mock-server</groupId>
+            <artifactId>mockserver-core</artifactId>
+            <version>5.15.0</version>
+            <scope>test</scope>
+        </dependency>
         <dependency>
             <groupId>org.immutables</groupId>
             <artifactId>value</artifactId>
             <version>2.9.3</version>
             <scope>test</scope>
         </dependency>
-
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
diff --git a/clients/hadoopfs/src/test/java/io/lakefs/FSTestBase.java b/clients/hadoopfs/src/test/java/io/lakefs/FSTestBase.java
index af1cc801ff8..c5f7c0c6780 100644
--- a/clients/hadoopfs/src/test/java/io/lakefs/FSTestBase.java
+++ b/clients/hadoopfs/src/test/java/io/lakefs/FSTestBase.java
@@ -60,7 +60,7 @@
  * See e.g. "Base Test Class Testing Pattern: Why and How to use",
  * https://eliasnogueira.com/base-test-class-testing-pattern-why-and-how-to-use/
  */
-abstract class FSTestBase {
+public abstract class FSTestBase {
     static protected final Long UNUSED_FILE_SIZE = 1L;
     static protected final Long UNUSED_MTIME = 0L;
     static protected final String UNUSED_CHECKSUM = "unused";
@@ -147,7 +147,7 @@ public void hadoopSetup() throws IOException, URISyntaxException {
         mockServerClient.when(request()
                               .withMethod("GET")
                               .withPath("/config/storage"),
-                              Times.once())
+                              Times.unlimited())
             .respond(response()
                      .withStatusCode(200)
                      .withBody(gson.toJson(new StorageConfig()
diff --git a/clients/hadoopfs/src/test/java/io/lakefs/S3FSTestBase.java b/clients/hadoopfs/src/test/java/io/lakefs/S3FSTestBase.java
index 49da8a190a8..cef1a10cf2e 100644
--- a/clients/hadoopfs/src/test/java/io/lakefs/S3FSTestBase.java
+++ b/clients/hadoopfs/src/test/java/io/lakefs/S3FSTestBase.java
@@ -33,7 +33,7 @@
  * Base for all LakeFSFilesystem tests that need to access S3.  It adds a
  * MinIO container to FSTestBase, and configures to use it.
  */
-abstract class S3FSTestBase extends FSTestBase {
+public abstract class S3FSTestBase extends FSTestBase {
     static private final Logger LOG = LoggerFactory.getLogger(S3FSTestBase.class);
 
     protected String s3Endpoint;