Make new tests work in maven.

Move dependencies around and get rid of conflicts.
Start removing uses of TestNG in preparation for JUnit move.
Rename tests.

pom.xml

@@ -335,6 +335,28 @@
 			<scope>compile</scope>
 		</dependency>
 
+          <!-- Arquillian Dependencies -->
+          <!-- Override the Maven resolver to the latest version -->
+          <!-- TODO Use the arquillian Shrinkwrap bom -->
+          <dependency>
+              <groupId>org.jboss.shrinkwrap.resolver</groupId>
+              <artifactId>shrinkwrap-resolver-api</artifactId>
+              <version>2.0.0-alpha-6</version>
+              <!-- TODO Overwritten from arquillian BOM 1.0.3.Final to use the MavenImporter -->
+          </dependency>
+          <dependency>
+              <groupId>org.jboss.shrinkwrap.resolver</groupId>
+              <artifactId>shrinkwrap-resolver-api-maven</artifactId>
+              <version>2.0.0-alpha-6</version>
+              <!-- TODO Overwritten from arquillian BOM 1.0.3.Final to use the MavenImporter -->
+          </dependency>
+          <dependency>
+              <groupId>org.jboss.shrinkwrap.resolver</groupId>
+              <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
+              <version>2.0.0-alpha-6</version>
+              <!-- TODO Overwritten from arquillian BOM 1.0.3.Final to use the MavenImporter -->
+          </dependency>
+
           <!-- Arquillian -->
           <dependency>
               <groupId>org.jboss.arquillian</groupId>

zanata-war/pom.xml

@@ -413,7 +413,7 @@
 					</execution>
 				</executions>
 				<configuration>
-					<redirectTestOutputToFile>false</redirectTestOutputToFile>
+					<!--<redirectTestOutputToFile>false</redirectTestOutputToFile>
 					<printSummary>true</printSummary>
 					<forkMode>always</forkMode>
 					<suiteXmlFiles>
@@ -431,10 +431,13 @@
 						-XX:HeapDumpPath=${project.build.directory} -Dsun.lang.ClassLoader.allowArraySyntax=true</argLine>
 					<classpathDependencyExcludes>
 						<classpathDependencyExclude>
-							<!-- collides with XMLLoginConfigImpl in jboss-embedded-all -->
+							&lt;!&ndash; collides with XMLLoginConfigImpl in jboss-embedded-all &ndash;&gt;
 							org.picketbox:picketbox
 						</classpathDependencyExclude>
-					</classpathDependencyExcludes>
+					</classpathDependencyExcludes>-->
+                    <includes>
+                        <include>**/*ITCase.java</include>
+                    </includes>
 				</configuration>
 			</plugin>
 
@@ -1084,19 +1087,6 @@
 
 	</profiles>
 
-    <dependencyManagement>
-        <dependencies>
-            <!-- Arquillian Bom -->
-            <dependency>
-                <groupId>org.jboss.arquillian</groupId>
-                <artifactId>arquillian-bom</artifactId>
-                <version>1.0.3.Final</version>
-                <scope>import</scope>
-                <type>pom</type>
-            </dependency>
-        </dependencies>
-    </dependencyManagement>
-
 	<dependencies>
 
         <!-- Zanata-specific dependencies -->
@@ -1683,31 +1673,6 @@
             <scope>provided</scope>
         </dependency>
 
-        <!-- Arquillian Dependencies -->
-        <!-- Override the Maven resolver to the latest version -->
-        <!-- TODO Use the arquillian Shrinkwrap bom -->
-        <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-api</artifactId>
-            <version>2.0.0-alpha-5</version>
-            <!-- TODO Overwritten from arquillian BOM 1.0.3.Final to use the MavenImporter -->
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-api-maven</artifactId>
-            <version>2.0.0-alpha-5</version>
-            <!-- TODO Overwritten from arquillian BOM 1.0.3.Final to use the MavenImporter -->
-            <scope>test</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.jboss.shrinkwrap.resolver</groupId>
-            <artifactId>shrinkwrap-resolver-impl-maven</artifactId>
-            <version>2.0.0-alpha-5</version>
-            <!-- TODO Overwritten from arquillian BOM 1.0.3.Final to use the MavenImporter -->
-            <scope>test</scope>
-        </dependency>
-
         <dependency>
             <groupId>org.jboss.arquillian.testng</groupId>
             <artifactId>arquillian-testng-container</artifactId>
@@ -1731,6 +1696,13 @@
             <groupId>org.jboss.arquillian.extension</groupId>
             <artifactId>arquillian-seam2</artifactId>
             <version>1.0.0.Alpha2</version>
+            <exclusions>
+                <!-- This obsolete package duplicates some of the classes found in the newer descriptors-spi package -->
+                <exclusion>
+                    <groupId>org.jboss.shrinkwrap.descriptors</groupId>
+                    <artifactId>shrinkwrap-descriptors-api</artifactId>
+                </exclusion>
+            </exclusions>
             <scope>test</scope>
         </dependency>
 

zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java

@@ -21,11 +21,11 @@
 import org.dbunit.operation.DatabaseOperation;
 import org.hibernate.Session;
 import org.hibernate.internal.SessionImpl;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.Optional;
-import org.testng.annotations.Parameters;
+//import org.testng.annotations.AfterMethod;
+//import org.testng.annotations.BeforeClass;
+//import org.testng.annotations.BeforeMethod;
+//import org.testng.annotations.Optional;
+//import org.testng.annotations.Parameters;
 
 public abstract class ZanataDbunitJpaTest extends ZanataJpaTest
 {
@@ -37,9 +37,9 @@ public abstract class ZanataDbunitJpaTest extends ZanataJpaTest
 
    private boolean prepared = false;
 
-   @BeforeClass
-   @Parameters("binaryDir")
-   public void setBinaryDir(@Optional String binaryDir)
+   //@BeforeClass
+   //@Parameters("binaryDir")
+   public void setBinaryDir(/*@Optional*/ String binaryDir)
    {
       if (binaryDir == null)
          return;
@@ -51,9 +51,9 @@ protected String getBinaryDir()
       return binaryDir;
    }
 
