inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-08-14 17:58:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged 5.2.0 (5.2.0) to HEAD (5.2)

Browse Source 
133846 rmunteanu: REPO-1746: Merge fixes for 5.2 GA issues to 5.2.0 branch
      Merged 5.2.N (5.2.1) to 5.2.0 (5.2.0)
         133293 jvonka: REPO-1646: V1 REST API - cannot unset optional fields (eg. when updating person / site details ...)
         - part 2 (Update Person)
         - REPO-1268, REPO-893


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134185 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2017-01-11 10:34:34 +00:00
parent 2b1c7382d1
commit c65142425d
7 changed files with 384 additions and 128 deletions
Download Patch File Download Diff File Expand all files Collapse all files

111
source/test-java/org/alfresco/rest/api/tests/TestPeople.java
View File

@@ -323,7 +323,18 @@ public class TestPeople extends EnterpriseTestApi
assertEquals(null, p.getInstantMessageId());
assertEquals(null, p.getJobTitle());
assertEquals(null, p.getLocation());
assertEquals(null, p.getCompany());
// note: empty company object is returned for backwards compatibility (with pre-existing getPerson API <= 5.1)
assertNotNull(p.getCompany());
assertNull(p.getCompany().getOrganization());
assertNull(p.getCompany().getAddress1());
assertNull(p.getCompany().getAddress2());
assertNull(p.getCompany().getAddress3());
assertNull(p.getCompany().getPostcode());
assertNull(p.getCompany().getFax());
assertNull(p.getCompany().getEmail());
assertNull(p.getCompany().getTelephone());
assertEquals(null, p.getMobile());
assertEquals("1234 5678 9012", p.getTelephone());
assertEquals(null, p.getUserStatus());
@@ -351,7 +362,18 @@ public class TestPeople extends EnterpriseTestApi
assertEquals(null, p.getInstantMessageId());
assertEquals(null, p.getJobTitle());
assertEquals(null, p.getLocation());
assertEquals(null, p.getCompany());
// note: empty company object is returned for backwards compatibility (with pre-existing getPerson API <= 5.1)
assertNotNull(p.getCompany());
assertNull(p.getCompany().getOrganization());
assertNull(p.getCompany().getAddress1());
assertNull(p.getCompany().getAddress2());
assertNull(p.getCompany().getAddress3());
assertNull(p.getCompany().getPostcode());
assertNull(p.getCompany().getFax());
assertNull(p.getCompany().getEmail());
assertNull(p.getCompany().getTelephone());
assertEquals(null, p.getMobile());
assertEquals(null, p.getTelephone());
assertEquals(null, p.getUserStatus());
@@ -862,7 +884,7 @@ public class TestPeople extends EnterpriseTestApi
}
@Test
public void testUpdatePersonUpdate() throws Exception
public void testUpdatePersonUpdateAsAdmin() throws Exception
{
final String personId = account3PersonIt.next();
@@ -942,6 +964,89 @@ public class TestPeople extends EnterpriseTestApi
assertEquals(userStatus, updatedPerson.getUserStatus());
assertEquals(emailNotificationsEnabled, updatedPerson.isEmailNotificationsEnabled());
assertEquals(enabled, updatedPerson.isEnabled());
// test ability to unset optional fields (could be one or more - here all) including individual company fields
response = people.update("people", personId, null, null,
"{\n"
+ " \"lastName\":null,\n"
+ " \"description\":null,\n"
+ " \"skypeId\":null,\n"
+ " \"googleId\":null,\n"
+ " \"instantMessageId\":null,\n"
+ " \"jobTitle\":null,\n"
+ " \"location\":null,\n"
+ " \"company\": {\n"
+ " \"organization\":null,\n"
+ " \"address1\":null,\n"
+ " \"address2\":null,\n"
+ " \"address3\":null,\n"
+ " \"postcode\":null,\n"
+ " \"telephone\":null,\n"
+ " \"fax\":null,\n"
+ " \"email\":null\n"
+ " },\n"
+ " \"mobile\":null,\n"
+ " \"telephone\":null,\n"
+ " \"userStatus\":null\n"
+ "}", params,
"Expected 200 response when updating " + personId, 200);
updatedPerson = Person.parsePerson((JSONObject) response.getJsonResponse().get("entry"));
assertNotNull(updatedPerson.getId());
assertNull(updatedPerson.getLastName());
assertNull(updatedPerson.getDescription());
assertNull(updatedPerson.getSkypeId());
assertNull(updatedPerson.getGoogleId());
assertNull(updatedPerson.getInstantMessageId());
assertNull(updatedPerson.getJobTitle());
assertNull(updatedPerson.getLocation());
assertNotNull(updatedPerson.getCompany());
assertNull(updatedPerson.getCompany().getOrganization());
assertNull(updatedPerson.getCompany().getAddress1());
assertNull(updatedPerson.getCompany().getAddress2());
assertNull(updatedPerson.getCompany().getAddress3());
assertNull(updatedPerson.getCompany().getPostcode());
assertNull(updatedPerson.getCompany().getFax());
assertNull(updatedPerson.getCompany().getEmail());
assertNull(updatedPerson.getCompany().getTelephone());
assertNull(updatedPerson.getMobile());
assertNull(updatedPerson.getTelephone());
assertNull(updatedPerson.getUserStatus());
// set at least one company field
String updatedOrgName = "another org";
response = people.update("people", personId, null, null,
"{\n"
+ " \"company\": {\n"
+ " \"organization\":\""+updatedOrgName+"\"\n"
+ " }\n"
+ "}", params,
"Expected 200 response when updating " + personId, 200);
updatedPerson = Person.parsePerson((JSONObject) response.getJsonResponse().get("entry"));
assertNotNull(updatedPerson.getCompany());
assertEquals(updatedOrgName, updatedPerson.getCompany().getOrganization());
// test ability to unset company fields as a whole
response = people.update("people", personId, null, null,
"{\n"
+ " \"company\": null\n"
+ "}", params,
"Expected 200 response when updating " + personId, 200);
updatedPerson = Person.parsePerson((JSONObject) response.getJsonResponse().get("entry"));
// note: empty company object is returned for backwards compatibility (with pre-existing getPerson API <= 5.1)
assertNotNull(updatedPerson.getCompany());
assertNull(updatedPerson.getCompany().getOrganization());
}
@Test

