Author: aadamchik
Date: Sat Nov 25 12:49:56 2006
New Revision: 479195
URL: http://svn.apache.org/viewvc?view=rev&rev=479195
Log:
renaming test classes that conflict wit default test case naming
Added:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/CalendarEntity.java
- copied, changed from r479188,
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/CalendarTest.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/auto/_CalendarEntity.java
- copied, changed from r479188,
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/auto/_CalendarTest.java
Removed:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/CalendarTest.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/auto/_CalendarTest.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/auto/_MeaningfulGeneratedColumnTest.java
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTst.java
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/resources/testmap.map.xml
Copied:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/CalendarEntity.java
(from r479188,
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/CalendarTest.java)
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/CalendarEntity.java?view=diff&rev=479195&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/CalendarTest.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/CalendarEntity.java&r2=479195
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/CalendarTest.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/CalendarEntity.java
Sat Nov 25 12:49:56 2006
@@ -1,8 +1,8 @@
package org.apache.art;
-import org.apache.art.auto._CalendarTest;
+import org.apache.art.auto._CalendarEntity;
-public class CalendarTest extends _CalendarTest {
+public class CalendarEntity extends _CalendarEntity {
}
Copied:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/auto/_CalendarEntity.java
(from r479188,
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/auto/_CalendarTest.java)
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/auto/_CalendarEntity.java?view=diff&rev=479195&p1=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/auto/_CalendarTest.java&r1=479188&p2=incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/auto/_CalendarEntity.java&r2=479195
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/auto/_CalendarTest.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/art/auto/_CalendarEntity.java
Sat Nov 25 12:49:56 2006
@@ -5,7 +5,7 @@
* since it may be overwritten next time code is regenerated.
* If you need to make any customizations, please use subclass.
*/
-public class _CalendarTest extends org.apache.cayenne.CayenneDataObject {
+public class _CalendarEntity extends org.apache.cayenne.CayenneDataObject {
public static final String CALENDAR_FIELD_PROPERTY = "calendarField";
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTst.java
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTst.java?view=diff&rev=479195&r1=479194&r2=479195
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTst.java
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/java/org/apache/cayenne/access/DateTimeTypesTst.java
Sat Nov 25 12:49:56 2006
@@ -22,7 +22,7 @@
import java.util.Calendar;
import java.util.Date;
-import org.apache.art.CalendarTest;
+import org.apache.art.CalendarEntity;
import org.apache.art.DateTestEntity;
import org.apache.cayenne.query.SelectQuery;
import org.apache.cayenne.unit.CayenneTestCase;
@@ -45,7 +45,7 @@
public void testCalendar() throws Exception {
- CalendarTest test = (CalendarTest)
context.newObject(CalendarTest.class);
+ CalendarEntity test = (CalendarEntity)
context.newObject(CalendarEntity.class);
Calendar cal = Calendar.getInstance();
cal.clear();
@@ -54,8 +54,8 @@
test.setCalendarField(cal);
context.commitChanges();
- SelectQuery q = new SelectQuery(CalendarTest.class);
- CalendarTest testRead = (CalendarTest) context.performQuery(q).get(0);
+ SelectQuery q = new SelectQuery(CalendarEntity.class);
+ CalendarEntity testRead = (CalendarEntity)
context.performQuery(q).get(0);
assertNotNull(testRead.getCalendarField());
assertEquals(cal, testRead.getCalendarField());
Modified:
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/resources/testmap.map.xml
URL:
http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/resources/testmap.map.xml?view=diff&rev=479195&r1=479194&r2=479195
==============================================================================
---
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/resources/testmap.map.xml
(original)
+++
incubator/cayenne/main/trunk/core/cayenne-jdk1.4/src/test/resources/testmap.map.xml
Sat Nov 25 12:49:56 2006
@@ -259,7 +259,7 @@
<obj-entity name="BooleanTestEntity"
className="org.apache.art.BooleanTestEntity" dbEntityName="BOOLEAN_TEST">
<obj-attribute name="booleanColumn" type="java.lang.Boolean"
db-attribute-path="BOOLEAN_COLUMN"/>
</obj-entity>
- <obj-entity name="CalendarTest" className="org.apache.art.CalendarTest"
dbEntityName="CALENDAR_TEST">
+ <obj-entity name="CalendarEntity"
className="org.apache.art.CalendarEntity" dbEntityName="CALENDAR_TEST">
<obj-attribute name="calendarField" type="java.util.Calendar"
db-attribute-path="CALENDAR_FIELD"/>
</obj-entity>
<obj-entity name="CharFkTestEntity"
className="org.apache.art.CharFkTestEntity" dbEntityName="CHAR_FK_TEST">
