From b0711f48c70e5c02150d012a73235f0a70d0c76e Mon Sep 17 00:00:00 2001
From: Arjen Poutsma <apoutsma@vmware.com>
Date: Wed, 29 Oct 2008 18:08:07 +0000
Subject: [PATCH] Moved tests from testsuite to beans

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@200 50f2f4bb-b051-0410-bef5-90022cba6387
---
 .../CollectingReaderEventListener.java        | 86 +++++++++++++++++++
 .../xml/DefaultLifecycleMethodsTests.java     |  0
 .../factory/xml/EventPublicationTests.java    |  0
 .../beans/factory/xml/beanEvents.xml          | 34 ++++++++
 .../beans/factory/xml/beanEventsImported.xml  |  6 ++
 .../factory/xml/defaultLifecycleMethods.xml   | 14 +++
 .../xml/ignoreDefaultLifecycleMethods.xml     |  8 ++
 7 files changed, 148 insertions(+)
 create mode 100644 org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
 rename {org.springframework.testsuite => org.springframework.beans}/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.beans}/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java (100%)
 create mode 100644 org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
 create mode 100644 org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml
 create mode 100644 org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml
 create mode 100644 org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml

diff --git a/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
new file mode 100644
index 00000000000..e2bfda3f1d6
--- /dev/null
+++ b/org.springframework.beans/src/test/java/org/springframework/beans/factory/parsing/CollectingReaderEventListener.java
@@ -0,0 +1,86 @@
+/*
+ * 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.beans.factory.parsing;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+
+import org.springframework.core.CollectionFactory;
+
+/**
+ * @author Rob Harrop
+ * @author Juergen Hoeller
+ */
+public class CollectingReaderEventListener implements ReaderEventListener {
+
+	private final List defaults = new LinkedList();
+
+	private final Map componentDefinitions = CollectionFactory.createLinkedMapIfPossible(8);
+
+	private final Map aliasMap = CollectionFactory.createLinkedMapIfPossible(8);
+
+	private final List imports = new LinkedList();
+
+
+	public void defaultsRegistered(DefaultsDefinition defaultsDefinition) {
+		this.defaults.add(defaultsDefinition);
+	}
+
+	public List getDefaults() {
+		return Collections.unmodifiableList(this.defaults);
+	}
+
+	public void componentRegistered(ComponentDefinition componentDefinition) {
+		this.componentDefinitions.put(componentDefinition.getName(), componentDefinition);
+	}
+
+	public ComponentDefinition getComponentDefinition(String name) {
+		return (ComponentDefinition) this.componentDefinitions.get(name);
+	}
+
+	public ComponentDefinition[] getComponentDefinitions() {
+		Collection collection = this.componentDefinitions.values();
+		return (ComponentDefinition[]) collection.toArray(new ComponentDefinition[collection.size()]);
+	}
+
+	public void aliasRegistered(AliasDefinition aliasDefinition) {
+		List aliases = (List) this.aliasMap.get(aliasDefinition.getBeanName());
+		if(aliases == null) {
+			aliases = new ArrayList();
+			this.aliasMap.put(aliasDefinition.getBeanName(), aliases);
+		}
+		aliases.add(aliasDefinition);
+	}
+
+	public List getAliases(String beanName) {
+		List aliases = (List) this.aliasMap.get(beanName);
+		return aliases == null ? null : Collections.unmodifiableList(aliases);
+	}
+
+	public void importProcessed(ImportDefinition importDefinition) {
+		this.imports.add(importDefinition);
+	}
+
+	public List getImports() {
+		return Collections.unmodifiableList(this.imports);
+	}
+
+}
\ No newline at end of file
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/DefaultLifecycleMethodsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java b/org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
rename to org.springframework.beans/src/test/java/org/springframework/beans/factory/xml/EventPublicationTests.java
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
new file mode 100644
index 00000000000..110eb1ebaff
--- /dev/null
+++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEvents.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans default-lazy-init="true" default-autowire="constructor" default-dependency-check="objects"
+		default-init-method="myInit" default-destroy-method="myDestroy" default-merge="true">
+
+	<import resource="beanEventsImported.xml"/>
+
+	<alias name="testBean" alias="testBeanAlias1"/>
+
+	<alias name="testBean" alias="testBeanAlias2"/>
+
+	<bean id="testBean" class="org.springframework.beans.TestBean">
+		<constructor-arg type="java.lang.String" value="Rob Harrop"/>
+		<property name="friends">
+			<ref bean="testBean2"/>
+		</property>
+		<property name="doctor">
+			<bean class="org.springframework.beans.NestedTestBean">
+				<constructor-arg type="java.lang.String" value="ACME"/>
+			</bean>
+		</property>
+	</bean>
+
+	<bean id="testBean2" class="org.springframework.beans.TestBean">
+		<property name="name" value="Juergen Hoeller"/>
+		<property name="spouse">
+			<bean class="org.springframework.beans.TestBean">
+				<property name="name" value="Eva Schallmeiner"/>
+			</bean>
+		</property>
+	</bean>
+
+</beans>
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml
new file mode 100644
index 00000000000..bdfc3c4c31e
--- /dev/null
+++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/beanEventsImported.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans>
+
+</beans>
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml
new file mode 100644
index 00000000000..635df1adc85
--- /dev/null
+++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/defaultLifecycleMethods.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans default-init-method="init" default-destroy-method="destroy">
+
+	<bean id="lifecycleAware" class="org.springframework.beans.factory.xml.DefaultLifecycleMethodsTests$LifecycleAwareBean"/>
+
+	<bean id="lifecycleMethodsDisabled" class="org.springframework.beans.factory.xml.DefaultLifecycleMethodsTests$LifecycleAwareBean"
+			init-method="" destroy-method=""/>
+
+	<bean id="overrideLifecycleMethods" class="org.springframework.beans.factory.xml.DefaultLifecycleMethodsTests$LifecycleAwareBean"
+			init-method="customInit" destroy-method="customDestroy"/>
+
+</beans>
diff --git a/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml
new file mode 100644
index 00000000000..a10029da323
--- /dev/null
+++ b/org.springframework.beans/src/test/resources/org/springframework/beans/factory/xml/ignoreDefaultLifecycleMethods.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN 2.0//EN" "http://www.springframework.org/dtd/spring-beans-2.0.dtd">
+
+<beans default-init-method="foo" default-destroy-method="bar">
+
+	<bean id="foo" class="org.springframework.beans.factory.xml.DefaultLifecycleMethodsTests$LifecycleAwareBean"/>
+
+</beans>