Merged 5.2.N (5.2.1) to HEAD (5.2)

129189 mmuller: Merged RETURN-OF-THE-API (5.2.0) to 5.2.N (5.2.1)
      129011 adavis: REPO-243 People Live Search
         - Fix build failures
         - replace tabs in Person.java


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@129363 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

source/test-java/org/alfresco/rest/api/tests/ApiTest.java

@@ -46,6 +46,7 @@ import org.junit.runners.Suite;
     NodeAssociationsApiTest.class,
     NodeVersionsApiTest.class,
     QueriesNodesApiTest.class,
+    QueriesPeopleApiTest.class,
     RenditionsTest.class,
     SharedLinkApiTest.class,
     ActivitiesPostingTest.class,

source/test-java/org/alfresco/rest/api/tests/NodeApiTest.java

@@ -348,10 +348,10 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
         assertEquals(content1_Id, node.getId());
         UserInfo createdByUser = node.getCreatedByUser();
         assertEquals(user1, createdByUser.getId());
-        assertEquals(user1 + " " + user1, createdByUser.getDisplayName());
+        assertEquals(UserInfo.getTestDisplayName(user1), createdByUser.getDisplayName());
         UserInfo modifiedByUser = node.getModifiedByUser();
         assertEquals(user1, modifiedByUser.getId());
-        assertEquals(user1 + " " + user1, modifiedByUser.getDisplayName());
+        assertEquals(UserInfo.getTestDisplayName(user1), modifiedByUser.getDisplayName());
         assertEquals(MimetypeMap.MIMETYPE_TEXT_PLAIN, node.getContent().getMimeType());
         assertNotNull(node.getContent().getMimeTypeName());
         assertNotNull(node.getContent().getEncoding());
@@ -665,7 +665,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
         String content_Id = documentResp.getId();
 
         // Expected result ...
-        UserInfo expectedUser = new UserInfo(user1, user1+" "+user1);
+        UserInfo expectedUser = new UserInfo(user1);
 
         Document d1 = new Document();
         d1.setId(content_Id);
@@ -1912,7 +1912,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
         
         String myNodeId = getMyNodeId();
 
-        UserInfo expectedUser = new UserInfo(user1, user1+" "+user1);
+        UserInfo expectedUser = new UserInfo(user1);
 
         String postUrl = getNodeChildrenUrl(myNodeId);
 
@@ -2392,7 +2392,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
         setRequestContext(user1);
 
         String myNodeId = getMyNodeId();
-        UserInfo expectedUser = new UserInfo(user1, user1+" "+user1);
+        UserInfo expectedUser = new UserInfo(user1);
         String myChildrenUrl = getNodeChildrenUrl(myNodeId);
         
         // create folder f1
@@ -2576,7 +2576,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
         String folder0Name = "f0-testCreateEmptyFile-"+RUNID;
         String f0Id = createFolder(Nodes.PATH_MY, folder0Name).getId();
 
-        UserInfo expectedUser = new UserInfo(user1, user1+" "+user1);
+        UserInfo expectedUser = new UserInfo(user1);
 
         String postUrl = getNodeChildrenUrl(f0Id);
 
@@ -2718,7 +2718,7 @@ public class NodeApiTest extends AbstractSingleNetworkSiteTest
         String folder0Name = "f0-testUpdateNodeInfo-"+RUNID;
         String f0Id = createFolder(Nodes.PATH_MY, folder0Name).getId();
 
-        UserInfo expectedUser = new UserInfo(user1, user1+" "+user1);
+        UserInfo expectedUser = new UserInfo(user1);
 
         String postUrl = getNodeChildrenUrl(f0Id);
 

source/test-java/org/alfresco/rest/api/tests/SharedLinkApiTest.java

@@ -38,6 +38,7 @@ import org.alfresco.rest.api.tests.client.data.Document;
 import org.alfresco.rest.api.tests.client.data.Node;
 import org.alfresco.rest.api.tests.client.data.QuickShareLinkEmailRequest;
 import org.alfresco.rest.api.tests.client.data.Rendition;
+import org.alfresco.rest.api.tests.client.data.UserInfo;
 import org.alfresco.rest.api.tests.util.MultiPartBuilder;
 import org.alfresco.rest.api.tests.util.RestApiUtil;
 import org.junit.Test;
