Repository: cayenne Updated Branches: refs/heads/master f6197e899 -> 5d75b6907
CAY-2011 Support for Java 8 date and time types warnings in unit tests Project: http://git-wip-us.apache.org/repos/asf/cayenne/repo Commit: http://git-wip-us.apache.org/repos/asf/cayenne/commit/5d75b690 Tree: http://git-wip-us.apache.org/repos/asf/cayenne/tree/5d75b690 Diff: http://git-wip-us.apache.org/repos/asf/cayenne/diff/5d75b690 Branch: refs/heads/master Commit: 5d75b690744b552c0ef6c580ce41477fd664d1e5 Parents: f6197e8 Author: aadamchik <aadamc...@apache.org> Authored: Sun May 10 11:36:24 2015 -0400 Committer: aadamchik <aadamc...@apache.org> Committed: Sun May 10 11:46:31 2015 -0400 ---------------------------------------------------------------------- .../org/apache/cayenne/java8/Java8TimeIT.java | 92 ++++++++++---------- 1 file changed, 44 insertions(+), 48 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cayenne/blob/5d75b690/cayenne-java8/src/test/java/org/apache/cayenne/java8/Java8TimeIT.java ---------------------------------------------------------------------- diff --git a/cayenne-java8/src/test/java/org/apache/cayenne/java8/Java8TimeIT.java b/cayenne-java8/src/test/java/org/apache/cayenne/java8/Java8TimeIT.java index 56f94c8..0d78fd8 100644 --- a/cayenne-java8/src/test/java/org/apache/cayenne/java8/Java8TimeIT.java +++ b/cayenne-java8/src/test/java/org/apache/cayenne/java8/Java8TimeIT.java @@ -19,77 +19,73 @@ package org.apache.cayenne.java8; -import org.apache.cayenne.ObjectContext; -import org.apache.cayenne.java8.db.LocalDateTestEntity; -import org.apache.cayenne.java8.db.LocalDateTimeTestEntity; -import org.apache.cayenne.java8.db.LocalTimeTestEntity; -import org.apache.cayenne.query.SelectQuery; -import org.junit.Test; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertNotNull; import java.time.LocalDate; import java.time.LocalDateTime; import java.time.LocalTime; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import org.apache.cayenne.ObjectContext; +import org.apache.cayenne.java8.db.LocalDateTestEntity; +import org.apache.cayenne.java8.db.LocalDateTimeTestEntity; +import org.apache.cayenne.java8.db.LocalTimeTestEntity; +import org.apache.cayenne.query.ObjectSelect; +import org.junit.Test; public class Java8TimeIT extends RuntimeBase { - @Test - public void testJava8LocalDate() { - ObjectContext context = runtime.newContext(); - - LocalDateTestEntity localDateTestEntity = context.newObject(LocalDateTestEntity.class); - LocalDate localDate = LocalDate.now(); - localDateTestEntity.setDate(localDate); + @Test + public void testJava8LocalDate() { + ObjectContext context = runtime.newContext(); - context.commitChanges(); + LocalDateTestEntity localDateTestEntity = context.newObject(LocalDateTestEntity.class); + LocalDate localDate = LocalDate.now(); + localDateTestEntity.setDate(localDate); - SelectQuery q = new SelectQuery(LocalDateTestEntity.class); - LocalDateTestEntity testRead = (LocalDateTestEntity) context.performQuery(q).get(0); + context.commitChanges(); - assertNotNull(testRead.getDate()); - assertEquals(LocalDate.class, testRead.getDate().getClass()); - assertEquals(localDate, testRead.getDate()); + LocalDateTestEntity testRead = ObjectSelect.query(LocalDateTestEntity.class).selectOne(context); - } + assertNotNull(testRead.getDate()); + assertEquals(LocalDate.class, testRead.getDate().getClass()); + assertEquals(localDate, testRead.getDate()); + } - @Test - public void testJava8LocalTime() { - ObjectContext context = runtime.newContext(); + @Test + public void testJava8LocalTime() { + ObjectContext context = runtime.newContext(); - LocalTimeTestEntity localTimeTestEntity = context.newObject(LocalTimeTestEntity.class); - LocalTime localTime = LocalTime.now(); - localTimeTestEntity.setTime(localTime); + LocalTimeTestEntity localTimeTestEntity = context.newObject(LocalTimeTestEntity.class); + LocalTime localTime = LocalTime.now(); + localTimeTestEntity.setTime(localTime); - context.commitChanges(); + context.commitChanges(); - SelectQuery q = new SelectQuery(LocalTimeTestEntity.class); - LocalTimeTestEntity testRead = (LocalTimeTestEntity) context.performQuery(q).get(0); + LocalTimeTestEntity testRead = ObjectSelect.query(LocalTimeTestEntity.class).selectOne(context); - assertNotNull(testRead.getTime()); - assertEquals(LocalTime.class, testRead.getTime().getClass()); - assertEquals(localTime.toSecondOfDay(), testRead.getTime().toSecondOfDay()); + assertNotNull(testRead.getTime()); + assertEquals(LocalTime.class, testRead.getTime().getClass()); + assertEquals(localTime.toSecondOfDay(), testRead.getTime().toSecondOfDay()); - } + } - @Test - public void testJava8LocalDateTime() { - ObjectContext context = runtime.newContext(); + @Test + public void testJava8LocalDateTime() { + ObjectContext context = runtime.newContext(); - LocalDateTimeTestEntity localDateTimeTestEntity = context.newObject(LocalDateTimeTestEntity.class); - LocalDateTime localDateTime = LocalDateTime.now(); - localDateTimeTestEntity.setTimestamp(localDateTime); + LocalDateTimeTestEntity localDateTimeTestEntity = context.newObject(LocalDateTimeTestEntity.class); + LocalDateTime localDateTime = LocalDateTime.now(); + localDateTimeTestEntity.setTimestamp(localDateTime); - context.commitChanges(); + context.commitChanges(); - SelectQuery q = new SelectQuery(LocalDateTimeTestEntity.class); - LocalDateTimeTestEntity testRead = (LocalDateTimeTestEntity) context.performQuery(q).get(0); + LocalDateTimeTestEntity testRead = ObjectSelect.query(LocalDateTimeTestEntity.class).selectOne(context); - assertNotNull(testRead.getTimestamp()); - assertEquals(LocalDateTime.class, testRead.getTimestamp().getClass()); - assertEquals(localDateTime, testRead.getTimestamp()); + assertNotNull(testRead.getTimestamp()); + assertEquals(LocalDateTime.class, testRead.getTimestamp().getClass()); + assertEquals(localDateTime, testRead.getTimestamp()); - } + } }