12
source/test-java/org/alfresco/rest/api/tests/client/data/Company.java
View File

@@ -31,6 +31,10 @@ import org.json.simple.JSONObject;
public class Company extends org.alfresco.rest.api.model.Company implements ExpectedComparison
{
public Company()
{
}
public Company(org.alfresco.rest.api.model.Company company)
{
super(company.getOrganization(), company.getAddress1(), company.getAddress2(), company.getAddress3(), company.getPostcode(), company.getTelephone(), company.getFax(), company.getEmail());
@@ -40,7 +44,7 @@ public class Company extends org.alfresco.rest.api.model.Company implements Expe
{
super(organization, address1, address2, address3, postcode, telephone, fax, email);
}
@SuppressWarnings("unchecked")
public JSONObject toJSON()
{
@@ -55,14 +59,14 @@ public class Company extends org.alfresco.rest.api.model.Company implements Expe
companyJson.put("email", getEmail());
return companyJson;
}
@Override
public void expected(Object o)
{
assertTrue(o instanceof Company);
Company other = (Company)o;
AssertUtil.assertEquals("organization", getOrganization(), other.getOrganization());
AssertUtil.assertEquals("address1", getAddress1(), other.getAddress1());
AssertUtil.assertEquals("address2", getAddress2(), other.getAddress2());

4
source/test-java/org/alfresco/rest/api/tests/client/data/Person.java
View File

@@ -219,6 +219,10 @@ public class Person
{
company = new Company(organization, address1, address2, address3, postcode, companyTelephone, fax, companyEmail);
}
else
{
company = new Company();
}
}
String mobile = (String)jsonObject.get("mobile");