From 42729014b67e8d63e70420f3aa4c058f00b07b45 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Fri, 4 Jan 2013 11:56:26 +0100
Subject: [PATCH] Move namespace tests to root integration module

Prior to this change, spring-beans contained its own META-INF containing
spring.handlers and spring.schemas files in src/main/resources; it also
had files of the same name within src/test/resources/META-INF, causing
'duplicate resource' warnings and confusion in general.

This commit moves the com.foo test package, it's associated namespace
parsing tests and test versions of META-INF files to the root project
and it's src/test integration testing folder.

Issue: SPR-9431
---
 {spring-beans/src => src}/test/java/com/foo/Component.java      | 0
 .../test/java/com/foo/ComponentBeanDefinitionParser.java        | 0
 .../test/java/com/foo/ComponentBeanDefinitionParserTests.java   | 2 +-
 .../src => src}/test/java/com/foo/ComponentFactoryBean.java     | 0
 .../test/java/com/foo/ComponentNamespaceHandler.java            | 0
 .../src => src}/test/resources/META-INF/spring.handlers         | 0
 .../src => src}/test/resources/META-INF/spring.schemas          | 0
 .../src => src}/test/resources/com/foo/component-config.xml     | 0
 {spring-beans/src => src}/test/resources/com/foo/component.xsd  | 0
 9 files changed, 1 insertion(+), 1 deletion(-)
 rename {spring-beans/src => src}/test/java/com/foo/Component.java (100%)
 rename {spring-beans/src => src}/test/java/com/foo/ComponentBeanDefinitionParser.java (100%)
 rename spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java => src/test/java/com/foo/ComponentBeanDefinitionParserTests.java (97%)
 rename {spring-beans/src => src}/test/java/com/foo/ComponentFactoryBean.java (100%)
 rename {spring-beans/src => src}/test/java/com/foo/ComponentNamespaceHandler.java (100%)
 rename {spring-beans/src => src}/test/resources/META-INF/spring.handlers (100%)
 rename {spring-beans/src => src}/test/resources/META-INF/spring.schemas (100%)
 rename {spring-beans/src => src}/test/resources/com/foo/component-config.xml (100%)
 rename {spring-beans/src => src}/test/resources/com/foo/component.xsd (100%)

diff --git a/spring-beans/src/test/java/com/foo/Component.java b/src/test/java/com/foo/Component.java
similarity index 100%
rename from spring-beans/src/test/java/com/foo/Component.java
rename to src/test/java/com/foo/Component.java
diff --git a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java b/src/test/java/com/foo/ComponentBeanDefinitionParser.java
similarity index 100%
rename from spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParser.java
rename to src/test/java/com/foo/ComponentBeanDefinitionParser.java
diff --git a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java b/src/test/java/com/foo/ComponentBeanDefinitionParserTests.java
similarity index 97%
rename from spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
rename to src/test/java/com/foo/ComponentBeanDefinitionParserTests.java
index 97e77c5740..b28d1d4160 100644
--- a/spring-beans/src/test/java/com/foo/ComponentBeanDefinitionParserTest.java
+++ b/src/test/java/com/foo/ComponentBeanDefinitionParserTests.java
@@ -30,7 +30,7 @@ import org.springframework.core.io.ClassPathResource;
 /**
  * @author Costin Leau
  */
-public class ComponentBeanDefinitionParserTest {
+public class ComponentBeanDefinitionParserTests {
 
 	private static DefaultListableBeanFactory bf;
 
diff --git a/spring-beans/src/test/java/com/foo/ComponentFactoryBean.java b/src/test/java/com/foo/ComponentFactoryBean.java
similarity index 100%
rename from spring-beans/src/test/java/com/foo/ComponentFactoryBean.java
rename to src/test/java/com/foo/ComponentFactoryBean.java
diff --git a/spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java b/src/test/java/com/foo/ComponentNamespaceHandler.java
similarity index 100%
rename from spring-beans/src/test/java/com/foo/ComponentNamespaceHandler.java
rename to src/test/java/com/foo/ComponentNamespaceHandler.java
diff --git a/spring-beans/src/test/resources/META-INF/spring.handlers b/src/test/resources/META-INF/spring.handlers
similarity index 100%
rename from spring-beans/src/test/resources/META-INF/spring.handlers
rename to src/test/resources/META-INF/spring.handlers
diff --git a/spring-beans/src/test/resources/META-INF/spring.schemas b/src/test/resources/META-INF/spring.schemas
similarity index 100%
rename from spring-beans/src/test/resources/META-INF/spring.schemas
rename to src/test/resources/META-INF/spring.schemas
diff --git a/spring-beans/src/test/resources/com/foo/component-config.xml b/src/test/resources/com/foo/component-config.xml
similarity index 100%
rename from spring-beans/src/test/resources/com/foo/component-config.xml
rename to src/test/resources/com/foo/component-config.xml
diff --git a/spring-beans/src/test/resources/com/foo/component.xsd b/src/test/resources/com/foo/component.xsd
similarity index 100%
rename from spring-beans/src/test/resources/com/foo/component.xsd
rename to src/test/resources/com/foo/component.xsd