moving unit tests from .testsuite -> .aop

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

@@ -0,0 +1,188 @@
+/*
+ * Copyright 2002-2007 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.aop.config;
+
+import static org.junit.Assert.*;
+
+import java.util.HashSet;
+import java.util.Set;
+
+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;
+import org.springframework.beans.factory.parsing.CollectingReaderEventListener;
+import org.springframework.beans.factory.parsing.ComponentDefinition;
+import org.springframework.beans.factory.parsing.CompositeComponentDefinition;
+import org.springframework.beans.factory.support.DefaultListableBeanFactory;
+import org.springframework.beans.factory.xml.XmlBeanDefinitionReader;
+import org.springframework.core.io.ClassPathResource;
+
+/**
+ * @author Rob Harrop
+ * @author Juergen Hoeller
+ */
+public class AopNamespaceHandlerEventTests {
+
+	private CollectingReaderEventListener eventListener = new CollectingReaderEventListener();
+
+	private XmlBeanDefinitionReader reader;
+
+	private DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+
+
+	@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();
+		assertEquals("Incorrect number of events fired", 1, componentDefinitions.length);
+		assertTrue("No holder with nested components", componentDefinitions[0] instanceof CompositeComponentDefinition);
+
+		CompositeComponentDefinition compositeDef = (CompositeComponentDefinition) componentDefinitions[0];
+		assertEquals("aop:config", compositeDef.getName());
+
+		ComponentDefinition[] nestedComponentDefs = compositeDef.getNestedComponents();
+		assertEquals("Incorrect number of inner components", 2, nestedComponentDefs.length);
+		PointcutComponentDefinition pcd = null;
+		for (int i = 0; i < nestedComponentDefs.length; i++) {
+			ComponentDefinition componentDefinition = nestedComponentDefs[i];
+			if (componentDefinition instanceof PointcutComponentDefinition) {
+				pcd = (PointcutComponentDefinition) componentDefinition;
+				break;
+			}
+		}
+		assertNotNull("PointcutComponentDefinition not found", pcd);
+		assertEquals("Incorrect number of BeanDefinitions", 1, pcd.getBeanDefinitions().length);
+	}
+
+	@Test
+	public void testAdvisorEventsWithPointcutRef() throws Exception {
+		loadBeansFrom("aopNamespaceHandlerAdvisorWithPointcutRefEventTests.xml");
+		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
+		assertEquals("Incorrect number of events fired", 2, componentDefinitions.length);
+
+		assertTrue("No holder with nested components", componentDefinitions[0] instanceof CompositeComponentDefinition);
+		CompositeComponentDefinition compositeDef = (CompositeComponentDefinition) componentDefinitions[0];
+		assertEquals("aop:config", compositeDef.getName());
+
+		ComponentDefinition[] nestedComponentDefs = compositeDef.getNestedComponents();
+		assertEquals("Incorrect number of inner components", 3, nestedComponentDefs.length);
+		AdvisorComponentDefinition acd = null;
+		for (int i = 0; i < nestedComponentDefs.length; i++) {
+			ComponentDefinition componentDefinition = nestedComponentDefs[i];
+			if (componentDefinition instanceof AdvisorComponentDefinition) {
+				acd = (AdvisorComponentDefinition) componentDefinition;
+				break;
+			}
+		}
+		assertNotNull("AdvisorComponentDefinition not found", acd);
+		assertEquals(1, acd.getBeanDefinitions().length);
+		assertEquals(2, acd.getBeanReferences().length);
+
+		assertTrue("No advice bean found", componentDefinitions[1] instanceof BeanComponentDefinition);
+		BeanComponentDefinition adviceDef = (BeanComponentDefinition) componentDefinitions[1];
+		assertEquals("countingAdvice", adviceDef.getBeanName());
+	}
+
+	@Test
+	public void testAdvisorEventsWithDirectPointcut() throws Exception {
+		loadBeansFrom("aopNamespaceHandlerAdvisorWithDirectPointcutEventTests.xml");
+		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
+		assertEquals("Incorrect number of events fired", 2, componentDefinitions.length);
+
+		assertTrue("No holder with nested components", componentDefinitions[0] instanceof CompositeComponentDefinition);
+		CompositeComponentDefinition compositeDef = (CompositeComponentDefinition) componentDefinitions[0];
+		assertEquals("aop:config", compositeDef.getName());
+
+		ComponentDefinition[] nestedComponentDefs = compositeDef.getNestedComponents();
+		assertEquals("Incorrect number of inner components", 2, nestedComponentDefs.length);
+		AdvisorComponentDefinition acd = null;
+		for (int i = 0; i < nestedComponentDefs.length; i++) {
+			ComponentDefinition componentDefinition = nestedComponentDefs[i];
+			if (componentDefinition instanceof AdvisorComponentDefinition) {
+				acd = (AdvisorComponentDefinition) componentDefinition;
+				break;
+			}
+		}
+		assertNotNull("AdvisorComponentDefinition not found", acd);
+		assertEquals(2, acd.getBeanDefinitions().length);
+		assertEquals(1, acd.getBeanReferences().length);
+
+		assertTrue("No advice bean found", componentDefinitions[1] instanceof BeanComponentDefinition);
+		BeanComponentDefinition adviceDef = (BeanComponentDefinition) componentDefinitions[1];
+		assertEquals("countingAdvice", adviceDef.getBeanName());
+	}
+
+	@Test
+	public void testAspectEvent() throws Exception {
+		loadBeansFrom("aopNamespaceHandlerAspectEventTests.xml");
+		ComponentDefinition[] componentDefinitions = this.eventListener.getComponentDefinitions();
+		assertEquals("Incorrect number of events fired", 5, componentDefinitions.length);
+
+		assertTrue("No holder with nested components", componentDefinitions[0] instanceof CompositeComponentDefinition);
+		CompositeComponentDefinition compositeDef = (CompositeComponentDefinition) componentDefinitions[0];
+		assertEquals("aop:config", compositeDef.getName());
+
+		ComponentDefinition[] nestedComponentDefs = compositeDef.getNestedComponents();
+		assertEquals("Incorrect number of inner components", 2, nestedComponentDefs.length);
+		AspectComponentDefinition acd = null;
+		for (int i = 0; i < nestedComponentDefs.length; i++) {
+			ComponentDefinition componentDefinition = nestedComponentDefs[i];
+			if (componentDefinition instanceof AspectComponentDefinition) {
+				acd = (AspectComponentDefinition) componentDefinition;
+				break;
+			}
+		}
+
+		assertNotNull("AspectComponentDefinition not found", acd);
+		BeanDefinition[] beanDefinitions = acd.getBeanDefinitions();
+		assertEquals(5, beanDefinitions.length);
+		BeanReference[] beanReferences = acd.getBeanReferences();
+		assertEquals(6, beanReferences.length);
+
+		Set<String> expectedReferences = new HashSet<String>();
+		expectedReferences.add("pc");
+		expectedReferences.add("countingAdvice");
+		for (int i = 0; i < beanReferences.length; i++) {
+			BeanReference beanReference = beanReferences[i];
+			expectedReferences.remove(beanReference.getBeanName());
+		}
+		assertEquals("Incorrect references found", 0, expectedReferences.size());
+
+		for (int i = 1; i < componentDefinitions.length; i++) {
+			assertTrue(componentDefinitions[i] instanceof BeanComponentDefinition);
+		}
+
+		ComponentDefinition[] nestedComponentDefs2 = acd.getNestedComponents();
+		assertEquals("Inner PointcutComponentDefinition not found", 1, nestedComponentDefs2.length);
+		assertTrue(nestedComponentDefs2[0] instanceof PointcutComponentDefinition);
+		PointcutComponentDefinition pcd = (PointcutComponentDefinition) nestedComponentDefs2[0];
+		assertEquals("Incorrect number of BeanDefinitions", 1, pcd.getBeanDefinitions().length);
+	}
+
+	private void loadBeansFrom(String path) {
+		this.reader.loadBeanDefinitions(new ClassPathResource(path, getClass()));
+	}
+
+}

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

