From 761b389ad87f999e48bcd15d5d3dc3e5a7cd3bc9 Mon Sep 17 00:00:00 2001
From: Chris Beams <cbeams@vmware.com>
Date: Wed, 17 Dec 2008 07:32:58 +0000
Subject: [PATCH] moving .test.* unit tests from .testsuite -> .test

git-svn-id: https://src.springframework.org/svn/spring-framework/trunk@449 50f2f4bb-b051-0410-bef5-90022cba6387
---
 org.springframework.context/.classpath.swp    | Bin 16384 -> 0 bytes
 org.springframework.context/.ivy.xml.swp      | Bin 16384 -> 0 bytes
 org.springframework.test/.classpath           |   2 +
 org.springframework.test/ivy.xml              |   1 +
 .../org/springframework/beans/Colour.java     |  35 ++
 .../org/springframework/beans/Employee.java   |  39 ++
 .../beans/INestedTestBean.java                |  23 +
 .../org/springframework/beans/IOther.java     |  24 +
 .../org/springframework/beans/ITestBean.java  |  71 +++
 .../beans/IndexedTestBean.java                | 145 ++++++
 .../springframework/beans/NestedTestBean.java |  60 +++
 .../java/org/springframework/beans/Pet.java   |  54 +++
 .../org/springframework/beans/TestBean.java   | 437 ++++++++++++++++++
 ...stractSpr3350SingleSpringContextTests.java |   0
 ...ingleSpringContextTests-context.properties |   0
 ...sBasedSpr3350SingleSpringContextTests.java |   0
 ...DependencyInjectionSpringContextTests.java |   0
 .../test/Spr3264SingleSpringContextTests.java |   0
 ...pr3350SingleSpringContextTests-context.xml |   0
 ...lBasedSpr3350SingleSpringContextTests.java |   0
 ...otationAwareTransactionalTests-context.xml |   0
 ...alueAnnotationAwareTransactionalTests.java |   0
 .../SpringRunnerContextCacheTests.java        |   0
 .../test/context/TestContextManagerTests.java |   0
 .../context/TestExecutionListenersTests.java  |   0
 ...ionalJUnit38SpringContextTests-context.xml |   0
 ...ransactionalJUnit38SpringContextTests.java |   0
 ...lingBeforeAndAfterMethodsTests-context.xml |   0
 .../FailingBeforeAndAfterMethodsTests.java    |   0
 ...ProfileValueJUnit38SpringContextTests.java |   0
 .../RepeatedJUnit38SpringContextTests.java    |   0
 ...athSpringJUnit4ClassRunnerAppCtxTests.java |   0
 ...bstractTransactionalSpringRunnerTests.java |   0
 ...fterTransactionAnnotationTests-context.xml |   0
 ...oreAndAfterTransactionAnnotationTests.java |   0
 .../ClassLevelDisabledSpringRunnerTests.java  |   0
 ...TransactionalSpringRunnerTests-context.xml |   0
 ...ssLevelTransactionalSpringRunnerTests.java |   0
 ...rceSpringJUnit4ClassRunnerAppCtxTests.java |   0
 ...tionalJUnit4SpringContextTests-context.xml |   0
 ...TransactionalJUnit4SpringContextTests.java |   0
 ...TransactionalSpringRunnerTests-context.xml |   0
 ...ckFalseTransactionalSpringRunnerTests.java |   0
 ...TransactionalSpringRunnerTests-context.xml |   0
 ...ackTrueTransactionalSpringRunnerTests.java |   0
 .../EnabledAndIgnoredSpringRunnerTests.java   |   0
 ...lingBeforeAndAfterMethodsTests-context.xml |   0
 .../FailingBeforeAndAfterMethodsTests.java    |   0
 ...edProfileValueSourceSpringRunnerTests.java |   0
 ...figSpringJUnit4ClassRunnerAppCtxTests.java |   0
 ...TransactionalSpringRunnerTests-context.xml |   0
 ...odLevelTransactionalSpringRunnerTests.java |   0
 ...gJUnit4ClassRunnerAppCtxTests-context1.xml |   0
 ...gJUnit4ClassRunnerAppCtxTests-context2.xml |   0
 ...gJUnit4ClassRunnerAppCtxTests-context3.xml |   0
 ...cesSpringJUnit4ClassRunnerAppCtxTests.java |   0
 ...erizedDependencyInjectionTests-context.xml |   0
 ...ParameterizedDependencyInjectionTests.java |   0
 ...4ClassRunnerAppCtxTests-context.properties |   0
 ...sedSpringJUnit4ClassRunnerAppCtxTests.java |   0
 ...athSpringJUnit4ClassRunnerAppCtxTests.java |   0
 ...TransactionalSpringRunnerTests-context.xml |   0
 ...ckFalseTransactionalSpringRunnerTests.java |   0
 ...TransactionalSpringRunnerTests-context.xml |   0
 ...ackTrueTransactionalSpringRunnerTests.java |   0
 ...ngJUnit4ClassRunnerAppCtxTests-context.xml |   0
 .../SpringJUnit4ClassRunnerAppCtxTests.java   |   0
 .../junit4/SpringJUnit4ClassRunnerTests.java  |   0
 .../junit4/SpringJUnit4SuiteTests.java        |   0
 ...andardJUnit4FeaturesSpringRunnerTests.java |   0
 .../junit4/StandardJUnit4FeaturesTests.java   |   0
 .../TimedTransactionalSpringRunnerTests.java  |   0
 ...DefaultLocationsInheritedTests-context.xml |   0
 ...rridingDefaultLocationsInheritedTests.java |   0
 ...ridingExplicitLocationsInheritedTests.java |   0
 .../DefaultLocationsBaseTests-context.xml     |   0
 .../spr3896/DefaultLocationsBaseTests.java    |   0
 ...DefaultLocationsInheritedTests-context.xml |   0
 .../DefaultLocationsInheritedTests.java       |   0
 .../spr3896/ExplicitLocationsBaseTests.java   |   0
 .../ExplicitLocationsInheritedTests.java      |   0
 .../junit4/spr3896/Spr3896SuiteTests.java     |   0
 .../junit4/transactionalTests-context.xml     |   0
 ...edGenericXmlContextLoaderTests-context.xml |   0
 ...ustomizedGenericXmlContextLoaderTests.java |   0
 ...mlContextLoaderResourceLocationsTests.java |   0
 ...tionalTestNGSpringContextTests-context.xml |   0
 ...ransactionalTestNGSpringContextTests_.java |   0
 ...tionalTestNGSpringContextTests-context.xml |   0
 ...ransactionalTestNGSpringContextTests_.java |   0
 ...lingBeforeAndAfterMethodsTests-context.xml |   0
 .../FailingBeforeAndAfterMethodsTests.java    |   0
 .../test/jdbc/JdbcTestUtilsTests.java         |   0
 .../transaction/TransactionTestUtils.java     |   0
 .../test/util/ReflectionTestUtilsTests.java   |   0
 .../util/subpackage/PersistentEntity.java     |   0
 .../test/util/subpackage/Person.java          |   0
 org.springframework.testsuite/.classpath.swp  | Bin 16384 -> 0 bytes
 org.springframework.testsuite/.ivy.xml.swp    | Bin 16384 -> 0 bytes
 99 files changed, 891 insertions(+)
 delete mode 100644 org.springframework.context/.classpath.swp
 delete mode 100644 org.springframework.context/.ivy.xml.swp
 create mode 100644 org.springframework.test/src/test/java/org/springframework/beans/Colour.java
 create mode 100644 org.springframework.test/src/test/java/org/springframework/beans/Employee.java
 create mode 100644 org.springframework.test/src/test/java/org/springframework/beans/INestedTestBean.java
 create mode 100644 org.springframework.test/src/test/java/org/springframework/beans/IOther.java
 create mode 100644 org.springframework.test/src/test/java/org/springframework/beans/ITestBean.java
 create mode 100644 org.springframework.test/src/test/java/org/springframework/beans/IndexedTestBean.java
 create mode 100644 org.springframework.test/src/test/java/org/springframework/beans/NestedTestBean.java
 create mode 100644 org.springframework.test/src/test/java/org/springframework/beans/Pet.java
 create mode 100644 org.springframework.test/src/test/java/org/springframework/beans/TestBean.java
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/TestContextManagerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/InheritedConfigSpringJUnit4ClassRunnerAppCtxTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/RelativePathSpringJUnit4ClassRunnerAppCtxTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesSpringRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests_.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests_.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/util/subpackage/PersistentEntity.java (100%)
 rename {org.springframework.testsuite => org.springframework.test}/src/test/java/org/springframework/test/util/subpackage/Person.java (100%)
 delete mode 100644 org.springframework.testsuite/.classpath.swp
 delete mode 100644 org.springframework.testsuite/.ivy.xml.swp

