From a5dfaa0cdd12e176d690d80280ab25dabdd7f4a6 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 11 Jan 2017 10:34:42 +0000 Subject: [PATCH] Merged 5.2.0 (5.2.0) to HEAD (5.2) 133847 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) 133296 jvonka: REPO-1646: V1 REST API - cannot unset optional fields (eg. when updating person / site details ...) - fix test fallout (Person returns empty Company object by default - as per existing V1 getPerson API) - TODO review the way we match expected results QueriesPeopleApiTest (vs other test patterns) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@134186 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../rest/api/tests/QueriesPeopleApiTest.java | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source/test-java/org/alfresco/rest/api/tests/QueriesPeopleApiTest.java b/source/test-java/org/alfresco/rest/api/tests/QueriesPeopleApiTest.java index 3475195c53..e3f5f18090 100644 --- a/source/test-java/org/alfresco/rest/api/tests/QueriesPeopleApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/QueriesPeopleApiTest.java @@ -435,9 +435,9 @@ public class QueriesPeopleApiTest extends AbstractSingleNetworkSiteTest term = LAST_A; expectedPeople = new String[] { - "Person ["+ "lastName=LastA, ]", // USER5 - "Person ["+"firstName=FirstA, lastName=LastA, ]", // USER1 - "Person ["+"firstName=FirstB, lastName=LastA, ]", // USER3 + "Person ["+ "lastName=LastA, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER5 + "Person ["+"firstName=FirstA, lastName=LastA, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER1 + "Person ["+"firstName=FirstB, lastName=LastA, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER3 }; checkApiCall(term, orderBy, fields, paging, expectedStatus, expectedPeople); @@ -450,9 +450,9 @@ public class QueriesPeopleApiTest extends AbstractSingleNetworkSiteTest term = LAST_A; expectedPeople = new String[] { - "Person [id=user5@org.alfresco.rest.api.tests.queriespeopleapitest, ]", // USER5 - "Person [id=user1@org.alfresco.rest.api.tests.queriespeopleapitest, ]", // USER1 - "Person [id=user3@org.alfresco.rest.api.tests.queriespeopleapitest, ]", // USER3 + "Person [id=user5@org.alfresco.rest.api.tests.queriespeopleapitest, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER5 + "Person [id=user1@org.alfresco.rest.api.tests.queriespeopleapitest, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER1 + "Person [id=user3@org.alfresco.rest.api.tests.queriespeopleapitest, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER3 }; checkApiCall(term, orderBy, fields, paging, expectedStatus, expectedPeople); @@ -528,9 +528,9 @@ public class QueriesPeopleApiTest extends AbstractSingleNetworkSiteTest term = LAST_A; expectedPeople = new String[] { - "Person ["+ "lastName=LastA, ]", // USER5 - "Person ["+"firstName=FirstA, lastName=LastA, ]", // USER1 - "Person ["+"firstName=FirstB, lastName=LastA, ]" // USER3 + "Person ["+ "lastName=LastA, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER5 + "Person ["+"firstName=FirstA, lastName=LastA, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER1 + "Person ["+"firstName=FirstB, lastName=LastA, company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]" // USER3 }; checkApiCall(term, orderBy, fields, paging, expectedStatus, expectedPeople);