REPO-2520: Community: SiteMembership Java API calls should tell which site resulted in errors

Changed tests asserts from (actual value, expected value) to (expected value, actual value) as recommended in the Junit Assert Javadoc.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137771 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alexandru Epure
2017-06-22 12:57:06 +00:00
parent 4191e3beed
commit df009a5e27
51 changed files with 962 additions and 234 deletions

View File

@@ -34,134 +34,142 @@ import org.alfresco.service.cmr.site.SiteRole;
* @author steveglover
*
*/
public class SiteMembership
{
private SiteInfo siteInfo;
private String personId;
private String firstName;
private String lastName;
private String role;
public SiteMembership(SiteInfo siteInfo, String personId, String firstName, String lastName, String role)
{
super();
if(siteInfo == null)
{
throw new java.lang.IllegalArgumentException();
}
if(personId == null)
{
throw new java.lang.IllegalArgumentException();
}
if(firstName == null)
{
throw new java.lang.IllegalArgumentException();
}
if(lastName == null)
{
throw new java.lang.IllegalArgumentException();
}
if(role == null)
{
throw new java.lang.IllegalArgumentException();
}
this.siteInfo = siteInfo;
this.personId = personId;
this.firstName = firstName;
this.lastName = lastName;
this.role = role;
}
public SiteMembership(SiteInfo siteInfo, String personId, String role)
{
super();
if(siteInfo == null)
{
throw new java.lang.IllegalArgumentException();
}
if(personId == null)
{
throw new java.lang.IllegalArgumentException();
}
if(role == null)
{
throw new java.lang.IllegalArgumentException();
}
this.siteInfo = siteInfo;
this.personId = personId;
this.role = role;
}
public SiteInfo getSiteInfo()
{
return siteInfo;
}
public String getPersonId()
{
return personId;
}
public String getFirstName()
{
return firstName;
}
public String getLastName()
{
return lastName;
}
public String getRole()
{
return role;
}
@Override
public int hashCode()
{
final int prime = 31;
int result = 1;
result = prime * result
+ ((personId == null) ? 0 : personId.hashCode());
result = prime * result + ((role == null) ? 0 : role.hashCode());
result = prime * result
+ ((getSiteInfo() == null) ? 0 : getSiteInfo().hashCode());
return result;
}
@Override
public boolean equals(Object obj)
{
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
SiteMembership other = (SiteMembership) obj;
if (personId == null) {
if (other.personId != null)
return false;
} else if (!personId.equals(other.personId))
return false;
if (role != other.role)
return false;
if (getSiteInfo() == null) {
if (other.getSiteInfo() != null)
return false;
} else if (!getSiteInfo().equals(other.getSiteInfo()))
return false;
return true;
}
@Override
public String toString()
{
return "SiteMembership [siteInfo=" + getSiteInfo()
+ ", personId=" + personId + ", firstName=" + firstName
+ ", lastName=" + lastName + ", role=" + role + "]";
}
}
public class SiteMembership
{
private SiteInfo siteInfo;
private String personId;
private String firstName;
private String lastName;
private String role;
public SiteMembership(SiteInfo siteInfo, String personId, String firstName, String lastName,
String role)
{
super();
if (siteInfo == null)
{
throw new java.lang.IllegalArgumentException();
}
if (personId == null)
{
throw new java.lang.IllegalArgumentException(
"Person required building site membership of " + siteInfo.getShortName());
}
if (firstName == null)
{
throw new java.lang.IllegalArgumentException(
"FirstName required building site membership of " + siteInfo.getShortName());
}
if (lastName == null)
{
throw new java.lang.IllegalArgumentException(
"LastName required building site membership of " + siteInfo.getShortName());
}
if (role == null)
{
throw new java.lang.IllegalArgumentException(
"Role required building site membership of " + siteInfo.getShortName());
}
this.siteInfo = siteInfo;
this.personId = personId;
this.firstName = firstName;
this.lastName = lastName;
this.role = role;
}
public SiteMembership(SiteInfo siteInfo, String personId, String role)
{
super();
if (siteInfo == null)
{
throw new java.lang.IllegalArgumentException();
}
if (personId == null)
{
throw new java.lang.IllegalArgumentException(
"Person required building site membership of " + siteInfo.getShortName());
}
if (role == null)
{
throw new java.lang.IllegalArgumentException(
"Role required building site membership of " + siteInfo.getShortName());
}
this.siteInfo = siteInfo;
this.personId = personId;
this.role = role;
}
public SiteInfo getSiteInfo()
{
return siteInfo;
}
public String getPersonId()
{
return personId;
}
public String getFirstName()
{
return firstName;
}
public String getLastName()
{
return lastName;
}
public String getRole()
{
return role;
}
@Override
public int hashCode()
{
final int prime = 31;
int result = 1;
result = prime * result + ((personId == null) ? 0 : personId.hashCode());
result = prime * result + ((role == null) ? 0 : role.hashCode());
result = prime * result + ((getSiteInfo() == null) ? 0 : getSiteInfo().hashCode());
return result;
}
@Override
public boolean equals(Object obj)
{
if (this == obj)
return true;
if (obj == null)
return false;
if (getClass() != obj.getClass())
return false;
SiteMembership other = (SiteMembership) obj;
if (personId == null)
{
if (other.personId != null)
return false;
}
else if (!personId.equals(other.personId))
return false;
if (role != other.role)
return false;
if (getSiteInfo() == null)
{
if (other.getSiteInfo() != null)
return false;
}
else if (!getSiteInfo().equals(other.getSiteInfo()))
return false;
return true;
}
@Override
public String toString()
{
return "SiteMembership [siteInfo=" + getSiteInfo() + ", personId=" + personId
+ ", firstName=" + firstName + ", lastName=" + lastName + ", role=" + role + "]";
}
}