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 4d9c78ecde0..00000000000 Binary files a/org.springframework.testsuite/.classpath.swp and /dev/null differ diff --git a/org.springframework.testsuite/.ivy.xml.swp b/org.springframework.testsuite/.ivy.xml.swp deleted file mode 100644 index 73e724d7bc5..00000000000 Binary files a/org.springframework.testsuite/.ivy.xml.swp and /dev/null differ