Fixed Xml/AnnotationBeanConfigurerTests after AbstractBeanConfigurerTests removal

spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/ShouldBeConfiguredBySpring.java

@@ -0,0 +1,37 @@
+/*
+ * Copyright 2002-2014 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.beans.factory.aspectj;
+
+import java.io.Serializable;
+
+import org.springframework.beans.factory.annotation.Configurable;
+
+@Configurable("configuredBean")
+@SuppressWarnings("serial")
+public class ShouldBeConfiguredBySpring implements Serializable {
+
+	private String name;
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+}

spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/XmlBeanConfigurerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -16,23 +16,22 @@
 
 package org.springframework.beans.factory.aspectj;
 
-import org.springframework.context.ConfigurableApplicationContext;
+import org.junit.Assert;
+import org.junit.Test;
+
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
 /**
  * @author Chris Beams
  */
-public class XmlBeanConfigurerTests extends AbstractBeanConfigurerTests {
+public class XmlBeanConfigurerTests {
-
-	@Override
-	protected ConfigurableApplicationContext createContext() {
-		return new ClassPathXmlApplicationContext("org/springframework/beans/factory/aspectj/beanConfigurerTests.xml");
-	}
 
-	public void testInjectionAfterRefresh() {
+	@Test
-		context.refresh();
+	public void testInjection() {
+		ClassPathXmlApplicationContext context = new ClassPathXmlApplicationContext(
+				"org/springframework/beans/factory/aspectj/beanConfigurerTests.xml");
 		ShouldBeConfiguredBySpring myObject = new ShouldBeConfiguredBySpring();
-		assertEquals("Rod", myObject.getName());
+		Assert.assertEquals("Rod", myObject.getName());
 	}
 
 }

spring-aspects/src/test/java/org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml

@@ -1,64 +1,10 @@
 <?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:context="http://www.springframework.org/schema/context"
+		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd">
-		xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-				http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">
 
-	<bean class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$WireArbitraryExistingPojo"
+	<bean id="configuredBean" class="org.springframework.beans.factory.aspectj.ShouldBeConfiguredBySpring" lazy-init="true">
-			factory-method="aspectOf"/>
-
-	<bean id="beanOne" class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$ShouldBeConfiguredBySpring"
-			lazy-init="true">
 		<property name="name" value="Rod"/>
 	</bean>
 
-	<bean class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$ShouldBeConfiguredBySpringUsingTypeNameAsBeanName"
-			lazy-init="true">
-		<property name="name" value="Rob"/>
-	</bean>
-
-	<bean class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$SubBean"
-			lazy-init="true">
-		<property name="name" value="Ramnivas"/>
-	</bean>
-
-	<bean class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$SubBeanPreConstruction"
-			lazy-init="true">
-		<property name="name" value="Ramnivas"/>
-	</bean>
-
-	<bean class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$SubSerializableBean"
-			lazy-init="true">
-		<property name="name" value="Ramnivas"/>
-	</bean>
-
-	<bean id="circular" class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$CircularFactoryBean"
-			autowire-candidate="false"/>
-
-	<!-- Used as a target for autowiring by type -->
-	<bean id="ramnivas" class="org.springframework.tests.sample.beans.TestBean" depends-on="circular">
-		<property name="name" value="Ramnivas"/>
-		<property name="spouse" ref="circular"/>
-	</bean>
-
-	<bean class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$ArbitraryExistingPojo">
-		<property name="friend" ref="ramnivas"/>
-	</bean>
-
-	<bean class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$PreConstructionConfiguredBean">
-		<property name="name" value="ramnivas"/>
-	</bean>
-
-	<bean class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$PostConstructionConfiguredBean">
-		<property name="name" value="ramnivas"/>
-	</bean>
-
-	<bean class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$GenericParameterConfigurableBean" scope="prototype">
-		<property name="testService" ref="testService"/>
-	</bean>
-
-	<bean id="testService" class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$TestService"/>
-	<bean id="paymentService" class="org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests$PaymentService"/>
-
 </beans>

spring-aspects/src/test/java/org/springframework/context/annotation/aspectj/AnnotationBeanConfigurerTests.java

@@ -1,5 +1,5 @@
 /*
- * Copyright 2002-2012 the original author or authors.
+ * Copyright 2002-2014 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.
@@ -16,31 +16,36 @@
 
 package org.springframework.context.annotation.aspectj;
 
-import org.springframework.beans.factory.aspectj.AbstractBeanConfigurerTests;
+import org.junit.Assert;
-import org.springframework.context.ConfigurableApplicationContext;
+import org.junit.Test;
+
+import org.springframework.beans.factory.aspectj.ShouldBeConfiguredBySpring;
 import org.springframework.context.annotation.AnnotationConfigApplicationContext;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.context.annotation.ImportResource;
-import org.springframework.context.annotation.aspectj.EnableSpringConfigured;
 
 /**
  * Tests that @EnableSpringConfigured properly registers an
- * {@link org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect}, just
+ * {@link org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect},
- * as does {@code <context:spring-configured>}
+ * just as does {@code <context:spring-configured>}.
  *
  * @author Chris Beams
  * @since 3.1
  */
-public class AnnotationBeanConfigurerTests extends AbstractBeanConfigurerTests {
+public class AnnotationBeanConfigurerTests {
 
-	@Override
+	@Test
-	protected ConfigurableApplicationContext createContext() {
+	public void testInjection() {
-		return new AnnotationConfigApplicationContext(Config.class);
+		AnnotationConfigApplicationContext context = new  AnnotationConfigApplicationContext(Config.class);
+		ShouldBeConfiguredBySpring myObject = new ShouldBeConfiguredBySpring();
+		Assert.assertEquals("Rod", myObject.getName());
 	}
 
+
 	@Configuration
 	@ImportResource("org/springframework/beans/factory/aspectj/beanConfigurerTests-beans.xml")
 	@EnableSpringConfigured
 	static class Config {
 	}
+
 }