moving unit tests from .testsuite -> .aop

org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerEventTests.java

@@ -16,11 +16,13 @@
 
 package org.springframework.aop.config;
 
+import static org.junit.Assert.*;
+
 import java.util.HashSet;
 import java.util.Set;
 
-import junit.framework.TestCase;
+import org.junit.Before;
-
+import org.junit.Test;
 import org.springframework.beans.factory.config.BeanDefinition;
 import org.springframework.beans.factory.config.BeanReference;
 import org.springframework.beans.factory.parsing.BeanComponentDefinition;
@@ -35,7 +37,7 @@ import org.springframework.core.io.ClassPathResource;
  * @author Rob Harrop
  * @author Juergen Hoeller
  */
-public class AopNamespaceHandlerEventTests extends TestCase {
+public class AopNamespaceHandlerEventTests {
 
 	private CollectingReaderEventListener eventListener = new CollectingReaderEventListener();
 
@@ -44,11 +46,13 @@ public class AopNamespaceHandlerEventTests extends TestCase {
 	private DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 
 
-	protected void setUp() throws Exception {
+	@Before
+	public void setUp() throws Exception {
 		this.reader = new XmlBeanDefinitionReader(this.beanFactory);
 		this.reader.setEventListener(this.eventListener);
 	}
 
+	@Test
 	public void testPointcutEvents() throws Exception {
 		loadBeansFrom("aopNamespaceHandlerPointcutEventTests.xml");
 		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
@@ -72,6 +76,7 @@ public class AopNamespaceHandlerEventTests extends TestCase {
 		assertEquals("Incorrect number of BeanDefinitions", 1, pcd.getBeanDefinitions().length);
 	}
 
+	@Test
 	public void testAdvisorEventsWithPointcutRef() throws Exception {
 		loadBeansFrom("aopNamespaceHandlerAdvisorWithPointcutRefEventTests.xml");
 		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
@@ -100,6 +105,7 @@ public class AopNamespaceHandlerEventTests extends TestCase {
 		assertEquals("countingAdvice", adviceDef.getBeanName());
 	}
 
+	@Test
 	public void testAdvisorEventsWithDirectPointcut() throws Exception {
 		loadBeansFrom("aopNamespaceHandlerAdvisorWithDirectPointcutEventTests.xml");
 		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
@@ -128,6 +134,7 @@ public class AopNamespaceHandlerEventTests extends TestCase {
 		assertEquals("countingAdvice", adviceDef.getBeanName());
 	}
 
+	@Test
 	public void testAspectEvent() throws Exception {
 		loadBeansFrom("aopNamespaceHandlerAspectEventTests.xml");
 		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
@@ -154,7 +161,7 @@ public class AopNamespaceHandlerEventTests extends TestCase {
 		BeanReference[] beanReferences = acd.getBeanReferences();
 		assertEquals(6, beanReferences.length);
 
-		Set expectedReferences = new HashSet();
+		Set<String> expectedReferences = new HashSet<String>();
 		expectedReferences.add("pc");
 		expectedReferences.add("countingAdvice");
 		for (int i = 0; i < beanReferences.length; i++) {

org.springframework.aop/src/test/java/org/springframework/aop/config/AopNamespaceHandlerPointcutErrorTests.java

@@ -16,8 +16,9 @@
 
 package org.springframework.aop.config;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
 
+import org.junit.Test;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.beans.factory.parsing.BeanDefinitionParsingException;
 import org.springframework.beans.factory.xml.XmlBeanFactory;
@@ -26,8 +27,9 @@ import org.springframework.core.io.ClassPathResource;
 /**
  * @author Mark Fisher
  */
-public class AopNamespaceHandlerPointcutErrorTests extends TestCase {
+public class AopNamespaceHandlerPointcutErrorTests {
 
+    @Test
 	public void testDuplicatePointcutConfig() {
 		try {
 			new XmlBeanFactory(new ClassPathResource(
@@ -39,6 +41,7 @@ public class AopNamespaceHandlerPointcutErrorTests extends TestCase {
 		}
 	}
 	
+    @Test
 	public void testMissingPointcutConfig() {
 		try {
 			new XmlBeanFactory(new ClassPathResource(

org.springframework.aop/src/test/java/org/springframework/aop/config/TopLevelAopTagTests.java

@@ -16,7 +16,9 @@
 
 package org.springframework.aop.config;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 import org.springframework.beans.factory.support.DefaultListableBeanFactory;
 import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
 import org.springframework.core.io.ClassPathResource;
@@ -26,8 +28,9 @@ import org.springframework.core.io.ClassPathResource;
  * 
  * @author Rob Harrop
  */
-public final class TopLevelAopTagTests extends TestCase {
+public final class TopLevelAopTagTests {
 
+    @Test
 	public void testParse() throws Exception {
 		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
 		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory);

org.springframework.testsuite/src/test/java/org/springframework/aop/config/AopNamespaceAdviceTypeTests.java

@@ -16,10 +16,10 @@
 
 package org.springframework.aop.config;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
 
+import org.junit.Test;
 import org.springframework.beans.ITestBean;
-import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
@@ -28,7 +28,7 @@ import org.xml.sax.SAXParseException;
 /**
  * @author Adrian Colyer
  */
-public class AopNamespaceAdviceTypeTests extends TestCase {
+public class AopNamespaceAdviceTypeTests {
 
 	private ApplicationContext context;
 
@@ -40,10 +40,12 @@ public class AopNamespaceAdviceTypeTests extends TestCase {
 		return "org/springframework/aop/config/aopNamespaceHandlerAdviceTypeErrorTests.xml";
 	}
 
+	@Test
 	public void testParsingOfAdviceTypes() {
 		this.context = new ClassPathXmlApplicationContext(getOKConfigLocation());
 	}
 	
+	@Test
 	public void testParsingOfAdviceTypesWithError() {
 		try {
 			this.context = new ClassPathXmlApplicationContext(getErrorConfigLocation());

org.springframework.testsuite/src/test/java/org/springframework/aop/config/AopNamespaceHandlerArgNamesTests.java

@@ -16,8 +16,9 @@
 
 package org.springframework.aop.config;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
 
+import org.junit.Test;
 import org.springframework.beans.ITestBean;
 import org.springframework.beans.factory.BeanCreationException;
 import org.springframework.context.ApplicationContext;
@@ -26,7 +27,7 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 /**
  * @author Adrian Colyer
  */
-public class AopNamespaceHandlerArgNamesTests extends TestCase {
+public class AopNamespaceHandlerArgNamesTests {
 
 	private ApplicationContext context;
 
@@ -38,10 +39,12 @@ public class AopNamespaceHandlerArgNamesTests extends TestCase {
 		return "org/springframework/aop/config/aopNamespaceHandlerArgNamesErrorTests.xml";
 	}
 
+	@Test
 	public void testArgNamesOK() {
 		this.context = new ClassPathXmlApplicationContext(getOKConfigLocation());
 	}
 	
+	@Test
 	public void testArgNamesError() {
 		try {
 			this.context = new ClassPathXmlApplicationContext(getErrorConfigLocation());

org.springframework.testsuite/src/test/java/org/springframework/aop/config/AopNamespaceHandlerProxyTargetClassTests.java

@@ -16,6 +16,9 @@
 
 package org.springframework.aop.config;
 
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.ITestBean;
 
@@ -24,6 +27,7 @@ import org.springframework.beans.ITestBean;
  */
 public class AopNamespaceHandlerProxyTargetClassTests extends AopNamespaceHandlerTests {
 
+    @Test
 	public void testIsClassProxy() {
 		ITestBean bean = getTestBean();
 		assertTrue("Should be a CGLIB proxy", AopUtils.isCglibProxy(bean));

org.springframework.testsuite/src/test/java/org/springframework/aop/config/AopNamespaceHandlerReturningTests.java

@@ -16,8 +16,9 @@
 
 package org.springframework.aop.config;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
 
+import org.junit.Test;
 import org.springframework.beans.ITestBean;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.context.ApplicationContext;
@@ -27,7 +28,7 @@ import org.xml.sax.SAXParseException;
 /**
  * @author Adrian Colyer
  */
-public class AopNamespaceHandlerReturningTests extends TestCase {
+public class AopNamespaceHandlerReturningTests {
 
 	private ApplicationContext context;
 
@@ -39,10 +40,12 @@ public class AopNamespaceHandlerReturningTests extends TestCase {
 		return "org/springframework/aop/config/aopNamespaceHandlerReturningErrorTests.xml";
 	}
 
+	@Test
 	public void testReturningOnReturningAdvice() {
 		this.context = new ClassPathXmlApplicationContext(getOKConfigLocation());
 	}
 	
+	@Test
 	public void testParseReturningOnOtherAdviceType() {
 		try {
 			this.context = new ClassPathXmlApplicationContext(getErrorConfigLocation());

org.springframework.testsuite/src/test/java/org/springframework/aop/config/AopNamespaceHandlerScopeTests.java

@@ -16,8 +16,10 @@
 
 package org.springframework.aop.config;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
 
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.support.AopUtils;
 import org.springframework.beans.ITestBean;
@@ -33,10 +35,11 @@ import org.springframework.web.context.support.XmlWebApplicationContext;
  * @author Rob Harrop
  * @author Juergen Hoeller
  */
-public class AopNamespaceHandlerScopeTests extends TestCase {
+public class AopNamespaceHandlerScopeTests {
 
 	private ApplicationContext context;
 
+	@Before
 	public void setUp() {
 		XmlWebApplicationContext wac = new XmlWebApplicationContext();
 		wac.setConfigLocations(new String[] {"classpath:org/springframework/aop/config/aopNamespaceHandlerScopeTests.xml"});
@@ -44,6 +47,7 @@ public class AopNamespaceHandlerScopeTests extends TestCase {
 		this.context = wac;
 	}
 
+	@Test
 	public void testRequestScoping() throws Exception {
 		MockHttpServletRequest oldRequest = new MockHttpServletRequest();
 		MockHttpServletRequest newRequest = new MockHttpServletRequest();
@@ -71,6 +75,7 @@ public class AopNamespaceHandlerScopeTests extends TestCase {
 		assertTrue("Should have advisors", ((Advised) scoped).getAdvisors().length > 0);
 	}
 
+	@Test
 	public void testSessionScoping() throws Exception {
 		MockHttpSession oldSession = new MockHttpSession();
 		MockHttpSession newSession = new MockHttpSession();

org.springframework.testsuite/src/test/java/org/springframework/aop/config/AopNamespaceHandlerTests.java

@@ -16,7 +16,10 @@
 
 package org.springframework.aop.config;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
+
+import org.junit.Before;
+import org.junit.Test;
 import org.springframework.aop.Advisor;
 import org.springframework.aop.framework.Advised;
 import org.springframework.aop.framework.CountingBeforeAdvice;
@@ -28,10 +31,11 @@ import org.springframework.context.support.ClassPathXmlApplicationContext;
 /**
  * @author Rob Harrop
  */
-public class AopNamespaceHandlerTests extends TestCase {
+public class AopNamespaceHandlerTests {
 
 	private ApplicationContext context;
 
+	@Before
 	public void setUp() {
 		this.context = new ClassPathXmlApplicationContext(getConfigLocation());
 	}
@@ -40,6 +44,7 @@ public class AopNamespaceHandlerTests extends TestCase {
 		return "org/springframework/aop/config/aopNamespaceHandlerTests.xml";
 	}
 
+	@Test
 	public void testIsProxy() throws Exception {
 		ITestBean bean = getTestBean();
 
@@ -52,6 +57,7 @@ public class AopNamespaceHandlerTests extends TestCase {
 		assertTrue("Advisors should not be empty", advisors.length > 0);
 	}
 
+	@Test
 	public void testAdviceInvokedCorrectly() throws Exception {
 		CountingBeforeAdvice getAgeCounter = (CountingBeforeAdvice) this.context.getBean("getAgeCounter");
 		CountingBeforeAdvice getNameCounter = (CountingBeforeAdvice) this.context.getBean("getNameCounter");
@@ -72,6 +78,7 @@ public class AopNamespaceHandlerTests extends TestCase {
 		assertEquals("Incorrect getName count on getAge counter", 0, getAgeCounter.getCalls("getName"));
 	}
 
+	@Test
 	public void testAspectApplied() throws Exception {
 		ITestBean testBean = getTestBean();
 

org.springframework.testsuite/src/test/java/org/springframework/aop/config/AopNamespaceHandlerThrowingTests.java

@@ -16,8 +16,9 @@
 
 package org.springframework.aop.config;
 
-import junit.framework.TestCase;
+import static org.junit.Assert.*;
 
+import org.junit.Test;
 import org.springframework.beans.ITestBean;
 import org.springframework.beans.factory.BeanDefinitionStoreException;
 import org.springframework.context.ApplicationContext;
@@ -27,7 +28,7 @@ import org.xml.sax.SAXParseException;
 /**
  * @author Adrian Colyer
  */
-public class AopNamespaceHandlerThrowingTests extends TestCase {
+public class AopNamespaceHandlerThrowingTests {
 
 	private ApplicationContext context;
 
@@ -39,10 +40,12 @@ public class AopNamespaceHandlerThrowingTests extends TestCase {
 		return "org/springframework/aop/config/aopNamespaceHandlerThrowingErrorTests.xml";
 	}
 
+	@Test
 	public void testThrowingOnThrowingAdvice() {
 		this.context = new ClassPathXmlApplicationContext(getOKConfigLocation());
 	}
 	
+	@Test
 	public void testParseThrowingOnOtherAdviceType() {
 		try {
 			this.context = new ClassPathXmlApplicationContext(getErrorConfigLocation());

org.springframework.testsuite/src/test/java/org/springframework/aop/config/MethodLocatingFactoryBeanTests.java

@@ -16,10 +16,12 @@
 
 package org.springframework.aop.config;
 
+import static org.junit.Assert.*;
+
 import java.lang.reflect.Method;
 
-import junit.framework.TestCase;
 import org.easymock.MockControl;
+import org.junit.Test;
 
 import org.springframework.beans.factory.BeanFactory;
 import org.springframework.mock.easymock.AbstractScalarMockTemplate;
@@ -28,21 +30,24 @@ import org.springframework.test.AssertThrows;
 /**
  * @author Rick Evans
  */
-public final class MethodLocatingFactoryBeanTests extends TestCase {
+public final class MethodLocatingFactoryBeanTests {
 
 	private static final String BEAN_NAME = "string";
 
 
+	@Test
 	public void testIsSingleton() throws Exception {
 		MethodLocatingFactoryBean factory = new MethodLocatingFactoryBean();
 		assertTrue(factory.isSingleton());
 	}
 
+	@Test
 	public void testGetObjectType() throws Exception {
 		MethodLocatingFactoryBean factory = new MethodLocatingFactoryBean();
 		assertEquals(Method.class, factory.getObjectType());
 	}
 
+	@Test
 	public void testWithNullTargetBeanName() throws Exception {
 		new BeanFactoryScalarMockTemplate() {
 			public void doTestInternal(final BeanFactory beanFactory) throws Exception {
@@ -57,6 +62,7 @@ public final class MethodLocatingFactoryBeanTests extends TestCase {
 		}.test();
 	}
 
+	@Test
 	public void testWithEmptyTargetBeanName() throws Exception {
 		new BeanFactoryScalarMockTemplate() {
 			public void doTestInternal(final BeanFactory beanFactory) throws Exception {
@@ -72,6 +78,7 @@ public final class MethodLocatingFactoryBeanTests extends TestCase {
 		}.test();
 	}
 
+	@Test
 	public void testWithNullTargetMethodName() throws Exception {
 		new BeanFactoryScalarMockTemplate() {
 			public void doTestInternal(final BeanFactory beanFactory) throws Exception {
@@ -86,6 +93,7 @@ public final class MethodLocatingFactoryBeanTests extends TestCase {
 		}.test();
 	}
 
+	@Test
 	public void testWithEmptyTargetMethodName() throws Exception {
 		new BeanFactoryScalarMockTemplate() {
 			public void doTestInternal(final BeanFactory beanFactory) throws Exception {
@@ -101,6 +109,7 @@ public final class MethodLocatingFactoryBeanTests extends TestCase {
 		}.test();
 	}
 
+	@Test
 	public void testWhenTargetBeanClassCannotBeResolved() throws Exception {
 		new BeanFactoryScalarMockTemplate() {
 			protected void setupBeanFactoryExpectations(MockControl mockControl, BeanFactory beanFactory) throws Exception {
@@ -120,6 +129,7 @@ public final class MethodLocatingFactoryBeanTests extends TestCase {
 		}.test();
 	}
 
+	@Test
 	public void testSunnyDayPath() throws Exception {
 		new BeanFactoryScalarMockTemplate() {
 			protected void setupBeanFactoryExpectations(MockControl mockControl, BeanFactory beanFactory) throws Exception {
@@ -140,6 +150,7 @@ public final class MethodLocatingFactoryBeanTests extends TestCase {
 		}.test();
 	}
 
+	@Test
 	public void testWhereMethodCannotBeResolved() throws Exception {
 		new BeanFactoryScalarMockTemplate() {
 			protected void setupBeanFactoryExpectations(MockControl mockControl, BeanFactory beanFactory) throws Exception {

org.springframework.testsuite/src/test/java/org/springframework/aop/config/PrototypeProxyTests.java

@@ -16,15 +16,15 @@
 
 package org.springframework.aop.config;
 
-import junit.framework.TestCase;
+import org.junit.Test;
-
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * @author Juergen Hoeller
  */
-public class PrototypeProxyTests extends TestCase {
+public class PrototypeProxyTests {
 
+    @Test
 	public void testInjectionBeforeWrappingCheckDoesNotKickInForPrototypeProxy() {
 		new ClassPathXmlApplicationContext("prototypeProxy.xml", getClass());
 	}