ISPN-6720 Don't enforce test dependencies everywhere

- Drop testng and junit forcing each module to select its one - Drop mockito - Drop xstream
infinispan · Jul 26, 2016 · 3a1bf6c · 3a1bf6c
1 parent e8d6d9c
commit 3a1bf6c
Show file tree

Hide file tree

Showing 209 changed files with 927 additions and 595 deletions.
diff --git a/all/cli/pom.xml b/all/cli/pom.xml
@@ -26,6 +26,12 @@
    <build>
       <finalName>${project.artifactId}-${project.version}</finalName>
       <plugins>
+         <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <skipTests>true</skipTests>
+            </configuration>
+         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>

diff --git a/all/embedded-query/pom.xml b/all/embedded-query/pom.xml
@@ -38,6 +38,12 @@
          </plugins>
       </pluginManagement>
       <plugins>
+         <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <skipTests>true</skipTests>
+            </configuration>
+         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
@@ -145,4 +151,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
diff --git a/all/embedded/pom.xml b/all/embedded/pom.xml
@@ -147,6 +147,12 @@
          </resource>
       </resources>
       <plugins>
+         <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <skipTests>true</skipTests>
+            </configuration>
+         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
@@ -382,4 +388,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
diff --git a/all/remote/pom.xml b/all/remote/pom.xml
@@ -93,6 +93,12 @@
          </resource>
       </resources>
       <plugins>
+         <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <skipTests>true</skipTests>
+            </configuration>
+         </plugin>
          <plugin>
             <groupId>org.apache.maven.plugins</groupId>
             <artifactId>maven-shade-plugin</artifactId>
@@ -331,4 +337,4 @@
       </plugins>
    </build>
 
-</project>
+</project>
diff --git a/atomic-factory/pom.xml b/atomic-factory/pom.xml
@@ -36,6 +36,12 @@
             <scope>test</scope>
         </dependency>
 
+        <dependency>
+            <groupId>org.testng</groupId>
+            <artifactId>testng</artifactId>
+            <scope>test</scope>
+        </dependency>
+
         <dependency>
             <groupId>org.javassist</groupId>
             <artifactId>javassist</artifactId>

diff --git a/cdi/common/pom.xml b/cdi/common/pom.xml
@@ -24,5 +24,16 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
+
+    <build>
+       <plugins>
+          <plugin>
+            <artifactId>maven-surefire-plugin</artifactId>
+            <configuration>
+               <skipTests>true</skipTests>
+            </configuration>
+         </plugin>
+       </plugins>
+    </build>
 
-</project>
+</project>
diff --git a/cdi/embedded/pom.xml b/cdi/embedded/pom.xml
@@ -68,12 +68,17 @@
             <scope>test</scope>
         </dependency>
 
-
         <dependency>
             <groupId>org.testng</groupId>
             <artifactId>testng</artifactId>
             <scope>test</scope>
         </dependency>
+
+        <dependency>
+            <groupId>org.mockito</groupId>
+            <artifactId>mockito-all</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

diff --git a/cli/cli-client/pom.xml b/cli/cli-client/pom.xml
@@ -57,6 +57,11 @@
          <artifactId>metainf-services</artifactId>
          <optional>true</optional>
       </dependency>
+      <dependency>
+         <groupId>org.testng</groupId>
+         <artifactId>testng</artifactId>
+         <scope>test</scope>
+      </dependency>
    </dependencies>
 
    <build>

diff --git a/cli/cli-interpreter/pom.xml b/cli/cli-interpreter/pom.xml
@@ -13,7 +13,7 @@
    <name>Infinispan CLI Interpreter</name>
    <description>Infinispan CLI Interpreter module</description>
 
-   
+
    <properties>
       <module.skipComponentMetaDataProcessing>false</module.skipComponentMetaDataProcessing>
    </properties>
@@ -102,6 +102,11 @@
          <artifactId>metainf-services</artifactId>
          <optional>true</optional>
       </dependency>
+      <dependency>
+         <groupId>org.testng</groupId>
+         <artifactId>testng</artifactId>
+         <scope>test</scope>
+      </dependency>
    </dependencies>
 
    <build>

