Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectHolderTest.java Sat Nov 25 14:20:59 2006 @@ -27,7 +27,7 @@ import org.apache.cayenne.testdo.mt.ClientMtTable1; import org.apache.cayenne.testdo.mt.ClientMtTable2; -public class PersistentObjectHolderTst extends TestCase { +public class PersistentObjectHolderTest extends TestCase { public void testSetInitialValue() {
Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectListTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectListTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectListTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectListTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectListTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectListTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/PersistentObjectListTest.java Sat Nov 25 14:20:59 2006 @@ -29,7 +29,7 @@ import org.apache.cayenne.remote.hessian.service.HessianUtil; import org.apache.cayenne.testdo.mt.ClientMtTable1; -public class PersistentObjectListTst extends TestCase { +public class PersistentObjectListTest extends TestCase { public void testFaultHessianSerialization() throws Exception { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/RegexUtilTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/RegexUtilTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/RegexUtilTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/RegexUtilTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/RegexUtilTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/RegexUtilTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/RegexUtilTest.java Sat Nov 25 14:20:59 2006 @@ -21,7 +21,7 @@ import junit.framework.TestCase; -public class RegexUtilTst extends TestCase { +public class RegexUtilTest extends TestCase { public void testSubstBackslashes() { assertTrue(RegexUtil.BACKSLASH.matcher("\\").find()); Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ResourceLocatorTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ResourceLocatorTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ResourceLocatorTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ResourceLocatorTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ResourceLocatorTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ResourceLocatorTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ResourceLocatorTest.java Sat Nov 25 14:20:59 2006 @@ -25,7 +25,7 @@ import junit.framework.TestCase; -public class ResourceLocatorTst extends TestCase { +public class ResourceLocatorTest extends TestCase { private File fTmpFileInCurrentDir; private String fTmpFileName; Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilExtTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilExtTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilExtTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilExtTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilExtTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilExtTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilExtTest.java Sat Nov 25 14:20:59 2006 @@ -23,13 +23,13 @@ import org.apache.cayenne.CayenneException; -public class UtilExtTst extends TestCase { +public class UtilExtTest extends TestCase { public void testPackagePath1() throws java.lang.Exception { String expectedPath = "org/apache/cayenne/util"; assertEquals( expectedPath, - Util.getPackagePath(UtilExtTst.class.getName())); + Util.getPackagePath(UtilExtTest.class.getName())); } public void testPackagePath2() throws java.lang.Exception { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/UtilTest.java Sat Nov 25 14:20:59 2006 @@ -28,7 +28,7 @@ import junit.framework.TestCase; -public class UtilTst extends TestCase { +public class UtilTest extends TestCase { private File fTmpFileInCurrentDir; private String fTmpFileName; @@ -62,7 +62,7 @@ assertEquals(String[].class.getName(), Util .getJavaClass("java.lang.String[]") .getName()); - assertEquals(new UtilTst[0].getClass().getName(), Util.getJavaClass( + assertEquals(new UtilTest[0].getClass().getName(), Util.getJavaClass( getClass().getName() + "[]").getName()); } Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/WebApplicationResourceLocatorTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/WebApplicationResourceLocatorTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/WebApplicationResourceLocatorTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/WebApplicationResourceLocatorTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/WebApplicationResourceLocatorTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/WebApplicationResourceLocatorTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/WebApplicationResourceLocatorTest.java Sat Nov 25 14:20:59 2006 @@ -26,7 +26,7 @@ /** * @author Andrus Adamchik */ -public class WebApplicationResourceLocatorTst extends TestCase { +public class WebApplicationResourceLocatorTest extends TestCase { public void testServletContext() { MockServletContext context = new MockServletContext(); Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ZipUtilTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ZipUtilTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ZipUtilTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ZipUtilTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ZipUtilTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ZipUtilTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/util/ZipUtilTest.java Sat Nov 25 14:20:59 2006 @@ -23,12 +23,12 @@ import java.io.File; import java.net.URL; -import org.apache.cayenne.unit.BasicTestCase; +import org.apache.cayenne.unit.BasicCase; /** * @author Andrus Adamchik */ -public class ZipUtilTst extends BasicTestCase { +public class ZipUtilTest extends BasicCase { public void testUnzip() throws Exception { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/BeanValidationFailureTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/BeanValidationFailureTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/BeanValidationFailureTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/BeanValidationFailureTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/BeanValidationFailureTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/BeanValidationFailureTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/BeanValidationFailureTest.java Sat Nov 25 14:20:59 2006 @@ -21,7 +21,7 @@ import junit.framework.TestCase; -public class BeanValidationFailureTst extends TestCase { +public class BeanValidationFailureTest extends TestCase { public void testValidateJavaClassName() { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/ValidationResultTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/ValidationResultTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/ValidationResultTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/validation/ValidationResultTest.java Sat Nov 25 14:20:59 2006 @@ -24,7 +24,7 @@ /** * @author Fabricio Voznika */ -public class ValidationResultTst extends TestCase { +public class ValidationResultTest extends TestCase { private ValidationResult res; Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelHelperTest.java Sat Nov 25 14:20:59 2006 @@ -26,12 +26,12 @@ import java.util.List; import java.util.Map; -import org.apache.cayenne.unit.BasicTestCase; +import org.apache.cayenne.unit.BasicCase; /** * @author Andrus Adamchik */ -public class EOModelHelperTst extends BasicTestCase { +public class EOModelHelperTest extends BasicCase { protected EOModelHelper helper; Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorInheritanceTest.java Sat Nov 25 14:20:59 2006 @@ -21,12 +21,12 @@ import org.apache.cayenne.map.DataMap; import org.apache.cayenne.map.ObjEntity; -import org.apache.cayenne.unit.BasicTestCase; +import org.apache.cayenne.unit.BasicCase; /** * @author Andrus Adamchik */ -public class EOModelProcessorInheritanceTst extends BasicTestCase { +public class EOModelProcessorInheritanceTest extends BasicCase { protected EOModelProcessor processor; public void setUp() throws Exception { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelProcessorTest.java Sat Nov 25 14:20:59 2006 @@ -31,9 +31,9 @@ import org.apache.cayenne.map.ObjRelationship; import org.apache.cayenne.query.Query; import org.apache.cayenne.query.SelectQuery; -import org.apache.cayenne.unit.BasicTestCase; +import org.apache.cayenne.unit.BasicCase; -public class EOModelProcessorTst extends BasicTestCase { +public class EOModelProcessorTest extends BasicCase { protected EOModelProcessor processor; Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOModelPrototypesTest.java Sat Nov 25 14:20:59 2006 @@ -26,12 +26,12 @@ import org.apache.cayenne.map.DbEntity; import org.apache.cayenne.map.ObjAttribute; import org.apache.cayenne.map.ObjEntity; -import org.apache.cayenne.unit.BasicTestCase; +import org.apache.cayenne.unit.BasicCase; /** * @author Andrus Adamchik */ -public class EOModelPrototypesTst extends BasicTestCase { +public class EOModelPrototypesTest extends BasicCase { public void testSkipPrototypes() throws Exception { DataMap map = new EOModelProcessor().loadEOModel("prototypes.eomodeld"); Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOQueryTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOQueryTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOQueryTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/EOQueryTest.java Sat Nov 25 14:20:59 2006 @@ -27,7 +27,7 @@ import org.apache.cayenne.map.DataMap; import org.apache.cayenne.query.PrefetchTreeNode; -public class EOQueryTst extends TestCase { +public class EOQueryTest extends TestCase { public void testConstructor() throws Exception { Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/PropertyListSerializationTest.java Sat Nov 25 14:20:59 2006 @@ -25,12 +25,12 @@ import java.util.List; import java.util.Map; -import org.apache.cayenne.unit.BasicTestCase; +import org.apache.cayenne.unit.BasicCase; /** * @author Andrus Adamchik */ -public class PropertyListSerializationTst extends BasicTestCase { +public class PropertyListSerializationTest extends BasicCase { public void testListPlist() throws Exception { File plistFile = new File(super.getTestDir(), "test-array.plist"); Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/wocompat/parser/PropertyListParserTest.java Sat Nov 25 14:20:59 2006 @@ -26,12 +26,12 @@ import java.util.List; import java.util.Map; -import org.apache.cayenne.unit.CayenneTestCase; +import org.apache.cayenne.unit.CayenneCase; /** * @author Andrus Adamchik */ -public class PropertyListParserTst extends CayenneTestCase { +public class PropertyListParserTest extends CayenneCase { private static Parser parser(String plistText) { return new Parser(new StringReader(plistText)); Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLDecoderTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLDecoderTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLDecoderTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLDecoderTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLDecoderTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLDecoderTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLDecoderTest.java Sat Nov 25 14:20:59 2006 @@ -26,12 +26,12 @@ import junit.framework.TestCase; -import org.apache.cayenne.unit.CayenneTestResources; +import org.apache.cayenne.unit.CayenneResources; /** * @author Andrus Adamchik */ -public class XMLDecoderTst extends TestCase { +public class XMLDecoderTest extends TestCase { static final String XML_DATA_DIR = "xmlcoding/"; protected XMLDecoder decoder; @@ -41,7 +41,7 @@ } public void testDecode() throws Exception { - Reader xml = new InputStreamReader(CayenneTestResources.getResource(XML_DATA_DIR + Reader xml = new InputStreamReader(CayenneResources.getResource(XML_DATA_DIR + "encoded-object.xml")); Object object = decoder.decode(xml); @@ -53,9 +53,9 @@ } public void testDecodeMappingAttributes() throws Exception { - Reader xml = new InputStreamReader(CayenneTestResources.getResource(XML_DATA_DIR + Reader xml = new InputStreamReader(CayenneResources.getResource(XML_DATA_DIR + "attribute-mapped.xml")); - Object object = decoder.decode(xml, CayenneTestResources.getResourceURL( + Object object = decoder.decode(xml, CayenneResources.getResourceURL( XML_DATA_DIR + "attribute-mapping.xml").toExternalForm()); assertTrue(object instanceof TestObject); @@ -71,9 +71,9 @@ * @throws Exception */ public void testDecodeMapping() throws Exception { - Reader xml = new InputStreamReader(CayenneTestResources.getResource(XML_DATA_DIR + Reader xml = new InputStreamReader(CayenneResources.getResource(XML_DATA_DIR + "simple-mapped.xml")); - Object object = decoder.decode(xml, CayenneTestResources.getResourceURL( + Object object = decoder.decode(xml, CayenneResources.getResourceURL( XML_DATA_DIR + "simple-mapping.xml").toExternalForm()); assertTrue(object instanceof TestObject); @@ -84,9 +84,9 @@ } public void testDecodeMappingCollection() throws Exception { - Reader xml = new InputStreamReader(CayenneTestResources.getResource(XML_DATA_DIR + Reader xml = new InputStreamReader(CayenneResources.getResource(XML_DATA_DIR + "collection-mapped.xml")); - Object object = decoder.decode(xml, CayenneTestResources.getResourceURL( + Object object = decoder.decode(xml, CayenneResources.getResourceURL( XML_DATA_DIR + "collection-mapping.xml").toExternalForm()); assertTrue(object instanceof TestObject); @@ -117,9 +117,9 @@ } public void testDecodeMappingCollectionWithNoEntity() throws Exception { - Reader xml = new InputStreamReader(CayenneTestResources.getResource(XML_DATA_DIR + Reader xml = new InputStreamReader(CayenneResources.getResource(XML_DATA_DIR + "collection-no-entity-mapped.xml")); - Object object = decoder.decode(xml, CayenneTestResources.getResourceURL( + Object object = decoder.decode(xml, CayenneResources.getResourceURL( XML_DATA_DIR + "collection-no-entity-mapping.xml").toExternalForm()); assertTrue(object instanceof TestObject); @@ -138,9 +138,9 @@ } public void testDecodeMappingCollection1() throws Exception { - Reader xml = new InputStreamReader(CayenneTestResources.getResource(XML_DATA_DIR + Reader xml = new InputStreamReader(CayenneResources.getResource(XML_DATA_DIR + "collection-mapped1.xml")); - Object object = decoder.decode(xml, CayenneTestResources.getResourceURL( + Object object = decoder.decode(xml, CayenneResources.getResourceURL( XML_DATA_DIR + "collection-mapping.xml").toExternalForm()); assertTrue(object instanceof TestObject); @@ -159,9 +159,9 @@ } public void testDecodeMappingCollection2() throws Exception { - Reader xml = new InputStreamReader(CayenneTestResources.getResource(XML_DATA_DIR + Reader xml = new InputStreamReader(CayenneResources.getResource(XML_DATA_DIR + "collection-mapped2.xml")); - Object object = decoder.decode(xml, CayenneTestResources.getResourceURL( + Object object = decoder.decode(xml, CayenneResources.getResourceURL( XML_DATA_DIR + "collection-mapping.xml").toExternalForm()); assertTrue(object instanceof TestObject); @@ -180,7 +180,7 @@ } public void testDecodeCollection() throws Exception { - Reader xml = new InputStreamReader(CayenneTestResources.getResource(XML_DATA_DIR + Reader xml = new InputStreamReader(CayenneResources.getResource(XML_DATA_DIR + "encoded-simple-collection.xml")); Object object = decoder.decode(xml); @@ -198,7 +198,7 @@ } public void testDecodeComplexCollection() throws Exception { - Reader xml = new InputStreamReader(CayenneTestResources.getResource(XML_DATA_DIR + Reader xml = new InputStreamReader(CayenneResources.getResource(XML_DATA_DIR + "encoded-complex-collection.xml")); Object object = decoder.decode(xml); @@ -230,7 +230,7 @@ } public void testDecodePrimitives() throws Exception { - Reader xml = new InputStreamReader(CayenneTestResources.getResource(XML_DATA_DIR + Reader xml = new InputStreamReader(CayenneResources.getResource(XML_DATA_DIR + "encoded-object-primitives.xml")); Object object = decoder.decode(xml); @@ -248,7 +248,7 @@ dataObjects.add(new TestObject("Mary", 28, false)); dataObjects.add(new TestObject("Joe", 31, true)); - Reader xml = new InputStreamReader(CayenneTestResources.getResource(XML_DATA_DIR + Reader xml = new InputStreamReader(CayenneResources.getResource(XML_DATA_DIR + "data-objects-encoded.xml")); final List decoded = XMLDecoder.decodeList(xml); @@ -262,9 +262,9 @@ dataObjects.add(new TestObject("Mary", 28, false)); dataObjects.add(new TestObject("Joe", 31, true)); - Reader xml = new InputStreamReader(CayenneTestResources.getResource(XML_DATA_DIR + Reader xml = new InputStreamReader(CayenneResources.getResource(XML_DATA_DIR + "data-objects-mapped.xml")); - final List decoded = XMLDecoder.decodeList(xml, CayenneTestResources + final List decoded = XMLDecoder.decodeList(xml, CayenneResources .getResourceURL(XML_DATA_DIR + "simple-mapping.xml") .toExternalForm()); Copied: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLEncoderTest.java (from r479188, incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLEncoderTst.java) URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLEncoderTest.java?view=diff&rev=479213&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLEncoderTst.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLEncoderTest.java&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLEncoderTst.java (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/xml/XMLEncoderTest.java Sat Nov 25 14:20:59 2006 @@ -27,12 +27,12 @@ import junit.framework.TestCase; -import org.apache.cayenne.unit.CayenneTestResources; +import org.apache.cayenne.unit.CayenneResources; /** * @author Kevin J. Menard, Jr. */ -public class XMLEncoderTst extends TestCase { +public class XMLEncoderTest extends TestCase { static final String XML_DATA_DIR = "xmlcoding/"; static final boolean windows; @@ -71,7 +71,7 @@ } private String loadTestFileAsString(String filename) throws IOException { - BufferedReader in = new BufferedReader(new InputStreamReader(CayenneTestResources + BufferedReader in = new BufferedReader(new InputStreamReader(CayenneResources .getResource(XML_DATA_DIR + filename))); StringBuffer comp = new StringBuffer(); while (in.ready()) { @@ -111,7 +111,7 @@ } public void testSimpleMapping() throws Exception { - XMLEncoder encoder = new XMLEncoder(CayenneTestResources.getResourceURL( + XMLEncoder encoder = new XMLEncoder(CayenneResources.getResourceURL( XML_DATA_DIR + "simple-mapping.xml").toExternalForm()); TestObject test = new TestObject(); test.setAge(57); @@ -126,7 +126,7 @@ } public void testCollectionMapping() throws Exception { - XMLEncoder encoder = new XMLEncoder(CayenneTestResources.getResourceURL( + XMLEncoder encoder = new XMLEncoder(CayenneResources.getResourceURL( XML_DATA_DIR + "collection-mapping.xml").toExternalForm()); TestObject george = new TestObject(); george.setName("George"); @@ -164,7 +164,7 @@ dataObjects.add(new TestObject("Mary", 28, false)); dataObjects.add(new TestObject("Joe", 31, true)); - String xml = new XMLEncoder(CayenneTestResources.getResourceURL( + String xml = new XMLEncoder(CayenneResources.getResourceURL( XML_DATA_DIR + "simple-mapping.xml").toExternalForm()).encode( "EncodedTestList", dataObjects); Modified: incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/resources/spring-test-resources.xml URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/resources/spring-test-resources.xml?view=diff&rev=479213&r1=479212&r2=479213 ============================================================================== --- incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/resources/spring-test-resources.xml (original) +++ incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/resources/spring-test-resources.xml Sat Nov 25 14:20:59 2006 @@ -163,7 +163,7 @@ <!-- ======================================= --> <!-- Test Resources Container --> <!-- ======================================= --> - <bean id="TestResources" class="org.apache.cayenne.unit.CayenneTestResources"> + <bean id="TestResources" class="org.apache.cayenne.unit.CayenneResources"> <constructor-arg> <map> <entry key="org.apache.cayenne.dba.oracle.OracleAdapter"><ref bean="OracleStackAdapter"/></entry>
