diff --git a/org.springframework.core/ivy.xml b/org.springframework.core/ivy.xml
index 65beb0bc97..fb670c305b 100644
--- a/org.springframework.core/ivy.xml
+++ b/org.springframework.core/ivy.xml
@@ -30,6 +30,7 @@
+
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java b/org.springframework.core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
rename to org.springframework.core/src/test/java/org/springframework/core/AttributeAccessorSupportTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/core/CollectionFactoryTests.java b/org.springframework.core/src/test/java/org/springframework/core/CollectionFactoryTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/core/CollectionFactoryTests.java
rename to org.springframework.core/src/test/java/org/springframework/core/CollectionFactoryTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/core/ConstantsTests.java b/org.springframework.core/src/test/java/org/springframework/core/ConstantsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/core/ConstantsTests.java
rename to org.springframework.core/src/test/java/org/springframework/core/ConstantsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/core/NestedExceptionTests.java b/org.springframework.core/src/test/java/org/springframework/core/NestedExceptionTests.java
similarity index 96%
rename from org.springframework.testsuite/src/test/java/org/springframework/core/NestedExceptionTests.java
rename to org.springframework.core/src/test/java/org/springframework/core/NestedExceptionTests.java
index ddc7056802..f95744cb68 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/core/NestedExceptionTests.java
+++ b/org.springframework.core/src/test/java/org/springframework/core/NestedExceptionTests.java
@@ -22,6 +22,7 @@ import java.io.PrintWriter;
import javax.servlet.ServletException;
import junit.framework.TestCase;
+import junit.framework.Assert;
/**
* @author Rod Johnson
@@ -51,7 +52,7 @@ public class NestedExceptionTests extends TestCase {
ServletException rootCause = new ServletException(rootCauseMesg);
// Making a class abstract doesn't _really_ prevent instantiation :-)
NestedRuntimeException nex = new NestedRuntimeException(myMessage, rootCause) {};
- assertEquals(nex.getCause(), rootCause);
+ Assert.assertEquals(nex.getCause(), rootCause);
assertTrue(nex.getMessage().indexOf(myMessage) != -1);
assertTrue(nex.getMessage().indexOf(rootCauseMesg) != -1);
@@ -87,7 +88,7 @@ public class NestedExceptionTests extends TestCase {
ServletException rootCause = new ServletException(rootCauseMesg);
// Making a class abstract doesn't _really_ prevent instantiation :-)
NestedCheckedException nex = new NestedCheckedException(myMessage, rootCause) {};
- assertEquals(nex.getCause(), rootCause);
+ Assert.assertEquals(nex.getCause(), rootCause);
assertTrue(nex.getMessage().indexOf(myMessage) != -1);
assertTrue(nex.getMessage().indexOf(rootCauseMesg) != -1);
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/core/OrderComparatorTests.java b/org.springframework.core/src/test/java/org/springframework/core/OrderComparatorTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/core/OrderComparatorTests.java
rename to org.springframework.core/src/test/java/org/springframework/core/OrderComparatorTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/core/enums/LabeledEnumTests.java b/org.springframework.core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
rename to org.springframework.core/src/test/java/org/springframework/core/enums/LabeledEnumTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/core/enums/StandAloneStaticLabeledEnum.java b/org.springframework.core/src/test/java/org/springframework/core/enums/StandAloneStaticLabeledEnum.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/core/enums/StandAloneStaticLabeledEnum.java
rename to org.springframework.core/src/test/java/org/springframework/core/enums/StandAloneStaticLabeledEnum.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/core/style/ToStringCreatorTests.java b/org.springframework.core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
rename to org.springframework.core/src/test/java/org/springframework/core/style/ToStringCreatorTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java b/org.springframework.core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
rename to org.springframework.core/src/test/java/org/springframework/core/task/SimpleAsyncTaskExecutorTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/CachingMapDecoratorTests.java b/org.springframework.core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/CachingMapDecoratorTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/CollectionUtilsTests.java b/org.springframework.core/src/test/java/org/springframework/util/CollectionUtilsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/CollectionUtilsTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/CollectionUtilsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/FileCopyUtilsTests.java b/org.springframework.core/src/test/java/org/springframework/util/FileCopyUtilsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/FileCopyUtilsTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/FileCopyUtilsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/FileSystemUtilsTests.java b/org.springframework.core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/FileSystemUtilsTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/FileSystemUtilsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/Log4jConfigurerTests.java b/org.springframework.core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
similarity index 94%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/Log4jConfigurerTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
index 5b36d46f89..1b75fd96e9 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/util/Log4jConfigurerTests.java
+++ b/org.springframework.core/src/test/java/org/springframework/util/Log4jConfigurerTests.java
@@ -34,7 +34,7 @@ public class Log4jConfigurerTests extends TestCase {
}
public void testInitLoggingWithRelativeFilePath() throws FileNotFoundException {
- doTestInitLogging("test/org/springframework/util/testlog4j.properties", false);
+ doTestInitLogging("src/test/resources/org/springframework/util/testlog4j.properties", false);
}
public void testInitLoggingWithAbsoluteFilePath() throws FileNotFoundException {
@@ -47,7 +47,7 @@ public class Log4jConfigurerTests extends TestCase {
}
public void testInitLoggingWithRelativeFilePathAndRefreshInterval() throws FileNotFoundException {
- doTestInitLogging("test/org/springframework/util/testlog4j.properties", true);
+ doTestInitLogging("src/test/resources/org/springframework/util/testlog4j.properties", true);
}
/* only works on Windows
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/MethodInvokerTests.java b/org.springframework.core/src/test/java/org/springframework/util/MethodInvokerTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/MethodInvokerTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/MethodInvokerTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/MockLog4jAppender.java b/org.springframework.core/src/test/java/org/springframework/util/MockLog4jAppender.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/MockLog4jAppender.java
rename to org.springframework.core/src/test/java/org/springframework/util/MockLog4jAppender.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/NumberUtilsTests.java b/org.springframework.core/src/test/java/org/springframework/util/NumberUtilsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/NumberUtilsTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/NumberUtilsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/ObjectUtilsTests.java b/org.springframework.core/src/test/java/org/springframework/util/ObjectUtilsTests.java
similarity index 99%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/ObjectUtilsTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/ObjectUtilsTests.java
index a963e17258..a2e1ed0c69 100644
--- a/org.springframework.testsuite/src/test/java/org/springframework/util/ObjectUtilsTests.java
+++ b/org.springframework.core/src/test/java/org/springframework/util/ObjectUtilsTests.java
@@ -22,7 +22,7 @@ import javax.servlet.ServletException;
import junit.framework.TestCase;
-import org.springframework.beans.FatalBeanException;
+import org.springframework.core.task.TaskRejectedException;
/**
* @author Rod Johnson
@@ -36,7 +36,7 @@ public final class ObjectUtilsTests extends TestCase {
assertTrue(ObjectUtils.isCheckedException(new ServletException()));
assertFalse(ObjectUtils.isCheckedException(new RuntimeException()));
- assertFalse(ObjectUtils.isCheckedException(new FatalBeanException("")));
+ assertFalse(ObjectUtils.isCheckedException(new TaskRejectedException("")));
// Any Throwable other than RuntimeException and Error
// has to be considered checked according to the JLS.
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/PathMatcherTests.java b/org.springframework.core/src/test/java/org/springframework/util/PathMatcherTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/PathMatcherTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/PathMatcherTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/PatternMatchUtilsTests.java b/org.springframework.core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/PatternMatchUtilsTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/PatternMatchUtilsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/PropertiesPersisterTests.java b/org.springframework.core/src/test/java/org/springframework/util/PropertiesPersisterTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/PropertiesPersisterTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/PropertiesPersisterTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/ResourceUtilsTests.java b/org.springframework.core/src/test/java/org/springframework/util/ResourceUtilsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/ResourceUtilsTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/ResourceUtilsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/StopWatchTests.java b/org.springframework.core/src/test/java/org/springframework/util/StopWatchTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/StopWatchTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/StopWatchTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/StringUtilsTests.java b/org.springframework.core/src/test/java/org/springframework/util/StringUtilsTests.java
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/StringUtilsTests.java
rename to org.springframework.core/src/test/java/org/springframework/util/StringUtilsTests.java
diff --git a/org.springframework.testsuite/src/test/java/org/springframework/util/testlog4j.properties b/org.springframework.core/src/test/resources/org/springframework/util/testlog4j.properties
similarity index 100%
rename from org.springframework.testsuite/src/test/java/org/springframework/util/testlog4j.properties
rename to org.springframework.core/src/test/resources/org/springframework/util/testlog4j.properties