-   @BeforeClass
-   @Parameters("replaceNull")
-   public void setReplaceNull(@Optional Boolean replaceNull)
+   //@BeforeClass
+   //@Parameters("replaceNull")
+   public void setReplaceNull(/*@Optional*/ Boolean replaceNull)
    {
       if (replaceNull == null)
          return;
@@ -65,7 +65,7 @@ protected Boolean isReplaceNull()
       return replaceNull;
    }
 
-   @BeforeMethod
+   //@BeforeMethod
    public void prepareDataBeforeTest()
    {
       // This is not pretty but we unfortunately can not have dependencies
@@ -92,7 +92,7 @@ public void prepareDataBeforeTest()
       clearCache();
    }
 
-   @AfterMethod
+   //@AfterMethod
    public void cleanDataAfterTest()
    {
       executeOperations(afterTestOperations);

zanata-war/src/test/java/org/zanata/ZanataJpaTest.java

@@ -16,16 +16,16 @@
 import org.jboss.seam.servlet.ServletSessionMap;
 import org.junit.Before;
 import org.junit.BeforeClass;
-import org.testng.annotations.AfterMethod;
-import org.testng.annotations.AfterSuite;
-import org.testng.annotations.BeforeMethod;
-import org.testng.annotations.BeforeSuite;
-import org.testng.annotations.Listeners;
-import org.testng.annotations.Test;
+//import org.testng.annotations.AfterMethod;
+//import org.testng.annotations.AfterSuite;
+//import org.testng.annotations.BeforeMethod;
+//import org.testng.annotations.BeforeSuite;
+//import org.testng.annotations.Listeners;
+//import org.testng.annotations.Test;
 import org.zanata.testng.TestMethodListener;
 
-@Listeners(TestMethodListener.class)
-@Test(groups = { "jpa-tests" })
+//@Listeners(TestMethodListener.class)
+//@Test(groups = { "jpa-tests" })
 public abstract class ZanataJpaTest
 {
 
@@ -37,15 +37,15 @@ public abstract class ZanataJpaTest
 
    Log log = Logging.getLog(ZanataJpaTest.class);
 
-   @BeforeMethod
+   //@BeforeMethod
    public void setupEM()
    {
       log.debug("Setting up EM");
       em = emf.createEntityManager();
       em.getTransaction().begin();
    }
 
-   @AfterMethod
+   //@AfterMethod
    public void shutdownEM()
    {
       log.debug("Shutting down EM");
@@ -64,14 +64,14 @@ protected Session getSession()
       return (Session) em.getDelegate();
    }
 
-   @BeforeSuite
+   //@BeforeSuite
    public void initializeEMF()
    {
       log.debug("Initializing EMF");
       emf = Persistence.createEntityManagerFactory(PERSIST_NAME);
    }
 
-   @AfterSuite
+   //@AfterSuite
    public void shutDownEMF()
    {
       log.debug("Shutting down EMF");

zanata-war/src/test/java/org/zanata/rest/helper/RemoteTestSignaler.java

@@ -25,6 +25,8 @@
 import javax.ws.rs.QueryParam;
 
 /**
+ * Rest interface to signal lifecycle events for a remotely executed test.
+ *
  * @author Carlos Munoz <a href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
  */
 @Path("/test/remote/signal")

zanata-war/src/test/java/org/zanata/rest/helper/RemoteTestSignalerImpl.java

@@ -35,7 +35,10 @@
 import org.zanata.arquillian.RemoteBefore;
 
 /**
+ * Default implementation for the Remote Signaler interface.
+ *
  * @author Carlos Munoz <a href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
+ * @see RemoteTestSignaler
  */
 @Path("/test/remote/signal")
 @Name("remoteTestSignalerImpl")

zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRestTest.java → zanata-war/src/test/java/org/zanata/rest/service/raw/GlossaryRawRestITCase.java

@@ -45,7 +45,7 @@
 import static org.zanata.util.RawRestTestUtils.jaxbUnmarshal;
 import static org.zanata.util.RawRestTestUtils.jsonUnmarshal;
 
-public class GlossaryRestTest extends RawRestTest
+public class GlossaryRawRestITCase extends RawRestTest
 {
 
    @Override

zanata-war/src/test/java/org/zanata/rest/service/raw/VersionRestTest.java → zanata-war/src/test/java/org/zanata/rest/service/raw/VersionRawRestITCase.java

@@ -36,7 +36,7 @@
 import org.zanata.rest.ResourceRequest;
 import org.zanata.rest.dto.VersionInfo;
 
-public class VersionRestTest extends RawRestTest
+public class VersionRawRestITCase extends RawRestTest
 {
 
    @Override

zanata-war/src/test/resources/AllIntegrationTests.tng.xml

@@ -34,11 +34,11 @@
      	<test name="Raw Rest Tests">
      		<classes>
      			<class name="org.zanata.rest.service.raw.AccountRestTest"/>
-     			<class name="org.zanata.rest.service.raw.GlossaryRestTest"/>
+     			<class name="org.zanata.rest.service.raw.GlossaryRawRestITCase"/>
      			<class name="org.zanata.rest.service.raw.ProjectIterationRestTest"/>
      			<class name="org.zanata.rest.service.raw.ProjectRestTest"/>
      			<class name="org.zanata.rest.service.raw.FileRestTest"/>
-     			<class name="org.zanata.rest.service.raw.VersionRestTest"/>
+     			<class name="org.zanata.rest.service.raw.VersionRawRestITCase"/>
                 <class name="org.zanata.rest.service.raw.StatisticsRestTest"/>
      		</classes>
      	</test>

zanata-war/src/test/resources/arquillian.xml

@@ -12,7 +12,7 @@
     <container qualifier="jbossas-managed" default="true">
         <configuration>
             <!-- We can use the JBOSS_HOME env variable instead of this -->
-            <property name="jbossHome">/opt/jboss-eap-6.0-standalone</property>
+            <property name="jbossHome">/opt/jboss-eap-6.1-alpha</property>
             <!-- We can use the JAVA_HOME env variable instead of this -->
             <property name="javaHome">/usr/lib/jvm/jre-1.6.0-openjdk.x86_64</property>
             <property name="javaVmArguments">-Xms1303m -Xmx1303m -XX:MaxPermSize=256m -Dorg.jboss.as.logging.per-deployment=false <!---Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8787--></property>
@@ -25,7 +25,7 @@
         <property name="seamVersion">2.3.0.Final</property>
         <property name="autoPackage">false</property>
     </extension>
-    <!--<extension qualifier="suite">
+    <extension qualifier="suite">
         <property name="deploymentClass">org.drools.guvnor.server.test.Deployments</property>
-    </extension>-->
+    </extension>
 </arquillian>

zanata-war/src/test/resources/arquillian/jboss-deployment-structure.xml

@@ -3,6 +3,8 @@
 <!-- https://access.redhat.com/knowledge/docs/en-US/JBoss_Enterprise_Application_Platform/6/html/Development_Guide/Included_Modules1.html -->
 <jboss-deployment-structure>
     <deployment>
+        <exclusions>
+        </exclusions>
         <dependencies>
             <module name="javax.annotation.api" />
             <module name="javax.el.api" />