diff --git a/org.springframework.context/.classpath.swp b/org.springframework.context/.classpath.swp
deleted file mode 100644
index 874d80f7df2c2b7a47d9dd47a0ff1f18d37472d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
zcmeHO&5ztP6nD#KfdVQ*<v0Y1+c-P3yWL9cY_(bq>Q>N|N?Qb%*2#EgGMmJao$Ln(
z{tZ+FH||KBIKUN&1AhSG$ccL|T!3dMnPfK~Gn1XIgw~O)*&YAv_xyV=w%@bIT6wtp
zaccv25j<}q#J|10`|B@%UD|kxkZn=o30YD9>=Wk;>SLGL#H~Yq8Fy%Y%J{x10`B-D
z!6I%`GhjR%GS^|r*X<!E9zB#e#z#2DPQSx8^Fw+Rn%H)U5CI9tbz*g$W<WC#g~RsE
zt7x^`S$WTRxAoSw2bvSjfM!55pc&8%Xa+O`ngPv#X5fM`5C)ggzcA*@P_9F{l$7V-
z^D2~glK<gDKbir}fM!55pc&8%Xa+O`ngPv#W<WEb8PE*;PZ=Nsg#H2DeHr+}`M=Bo
z{Qd?)zd`vLiUs8wl%HQmD1dSu%1@9Ou%PU{hS1|z5n6u*p&zdx^yFoPK7R?JA6`W0
zZ7A=*fY8SCkVAlE!r#!pl;KG^7xuZbIlZw!{g5BG_8ouFGY$whTJjo0&)9wV*`uB9
zo!fnLLJr6gKJr}51KYHjmt2F0uT0>R)g9cyD>FcC1%ig$Ft^a+s)U^Qg4m(M{3=O#
zNUcgaU{0-8Jhqq#^E4H?HcOQs3l%v%8qpI_E*ue3AMUeMSSt?!dsSO32L!bMsH|2`
zPp-{U<!AJydNiVE;)yD?WL2%V03c_bdK%6uCmXILzVXXKCsx&PWz}k(^#RaUfH|yw
zRypZ#GkFVISGqdm#C9oW_S&R4=%i9jd@dsc%FWISOjoP8GY`0(f}7Yvy@!#HVX~zh
zE}V&ySF?zLn{2U~<wmM(kb6}ZBvD>+W7dS);UTp!5ndTHryy_(&hwZr%r5TY)dd=~
zRfAgJdbawcKA7qC4CtGiwsWFue)&tG2d;AZVoY7P=qQ#LgEDe*x7JE)fq}TT$tx&b
z$z}sOCXv7+&e*|mQAio6gV)Pvh(dqx-T`!`L!Y-6shu)y8o2R<M^*(vaaF}aDH&9N
zITp$(w%ibN%E^Y?aG~^Rh~rL%pb^FP$aP8<O$8e!wOzSz6xGgSz+2_wB3JIJox*uZ
zPASPWDDwcAw=Kt~#I~srJaVb%8AIX<Y9!%+;C31gR9t`Nv~&x9=AP9oaXwuW7L;}z
zM?i3+I~}t0PHMYOASj*;LhO>rx5sc-9N)Ruf3&lA_x|?o-Tu9r&J=$v3WF%@86g4R
z3eAv;u&wqWRHTvsr@l8iO)R&}PGx{LtG_tXk$QN<@#oj$RJ&AE7F}+k&07#Uwhm-a
z!u*~A@2Js&*n|y$$)54x{)g?G#;q+R<NrN~)xUxw<9~VP|0l%wPvMX6A-?|x;`>b~
zPawv>12O(C#P}14@jrm_2ekPvZF^y3dOdK>fM!55pcz;q1DobFQCgX*j92({F;CX{
zbcsKgjTb!%V5=Y()S898ESb9?T<!XZAG*A_)s4UI;thPGq7pX1P+7YHmV2z`{b$?U
zR8AS&HK}d2#UtX_WA=V=5GQIOwNaKP&0}D^GJ93G;m^aDATT2!6}%t;bP!?cF@B6a
z$oks?Tg2X%KY}bOR}EDuy9FA|kyES|rjlN{pKRi4=)!uXbgG8RjtkN$%}Yc8>9f-O
z<FpbVQUW_-NH*VqoY}qpNB!+j`b7qF-6bs`sLr*hRPoI5m*b0&M;@dr8_gIjAg=3>
z(h~?Zs2o5YD^!d<gXL11Rl)S>jtic08Zf8i)GHLclJXg|3<-!mhSWlmDlOOT1O}47
zqY=bN>O`V6Lk;d!+CpVsW~ZS}Hm<NhselG5WhBbHQG?SAX}n3~J0&wyR<#ECx02Jx
zDWI(YN_?Fcon1~k+)Q4RnItA3{Gj|eV`~2x(SfO?vtDaQ1qAnyz?m#0{;_oNDK|Ma
HfSmsThX%k4

diff --git a/org.springframework.context/.ivy.xml.swp b/org.springframework.context/.ivy.xml.swp
deleted file mode 100644
index 1bb97904129e9a1b3ae22e4a0dcfca24434c73ea..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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
CWM!fN

diff --git a/org.springframework.test/.classpath b/org.springframework.test/.classpath
index 62b0d07af7e..f35ec27145a 100644
--- a/org.springframework.test/.classpath
+++ b/org.springframework.test/.classpath
@@ -25,6 +25,8 @@
 	<classpathentry kind="var" path="IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-1.1.2.jar" sourcepath="/IVY_CACHE/org.apache.taglibs/com.springsource.org.apache.taglibs.standard/1.1.2/com.springsource.org.apache.taglibs.standard-sources-1.1.2.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/org.aspectj/com.springsource.org.aspectj.weaver/1.6.2.RELEASE/com.springsource.org.aspectj.weaver-1.6.2.RELEASE.jar"/>
 	<classpathentry kind="var" path="IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-2.1.0.jar" sourcepath="/IVY_CACHE/javax.el/com.springsource.javax.el/2.1.0/com.springsource.javax.el-sources-2.1.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.collections/3.2.0/com.springsource.org.apache.commons.collections-3.2.0.jar" sourcepath="/IVY_CACHE/org.apache.commons/com.springsource.org.apache.commons.collections/3.2.0/com.springsource.org.apache.commons.collections-sources-3.2.0.jar"/>
+	<classpathentry kind="var" path="IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-1.8.0.9.jar" sourcepath="/IVY_CACHE/org.hsqldb/com.springsource.org.hsqldb/1.8.0.9/com.springsource.org.hsqldb-sources-1.8.0.9.jar"/>
 	<classpathentry combineaccessrules="false" kind="src" path="/org.springframework.orm"/>
 	<classpathentry kind="output" path="target/classes"/>
 </classpath>
diff --git a/org.springframework.test/ivy.xml b/org.springframework.test/ivy.xml
index 5c3adb67d20..3b019fcdae0 100644
--- a/org.springframework.test/ivy.xml
+++ b/org.springframework.test/ivy.xml
@@ -41,6 +41,7 @@
 		<dependency org="org.springframework" name="org.springframework.web" rev="latest.integration" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web.portlet" rev="latest.integration" conf="optional->compile"/>
 		<dependency org="org.springframework" name="org.springframework.web.servlet" rev="latest.integration" conf="optional->compile"/>
+		<dependency org="org.hsqldb" name="com.springsource.org.hsqldb" rev="1.8.0.9" conf="test->compile"/>
 	</dependencies>
 
 </ivy-module>
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/Colour.java b/org.springframework.test/src/test/java/org/springframework/beans/Colour.java
new file mode 100644
index 00000000000..60dc333e0b4
--- /dev/null
+++ b/org.springframework.test/src/test/java/org/springframework/beans/Colour.java
@@ -0,0 +1,35 @@
+/*
+ * 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;
+
+import org.springframework.core.enums.ShortCodedLabeledEnum;
+
+/**
+ * @author Rob Harrop
+ */
+public class Colour extends ShortCodedLabeledEnum {
+
+	public static final Colour RED = new Colour(0, "RED");
+	public static final Colour BLUE = new Colour(1, "BLUE");
+	public static final Colour GREEN = new Colour(2, "GREEN");
+	public static final Colour PURPLE = new Colour(3, "PURPLE");
+
+	private Colour(int code, String label) {
+		super(code, label);
+	}
+
+}
\ No newline at end of file
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/Employee.java b/org.springframework.test/src/test/java/org/springframework/beans/Employee.java
new file mode 100644
index 00000000000..923c0041087
--- /dev/null
+++ b/org.springframework.test/src/test/java/org/springframework/beans/Employee.java
@@ -0,0 +1,39 @@
+
+/*
+ * Copyright 2002-2005 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;
+
+public class Employee extends TestBean {
+	
+	private String co;
+
+	/**
+	 * Constructor for Employee.
+	 */
+	public Employee() {
+		super();
+	}
+	
+	public String getCompany() {
+		return co;
+	}
+	
+	public void setCompany(String co) {
+		this.co = co;
+	}
+
+}
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/INestedTestBean.java b/org.springframework.test/src/test/java/org/springframework/beans/INestedTestBean.java
new file mode 100644
index 00000000000..7d87547b5f7
--- /dev/null
+++ b/org.springframework.test/src/test/java/org/springframework/beans/INestedTestBean.java
@@ -0,0 +1,23 @@
+/*
+ * Copyright 2002-2005 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;
+
+public interface INestedTestBean {
+
+	public String getCompany();
+
+}
\ No newline at end of file
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/IOther.java b/org.springframework.test/src/test/java/org/springframework/beans/IOther.java
new file mode 100644
index 00000000000..797486ec44e
--- /dev/null
+++ b/org.springframework.test/src/test/java/org/springframework/beans/IOther.java
@@ -0,0 +1,24 @@
+
+/*
+ * Copyright 2002-2005 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;
+
+public interface IOther {
+
+	void absquatulate();
+
+}
\ No newline at end of file
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/ITestBean.java b/org.springframework.test/src/test/java/org/springframework/beans/ITestBean.java
new file mode 100644
index 00000000000..cdf5ef510dd
--- /dev/null
+++ b/org.springframework.test/src/test/java/org/springframework/beans/ITestBean.java
@@ -0,0 +1,71 @@
+/*
+ * 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;
+
+import java.io.IOException;
+
+/**
+ * Interface used for {@link org.springframework.beans.TestBean}.
+ *
+ * <p>Two methods are the same as on Person, but if this
+ * extends person it breaks quite a few tests..
+ *
+ * @author Rod Johnson
+ * @author Juergen Hoeller
+ */
+public interface ITestBean {
+
+	int getAge();
+
+	void setAge(int age);
+
+	String getName();
+
+	void setName(String name);
+
+	ITestBean getSpouse();
+
+	void setSpouse(ITestBean spouse);
+
+	ITestBean[] getSpouses();
+
+	String[] getStringArray();
+
+	void setStringArray(String[] stringArray);
+
+	/**
+	 * Throws a given (non-null) exception.
+	 */
+	void exceptional(Throwable t) throws Throwable;
+
+	Object returnsThis();
+
+	INestedTestBean getDoctor();
+
+	INestedTestBean getLawyer();
+
+	IndexedTestBean getNestedIndexedBean();
+
+	/**
+	 * Increment the age by one.
+	 * @return the previous age
+	 */
+	int haveBirthday();
+
+	void unreliableFileOperation() throws IOException;
+
+}
\ No newline at end of file
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/IndexedTestBean.java b/org.springframework.test/src/test/java/org/springframework/beans/IndexedTestBean.java
new file mode 100644
index 00000000000..ddb091770ee
--- /dev/null
+++ b/org.springframework.test/src/test/java/org/springframework/beans/IndexedTestBean.java
@@ -0,0 +1,145 @@
+/*
+ * 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.beans;
+
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import java.util.SortedMap;
+import java.util.SortedSet;
+import java.util.TreeSet;
+
+/**
+ * @author Juergen Hoeller
+ * @since 11.11.2003
+ */
+public class IndexedTestBean {
+
+	private TestBean[] array;
+
+	private Collection collection;
+
+	private List list;
+
+	private Set set;
+
+	private SortedSet sortedSet;
+
+	private Map map;
+
+	private SortedMap sortedMap;
+
+
+	public IndexedTestBean() {
+		this(true);
+	}
+
+	public IndexedTestBean(boolean populate) {
+		if (populate) {
+			populate();
+		}
+	}
+
+	public void populate() {
+		TestBean tb0 = new TestBean("name0", 0);
+		TestBean tb1 = new TestBean("name1", 0);
+		TestBean tb2 = new TestBean("name2", 0);
+		TestBean tb3 = new TestBean("name3", 0);
+		TestBean tb4 = new TestBean("name4", 0);
+		TestBean tb5 = new TestBean("name5", 0);
+		TestBean tb6 = new TestBean("name6", 0);
+		TestBean tb7 = new TestBean("name7", 0);
+		TestBean tbX = new TestBean("nameX", 0);
+		TestBean tbY = new TestBean("nameY", 0);
+		this.array = new TestBean[] {tb0, tb1};
+		this.list = new ArrayList();
+		this.list.add(tb2);
+		this.list.add(tb3);
+		this.set = new TreeSet();
+		this.set.add(tb6);
+		this.set.add(tb7);
+		this.map = new HashMap();
+		this.map.put("key1", tb4);
+		this.map.put("key2", tb5);
+		this.map.put("key.3", tb5);
+		List list = new ArrayList();
+		list.add(tbX);
+		list.add(tbY);
+		this.map.put("key4", list);
+	}
+
+
+	public TestBean[] getArray() {
+		return array;
+	}
+
+	public void setArray(TestBean[] array) {
+		this.array = array;
+	}
+
+	public Collection getCollection() {
+		return collection;
+	}
+
+	public void setCollection(Collection collection) {
+		this.collection = collection;
+	}
+
+	public List getList() {
+		return list;
+	}
+
+	public void setList(List list) {
+		this.list = list;
+	}
+
+	public Set getSet() {
+		return set;
+	}
+
+	public void setSet(Set set) {
+		this.set = set;
+	}
+
+	public SortedSet getSortedSet() {
+		return sortedSet;
+	}
+
+	public void setSortedSet(SortedSet sortedSet) {
+		this.sortedSet = sortedSet;
+	}
+
+	public Map getMap() {
+		return map;
+	}
+
+	public void setMap(Map map) {
+		this.map = map;
+	}
+
+	public SortedMap getSortedMap() {
+		return sortedMap;
+	}
+
+	public void setSortedMap(SortedMap sortedMap) {
+		this.sortedMap = sortedMap;
+	}
+
+}
\ No newline at end of file
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/NestedTestBean.java b/org.springframework.test/src/test/java/org/springframework/beans/NestedTestBean.java
new file mode 100644
index 00000000000..a06e15d150b
--- /dev/null
+++ b/org.springframework.test/src/test/java/org/springframework/beans/NestedTestBean.java
@@ -0,0 +1,60 @@
+/*
+ * Copyright 2002-2005 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;
+
+/**
+ * Simple nested test bean used for testing bean factories, AOP framework etc.
+ *
+ * @author Trevor D. Cook
+ * @since 30.09.2003
+ */
+public class NestedTestBean implements INestedTestBean {
+
+	private String company = "";
+
+	public NestedTestBean() {
+	}
+
+	public NestedTestBean(String company) {
+		setCompany(company);
+	}
+
+	public void setCompany(String company) {
+		this.company = (company != null ? company : "");
+	}
+
+	public String getCompany() {
+		return company;
+	}
+
+	public boolean equals(Object obj) {
+		if (!(obj instanceof NestedTestBean)) {
+			return false;
+		}
+		NestedTestBean ntb = (NestedTestBean) obj;
+		return this.company.equals(ntb.company);
+	}
+
+	public int hashCode() {
+		return this.company.hashCode();
+	}
+
+	public String toString() {
+		return "NestedTestBean: " + this.company;
+	}
+
+}
\ No newline at end of file
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/Pet.java b/org.springframework.test/src/test/java/org/springframework/beans/Pet.java
new file mode 100644
index 00000000000..eb78f612fb0
--- /dev/null
+++ b/org.springframework.test/src/test/java/org/springframework/beans/Pet.java
@@ -0,0 +1,54 @@
+/*
+ * 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.beans;
+
+/**
+ * @author Rob Harrop
+ * @since 2.0
+ */
+public class Pet {
+
+	private String name;
+
+	public Pet(String name) {
+		this.name = name;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public String toString() {
+		return getName();
+	}
+
+	public boolean equals(Object o) {
+		if (this == o) return true;
+		if (o == null || getClass() != o.getClass()) return false;
+
+		final Pet pet = (Pet) o;
+
+		if (name != null ? !name.equals(pet.name) : pet.name != null) return false;
+
+		return true;
+	}
+
+	public int hashCode() {
+		return (name != null ? name.hashCode() : 0);
+	}
+
+}
diff --git a/org.springframework.test/src/test/java/org/springframework/beans/TestBean.java b/org.springframework.test/src/test/java/org/springframework/beans/TestBean.java
new file mode 100644
index 00000000000..ef4aef309ea
--- /dev/null
+++ b/org.springframework.test/src/test/java/org/springframework/beans/TestBean.java
@@ -0,0 +1,437 @@
+/*
+ * Copyright 2002-2008 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;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.Map;
+import java.util.Properties;
+import java.util.Set;
+
+import org.springframework.beans.factory.BeanFactory;
+import org.springframework.beans.factory.BeanFactoryAware;
+import org.springframework.beans.factory.BeanNameAware;
+import org.springframework.util.ObjectUtils;
+
+/**
+ * Simple test bean used for testing bean factories, the AOP framework etc.
+ *
+ * @author Rod Johnson
+ * @author Juergen Hoeller
+ * @since 15 April 2001
+ */
+public class TestBean implements BeanNameAware, BeanFactoryAware, ITestBean, IOther, Comparable {
+
+	private String beanName;
+
+	private String country;
+
+	private BeanFactory beanFactory;
+
+	private boolean postProcessed;
+
+	private String name;
+
+	private String sex;
+
+	private int age;
+
+	private boolean jedi;
+
+	private ITestBean[] spouses;
+
+	private String touchy;
+
+	private String[] stringArray;
+
+	private Integer[] someIntegerArray;
+
+	private Date date = new Date();
+
+	private Float myFloat = new Float(0.0);
+
+	private Collection friends = new LinkedList();
+
+	private Set someSet = new HashSet();
+
+	private Map someMap = new HashMap();
+
+	private List someList = new ArrayList();
+
+	private Properties someProperties = new Properties();
+
+	private INestedTestBean doctor = new NestedTestBean();
+
+	private INestedTestBean lawyer = new NestedTestBean();
+
+	private IndexedTestBean nestedIndexedBean;
+
+	private boolean destroyed;
+
+	private Number someNumber;
+
+	private Colour favouriteColour;
+
+	private Boolean someBoolean;
+
+	private List otherColours;
+
+	private List pets;
+
+
+	public TestBean() {
+	}
+
+	public TestBean(String name) {
+		this.name = name;
+	}
+
+	public TestBean(ITestBean spouse) {
+		this.spouses = new ITestBean[] {spouse};
+	}
+
+	public TestBean(String name, int age) {
+		this.name = name;
+		this.age = age;
+	}
+
+	public TestBean(ITestBean spouse, Properties someProperties) {
+		this.spouses = new ITestBean[] {spouse};
+		this.someProperties = someProperties;
+	}
+
+	public TestBean(List someList) {
+		this.someList = someList;
+	}
+
+	public TestBean(Set someSet) {
+		this.someSet = someSet;
+	}
+
+	public TestBean(Map someMap) {
+		this.someMap = someMap;
+	}
+
+	public TestBean(Properties someProperties) {
+		this.someProperties = someProperties;
+	}
+
+
+	public void setBeanName(String beanName) {
+		this.beanName = beanName;
+	}
+
+	public String getBeanName() {
+		return beanName;
+	}
+
+	public void setBeanFactory(BeanFactory beanFactory) {
+		this.beanFactory = beanFactory;
+	}
+
+	public BeanFactory getBeanFactory() {
+		return beanFactory;
+	}
+
+	public void setPostProcessed(boolean postProcessed) {
+		this.postProcessed = postProcessed;
+	}
+
+	public boolean isPostProcessed() {
+		return postProcessed;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getSex() {
+		return sex;
+	}
+
+	public void setSex(String sex) {
+		this.sex = sex;
+		if (this.name == null) {
+			this.name = sex;
+		}
+	}
+
+	public int getAge() {
+		return age;
+	}
+
+	public void setAge(int age) {
+		this.age = age;
+	}
+
+	public boolean isJedi() {
+		return jedi;
+	}
+
+	public void setJedi(boolean jedi) {
+		this.jedi = jedi;
+	}
+
+	public ITestBean getSpouse() {
+		return (spouses != null ? spouses[0] : null);
+	}
+
+	public void setSpouse(ITestBean spouse) {
+		this.spouses = new ITestBean[] {spouse};
+	}
+
+	public ITestBean[] getSpouses() {
+		return spouses;
+	}
+
+	public String getTouchy() {
+		return touchy;
+	}
+
+	public void setTouchy(String touchy) throws Exception {
+		if (touchy.indexOf('.') != -1) {
+			throw new Exception("Can't contain a .");
+		}
+		if (touchy.indexOf(',') != -1) {
+			throw new NumberFormatException("Number format exception: contains a ,");
+		}
+		this.touchy = touchy;
+	}
+
+	public String getCountry() {
+		return country;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public String[] getStringArray() {
+		return stringArray;
+	}
+
+	public void setStringArray(String[] stringArray) {
+		this.stringArray = stringArray;
+	}
+
+	public Integer[] getSomeIntegerArray() {
+		return someIntegerArray;
+	}
+
+	public void setSomeIntegerArray(Integer[] someIntegerArray) {
+		this.someIntegerArray = someIntegerArray;
+	}
+
+	public Date getDate() {
+		return date;
+	}
+
+	public void setDate(Date date) {
+		this.date = date;
+	}
+
+	public Float getMyFloat() {
+		return myFloat;
+	}
+
+	public void setMyFloat(Float myFloat) {
+		this.myFloat = myFloat;
+	}
+
+	public Collection getFriends() {
+		return friends;
+	}
+
+	public void setFriends(Collection friends) {
+		this.friends = friends;
+	}
+
+	public Set getSomeSet() {
+		return someSet;
+	}
+
+	public void setSomeSet(Set someSet) {
+		this.someSet = someSet;
+	}
+
+	public Map getSomeMap() {
+		return someMap;
+	}
+
+	public void setSomeMap(Map someMap) {
+		this.someMap = someMap;
+	}
+
+	public List getSomeList() {
+		return someList;
+	}
+
+	public void setSomeList(List someList) {
+		this.someList = someList;
+	}
+
+	public Properties getSomeProperties() {
+		return someProperties;
+	}
+
+	public void setSomeProperties(Properties someProperties) {
+		this.someProperties = someProperties;
+	}
+
+	public INestedTestBean getDoctor() {
+		return doctor;
+	}
+
+	public void setDoctor(INestedTestBean doctor) {
+		this.doctor = doctor;
+	}
+
+	public INestedTestBean getLawyer() {
+		return lawyer;
+	}
+
+	public void setLawyer(INestedTestBean lawyer) {
+		this.lawyer = lawyer;
+	}
+
+	public Number getSomeNumber() {
+		return someNumber;
+	}
+
+	public void setSomeNumber(Number someNumber) {
+		this.someNumber = someNumber;
+	}
+
+	public Colour getFavouriteColour() {
+		return favouriteColour;
+	}
+
+	public void setFavouriteColour(Colour favouriteColour) {
+		this.favouriteColour = favouriteColour;
+	}
+
+	public Boolean getSomeBoolean() {
+		return someBoolean;
+	}
+
+	public void setSomeBoolean(Boolean someBoolean) {
+		this.someBoolean = someBoolean;
+	}
+
+	public IndexedTestBean getNestedIndexedBean() {
+		return nestedIndexedBean;
+	}
+
+	public void setNestedIndexedBean(IndexedTestBean nestedIndexedBean) {
+		this.nestedIndexedBean = nestedIndexedBean;
+	}
+
+	public List getOtherColours() {
+		return otherColours;
+	}
+
+	public void setOtherColours(List otherColours) {
+		this.otherColours = otherColours;
+	}
+
+	public List getPets() {
+		return pets;
+	}
+
+	public void setPets(List pets) {
+		this.pets = pets;
+	}
+
+
+	/**
+	 * @see ITestBean#exceptional(Throwable)
+	 */
+	public void exceptional(Throwable t) throws Throwable {
+		if (t != null) {
+			throw t;
+		}
+	}
+
+	public void unreliableFileOperation() throws IOException {
+		throw new IOException();
+	}
+	/**
+	 * @see ITestBean#returnsThis()
+	 */
+	public Object returnsThis() {
+		return this;
+	}
+
+	/**
+	 * @see IOther#absquatulate()
+	 */
+	public void absquatulate() {
+	}
+
+	public int haveBirthday() {
+		return age++;
+	}
+
+
+	public void destroy() {
+		this.destroyed = true;
+	}
+
+	public boolean wasDestroyed() {
+		return destroyed;
+	}
+
+
+	public boolean equals(Object other) {
+		if (this == other) {
+			return true;
+		}
+		if (other == null || !(other instanceof TestBean)) {
+			return false;
+		}
+		TestBean tb2 = (TestBean) other;
+		return (ObjectUtils.nullSafeEquals(this.name, tb2.name) && this.age == tb2.age);
+	}
+
+	public int hashCode() {
+		return this.age;
+	}
+
+	public int compareTo(Object other) {
+		if (this.name != null && other instanceof TestBean) {
+			return this.name.compareTo(((TestBean) other).getName());
+		}
+		else {
+			return 1;
+		}
+	}
+
+	public String toString() {
+		return this.name;
+	}
+
+}
\ No newline at end of file
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java b/org.springframework.test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/AbstractSpr3350SingleSpringContextTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties b/org.springframework.test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties
rename to org.springframework.test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests-context.properties
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java b/org.springframework.test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/PropertiesBasedSpr3350SingleSpringContextTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java b/org.springframework.test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/Spr3264DependencyInjectionSpringContextTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java b/org.springframework.test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/Spr3264SingleSpringContextTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java b/org.springframework.test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/XmlBasedSpr3350SingleSpringContextTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java b/org.springframework.test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/annotation/ProfileValueAnnotationAwareTransactionalTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/SpringRunnerContextCacheTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/TestContextManagerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/TestContextManagerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/TestContextManagerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/TestContextManagerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/TestExecutionListenersTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit38/ConcreteTransactionalJUnit38SpringContextTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit38/FailingBeforeAndAfterMethodsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit38/ProfileValueJUnit38SpringContextTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit38/RepeatedJUnit38SpringContextTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/AbsolutePathSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/AbstractTransactionalSpringRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/BeforeAndAfterTransactionAnnotationTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassLevelDisabledSpringRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassLevelTransactionalSpringRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/ClassPathResourceSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/ConcreteTransactionalJUnit4SpringContextTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackFalseTransactionalSpringRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/DefaultRollbackTrueTransactionalSpringRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/EnabledAndIgnoredSpringRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/FailingBeforeAndAfterMethodsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/HardCodedProfileValueSourceSpringRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/InheritedConfigSpringJUnit4ClassRunnerAppCtxTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/InheritedConfigSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/InheritedConfigSpringJUnit4ClassRunnerAppCtxTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/InheritedConfigSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/MethodLevelTransactionalSpringRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context1.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context2.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests-context3.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/MultipleResourcesSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/ParameterizedDependencyInjectionTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests-context.properties
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/PropertiesBasedSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/RelativePathSpringJUnit4ClassRunnerAppCtxTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/RelativePathSpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/RelativePathSpringJUnit4ClassRunnerAppCtxTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/RelativePathSpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackFalseTransactionalSpringRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/RollbackOverrideDefaultRollbackTrueTransactionalSpringRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerAppCtxTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/SpringJUnit4SuiteTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesSpringRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesSpringRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesSpringRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesSpringRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/StandardJUnit4FeaturesTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/TimedTransactionalSpringRunnerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingDefaultLocationsInheritedTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/BeanOverridingExplicitLocationsInheritedTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsBaseTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/DefaultLocationsInheritedTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsBaseTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/ExplicitLocationsInheritedTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/spr3896/Spr3896SuiteTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/junit4/transactionalTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/support/CustomizedGenericXmlContextLoaderTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/support/GenericXmlContextLoaderResourceLocationsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests_.java b/org.springframework.test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests_.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests_.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/testng/ConcreteTransactionalTestNGSpringContextTests_.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests_.java b/org.springframework.test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests_.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests_.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/testng/DirtiesContextTransactionalTestNGSpringContextTests_.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml b/org.springframework.test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml
rename to org.springframework.test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests-context.xml
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java b/org.springframework.test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/context/testng/FailingBeforeAndAfterMethodsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java b/org.springframework.test/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/jdbc/JdbcTestUtilsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java b/org.springframework.test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java
rename to org.springframework.test/src/test/java/org/springframework/test/transaction/TransactionTestUtils.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java b/org.springframework.test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
rename to org.springframework.test/src/test/java/org/springframework/test/util/ReflectionTestUtilsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/util/subpackage/PersistentEntity.java b/org.springframework.test/src/test/java/org/springframework/test/util/subpackage/PersistentEntity.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/util/subpackage/PersistentEntity.java
rename to org.springframework.test/src/test/java/org/springframework/test/util/subpackage/PersistentEntity.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/test/util/subpackage/Person.java b/org.springframework.test/src/test/java/org/springframework/test/util/subpackage/Person.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/test/util/subpackage/Person.java
rename to org.springframework.test/src/test/java/org/springframework/test/util/subpackage/Person.java
diff --git a/org.springframework.testsuite/.classpath.swp b/org.springframework.testsuite/.classpath.swp
deleted file mode 100644
index 4d9c78ecde0ad942bdd7cd7e5536dc85769e1b6d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
zcmeI3%WvF79LJ};3xr2GZ~_){-f?!*JOtTPQIx8wM3JhrsHbSwJG<+R?J*uZj~)<r
zu3X^6e*l6jj~llNZm2gnapJ}aLCbgiShw}s*=%BZ$XNO*9?x&)H}mm$c7DH^bmwnw
zz28`-ZG!6+LhgLJzV-PZzn)wEix8{JnJZOB^|j0F+uWm$u$WV&`EgRA`Jo7QP3Z@=
zH;^I<EN=QD2>ZgZMf$ke517mMm7WL&G|?SDqal}}jO>t`)N+`VJ`0CchIO7MaMlS#
zVZXUDM;6+x`FD)B8?Rlsan_0G{%Zo7fF_^`XabsmCZGvu0%wju=s!d5qt{PB-hiA-
z<vy;LasOtTzK8TnxNoNEf03TU{d;NpAEaNz{gpKRB>p}N*-q2=qc2TB6VL=S0Zl*?
z&;&FAO+XXS1T+CnKofXO1Xz!dTd@7RvXA|L6$7{n$NvuG3rH7o0rEYZe;@KX<U2V2
zJCMKO@P7%p4Egf~LOz4M3%UC|A)i3rg8Xovke{C;<QoJ7<{<Z;CgiK92>A&Cf*%od
z_yqw6W&1ZsE!X+g@eu*;g~4HC*Y<iHV~+(!L!BGw7+W`Q?QE=XT-h{7Y>yq#kt<D0
zxap~b<b(pvvs$!8=PMMNu>uOfKvFm{W1hC1q;mOyJ#&rB(A}OW?G3WpbiSgyJ<*I6
zrs?hp?PT4}?akEPKC^h~`%N-iG`6u)h9%Yl_C#xnuAiFCjKM>;XTrdpvfd%5T{XnH
zgIA7EV2Xa9$Vk@L+}JTY%6k#zt_TjPi|^c$w9Bkrb<(KV^K#XN$-}?2Kr=2-$)>by
zt?kNi=IuKsPBkS8pL_Dq^@qYcq#s2r2yYh~txjyEc`dp`+f^F)il9-6s~)=<j@<qX
zIP9)V_jy<PLmu#AH&x3YQlXL9H<vJ?Fs7HM)Nf|`F{EQQQoRc1Gi%6kI&W}sRJ2*p
zP*Y25@o2?({%b8(zPdu?g`d@e#?<EX7pU4hE1Xf}*%Rgi)vP4zB3+#H^EXy##tKJL
zIJupyzq!3hV*!A>w#S);A2}IB4woIH&m75(bloEZD_i$WJX(q2OeGKY93C3A8BmjO
zod)V@c^EKHGAp!&SCau8Ypthd5xDhKjJ0x275BPUJvCb*;C0pPh5R6-GV;|3uhmFB
zmE*v-SJMk+!k^gY#2vHnO{MObnp(N#*uLa+)C;M@BF`G)tT?@TeRF5ygKOLCTh}(P
zS5y|yaUu%+DC`&^3kEzi)sgXL><Mz2S%O~t+zfa+yPjsH%40mLzQi+B?QogxP2Y}3
z%4Mc<S9gu9UOI4{#vTtO=Bti@1-sGUo+Wx9*)eWxUv91#m)3~#|5xFsI}qjnt3CT~
z;p1P0fB!1{`ZoOeuaS3{>g*~#eQ5%kfF_^`XabsmCZGvu0#guJHOE^qr5hE=vOQa&
zr;GP&-99NGQL&xlark2KKbZF6RB#p7@QZ=1_$l^m7HDg7rrKaZ=Byzm=7mmBtT}ny
zrpt7xBokqFWF8q>n!Wxkq?Fq^CSc{NrQt;co?PKg*jOp*z@zg9WqS-I>Qihv6iXJl
z7IkK7Ob#yF2bmq53aO8LR@v56hx*E!lOfzV<r;S_Q<*P`ucz;&tSAPx3PV@zQa%9d
iaWygnoj3OX0qxjbpxI-K#~?f|Qy<!~iJ6);5$1m$*0K2j

diff --git a/org.springframework.testsuite/.ivy.xml.swp b/org.springframework.testsuite/.ivy.xml.swp
deleted file mode 100644
index 73e724d7bc5d8f70c7028997f9d277027ae90f80..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 16384
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
R7xp81{H?xx#auS#{{RsBPFVl|