#3626 Add tests for bean property name instead of db column

Author: rbygrave

ebean-test/src/test/java/org/tests/basic/TestM2MCascadeOne.java

@@ -39,7 +39,7 @@ public void testRawPredicate_with_ManyToManyPath() {
 
     Query<MUser> query = DB.find(MUser.class)
       .select("userid")
-      .where().raw("roles.roleid in (?)", 24)
+      .where().raw("roles.roleId in (?)", 24)
       .query();
 
     query.findList();

ebean-test/src/test/java/org/tests/m2m/TestM2MDeleteWithCascade.java

@@ -39,7 +39,7 @@ public void test() {
     assertNull(notThere);
 
     List<Object> roleIds = new ArrayList<>();
-    Collections.addAll(roleIds, r0.getRoleid(), r1.getRoleid());
+    Collections.addAll(roleIds, r0.getRoleId(), r1.getRoleId());
 
     int rc = DB.find(MRole.class).where().idIn(roleIds).findCount();
 

ebean-test/src/test/java/org/tests/model/basic/MRole.java

@@ -8,7 +8,8 @@
 public class MRole {
 
   @Id
-  Integer roleid;
+  @Column(name = "role_id")
+  Integer roleId;
 
   String roleName;
 
@@ -23,12 +24,12 @@ public MRole(String roleName) {
     this.roleName = roleName;
   }
 
-  public Integer getRoleid() {
-    return roleid;
+  public Integer getRoleId() {
+    return roleId;
   }
 
-  public void setRoleid(Integer roleid) {
-    this.roleid = roleid;
+  public void setRoleId(Integer roleId) {
+    this.roleId = roleId;
   }
 
   public String getRoleName() {
@@ -61,8 +62,8 @@ public boolean equals(Object other) {
     // Make sure other is not null and has the same class as this
     if (other != null && getClass().equals(other.getClass())) {
       final MRole rhs = (MRole) other;
-      if (roleid.equals(rhs.roleid)) {
-        if (roleid == 0) {
+      if (roleId.equals(rhs.roleId)) {
+        if (roleId == 0) {
           return false;
         } else {
           return true;
@@ -74,8 +75,8 @@ public boolean equals(Object other) {
 
   @Override
   public int hashCode() {
-    if (roleid != null && roleid != 0) {
-      int rid = roleid;
+    if (roleId != null && roleId != 0) {
+      int rid = roleId;
       return (int) (rid ^ (rid >>> 32));
     }
     return super.hashCode();

ebean-test/src/test/java/org/tests/query/TestQueryFilterManyOnM2M.java

@@ -10,17 +10,17 @@
 
 import static org.assertj.core.api.Assertions.assertThat;
 
-public class TestQueryFilterManyOnM2M extends BaseTestCase {
+class TestQueryFilterManyOnM2M extends BaseTestCase {
 
   @Test
-  public void test() {
+  void test() {
     LoggedSql.start();
 
     DB.find(MUser.class).fetch("roles").filterMany("roles").ilike("roleName", "Jim%").findList();
 
     List<String> sql = LoggedSql.stop();
     assertThat(sql).hasSize(1);
-    assertThat(sql.get(0)).contains("select t0.userid, t0.user_name, t0.user_type_id, t1.roleid, t1.role_name from muser t0 left join mrole_muser t1z_ on t1z_.muser_userid = t0.userid left join mrole t1 on t1.roleid = t1z_.mrole_roleid where (t1.roleid is null or (lower(t1.role_name) like ");
+    assertThat(sql.get(0)).contains("select t0.userid, t0.user_name, t0.user_type_id, t1.role_id, t1.role_name from muser t0 left join mrole_muser t1z_ on t1z_.muser_userid = t0.userid left join mrole t1 on t1.role_id = t1z_.mrole_role_id where (t1.role_id is null or (lower(t1.role_name) like ");
     assertThat(sql.get(0)).contains("order by t0.userid;");
   }
 

ebean-test/src/test/java/org/tests/query/joins/TestDisjunctWhereOuterJoin.java

@@ -46,9 +46,9 @@ public void test() {
 
       DB.save(u1);
 
-      queryOrExpression(r2.getRoleid());
+      queryOrExpression(r2.getRoleId());
 
-      queryDisjunction(r2.getRoleid());
+      queryDisjunction(r2.getRoleId());
 
       Query<MUser> query = DB.find(MUser.class)
         .where().disjunction()
@@ -66,19 +66,19 @@ public void test() {
     }
   }
 
-  private void queryDisjunction(Integer roleid) {
+  private void queryDisjunction(Integer roleId) {
 
     Query<MUser> query = DB.find(MUser.class)
       .where().or()
       .eq("userName", "user0B")
-      .eq("roles.roleid", roleid)
+      .eq("roles.roleId", roleId)
       .endOr().query();
 
     query.findList();
 
     String sql = sqlOf(query);
     assertSqlOuterJoins(sql);
-    assertThat(sql).contains("where (t0.user_name = ? or u1.roleid = ?)");
+    assertThat(sql).contains("where (t0.user_name = ? or u1.role_id = ?)");
   }
 
   @Test
@@ -101,20 +101,20 @@ private void queryOrExpression(Integer roleid) {
     Query<MUser> query = DB.find(MUser.class)
       .where().or(
         Expr.eq("userName", "user0B"),
-        Expr.eq("roles.roleid", roleid)
+        Expr.eq("roles.roleId", roleid)
       )
       .query();
 
     query.findList();
 
     String sql = sqlOf(query);
     assertSqlOuterJoins(sql);
-    assertThat(sql).contains("where (t0.user_name = ? or u1.roleid = ?)");
+    assertThat(sql).contains("where (t0.user_name = ? or u1.role_id = ?)");
   }
 
   private void assertSqlOuterJoins(String sql) {
     assertThat(sql).contains("select distinct");
     assertThat(sql).contains("left join mrole_muser u1z_ on u1z_.muser_userid = t0.userid");
-    assertThat(sql).contains("left join mrole u1 on u1.roleid = u1z_.mrole_roleid");
+    assertThat(sql).contains("left join mrole u1 on u1.role_id = u1z_.mrole_role_id");
   }
 }

ebean-test/src/test/java/org/tests/text/json/TestTextJsonUpdateCascade.java

@@ -80,8 +80,8 @@ public void test() throws IOException {
     jsonContext.toJson(u0);
 
     String s = "{\"userid\":" + u0.getUserid()
-      + ",\"userName\":\"userj1\", \"roles\":[{\"roleid\":" + r2.getRoleid() + "},{\"roleid\":"
-      + r3.getRoleid() + "}]} ";
+      + ",\"userName\":\"userj1\", \"roles\":[{\"roleid\":" + r2.getRoleId() + "},{\"roleid\":"
+      + r3.getRoleId() + "}]} ";
 
     MUser updMUser = jsonContext.toBean(MUser.class, s);