github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

No effective change - change test code to use Long as @Version on BasicDomain

Browse Source
This commit is contained in:
rbygrave
2015-06-01 12:14:20 +12:00
parent 16f7de30c6
commit 0d92807308
2 changed files with 16 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/test/java/com/avaje/tests/model/basic/BasicDomain.java
+14 -2
View File
@@ -8,6 +8,7 @@ import javax.persistence.MappedSuperclass;
import javax.persistence.Version;
import com.avaje.ebean.annotation.CreatedTimestamp;
import com.avaje.ebean.annotation.UpdatedTimestamp;
@MappedSuperclass
public class BasicDomain implements Serializable {
@@ -20,9 +21,12 @@ public class BasicDomain implements Serializable {
@CreatedTimestamp
Timestamp cretime;
@Version
@UpdatedTimestamp
Timestamp updtime;
@Version
Long version;
public Integer getId() {
return id;
}
@@ -46,4 +50,12 @@ public class BasicDomain implements Serializable {
public void setCretime(Timestamp cretime) {
this.cretime = cretime;
}
public Long getVersion() {
return version;
}
public void setVersion(Long version) {
this.version = version;
}
}
src/test/java/com/avaje/tests/query/TestQueryFindIterate.java
+2 -2
View File
@@ -100,7 +100,7 @@ public class TestQueryFindIterate extends BaseTestCase {
assertEquals(3, loggedSql.size());
assertTrue(loggedSql.get(0).contains("select t0.id c0, t0.status c1, t0.order_date c2, t1.id c3, t1.name c4 from o_order t0 join o_customer t1"));
assertTrue(loggedSql.get(1).contains("select t0.order_id c0, t0.id c1, t0.order_qty c2, t0.ship_qty c3, t0.unit_price c4"));
assertTrue(loggedSql.get(2).contains("select t0.order_id c0, t0.id c1, t0.ship_time c2, t0.cretime c3, t0.updtime c4, t0.order_id c5 from or_order_ship"));
assertTrue(loggedSql.get(2).contains("select t0.order_id c0, t0.id c1, t0.ship_time c2, t0.cretime c3, t0.updtime c4, t0.version c5, t0.order_id c6 from or_order_ship"));
}
@Test
@@ -142,7 +142,7 @@ public class TestQueryFindIterate extends BaseTestCase {
assertEquals("Got SQL: "+loggedSql, 2, loggedSql.size());
assertTrue(loggedSql.get(0).contains("select t0.id c0, t0.status c1, t0.order_date c2, t1.id c3, t1.name c4, t2.id c5, t2.order_qty c6, t2.ship_qty"));
assertTrue(loggedSql.get(1).contains("select t0.order_id c0, t0.id c1, t0.ship_time c2, t0.cretime c3, t0.updtime c4, t0.order_id c5 from or_order_ship"));
assertTrue(loggedSql.get(1).contains("select t0.order_id c0, t0.id c1, t0.ship_time c2, t0.cretime c3, t0.updtime c4, t0.version c5, t0.order_id c6 from or_order_ship"));
}
@Test(expected=PersistenceException.class)