@@ -153,10 +154,10 @@ public class SharedLinkApiTest extends AbstractBaseApiTest
 
         assertEquals(docModifiedAt.getTime(), resp.getModifiedAt().getTime()); // not changed
         assertEquals(docModifiedBy, resp.getModifiedByUser().getId()); // not changed (ie. not user2)
-        assertEquals(docModifiedBy+" "+docModifiedBy, resp.getModifiedByUser().getDisplayName());
+        assertEquals(UserInfo.getTestDisplayName(docModifiedBy), resp.getModifiedByUser().getDisplayName());
 
         assertEquals(user2, resp.getSharedByUser().getId());
-        assertEquals(user2+" "+user2, resp.getSharedByUser().getDisplayName());
+        assertEquals(UserInfo.getTestDisplayName(user2), resp.getSharedByUser().getDisplayName());
 
         // -ve test - try to create again (same user) - already exists
         post(URL_SHARED_LINKS, toJsonAsStringNonNull(body), 409);
@@ -187,9 +188,9 @@ public class SharedLinkApiTest extends AbstractBaseApiTest
         assertNull(resp.getAllowableOperations()); // include is ignored
 
         assertNull(resp.getModifiedByUser().getId()); // userId not returned
-        assertEquals(user1+" "+user1, resp.getModifiedByUser().getDisplayName());
+        assertEquals(UserInfo.getTestDisplayName(user1), resp.getModifiedByUser().getDisplayName());
         assertNull(resp.getSharedByUser().getId()); // userId not returned
-        assertEquals(user2+" "+user2, resp.getSharedByUser().getDisplayName());
+        assertEquals(UserInfo.getTestDisplayName(user2), resp.getSharedByUser().getDisplayName());
 
         // access to get shared link info - pass user2 (but ignore in non-MT)
         params = Collections.singletonMap("include", "allowableOperations");
@@ -202,9 +203,9 @@ public class SharedLinkApiTest extends AbstractBaseApiTest
         assertNull(resp.getAllowableOperations()); // include is ignored
 
         assertNull(resp.getModifiedByUser().getId()); // userId not returned
-        assertEquals(user1+" "+user1, resp.getModifiedByUser().getDisplayName());
+        assertEquals(UserInfo.getTestDisplayName(user1), resp.getModifiedByUser().getDisplayName());
         assertNull(resp.getSharedByUser().getId()); // userId not returned
-        assertEquals(user2+" "+user2, resp.getSharedByUser().getDisplayName());
+        assertEquals(UserInfo.getTestDisplayName(user2), resp.getSharedByUser().getDisplayName());
 
 
         // allowable operations not included - no params
@@ -225,9 +226,9 @@ public class SharedLinkApiTest extends AbstractBaseApiTest
         assertNull(resp.getAllowableOperations()); // include is ignored
 
         assertNull(resp.getModifiedByUser().getId()); // userId not returned
-        assertEquals(user1+" "+user1, resp.getModifiedByUser().getDisplayName());
+        assertEquals(UserInfo.getTestDisplayName(user1), resp.getModifiedByUser().getDisplayName());
         assertNull(resp.getSharedByUser().getId()); // userId not returned
-        assertEquals(user2+" "+user2, resp.getSharedByUser().getDisplayName());
+        assertEquals(UserInfo.getTestDisplayName(user2), resp.getSharedByUser().getDisplayName());
 
         // unauth access to file 1 content (via shared link)
         response = getSingle(QuickShareLinkEntityResource.class, shared1Id + "/content", null, 200);

source/test-java/org/alfresco/rest/api/tests/client/data/UserInfo.java

@@ -42,12 +42,35 @@ public class UserInfo
     {
     }
 
+    public UserInfo(String id)
+    {
+        this(id, getTestDisplayName(id));
+    }
+
     public UserInfo(String id, String displayName)
     {
         this.id = id;
         this.displayName = displayName;
     }
 
+    /*
+     * Builds a test display name from a test user id. The display name is normally
+     * make up of the first and last name and in the case of test users the user id
+     * is also used for both first and last name. With the addition of a network to
+     * the user id, the display name looks rather strange. This method simply strips
+     * the network (if it exists) from the user id and uses that for both first and
+     * last names.
+     */
+    public static String getTestDisplayName(String id)
+    {
+        int i = id.lastIndexOf('@');
+        if (i != -1)
+        {
+            id = id.substring(0, i);
+        }
+        return id+' '+id;
+    }
+
     public String getDisplayName()
     {
         return displayName;