Re-enable and document @ignore'd tests

sbrannen · sbrannen · commit 025d111efc79 · 2012-12-05T10:31:31.000+01:00
Documented why static nested test cases in the spring-test module are ignored, explaining that such "TestCase classes are run manually by the enclosing test class". Prior to the migration to Gradle (i.e., with Spring Build), these tests would not have been picked up by the test suite since they end with a "TestCase" suffix instead of "Test" or "Tests". Re-enabled HibernateMultiEntityManagerFactoryIntegrationTests. For the remaining tests that were disabled as a result of the migration to Gradle, comments have been added to the @ignore declarations. Issue: SPR-8116, SPR-9398
diff --git a/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java b/spring-beans/src/test/java/org/springframework/beans/factory/support/security/CallbacksSecurityTests.java
@@ -436,7 +436,9 @@ public void testConstructor() throws Exception {
 	}
 
 	@Test
-	@Ignore // TODO SPR-8116 passes under Eclipse, but fails under Gradle with https://gist.github.com/1664133
+	@Ignore("passes under Eclipse, but fails under Gradle with https://gist.github.com/1664133")
+	// TODO SPR-8116 passes under Eclipse, but fails under Gradle with
+	// https://gist.github.com/1664133
 	public void testContainerPrivileges() throws Exception {
 		AccessControlContext acc = provider.getAccessControlContext();
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/hibernate/HibernateMultiEntityManagerFactoryIntegrationTests.java
@@ -26,7 +26,6 @@
  *
  * @author Juergen Hoeller
  */
-@org.junit.Ignore // TODO SPR-8116 work out JPA 1 vs 2 classpath issues in spring-orm
 public class HibernateMultiEntityManagerFactoryIntegrationTests extends
 		AbstractContainerEntityManagerFactoryIntegrationTests {
 
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/openjpa/OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests.java
@@ -16,17 +16,20 @@
 
 package org.springframework.orm.jpa.openjpa;
 
+import org.junit.Ignore;
+
 /**
  * Test that AspectJ weaving (in particular the currently shipped aspects) work with JPA (see SPR-3873 for more details). 
  *
  * @author Ramnivas Laddad
  */
-@org.junit.Ignore // TODO SPR-8116 this test causes gradle to hang.
+// TODO SPR-8116 this test causes gradle to hang.
 // when run independently e.g. `./gradlew :spring-orm:test -Dtest.single=OpenJpaEntity...`
 // it works fine. When run together with all other tests e.g. `./gradlew :spring-orm:test`
 // it hangs on the 'testCanSerializeProxies' test method. Note that this test DOES pass in
 // Eclipse, even when the entire 'spring-orm' module is run. Run gradle with '-i' to
 // get more details when reproducing the hanging test.
+@Ignore("this test causes gradle to hang")
 public class OpenJpaEntityManagerFactoryWithAspectJWeavingIntegrationTests extends OpenJpaEntityManagerFactoryIntegrationTests {
 
 	protected String[] getConfigLocations() {
diff --git a/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java b/spring-orm/src/test/java/org/springframework/orm/jpa/toplink/TopLinkMultiEntityManagerFactoryIntegrationTests.java
@@ -19,20 +19,23 @@
 import javax.persistence.EntityManager;
 import javax.persistence.EntityManagerFactory;
 
+import org.junit.Ignore;
 import org.springframework.orm.jpa.AbstractContainerEntityManagerFactoryIntegrationTests;
 
 /**
  * Toplink-specific JPA tests with multiple EntityManagerFactory instances.
  *
  * @author Costin Leau
  */
-@org.junit.Ignore // TODO SPR-8116 this test causes gradle to hang. See OJEMFWAJWIT.
+// TODO SPR-8116 this test causes gradle to hang. See OJEMFWAJWIT.
+@Ignore("this test causes gradle to hang. See OJEMFWAJWIT.")
 public class TopLinkMultiEntityManagerFactoryIntegrationTests extends
 		AbstractContainerEntityManagerFactoryIntegrationTests {
 
 	private EntityManagerFactory entityManagerFactory2;
 
 
+	@SuppressWarnings("deprecation")
 	public TopLinkMultiEntityManagerFactoryIntegrationTests() {
 		setAutowireMode(AUTOWIRE_BY_NAME);
 	}
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
@@ -16,14 +16,15 @@
 
 package org.springframework.test.context.junit38;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.util.Arrays;
 import java.util.Collection;
 
 import junit.framework.TestCase;
 import junit.framework.TestResult;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runners.Parameterized;
@@ -104,7 +105,7 @@ public void afterTestMethod(TestContext testContext) {
 		}
 	}
 
-	@org.junit.Ignore // TODO SPR-8116
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@SuppressWarnings("deprecation")
 	@TestExecutionListeners(listeners = AlwaysFailingBeforeTestMethodTestExecutionListener.class, inheritListeners = false)
 	public static class AlwaysFailingBeforeTestMethodTestCase extends AbstractJUnit38SpringContextTests {
@@ -113,7 +114,7 @@ public void testNothing() {
 		}
 	}
 
-	@org.junit.Ignore // TODO SPR-8116
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@SuppressWarnings("deprecation")
 	@TestExecutionListeners(listeners = AlwaysFailingAfterTestMethodTestExecutionListener.class, inheritListeners = false)
 	public static class AlwaysFailingAfterTestMethodTestCase extends AbstractJUnit38SpringContextTests {
@@ -122,7 +123,7 @@ public void testNothing() {
 		}
 	}
 
-	@org.junit.Ignore // TODO SPR-8116
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@SuppressWarnings("deprecation")
 	@ContextConfiguration("FailingBeforeAndAfterMethodsTests-context.xml")
 	public static class FailingBeforeTransactionalTestCase extends AbstractTransactionalJUnit38SpringContextTests {
@@ -136,7 +137,7 @@ public void beforeTransaction() {
 		}
 	}
 
-	@org.junit.Ignore // TODO SPR-8116
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@SuppressWarnings("deprecation")
 	@ContextConfiguration("FailingBeforeAndAfterMethodsTests-context.xml")
 	public static class FailingAfterTransactionalTestCase extends AbstractTransactionalJUnit38SpringContextTests {
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/ExpectedExceptionSpringRunnerTests.java
@@ -16,10 +16,11 @@
 
 package org.springframework.test.context.junit4;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.util.ArrayList;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.notification.RunNotifier;
@@ -59,7 +60,7 @@ public void expectedExceptions() throws Exception {
 	}
 
 
-	@org.junit.Ignore // TODO SPR-8116
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@RunWith(SpringJUnit4ClassRunner.class)
 	@TestExecutionListeners({})
 	public static final class ExpectedExceptionSpringRunnerTestCase {
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
@@ -16,12 +16,12 @@
 
 package org.springframework.test.context.junit4;
 
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.junit.Assert.*;
 
 import java.util.Arrays;
 import java.util.Collection;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.notification.RunNotifier;
@@ -146,32 +146,32 @@ public void testNothing() {
 		}
 	}
 
-	@org.junit.Ignore // TODO SPR-8116
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@TestExecutionListeners(AlwaysFailingBeforeTestClassTestExecutionListener.class)
 	public static class AlwaysFailingBeforeTestClassTestCase extends BaseTestCase {
 	}
 
-	@org.junit.Ignore // TODO SPR-8116
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@TestExecutionListeners(AlwaysFailingAfterTestClassTestExecutionListener.class)
 	public static class AlwaysFailingAfterTestClassTestCase extends BaseTestCase {
 	}
 
-	@org.junit.Ignore // TODO SPR-8116
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@TestExecutionListeners(AlwaysFailingPrepareTestInstanceTestExecutionListener.class)
 	public static class AlwaysFailingPrepareTestInstanceTestCase extends BaseTestCase {
 	}
 
-	@org.junit.Ignore // TODO SPR-8116
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@TestExecutionListeners(AlwaysFailingBeforeTestMethodTestExecutionListener.class)
 	public static class AlwaysFailingBeforeTestMethodTestCase extends BaseTestCase {
 	}
 
-	@org.junit.Ignore // TODO SPR-8116
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@TestExecutionListeners(AlwaysFailingAfterTestMethodTestExecutionListener.class)
 	public static class AlwaysFailingAfterTestMethodTestCase extends BaseTestCase {
 	}
 
-	@org.junit.Ignore // TODO SPR-8116
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@ContextConfiguration("FailingBeforeAndAfterMethodsTests-context.xml")
 	public static class FailingBeforeTransactionTestCase extends AbstractTransactionalJUnit4SpringContextTests {
 
@@ -185,7 +185,7 @@ public void beforeTransaction() {
 		}
 	}
 
-	@org.junit.Ignore // TODO SPR-8116
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@ContextConfiguration("FailingBeforeAndAfterMethodsTests-context.xml")
 	public static class FailingAfterTransactionTestCase extends AbstractTransactionalJUnit4SpringContextTests {
 
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
@@ -16,13 +16,14 @@
 
 package org.springframework.test.context.junit4;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
 import java.io.IOException;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.concurrent.atomic.AtomicInteger;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.notification.RunNotifier;
@@ -100,7 +101,7 @@ public void assertRepetitions() throws Exception {
 
 
 	@RunWith(SpringJUnit4ClassRunner.class)
-	@TestExecutionListeners( {})
+	@TestExecutionListeners({})
 	public abstract static class AbstractRepeatedTestCase {
 
 		protected void incrementInvocationCount() throws IOException {
@@ -151,8 +152,7 @@ public void repeatedFiveTimes() throws Exception {
 	 * href="http://jira.springframework.org/browse/SPR-6011"
 	 * target="_blank">SPR-6011</a>.
 	 */
-	@org.junit.Ignore // TODO SPR-8116 causing timeouts on cbeams' (otherwise fast) MBP.
-	// Timeouts are 2x-4x their expected range. Something seems wrong indeed.
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	public static final class TimedRepeatedTestCase extends AbstractRepeatedTestCase {
 
 		@Test
diff --git a/spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java b/spring-test/src/test/java/org/springframework/test/context/junit4/TimedSpringRunnerTests.java
@@ -16,8 +16,9 @@
 
 package org.springframework.test.context.junit4;
 
-import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.*;
 
+import org.junit.Ignore;
 import org.junit.Test;
 import org.junit.runner.RunWith;
 import org.junit.runner.notification.RunNotifier;
@@ -56,10 +57,9 @@ public void timedTests() throws Exception {
 	}
 
 
-	@org.junit.Ignore // TODO SPR-8116 causing timeouts on cbeams' (otherwise fast) MBP.
-	// Timeouts are 2x-5x their expected range. Something seems wrong indeed.
+	@Ignore("TestCase classes are run manually by the enclosing test class")
 	@RunWith(SpringJUnit4ClassRunner.class)
-	@TestExecutionListeners( {})
+	@TestExecutionListeners({})
 	public static final class TimedSpringRunnerTestCase {
 
 		// Should Pass.
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/SPR-8116.txt b/spring-test/src/test/java/org/springframework/test/context/testng/SPR-8116.txt
diff --git a/spring-test/src/test/java/org/springframework/test/context/testng/SPR-9398.txt b/spring-test/src/test/java/org/springframework/test/context/testng/SPR-9398.txt
@@ -0,0 +1,3 @@
+TODO [SPR-9398] re-enable TestNG support for spring-test.
+
+These TestNG test classes are currently not run at all.
diff --git a/spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java b/spring-web/src/test/java/org/springframework/remoting/jaxws/JaxWsSupportTests.java
@@ -16,18 +16,20 @@
 
 package org.springframework.remoting.jaxws;
 
+import static org.junit.Assert.*;
+
 import java.net.MalformedURLException;
 import java.net.URL;
+
 import javax.xml.namespace.QName;
 import javax.xml.ws.BindingProvider;
 import javax.xml.ws.Service;
 import javax.xml.ws.WebServiceClient;
 import javax.xml.ws.WebServiceRef;
 import javax.xml.ws.soap.AddressingFeature;
 
-import static org.junit.Assert.*;
+import org.junit.Ignore;
 import org.junit.Test;
-
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.support.GenericBeanDefinition;
 import org.springframework.beans.factory.support.RootBeanDefinition;
@@ -38,7 +40,8 @@
  * @author Juergen Hoeller
  * @since 2.5
  */
-@org.junit.Ignore // TODO SPR-8116 - see https://gist.github.com/1150858
+// TODO SPR-8116 - see https://gist.github.com/1150858
+@Ignore("see https://gist.github.com/1150858")
 public class JaxWsSupportTests {
 
 	@Test

Original file line number	Diff line number	Diff line change
`@@ -436,7 +436,9 @@ public void testConstructor() throws Exception {`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`@Test`
`439`		`- @Ignore // TODO SPR-8116 passes under Eclipse, but fails under Gradle with https://gist.github.com/1664133`
	`439`	`+ @Ignore("passes under Eclipse, but fails under Gradle with https://gist.github.com/1664133")`
	`440`	`+ // TODO SPR-8116 passes under Eclipse, but fails under Gradle with`
	`441`	`+ // https://gist.github.com/1664133`
`440`	`442`	`public void testContainerPrivileges() throws Exception {`
`441`	`443`	`AccessControlContext acc = provider.getAccessControlContext();`
`442`	`444`
Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,6 @@`
`26`	`26`	`*`
`27`	`27`	`* @author Juergen Hoeller`
`28`	`28`	`*/`
`29`		`-@org.junit.Ignore // TODO SPR-8116 work out JPA 1 vs 2 classpath issues in spring-orm`
`30`	`29`	`public class HibernateMultiEntityManagerFactoryIntegrationTests extends`
`31`	`30`	`AbstractContainerEntityManagerFactoryIntegrationTests {`
`32`	`31`
Original file line number	Diff line number	Diff line change
`@@ -16,14 +16,15 @@`
`16`	`16`
`17`	`17`	`package org.springframework.test.context.junit38;`
`18`	`18`
`19`		`-import static org.junit.Assert.assertEquals;`
	`19`	`+import static org.junit.Assert.*;`
`20`	`20`
`21`	`21`	`import java.util.Arrays;`
`22`	`22`	`import java.util.Collection;`
`23`	`23`
`24`	`24`	`import junit.framework.TestCase;`
`25`	`25`	`import junit.framework.TestResult;`
`26`	`26`
	`27`	`+import org.junit.Ignore;`
`27`	`28`	`import org.junit.Test;`
`28`	`29`	`import org.junit.runner.RunWith;`
`29`	`30`	`import org.junit.runners.Parameterized;`
`@@ -104,7 +105,7 @@ public void afterTestMethod(TestContext testContext) {`
`104`	`105`	`}`
`105`	`106`	`}`
`106`	`107`
`107`		`- @org.junit.Ignore // TODO SPR-8116`
	`108`	`+ @Ignore("TestCase classes are run manually by the enclosing test class")`
`108`	`109`	`@SuppressWarnings("deprecation")`
`109`	`110`	`@TestExecutionListeners(listeners = AlwaysFailingBeforeTestMethodTestExecutionListener.class, inheritListeners = false)`
`110`	`111`	`public static class AlwaysFailingBeforeTestMethodTestCase extends AbstractJUnit38SpringContextTests {`
`@@ -113,7 +114,7 @@ public void testNothing() {`
`113`	`114`	`}`
`114`	`115`	`}`
`115`	`116`
`116`		`- @org.junit.Ignore // TODO SPR-8116`
	`117`	`+ @Ignore("TestCase classes are run manually by the enclosing test class")`
`117`	`118`	`@SuppressWarnings("deprecation")`
`118`	`119`	`@TestExecutionListeners(listeners = AlwaysFailingAfterTestMethodTestExecutionListener.class, inheritListeners = false)`
`119`	`120`	`public static class AlwaysFailingAfterTestMethodTestCase extends AbstractJUnit38SpringContextTests {`
`@@ -122,7 +123,7 @@ public void testNothing() {`
`122`	`123`	`}`
`123`	`124`	`}`
`124`	`125`
`125`		`- @org.junit.Ignore // TODO SPR-8116`
	`126`	`+ @Ignore("TestCase classes are run manually by the enclosing test class")`
`126`	`127`	`@SuppressWarnings("deprecation")`
`127`	`128`	`@ContextConfiguration("FailingBeforeAndAfterMethodsTests-context.xml")`
`128`	`129`	`public static class FailingBeforeTransactionalTestCase extends AbstractTransactionalJUnit38SpringContextTests {`
`@@ -136,7 +137,7 @@ public void beforeTransaction() {`
`136`	`137`	`}`
`137`	`138`	`}`
`138`	`139`
`139`		`- @org.junit.Ignore // TODO SPR-8116`
	`140`	`+ @Ignore("TestCase classes are run manually by the enclosing test class")`
`140`	`141`	`@SuppressWarnings("deprecation")`
`141`	`142`	`@ContextConfiguration("FailingBeforeAndAfterMethodsTests-context.xml")`
`142`	`143`	`public static class FailingAfterTransactionalTestCase extends AbstractTransactionalJUnit38SpringContextTests {`
Original file line number	Diff line number	Diff line change
`@@ -16,12 +16,12 @@`
`16`	`16`
`17`	`17`	`package org.springframework.test.context.junit4;`
`18`	`18`
`19`		`-import static org.junit.Assert.assertEquals;`
`20`		`-import static org.junit.Assert.fail;`
	`19`	`+import static org.junit.Assert.*;`
`21`	`20`
`22`	`21`	`import java.util.Arrays;`
`23`	`22`	`import java.util.Collection;`
`24`	`23`
	`24`	`+import org.junit.Ignore;`
`25`	`25`	`import org.junit.Test;`
`26`	`26`	`import org.junit.runner.RunWith;`
`27`	`27`	`import org.junit.runner.notification.RunNotifier;`
`@@ -146,32 +146,32 @@ public void testNothing() {`
`146`	`146`	`}`
`147`	`147`	`}`
`148`	`148`
`149`		`- @org.junit.Ignore // TODO SPR-8116`
	`149`	`+ @Ignore("TestCase classes are run manually by the enclosing test class")`
`150`	`150`	`@TestExecutionListeners(AlwaysFailingBeforeTestClassTestExecutionListener.class)`
`151`	`151`	`public static class AlwaysFailingBeforeTestClassTestCase extends BaseTestCase {`
`152`	`152`	`}`
`153`	`153`
`154`		`- @org.junit.Ignore // TODO SPR-8116`
	`154`	`+ @Ignore("TestCase classes are run manually by the enclosing test class")`
`155`	`155`	`@TestExecutionListeners(AlwaysFailingAfterTestClassTestExecutionListener.class)`
`156`	`156`	`public static class AlwaysFailingAfterTestClassTestCase extends BaseTestCase {`
`157`	`157`	`}`
`158`	`158`
`159`		`- @org.junit.Ignore // TODO SPR-8116`
	`159`	`+ @Ignore("TestCase classes are run manually by the enclosing test class")`
`160`	`160`	`@TestExecutionListeners(AlwaysFailingPrepareTestInstanceTestExecutionListener.class)`
`161`	`161`	`public static class AlwaysFailingPrepareTestInstanceTestCase extends BaseTestCase {`
`162`	`162`	`}`
`163`	`163`
`164`		`- @org.junit.Ignore // TODO SPR-8116`
	`164`	`+ @Ignore("TestCase classes are run manually by the enclosing test class")`
`165`	`165`	`@TestExecutionListeners(AlwaysFailingBeforeTestMethodTestExecutionListener.class)`
`166`	`166`	`public static class AlwaysFailingBeforeTestMethodTestCase extends BaseTestCase {`
`167`	`167`	`}`
`168`	`168`
`169`		`- @org.junit.Ignore // TODO SPR-8116`
	`169`	`+ @Ignore("TestCase classes are run manually by the enclosing test class")`
`170`	`170`	`@TestExecutionListeners(AlwaysFailingAfterTestMethodTestExecutionListener.class)`
`171`	`171`	`public static class AlwaysFailingAfterTestMethodTestCase extends BaseTestCase {`
`172`	`172`	`}`
`173`	`173`
`174`		`- @org.junit.Ignore // TODO SPR-8116`
	`174`	`+ @Ignore("TestCase classes are run manually by the enclosing test class")`
`175`	`175`	`@ContextConfiguration("FailingBeforeAndAfterMethodsTests-context.xml")`
`176`	`176`	`public static class FailingBeforeTransactionTestCase extends AbstractTransactionalJUnit4SpringContextTests {`
`177`	`177`
`@@ -185,7 +185,7 @@ public void beforeTransaction() {`
`185`	`185`	`}`
`186`	`186`	`}`
`187`	`187`
`188`		`- @org.junit.Ignore // TODO SPR-8116`
	`188`	`+ @Ignore("TestCase classes are run manually by the enclosing test class")`
`189`	`189`	`@ContextConfiguration("FailingBeforeAndAfterMethodsTests-context.xml")`
`190`	`190`	`public static class FailingAfterTransactionTestCase extends AbstractTransactionalJUnit4SpringContextTests {`
`191`	`191`