From 3161664d58fe2894246506ed7064af59324ab204 Mon Sep 17 00:00:00 2001
From: Robin Bygrave <robin.bygrave@gmail.com>
Date: Tue, 17 May 2016 16:41:58 +1200
Subject: [PATCH] No effective change - additional test for constructor
 enhancement (from agent
 https://github.com/ebean-orm/avaje-ebeanorm-agent/issues/31)

---
 .../tests/draftable/LinkQueryPublishTest.java |   1 +
 .../TestConstructorManyAddAll.java            |  20 +++
 .../com/avaje/tests/model/basic/MUser.java    | 124 ++++++++++--------
 3 files changed, 87 insertions(+), 58 deletions(-)
 create mode 100644 src/test/java/com/avaje/tests/enhancement/TestConstructorManyAddAll.java

diff --git a/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java b/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java
index 9afd5c209..03d885b35 100644
--- a/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java
+++ b/src/test/java/com/avaje/tests/draftable/LinkQueryPublishTest.java
@@ -40,6 +40,7 @@ public class LinkQueryPublishTest {
         .findPagedList();
 
     assertThat(pagedList.getTotalRowCount()).isEqualTo(3);
+    assertThat(pagedList.getList()).hasSize(3);
 
 
     Query<Link> pubQuery = server.find(Link.class)
diff --git a/src/test/java/com/avaje/tests/enhancement/TestConstructorManyAddAll.java b/src/test/java/com/avaje/tests/enhancement/TestConstructorManyAddAll.java
new file mode 100644
index 000000000..8eeea9139
--- /dev/null
+++ b/src/test/java/com/avaje/tests/enhancement/TestConstructorManyAddAll.java
@@ -0,0 +1,20 @@
+package com.avaje.tests.enhancement;
+
+import com.avaje.ebean.BaseTestCase;
+import com.avaje.tests.model.basic.MRole;
+import com.avaje.tests.model.basic.MUser;
+import org.junit.Test;
+
+import java.util.ArrayList;
+import java.util.List;
+
+public class TestConstructorManyAddAll extends BaseTestCase {
+
+  @Test
+  public void test() {
+
+    List<MRole> startRoles = new ArrayList<MRole>();
+    MUser mUser = new MUser(startRoles);
+    mUser.getRoles();
+  }
+}
diff --git a/src/test/java/com/avaje/tests/model/basic/MUser.java b/src/test/java/com/avaje/tests/model/basic/MUser.java
index 5c6746de8..558b590d7 100644
--- a/src/test/java/com/avaje/tests/model/basic/MUser.java
+++ b/src/test/java/com/avaje/tests/model/basic/MUser.java
@@ -1,72 +1,80 @@
 package com.avaje.tests.model.basic;
 
+import javax.persistence.CascadeType;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.ManyToMany;
+import javax.persistence.ManyToOne;
+import javax.persistence.Table;
 import java.util.ArrayList;
 import java.util.List;
 
-import javax.persistence.*;
-
 @Entity
-@Table(name="muser")
+@Table(name = "muser")
 public class MUser {
 
-	@Id
-	Integer userid;
-	
-	String userName;
+  @Id
+  Integer userid;
 
-	// Cascade remove will delete from intersection table
-	// but will not delete the actual Roles
-	@ManyToMany(mappedBy="users",cascade=CascadeType.ALL)
-	List<MRole> roles;
-	
-	@ManyToOne
-	private MUserType userType;
-	
-    public MUser() {
-        
+  String userName;
+
+  // Cascade remove will delete from intersection table
+  // but will not delete the actual Roles
+  @ManyToMany(mappedBy = "users", cascade = CascadeType.ALL)
+  List<MRole> roles;
+
+  @ManyToOne
+  private MUserType userType;
+
+  public MUser() {
+
+  }
+
+  public MUser(List<MRole> startRoles) {
+    this.roles.addAll(startRoles);
+  }
+
+  public MUser(String userName) {
+    this.userName = userName;
+  }
+
+  public Integer getUserid() {
+    return userid;
+  }
+
+  public void setUserid(Integer userid) {
+    this.userid = userid;
+  }
+
+  public String getUserName() {
+    return userName;
+  }
+
+  public void setUserName(String userName) {
+    this.userName = userName;
+  }
+
+  public List<MRole> getRoles() {
+    return roles;
+  }
+
+  public void setRoles(List<MRole> roles) {
+    this.roles = roles;
+  }
+
+  public void addRole(MRole role) {
+    if (roles == null) {
+      roles = new ArrayList<MRole>();
     }
-    
-    public MUser(String userName) {
-        this.userName = userName;
-    }
-    
-	public Integer getUserid() {
-		return userid;
-	}
+    roles.add(role);
+  }
 
-	public void setUserid(Integer userid) {
-		this.userid = userid;
-	}
+  public MUserType getUserType() {
+    return userType;
+  }
 
-	public String getUserName() {
-		return userName;
-	}
+  public void setUserType(MUserType userType) {
+    this.userType = userType;
+  }
 
-	public void setUserName(String userName) {
-		this.userName = userName;
-	}
-
-	public List<MRole> getRoles() {
-		return roles;
-	}
-
-	public void setRoles(List<MRole> roles) {
-		this.roles = roles;
-	}
-	
-	public void addRole(MRole role){
-	    if (roles == null){
-	        roles = new ArrayList<MRole>();
-	    }
-	    roles.add(role);
-	}
-
-	public MUserType getUserType() {
-		return userType;
-	}
-	
-	public void setUserType(MUserType userType) {
-		this.userType = userType;
-	}
-	
 }