@@ -0,0 +1,56 @@
+/*
+ * Copyright 2002-2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.aop.config;
+
+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;
+import org.springframework.core.io.ClassPathResource;
+
+/**
+ * @author Mark Fisher
+ */
+public class AopNamespaceHandlerPointcutErrorTests {
+
+    @Test
+	public void testDuplicatePointcutConfig() {
+		try {
+			new XmlBeanFactory(new ClassPathResource(
+					"org/springframework/aop/config/aopNamespaceHandlerPointcutDuplicationTests.xml"));
+			fail("parsing should have caused a BeanDefinitionStoreException");
+		}
+		catch (BeanDefinitionStoreException ex) {
+			assertTrue(ex.contains(BeanDefinitionParsingException.class));
+		}
+	}
+	
+    @Test
+	public void testMissingPointcutConfig() {
+		try {
+			new XmlBeanFactory(new ClassPathResource(
+					"org/springframework/aop/config/aopNamespaceHandlerPointcutMissingTests.xml"));
+			fail("parsing should have caused a BeanDefinitionStoreException");
+		}
+		catch (BeanDefinitionStoreException ex) {
+			assertTrue(ex.contains(BeanDefinitionParsingException.class));
+		}
+	}
+
+}

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

@@ -0,0 +1,42 @@
+/*
+ * Copyright 2002-2006 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.springframework.aop.config;
+
+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;
+
+/**
+ * Tests that the <aop:config/> element can be used as a top level element.
+ * 
+ * @author Rob Harrop
+ */
+public final class TopLevelAopTagTests {
+
+    @Test
+	public void testParse() throws Exception {
+		DefaultListableBeanFactory beanFactory = new DefaultListableBeanFactory();
+		XmlBeanDefinitionReader reader = new XmlBeanDefinitionReader(beanFactory);
+		reader.loadBeanDefinitions(new ClassPathResource("topLevelAop.xml", getClass()));
+
+		assertTrue(beanFactory.containsBeanDefinition("testPointcut"));
+	}
+
+}

