mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-12 22:41:35 +00:00
Refactor and fixes for interfaces (like Path) + extend existing tests
This commit is contained in:
1 parent
3dc6c567a0
commit
eb21b41fba
3 files changed
+36
-19
No files matched your search
@@ -7,6 +7,7 @@ import javax.persistence.Version;
|
||||
import java.nio.file.Path;
|
||||
import java.sql.Date;
|
||||
import java.time.*;
|
||||
import java.util.Calendar;
|
||||
|
||||
@Entity
|
||||
public class SomeNewTypesBean {
|
||||
@@ -58,6 +59,8 @@ public class SomeNewTypesBean {
|
||||
|
||||
Duration duration;
|
||||
|
||||
Calendar calendar;
|
||||
|
||||
public Long getId() {
|
||||
return id;
|
||||
}
|
||||
@@ -217,4 +220,12 @@ public class SomeNewTypesBean {
|
||||
public void setDuration(Duration duration) {
|
||||
this.duration = duration;
|
||||
}
|
||||
|
||||
public Calendar getCalendar() {
|
||||
return calendar;
|
||||
}
|
||||
|
||||
public void setCalendar(final Calendar calendar) {
|
||||
this.calendar = calendar;
|
||||
}
|
||||
}
|
||||
@@ -10,6 +10,8 @@ import org.tests.model.types.SomeNewTypesBean;
|
||||
import java.io.File;
|
||||
import java.nio.file.Paths;
|
||||
import java.time.*;
|
||||
import java.util.Calendar;
|
||||
import java.util.GregorianCalendar;
|
||||
import java.util.List;
|
||||
|
||||
import static org.assertj.core.api.Assertions.assertThat;
|
||||
@@ -44,6 +46,7 @@ public class TestNewTypes extends BaseTestCase {
|
||||
bean.setPath(Paths.get(TEMP_PATH));
|
||||
bean.setPeriod(Period.of(4,3,2));
|
||||
bean.setDuration(Duration.ofMinutes(5));
|
||||
bean.setCalendar(Calendar.getInstance());
|
||||
|
||||
|
||||
DB.save(bean);
|
||||
@@ -104,6 +107,9 @@ public class TestNewTypes extends BaseTestCase {
|
||||
list = DB.find(SomeNewTypesBean.class).where().eq("duration", Duration.ofMinutes(5)).findList();
|
||||
assertThat(list).isNotEmpty();
|
||||
|
||||
list = DB.find(SomeNewTypesBean.class).where().le("calendar", GregorianCalendar.getInstance()).findList();
|
||||
assertThat(list).isNotEmpty();
|
||||
|
||||
SomeNewTypesBean fetched = DB.find(SomeNewTypesBean.class, bean.getId());
|
||||
|
||||
assertEquals(bean.getZoneId(), fetched.getZoneId());
|
||||
@@ -122,6 +128,7 @@ public class TestNewTypes extends BaseTestCase {
|
||||
assertEquals(bean.getPath(), fetched.getPath());
|
||||
assertEquals(bean.getPeriod(), fetched.getPeriod());
|
||||
assertEquals(bean.getDuration(), fetched.getDuration());
|
||||
assertEquals(bean.getCalendar(), fetched.getCalendar());
|
||||
|
||||
|
||||
String asJson = DB.json().toJson(fetched);
|
||||
@@ -139,10 +146,10 @@ public class TestNewTypes extends BaseTestCase {
|
||||
assertThat(toBean.getOffsetDateTime()).isEqualToIgnoringNanos(bean.getOffsetDateTime());
|
||||
assertEquals(bean.getLocalTime().toSecondOfDay(), toBean.getLocalTime().toSecondOfDay());
|
||||
assertEquals(bean.getInstant().toEpochMilli() / 1000, toBean.getInstant().toEpochMilli() / 1000);
|
||||
// FIXME: This test fails on Windows with: expected:<\tmp> but was:<C:\tmp>
|
||||
assertEquals(bean.getPath(), toBean.getPath());
|
||||
assertEquals(bean.getPeriod(), toBean.getPeriod());
|
||||
assertEquals(bean.getDuration(), toBean.getDuration());
|
||||
assertEquals(bean.getCalendar(), toBean.getCalendar());
|
||||
|
||||
}
|
||||
|
||||
|
||||
Reference in new issue
Block a user