mirror of
https://github.com/ebean-orm/ebean.git
synced 2024-04-21 10:51:47 +00:00
No effective change - tidy up tests
This commit is contained in:
@@ -22,22 +22,15 @@ public class TestM2MDeleteObjectWithCascadeToM2m extends BaseTestCase {
|
||||
Ebean.createUpdate(Tenant.class, "delete from Tenant").execute();
|
||||
Ebean.createUpdate(Role.class, "delete from Role").execute();
|
||||
|
||||
Tenant tenant1 = new Tenant();
|
||||
tenant1.setName("Tenant");
|
||||
|
||||
Tenant tenant1 = new Tenant("Tenant");
|
||||
Ebean.save(tenant1);
|
||||
|
||||
Permission p1 = new Permission();
|
||||
Permission p2 = new Permission();
|
||||
|
||||
p1.setName("p1");
|
||||
p2.setName("p2");
|
||||
|
||||
Permission p1 = new Permission("p1");
|
||||
Permission p2 = new Permission("p2");
|
||||
Ebean.save(p1);
|
||||
Ebean.save(p2);
|
||||
|
||||
Role role1 = new Role();
|
||||
role1.setName("RoleOne");
|
||||
Role role1 = new Role("RoleOne");
|
||||
role1.setTenant(tenant1);
|
||||
|
||||
Set<Permission> permissions = new HashSet<Permission>();
|
||||
|
||||
@@ -22,23 +22,17 @@ public class TestM2mDeleteObject extends BaseTestCase {
|
||||
Ebean.createUpdate(Tenant.class, "delete from Tenant").execute();
|
||||
Ebean.createUpdate(Role.class, "delete from Role").execute();
|
||||
|
||||
Tenant t = new Tenant();
|
||||
t.setName("tenant");
|
||||
Tenant t = new Tenant("tenant");
|
||||
|
||||
Ebean.save(t);
|
||||
|
||||
Permission p1 = new Permission();
|
||||
Permission p2 = new Permission();
|
||||
|
||||
p1.setName("p1");
|
||||
p2.setName("p2");
|
||||
Permission p1 = new Permission("p1");
|
||||
Permission p2 = new Permission("p2");
|
||||
|
||||
Ebean.save(p1);
|
||||
|
||||
Ebean.save(p2);
|
||||
|
||||
Role role1 = new Role();
|
||||
role1.setName("role");
|
||||
Role role1 = new Role("role");
|
||||
role1.setTenant(t);
|
||||
|
||||
Set<Permission> permissions = new HashSet<Permission>();
|
||||
@@ -72,15 +66,12 @@ public class TestM2mDeleteObject extends BaseTestCase {
|
||||
@Test
|
||||
public void test_deleteCascading() {
|
||||
|
||||
Permission p1 = new Permission();
|
||||
Permission p2 = new Permission();
|
||||
p1.setName("p1");
|
||||
p2.setName("p2");
|
||||
Permission p1 = new Permission("p1");
|
||||
Permission p2 = new Permission("p2");
|
||||
Ebean.save(p1);
|
||||
Ebean.save(p2);
|
||||
|
||||
Role role1 = new Role();
|
||||
role1.setName("role");
|
||||
Role role1 = new Role("role");
|
||||
|
||||
Set<Permission> permissions = new HashSet<Permission>();
|
||||
permissions.add(p2);
|
||||
|
||||
@@ -1,15 +1,14 @@
|
||||
package com.avaje.tests.model.m2m;
|
||||
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
import com.avaje.ebean.annotation.CacheStrategy;
|
||||
|
||||
import javax.persistence.Column;
|
||||
import javax.persistence.Entity;
|
||||
import javax.persistence.Id;
|
||||
import javax.persistence.ManyToMany;
|
||||
import javax.persistence.Table;
|
||||
|
||||
import com.avaje.ebean.annotation.CacheStrategy;
|
||||
import java.util.Set;
|
||||
import java.util.UUID;
|
||||
|
||||
/**
|
||||
* The Class Permission.
|
||||
@@ -19,42 +18,46 @@ import com.avaje.ebean.annotation.CacheStrategy;
|
||||
@Table(name = "mt_permission")
|
||||
public class Permission {
|
||||
|
||||
@Id
|
||||
private UUID id;
|
||||
@Id
|
||||
private UUID id;
|
||||
|
||||
@Column
|
||||
private String name;
|
||||
@Column
|
||||
private String name;
|
||||
|
||||
@ManyToMany(mappedBy = "permissions")
|
||||
private Set<Role> roles;
|
||||
@ManyToMany(mappedBy = "permissions")
|
||||
private Set<Role> roles;
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
public Permission(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
public void setId(UUID id) {
|
||||
this.id = id;
|
||||
}
|
||||
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
public String getName() {
|
||||
return name;
|
||||
}
|
||||
|
||||
public Set<Role> getRoles() {
|
||||
return roles;
|
||||
}
|
||||
public void setName(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public void setRoles(Set<Role> roles) {
|
||||
this.roles = roles;
|
||||
}
|
||||
public Set<Role> getRoles() {
|
||||
return roles;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
public void setRoles(Set<Role> roles) {
|
||||
this.roles = roles;
|
||||
}
|
||||
|
||||
@Override
|
||||
public String toString() {
|
||||
return "name:" + name + "id:" + id;
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
||||
@@ -34,6 +34,10 @@ public class Role {
|
||||
@Version
|
||||
private Long version;
|
||||
|
||||
public Role(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public UUID getId() {
|
||||
return id;
|
||||
}
|
||||
|
||||
@@ -30,7 +30,8 @@ public class Tenant {
|
||||
@Version
|
||||
private Long version;
|
||||
|
||||
public Tenant() {
|
||||
public Tenant(String name) {
|
||||
this.name = name;
|
||||
}
|
||||
|
||||
public UUID getId() {
|
||||
|
||||
Reference in New Issue
Block a user