org.springframework.aop/src/test/java/org/springframework/aop/config/aopNamespaceHandlerAdvisorWithDirectPointcutEventTests.xml

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:aop="http://www.springframework.org/schema/aop"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+	<aop:config>
+		<aop:advisor advice-ref="countingAdvice" pointcut="within(org.springframework..*)"/>
+	</aop:config>
+
+	<bean id="countingAdvice" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
+
+</beans>

org.springframework.aop/src/test/java/org/springframework/aop/config/aopNamespaceHandlerAdvisorWithPointcutRefEventTests.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:aop="http://www.springframework.org/schema/aop"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+	<aop:config>
+		<aop:pointcut id="pc" expression="within(org.springframework..*)"/>
+		<aop:advisor advice-ref="countingAdvice" pointcut-ref="pc"/>
+	</aop:config>
+
+	<bean id="countingAdvice" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
+
+</beans>

org.springframework.aop/src/test/java/org/springframework/aop/config/aopNamespaceHandlerAspectEventTests.xml

@@ -0,0 +1,27 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:aop="http://www.springframework.org/schema/aop"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+	<aop:config>
+		<aop:aspect id="countAgeCalls" ref="countingAdvice">
+			<aop:pointcut id="pc" expression="execution(* getAge())"/>
+			<aop:before pointcut-ref="pc" method="myBeforeAdvice" />
+			<aop:after pointcut-ref="pc" method="myAfterAdvice" />
+			<aop:after-returning pointcut-ref="pc" method="myAfterReturningAdvice" returning="age"/>
+			<aop:after-throwing pointcut-ref="pc" method="myAfterThrowingAdvice" throwing="ex"/>
+			<aop:around pointcut-ref="pc" method="myAroundAdvice"/>
+		</aop:aspect>
+	</aop:config>
+
+	<bean id="getNameCounter" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
+
+	<bean id="getAgeCounter" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
+
+	<bean id="testBean" class="org.springframework.beans.TestBean"/>
+
+	<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>
+
+</beans>

org.springframework.aop/src/test/java/org/springframework/aop/config/aopNamespaceHandlerPointcutDuplicationTests.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:aop="http://www.springframework.org/schema/aop"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+	<aop:config>
+		<aop:aspect id="countAgeCalls" ref="countingAdvice">
+			<aop:pointcut id="pc" expression="execution(* getAge())"/>
+			<aop:before pointcut-ref="pc" pointcut="execution(* getAge())" method="myBeforeAdvice"/>
+		</aop:aspect>
+	</aop:config>
+
+	<bean id="getAgeCounter" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
+
+	<bean id="testBean" class="org.springframework.beans.TestBean"/>
+
+	<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>
+
+</beans>

org.springframework.aop/src/test/java/org/springframework/aop/config/aopNamespaceHandlerPointcutEventTests.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:aop="http://www.springframework.org/schema/aop"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+	<aop:config>
+		<aop:pointcut id="myPointcut" expression="within(org.springframework..*)"/>
+	</aop:config>
+
+</beans>

org.springframework.aop/src/test/java/org/springframework/aop/config/aopNamespaceHandlerPointcutMissingTests.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+		xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		xmlns:aop="http://www.springframework.org/schema/aop"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
+				http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+	<aop:config>
+		<aop:aspect id="countAgeCalls" ref="countingAdvice">
+			<aop:pointcut id="pc" expression="execution(* getAge())"/>
+			<aop:before method="myBeforeAdvice" />
+		</aop:aspect>
+	</aop:config>
+
+	<bean id="getAgeCounter" class="org.springframework.aop.framework.CountingBeforeAdvice"/>
+
+	<bean id="testBean" class="org.springframework.beans.TestBean"/>
+
+	<bean id="countingAdvice" class="org.springframework.aop.config.CountingAspectJAdvice"/>
+
+</beans>

org.springframework.aop/src/test/java/org/springframework/aop/config/topLevelAop.xml

@@ -0,0 +1,12 @@
+<config xmlns="http://www.springframework.org/schema/aop"
+				xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+				xsi:schemaLocation="http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.0.xsd">
+
+	<pointcut id="testPointcut" expression="execution(* foo(..)) and within(springbank.dao.AccountDao+)"/>
+	<pointcut id="testPointcut1" expression="execution(* springbank.dao.AccountDao.foo(..))"/>
+
+	<aspect ref="myAspect">
+		<after method="foo" pointcut-ref="testPointcut"/>
+	</aspect>
+
+</config>