diff --git a/client/hotrod-client/pom.xml b/client/hotrod-client/pom.xml
@@ -54,13 +54,13 @@
          <artifactId>infinispan-remote-query-server</artifactId>
          <scope>test</scope>
       </dependency>
-      
+
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-scripting</artifactId>
          <scope>test</scope>
       </dependency>
-      
+
       <dependency>
          <groupId>${project.groupId}</groupId>
          <artifactId>infinispan-scripting</artifactId>
@@ -117,6 +117,18 @@
          <artifactId>jboss-sasl</artifactId>
          <scope>test</scope>
       </dependency>
+
+      <dependency>
+         <groupId>org.testng</groupId>
+         <artifactId>testng</artifactId>
+         <scope>test</scope>
+      </dependency>
+
+      <dependency>
+         <groupId>org.mockito</groupId>
+         <artifactId>mockito-all</artifactId>
+         <scope>test</scope>
+      </dependency>
    </dependencies>
 
    <build>

diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysDistTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/BulkGetKeysDistTest.java
@@ -8,8 +8,8 @@
 import java.util.Set;
 
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
 
 /**
  * Tests functionality related to getting multiple entries from a HotRod server

diff --git a/...od-client/src/test/java/org/infinispan/client/hotrod/MultipleCacheTopologyChangeTest.java b/...od-client/src/test/java/org/infinispan/client/hotrod/MultipleCacheTopologyChangeTest.java
@@ -19,10 +19,8 @@
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
 import static org.infinispan.test.TestingUtil.killCacheManagers;
 import static org.infinispan.test.fwk.TestCacheManagerFactory.createClusteredCacheManager;
-import static org.junit.Assert.assertTrue;
-import static org.testng.Assert.assertNotNull;
-import static org.testng.Assert.assertNull;
-import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
+
 
 /**
  * @since 9.0

diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteAsyncAPITest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RemoteAsyncAPITest.java
@@ -13,7 +13,8 @@
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicReference;
 
-import static org.junit.Assert.*;
+import static org.testng.Assert.assertNotEquals;
+import static org.testng.AssertJUnit.*;
 
 /**
  * @author Mircea.Markus@jboss.com

diff --git a/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerShutdownTest.java b/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerShutdownTest.java
@@ -8,7 +8,7 @@
 import org.infinispan.test.fwk.TestCacheManagerFactory;
 import org.testng.annotations.Test;
 
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 import static org.infinispan.client.hotrod.test.HotRodClientTestingUtil.killServers;
 import static org.infinispan.client.hotrod.test.HotRodClientTestingUtil.withRemoteCacheManager;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;

diff --git a/...t/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/ClientEventsOOMTest.java b/...t/hotrod-client/src/test/java/org/infinispan/client/hotrod/event/ClientEventsOOMTest.java
@@ -25,7 +25,7 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 /**
  * @author anistor@redhat.com

diff --git a/...test/java/org/infinispan/client/hotrod/event/ClientListenerWithFilterAndProtobufTest.java b/...test/java/org/infinispan/client/hotrod/event/ClientListenerWithFilterAndProtobufTest.java
@@ -27,9 +27,9 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertNull;
 
 
 /**

diff --git a/...t/java/org/infinispan/client/hotrod/event/ClientListenerWithFilterAndRawProtobufTest.java b/...t/java/org/infinispan/client/hotrod/event/ClientListenerWithFilterAndRawProtobufTest.java
@@ -27,9 +27,9 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertNull;
 
 
 /**

diff --git a/...st/java/org/infinispan/client/hotrod/event/ClientListenerWithIndexingAndProtobufTest.java b/...st/java/org/infinispan/client/hotrod/event/ClientListenerWithIndexingAndProtobufTest.java
@@ -21,10 +21,10 @@
 import java.util.concurrent.TimeUnit;
 
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertNull;
 
 
 /**

diff --git a/...ava/org/infinispan/client/hotrod/event/EmbeddedCompatClientListenerWithDslFilterTest.java b/...ava/org/infinispan/client/hotrod/event/EmbeddedCompatClientListenerWithDslFilterTest.java
@@ -45,10 +45,10 @@
 import static org.infinispan.query.dsl.Expression.max;
 import static org.infinispan.query.dsl.Expression.param;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertNull;
 
 
 /**

diff --git a/...t/src/test/java/org/infinispan/client/hotrod/event/EmbeddedCompatContinuousQueryTest.java b/...t/src/test/java/org/infinispan/client/hotrod/event/EmbeddedCompatContinuousQueryTest.java
@@ -4,11 +4,7 @@
 import static org.infinispan.query.dsl.Expression.max;
 import static org.infinispan.query.dsl.Expression.param;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -49,7 +45,6 @@
 import org.infinispan.util.TimeService;
 import org.testng.annotations.Test;
 
-
 /**
  * Test remote continuous query in compat mode.
  *

diff --git a/...od-client/src/test/java/org/infinispan/client/hotrod/event/RemoteContinuousQueryTest.java b/...od-client/src/test/java/org/infinispan/client/hotrod/event/RemoteContinuousQueryTest.java
@@ -4,11 +4,7 @@
 import static org.infinispan.query.dsl.Expression.max;
 import static org.infinispan.query.dsl.Expression.param;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.*;
 
 import java.util.ArrayList;
 import java.util.Arrays;
@@ -44,7 +40,6 @@
 import org.infinispan.util.TimeService;
 import org.testng.annotations.Test;
 
-
 /**
  * Test remote continuous query in compat mode.
  *

diff --git a/...ent/src/test/java/org/infinispan/client/hotrod/event/RemoteListenerWithDslFilterTest.java b/...ent/src/test/java/org/infinispan/client/hotrod/event/RemoteListenerWithDslFilterTest.java
@@ -42,10 +42,10 @@
 import static org.infinispan.query.dsl.Expression.max;
 import static org.infinispan.query.dsl.Expression.param;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertFalse;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertFalse;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertNull;
 
 
 /**

diff --git a/...nt/hotrod-client/src/test/java/org/infinispan/client/hotrod/impl/RemoteCacheImplTest.java b/...nt/hotrod-client/src/test/java/org/infinispan/client/hotrod/impl/RemoteCacheImplTest.java
@@ -1,7 +1,7 @@
 package org.infinispan.client.hotrod.impl;
 
 import org.infinispan.client.hotrod.impl.protocol.CodecUtils;
-import static org.junit.Assert.assertEquals;
+import static org.testng.AssertJUnit.assertEquals;
 
 import java.util.concurrent.TimeUnit;
 

diff --git a/...hotrod-client/src/test/java/org/infinispan/client/hotrod/marshall/EmbeddedCompatTest.java b/...hotrod-client/src/test/java/org/infinispan/client/hotrod/marshall/EmbeddedCompatTest.java
@@ -50,10 +50,10 @@
 import static org.infinispan.client.hotrod.test.HotRodClientTestingUtil.killRemoteCacheManager;
 import static org.infinispan.client.hotrod.test.HotRodClientTestingUtil.killServers;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertNotNull;
-import static org.junit.Assert.assertNull;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertNotNull;
+import static org.testng.AssertJUnit.assertNull;
+import static org.testng.AssertJUnit.assertTrue;
 
 /**
  * Tests compatibility between remote query and embedded mode.

diff --git a/...ient/src/test/java/org/infinispan/client/hotrod/marshall/PrimitiveEmbeddedCompatTest.java b/...ient/src/test/java/org/infinispan/client/hotrod/marshall/PrimitiveEmbeddedCompatTest.java
@@ -16,8 +16,8 @@
 import static org.infinispan.client.hotrod.test.HotRodClientTestingUtil.killRemoteCacheManager;
 import static org.infinispan.client.hotrod.test.HotRodClientTestingUtil.killServers;
 import static org.infinispan.server.hotrod.test.HotRodTestingUtil.hotRodCacheConfiguration;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.assertTrue;
+import static org.testng.AssertJUnit.assertEquals;
+import static org.testng.AssertJUnit.assertTrue;
 
 /**
  * Tests compatibility mode with primitive types.