From bb0ab874a0a49d50c84d7e8038244bce0739bbfe Mon Sep 17 00:00:00 2001 From: Jan Vonka Date: Wed, 12 Jul 2017 12:10:23 +0000 Subject: [PATCH] Merged 5.2.N-AUDIT-API (5.2.2) to 5.2.N (5.2.2) 137907 jvonka: Trivial improvement: Queries REST API Test - testFieldsId - noticed whilst running ApiTest suite locally for new V1 Audit REST API - hence initially committed on 5.2.N-AUDIT-API branch (prior to merge to 5.2.N - this tests now passes even if AbstractSingleNetworkSiteTest -> useDefaultNetwork is set to true git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137967 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../alfresco/rest/api/tests/QueriesPeopleApiTest.java | 11 ++++++----- 1 file changed, 6 insertions(+), 5 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 e3f5f18090..2e4c741a28 100644 --- a/source/test-java/org/alfresco/rest/api/tests/QueriesPeopleApiTest.java +++ b/source/test-java/org/alfresco/rest/api/tests/QueriesPeopleApiTest.java @@ -29,8 +29,6 @@ import static org.alfresco.rest.api.Queries.PARAM_FIRSTNAME; import static org.alfresco.rest.api.Queries.PARAM_LASTNAME; import static org.alfresco.rest.api.Queries.PARAM_PERSON_ID; import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; -import static org.junit.Assert.assertTrue; import static org.junit.Assert.fail; import java.util.ArrayList; @@ -448,11 +446,14 @@ public class QueriesPeopleApiTest extends AbstractSingleNetworkSiteTest { fields = PARAM_PERSON_ID; term = LAST_A; + + String tenantSuffix = (useDefaultNetwork ? "" : "@"+networkOne.getId()); + expectedPeople = new String[] { - "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 + "Person [id=user5"+tenantSuffix+", company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER5 + "Person [id=user1"+tenantSuffix+", company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER1 + "Person [id=user3"+tenantSuffix+", company=Company [address1=null, address2=null, address3=null, postcode=null, telephone=null, fax=null, email=null], ]", // USER3 }; checkApiCall(term, orderBy, fields, paging, expectedStatus, expectedPeople);