Index: src/java/oracle/toplink/essentials/testing/models/cmp3/datetime/DateTimePopulator.java =================================================================== RCS file: /cvs/glassfish/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/models/cmp3/datetime/DateTimePopulator.java,v retrieving revision 1.3 diff -c -w -r1.3 DateTimePopulator.java *** src/java/oracle/toplink/essentials/testing/models/cmp3/datetime/DateTimePopulator.java 6 Dec 2006 17:00:23 -0000 1.3 --- src/java/oracle/toplink/essentials/testing/models/cmp3/datetime/DateTimePopulator.java 19 Dec 2006 03:03:14 -0000 *************** *** 62,68 **** public DateTime example2() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); return buildAttributes(cal); --- 62,68 ---- public DateTime example2() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); return buildAttributes(cal); *************** *** 84,90 **** public DateTime buildAttributes(Calendar cal) { DateTime dateTime = new DateTime(); ! long time = cal.getTime().getTime();; dateTime.setDate(new java.sql.Date(time)); dateTime.setTime(new Time(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND))); --- 84,90 ---- public DateTime buildAttributes(Calendar cal) { DateTime dateTime = new DateTime(); ! long time = cal.getTime().getTime(); dateTime.setDate(new java.sql.Date(time)); dateTime.setTime(new Time(cal.get(Calendar.HOUR_OF_DAY), cal.get(Calendar.MINUTE), cal.get(Calendar.SECOND))); Index: src/java/oracle/toplink/essentials/testing/tests/ejb/ejbqltesting/JUnitEJBQLDateTimeTestSuite.java =================================================================== RCS file: /cvs/glassfish/entity-persistence-tests/src/java/oracle/toplink/essentials/testing/tests/ejb/ejbqltesting/JUnitEJBQLDateTimeTestSuite.java,v retrieving revision 1.6 diff -c -w -r1.6 JUnitEJBQLDateTimeTestSuite.java *** src/java/oracle/toplink/essentials/testing/tests/ejb/ejbqltesting/JUnitEJBQLDateTimeTestSuite.java 6 Jun 2006 13:30:05 -0000 1.6 --- src/java/oracle/toplink/essentials/testing/tests/ejb/ejbqltesting/JUnitEJBQLDateTimeTestSuite.java 19 Dec 2006 03:03:15 -0000 *************** *** 40,46 **** public void testSqlDate() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.date = :date"). --- 40,46 ---- public void testSqlDate() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.date = :date"). *************** *** 52,58 **** public void testSqlDateToTS() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.date = :date"). --- 52,58 ---- public void testSqlDateToTS() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.date = :date"). *************** *** 64,70 **** public void testTime() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.time = :time"). --- 64,70 ---- public void testTime() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.time = :time"). *************** *** 76,82 **** public void testTimeToTS() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.time = :time"). --- 76,82 ---- public void testTimeToTS() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.time = :time"). *************** *** 88,94 **** public void testTimestamp() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.timestamp = :timestamp"). --- 88,94 ---- public void testTimestamp() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.timestamp = :timestamp"). *************** *** 100,106 **** public void testTimestampToDate() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.timestamp = :timestamp"). --- 100,106 ---- public void testTimestampToDate() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.timestamp = :timestamp"). *************** *** 112,118 **** public void testTimestampToTime() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.timestamp = :timestamp"). --- 112,118 ---- public void testTimestampToTime() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.timestamp = :timestamp"). *************** *** 124,130 **** public void testUtilDate() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.utilDate = :utilDate"). --- 124,130 ---- public void testUtilDate() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.utilDate = :utilDate"). *************** *** 136,142 **** public void testCalenderWithUtilDate() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.calendar = :calendar"). --- 136,142 ---- public void testCalenderWithUtilDate() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.calendar = :calendar"). *************** *** 148,154 **** public void testSqlDateWithCal() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.date = :date"). --- 148,154 ---- public void testSqlDateWithCal() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.date = :date"). *************** *** 160,166 **** public void testTimeWithCal() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.time = :time"). --- 160,166 ---- public void testTimeWithCal() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.time = :time"). *************** *** 172,178 **** public void testTimestampWithCal() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.timestamp = :timestamp"). --- 172,178 ---- public void testTimestampWithCal() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.timestamp = :timestamp"). *************** *** 184,190 **** public void testUtilDateWithCal() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.utilDate = :utilDate"). --- 184,190 ---- public void testUtilDateWithCal() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.utilDate = :utilDate"). *************** *** 196,202 **** public void testCalendar() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.calendar = :calendar"). --- 196,202 ---- public void testCalendar() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.calendar = :calendar"). *************** *** 208,214 **** public void testTimestampGreaterThan() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.timestamp > :timestamp"). --- 208,214 ---- public void testTimestampGreaterThan() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); List result = createEntityManager().createQuery("SELECT OBJECT(o) FROM DateTime o WHERE o.timestamp > :timestamp"). *************** *** 233,239 **** //IN node is going to be fixed and then this test will run public void testTimestampIn() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); GregorianCalendar cal2 = new GregorianCalendar(); --- 233,239 ---- //IN node is going to be fixed and then this test will run public void testTimestampIn() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); GregorianCalendar cal2 = new GregorianCalendar(); *************** *** 250,256 **** public void testTimestampBetween() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1901, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); Calendar cal2 = Calendar.getInstance(); --- 250,256 ---- public void testTimestampBetween() { GregorianCalendar cal = new GregorianCalendar(); ! cal.set(1911, 11, 31, 23, 59, 59); cal.set(Calendar.MILLISECOND, 999); Calendar cal2 = Calendar.getInstance();