Merge pull request #850 from zanata/remove-quarantine

Start SeamAutowire before tests; remove QuarantiningRunner

functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java

@@ -21,6 +21,7 @@
 
 package org.zanata.feature.projectversion;
 
+import org.junit.Ignore;
 import org.junit.Rule;
 import org.junit.Test;
 import org.junit.experimental.categories.Category;
@@ -51,6 +52,7 @@ public class VersionFilteringTest extends ZanataTestCase {
 
     @Feature(summary = "The user can filter project versions by name",
             tcmsTestPlanIds = 5316, tcmsTestCaseIds = 0)
+    @Ignore("dodgy test (intermittent timeout)")
     @Test(timeout = ZanataTestCase.MAX_SHORT_TEST_DURATION)
     public void versionSearchFiltering() throws Exception {
         String projectName = "versionsearchnums";

zanata-war/pom.xml

@@ -1259,13 +1259,6 @@
 
   <dependencies>
 
-    <dependency>
-      <groupId>com.binarytweed</groupId>
-      <artifactId>quarantining-test-runner</artifactId>
-      <version>0.0.3</version>
-      <scope>test</scope>
-    </dependency>
-
     <dependency>
       <groupId>com.tngtech.java</groupId>
       <artifactId>junit-dataprovider</artifactId>

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

@@ -20,14 +20,15 @@
  */
 package org.zanata;
 
-import com.binarytweed.test.Quarantine;
-import org.junit.runner.RunWith;
-import org.zanata.test.QuarantiningRunner;
+import org.zanata.seam.SeamAutowire;
 
 /**
  * @author Sean Flanigan <a href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a>
  */
-@Quarantine({ "org.jboss.seam" })
-@RunWith(QuarantiningRunner.class)
 public abstract class ZanataTest {
+
+    static {
+        SeamAutowire.instance();
+    }
+
 }

zanata-war/src/test/java/org/zanata/dao/TextFlowTargetHistoryDAOTest.java

@@ -9,7 +9,6 @@
 import org.joda.time.format.DateTimeFormatter;
 import org.junit.Before;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.zanata.ZanataJpaTest;
 import org.zanata.common.ContentState;
 import org.zanata.common.LocaleId;

zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsTest.java

@@ -10,7 +10,6 @@
 import java.util.Properties;
 import javax.persistence.EntityManager;
 
-import com.binarytweed.test.DelegateRunningTo;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
@@ -44,7 +43,7 @@
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
 
-@DelegateRunningTo(DataProviderRunner.class)
+@RunWith(DataProviderRunner.class)
 public class ResourceUtilsTest extends ZanataTest {
     private static final Logger log = LoggerFactory
             .getLogger(ResourceUtilsTest.class);

zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java

@@ -9,7 +9,6 @@
 import javax.validation.ValidatorFactory;
 import javax.ws.rs.core.MediaType;
 
-import com.binarytweed.test.DelegateRunningTo;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
@@ -31,7 +30,7 @@
 import static org.hamcrest.MatcherAssert.assertThat;
 import static org.hamcrest.Matchers.is;
 
-@DelegateRunningTo(DataProviderRunner.class)
+@RunWith(DataProviderRunner.class)
 public class RestUtilsTest extends ZanataTest {
     RestUtils restUtils;
 

zanata-war/src/test/java/org/zanata/test/SeamQuarantineTest.java → zanata-war/src/test/java/org/zanata/seam/SeamAutowireLinkageTest.java

@@ -18,20 +18,17 @@
  * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
  * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
  */
-package org.zanata.test;
+package org.zanata.seam;
 
-import com.binarytweed.test.Quarantine;
 import org.junit.Test;
-import org.junit.runner.RunWith;
 import org.zanata.ZanataTest;
-import org.zanata.seam.SeamAutowire;
 
 /**
  * @author Sean Flanigan <a
  *         href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a>
  */
-@Quarantine({ "org.jboss.seam", "org.zanata.test.SeamQuarantineTest" })
-public class SeamQuarantineTest extends ZanataTest {
+public class SeamAutowireLinkageTest extends ZanataTest {
+
     @Test
     public void test1() throws ClassNotFoundException {
         // load Seam before test2 gets a chance to use SeamAutowire

zanata-war/src/test/java/org/zanata/seam/SeamAutowireTest.java

@@ -20,7 +20,6 @@
  */
 package org.zanata.seam;
 
-import com.binarytweed.test.DelegateRunningTo;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
@@ -51,7 +50,7 @@
  * @author Carlos Munoz <a
  *         href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
  */
-@DelegateRunningTo(DataProviderRunner.class)
+@RunWith(DataProviderRunner.class)
 public class SeamAutowireTest extends ZanataDbunitJpaTest {
     @Override
     protected void prepareDBUnitOperations() {

zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

@@ -24,7 +24,6 @@
 import java.util.HashSet;
 import java.util.Set;
 
-import com.binarytweed.test.DelegateRunningTo;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
@@ -79,7 +78,7 @@
  * @author Sean Flanigan <a
  *         href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a>
  */
-@DelegateRunningTo(DataProviderRunner.class)
+@RunWith(DataProviderRunner.class)
 public class CopyTransServiceImplTest extends ZanataDbunitJpaTest {
     private SeamAutowire seam = SeamAutowire.instance();
 

zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java

@@ -9,7 +9,6 @@
 import java.util.List;
 import java.util.Set;
 
-import com.binarytweed.test.DelegateRunningTo;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
@@ -46,7 +45,7 @@
  *         href="mailto:camunoz@redhat.com">camunoz@redhat.com</a>
  * @author Sean Flanigan <a href="mailto:sflaniga@redhat.com">sflaniga@redhat.com</a>
  */
-@DelegateRunningTo(DataProviderRunner.class)
+@RunWith(DataProviderRunner.class)
 public class TranslationFinderTest extends ImmutableDbunitJpaTest {
     private SeamAutowire seam = SeamAutowire.instance();
     private HLocale sourceLocale;

zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java

@@ -3,7 +3,6 @@
 import java.util.Date;
 import java.util.List;
 
-import com.binarytweed.test.DelegateRunningTo;
 import com.tngtech.java.junit.dataprovider.DataProvider;
 import com.tngtech.java.junit.dataprovider.DataProviderRunner;
 import com.tngtech.java.junit.dataprovider.UseDataProvider;
@@ -13,7 +12,6 @@
 import org.hibernate.search.impl.FullTextSessionImpl;
 import org.hibernate.search.jpa.Search;
 import org.junit.Before;
-import org.junit.BeforeClass;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.mockito.MockitoAnnotations;
@@ -49,7 +47,7 @@
  * @author Alex Eng <a href="mailto:aeng@redhat.com">aeng@redhat.com</a>
  */
 // see also TranslationFinderTest
-@DelegateRunningTo(DataProviderRunner.class)
+@RunWith(DataProviderRunner.class)
 public class TranslationMemoryServiceImplTest extends ImmutableDbunitJpaTest {
     private SeamAutowire seam = SeamAutowire.instance();
     private TranslationMemoryServiceImpl service;