Updating tests

mishmash-io · Nov 1, 2024 · bf8a830 · bf8a830
1 parent db4e11e
commit bf8a830
Show file tree

Hide file tree

Showing 2 changed files with 66 additions and 14 deletions.
diff --git a/hadoop/hadoop-common-stable/pom.xml b/hadoop/hadoop-common-stable/pom.xml
@@ -570,18 +570,18 @@
       <groupId>io.dropwizard.metrics</groupId>
       <artifactId>metrics-core</artifactId>
     </dependency>
-    <!-- Change to contained artifact -->
     <dependency>
       <groupId>io.mishmash.apache.zookeeper</groupId>
-      <artifactId>mmio-zookeeper-stable-client</artifactId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
       <version>${zookeeper.stable.version}-mmio.${zookeeper.stable.mishmash.io.patch}</version>
-      <type>test-jar</type>
       <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>io.mishmash.apache.zookeeper</groupId>
-      <artifactId>mmio-zookeeper-stable-server</artifactId>
+      <artifactId>mmio-zookeeper-stable</artifactId>
       <version>${zookeeper.stable.version}-mmio.${zookeeper.stable.mishmash.io.patch}</version>
+      <classifier>tests</classifier>
+      <scope>test</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.commons</groupId>
@@ -826,6 +826,45 @@
           </execution>
         </executions>
       </plugin>
+      <plugin>
+        <groupId>org.apache.avro</groupId>
+        <artifactId>avro-maven-plugin</artifactId>
+        <version>1.12.0</version>
+        <executions>
+          <execution>
+            <id>generate-avro-test-sources</id>
+            <phase>generate-test-sources</phase>
+            <goals>
+              <goal>schema</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <testSourceDirectory>${project.build.directory}/hadoop-rel-release-${hadoop.stable.version}/hadoop-common-project/hadoop-common/src/test/avro</testSourceDirectory>
+          <testOutputDirectory>${project.build.directory}/generated-test-sources/java</testOutputDirectory>
+        </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <executions>
+          <execution>
+            <id>default-testCompile</id>
+            <phase>test-compile</phase>
+            <goals>
+              <goal>testCompile</goal>
+            </goals>
+            <configuration>
+              <!--
+                TODO: Exclude the following tests for now
+              -->
+              <testExcludes>
+                <exclude>**/TestProtoBufRpc.java</exclude>
+              </testExcludes>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-jar-plugin</artifactId>

diff --git a/zookeeper/stable-client/pom.xml b/zookeeper/stable-client/pom.xml
@@ -115,6 +115,22 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-transport-native-epoll</artifactId>
     </dependency>
+
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-api</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.junit.jupiter</groupId>
+      <artifactId>junit-jupiter-engine</artifactId>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.mockito</groupId>
+      <artifactId>mockito-core</artifactId>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <build>
@@ -157,7 +173,6 @@
                   <groupId>org.apache.zookeeper</groupId>
                   <artifactId>zookeeper-jute</artifactId>
                   <version>${zookeeper.stable.version}</version>
-                  <type>jar</type>
                   <classifier>sources</classifier>
                   <overWrite>false</overWrite>
                   <excludes>
@@ -174,7 +189,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-dependency-plugin</artifactId>
         <executions>
-          <execution>
+          <!--execution>
             <id>unpack-test</id>
             <phase>generate-test-sources</phase>
             <goals>
@@ -186,22 +201,20 @@
                   <groupId>io.mishmash.apache.zookeeper</groupId>
                   <artifactId>mmio-zookeeper-stable</artifactId>
                   <version>${project.version}</version>
-                  <type>test-jar</type>
-                  <classifier>sources</classifier>
+                  <classifier>test-sources</classifier>
                   <overWrite>false</overWrite>
                   <includes>
                     **/zookeeper/*.java,
-                    **/zookeeper/client/**
+                    **/zookeeper/client/**,
+                    **/zookeeper/common/**,
+                    **/zookeeper/metrics/**,
+                    **/zookeeper/util/**
                   </includes>
-                  <excludes>
-                    **/zookeeper/JLineZNodeCompleter*.java,
-                    **/zookeeper/ZooKeeperMain*.java,
-                  </excludes>
                 </artifactItem>
               </artifactItems>
               <outputDirectory>${project.build.directory}/generated-test-sources/java</outputDirectory>
             </configuration>
-          </execution>
+          </execution-->
         </executions>
       </plugin>
       <plugin>