Merged HEAD-QA to HEAD (4.2) (including moving test classes into separate folders)

51903 to 54309 


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@54310 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Samuel Langlois
2013-08-20 17:17:31 +00:00
parent a91f6e2535
commit 788d3c9c89
777 changed files with 77820 additions and 23746 deletions

View File

@@ -62,11 +62,6 @@ public class LinksListGet extends AbstractLinksWebScript
{
tagFiltering = false;
}
else
{
// Tags can be full unicode strings, so decode
tag = URLDecoder.decode(tag);
}
// User?
boolean userFiltering = false;
@@ -92,6 +87,7 @@ public class LinksListGet extends AbstractLinksWebScript
// Get the links for the list
PagingRequest paging = buildPagingRequest(req);
paging.setRequestTotalCountMax(paging.getSkipCount() + paging.getRequestTotalCountMax());
PagingResults<LinkInfo> links;
if (tagFiltering)
{
@@ -134,6 +130,15 @@ public class LinksListGet extends AbstractLinksWebScript
}
data.put("total", total);
if (total == paging.getRequestTotalCountMax())
{
data.put("totalRecordsUpper", true);
}
else
{
data.put("totalRecordsUpper", false);
}
// We need the container node for permissions checking
NodeRef container;
if (links.getPage().size() > 0)

View File

@@ -1,659 +0,0 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
*
* This file is part of Alfresco
*
* Alfresco is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* Alfresco is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU Lesser General Public License for more details.
*
* You should have received a copy of the GNU Lesser General Public License
* along with Alfresco. If not, see <http://www.gnu.org/licenses/>.
*/
package org.alfresco.repo.web.scripts.links;
import java.util.Arrays;
import java.util.Date;
import java.util.List;
import javax.transaction.UserTransaction;
import org.alfresco.model.ContentModel;
import org.alfresco.repo.policy.BehaviourFilter;
import org.alfresco.repo.security.authentication.AuthenticationComponent;
import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.site.SiteModel;
import org.alfresco.repo.web.scripts.BaseWebScriptTest;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.cmr.site.SiteInfo;
import org.alfresco.service.cmr.site.SiteService;
import org.alfresco.service.cmr.site.SiteVisibility;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ISO8601DateFormat;
import org.alfresco.util.PropertyMap;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.json.JSONArray;
import org.json.JSONObject;
import org.springframework.extensions.webscripts.Status;
import org.springframework.extensions.webscripts.TestWebScriptServer.DeleteRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.GetRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.PostRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.PutRequest;
import org.springframework.extensions.webscripts.TestWebScriptServer.Response;
/**
* Unit Test to test the Links Web Script API
*
* @author Nick Burch
* @since 4.0
*/
public class LinksRestApiTest extends BaseWebScriptTest
{
@SuppressWarnings("unused")
private static Log logger = LogFactory.getLog(LinksRestApiTest.class);
private MutableAuthenticationService authenticationService;
private AuthenticationComponent authenticationComponent;
private TransactionService transactionService;
private BehaviourFilter policyBehaviourFilter;
private PersonService personService;
private NodeService nodeService;
private NodeService internalNodeService;
private SiteService siteService;
private static final String USER_ONE = "UserOneSecondToo";
private static final String USER_TWO = "UserTwoSecondToo";
private static final String USERDETAILS_FIRSTNAME = "FirstName123";
private static final String USERDETAILS_LASTNAME = "LastName123";
private static final String SITE_SHORT_NAME_LINKS = "LinkSiteShortNameTest";
private static final String LINK_TITLE_ONE = "TestLinkOne";
private static final String LINK_TITLE_TWO = "TestLinkTwo";
private static final String LINK_TITLE_THREE = "StillTestLinkThree";
private static final String LINK_URL_ONE = "http://google.com/";
private static final String LINK_URL_TWO = "http://alfresco.com/";
private static final String LINK_URL_THREE = "http://share.alfresco.com/";
private static final String URL_LINKS_BASE = "/api/links/site/" + SITE_SHORT_NAME_LINKS + "/links";
private static final String URL_LINKS_LIST = URL_LINKS_BASE;
private static final String URL_LINKS_CREATE = URL_LINKS_BASE + "/posts";
private static final String URL_LINKS_UPDATE = URL_LINKS_BASE + "/"; // plus path
private static final String URL_LINKS_DELETE = "/api/links/delete/site/" + SITE_SHORT_NAME_LINKS + "/links";
private static final String URL_LINKS_FETCH = "/api/links/link/site/" + SITE_SHORT_NAME_LINKS + "/links/"; // plus path
// General methods
@Override
protected void setUp() throws Exception
{
super.setUp();
this.authenticationService = (MutableAuthenticationService)getServer().getApplicationContext().getBean("AuthenticationService");
this.authenticationComponent = (AuthenticationComponent)getServer().getApplicationContext().getBean("authenticationComponent");
this.policyBehaviourFilter = (BehaviourFilter)getServer().getApplicationContext().getBean("policyBehaviourFilter");
this.transactionService = (TransactionService)getServer().getApplicationContext().getBean("transactionService");
this.personService = (PersonService)getServer().getApplicationContext().getBean("PersonService");
this.nodeService = (NodeService)getServer().getApplicationContext().getBean("NodeService");
this.siteService = (SiteService)getServer().getApplicationContext().getBean("SiteService");
this.internalNodeService = (NodeService)getServer().getApplicationContext().getBean("nodeService");
// Authenticate as user
this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
// Create test site
// - only create the site if it doesn't already exist
SiteInfo siteInfo = this.siteService.getSite(SITE_SHORT_NAME_LINKS);
if (siteInfo == null)
{
this.siteService.createSite("CalendarSitePreset", SITE_SHORT_NAME_LINKS, "LinksSiteTitle", "TestDescription", SiteVisibility.PUBLIC);
}
// Ensure the links container is there
if (!siteService.hasContainer(SITE_SHORT_NAME_LINKS, "links"))
{
siteService.createContainer(SITE_SHORT_NAME_LINKS, "links", null, null);
}
// Create users
createUser(USER_ONE, SiteModel.SITE_COLLABORATOR);
createUser(USER_TWO, SiteModel.SITE_COLLABORATOR);
// Do tests as inviter user
this.authenticationComponent.setCurrentUser(USER_ONE);
}
@Override
protected void tearDown() throws Exception
{
super.tearDown();
// admin user required to delete user
this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
// delete the site
siteService.deleteSite(SITE_SHORT_NAME_LINKS);
// delete the users
personService.deletePerson(USER_ONE);
if(this.authenticationService.authenticationExists(USER_ONE))
{
this.authenticationService.deleteAuthentication(USER_ONE);
}
personService.deletePerson(USER_TWO);
if (this.authenticationService.authenticationExists(USER_TWO))
{
this.authenticationService.deleteAuthentication(USER_TWO);
}
}
private void createUser(String userName, String role)
{
// if user with given user name doesn't already exist then create user
if (this.authenticationService.authenticationExists(userName) == false)
{
// create user
this.authenticationService.createAuthentication(userName, "password".toCharArray());
// create person properties
PropertyMap personProps = new PropertyMap();
personProps.put(ContentModel.PROP_USERNAME, userName);
personProps.put(ContentModel.PROP_FIRSTNAME, USERDETAILS_FIRSTNAME);
personProps.put(ContentModel.PROP_LASTNAME, USERDETAILS_LASTNAME);
personProps.put(ContentModel.PROP_EMAIL, "FirstName123.LastName123@email.com");
personProps.put(ContentModel.PROP_JOBTITLE, "JobTitle123");
personProps.put(ContentModel.PROP_JOBTITLE, "Organisation123");
// create person node for user
this.personService.createPerson(personProps);
}
// add the user as a member with the given role
this.siteService.setMembership(SITE_SHORT_NAME_LINKS, userName, role);
}
// Test helper methods
private JSONObject getLinks(String filter, String username) throws Exception
{
String origUser = this.authenticationComponent.getCurrentUserName();
if (username != null)
{
this.authenticationComponent.setCurrentUser(username);
filter = "user";
}
String url = URL_LINKS_LIST;
if (filter == null)
{
filter = "all";
}
url += "?filter=" + filter;
url += "&startIndex=0&page=1&pageSize=4";
Response response = sendRequest(new GetRequest(url), 200);
JSONObject result = new JSONObject(response.getContentAsString());
if (username != null)
{
this.authenticationComponent.setCurrentUser(origUser);
}
return result;
}
private JSONObject getLink(String name, int expectedStatus) throws Exception
{
Response response = sendRequest(new GetRequest(URL_LINKS_FETCH + name), expectedStatus);
if (expectedStatus == Status.STATUS_OK)
{
JSONObject result = new JSONObject(response.getContentAsString());
if (result.has("item"))
{
return result.getJSONObject("item");
}
return result;
}
else
{
return null;
}
}
/**
* Creates a single link based on the supplied details
*/
private JSONObject createLink(String title, String description, String url,
boolean internal, int expectedStatus) throws Exception
{
JSONObject json = new JSONObject();
json.put("site", SITE_SHORT_NAME_LINKS);
json.put("title", title);
json.put("description", description);
json.put("url", url);
json.put("tags", "");
if (internal)
{
json.put("internal", "true");
}
json.put("page", "links-view"); // TODO Is this really needed?
Response response = sendRequest(new PostRequest(URL_LINKS_CREATE, json.toString(), "application/json"), expectedStatus);
if (expectedStatus == Status.STATUS_OK)
{
JSONObject result = new JSONObject(response.getContentAsString());
if (result.has("link"))
{
return result.getJSONObject("link");
}
return result;
}
else
{
return null;
}
}
/**
* Updates the link with the new details
*/
private JSONObject updateLink(String name, String title, String description, String url,
boolean internal, int expectedStatus) throws Exception
{
JSONObject json = new JSONObject();
json.put("site", SITE_SHORT_NAME_LINKS);
json.put("title", title);
json.put("description", description);
json.put("url", url);
json.put("tags", "");
json.put("internal", Boolean.toString(internal).toLowerCase());
json.put("page", "links-view"); // TODO Is this really needed?
Response response = sendRequest(new PutRequest(URL_LINKS_UPDATE + name, json.toString(), "application/json"), expectedStatus);
if (expectedStatus == Status.STATUS_OK)
{
JSONObject result = new JSONObject(response.getContentAsString());
if (result.has("links"))
{
return result.getJSONObject("links");
}
return result;
}
else
{
return null;
}
}
/**
* Deletes the link
*/
private JSONObject deleteLink(String name, int expectedStatus) throws Exception
{
Response response = sendRequest(new DeleteRequest(URL_LINKS_FETCH+name), expectedStatus);
if (expectedStatus == Status.STATUS_OK)
{
JSONObject result = new JSONObject(response.getContentAsString());
return result;
}
else
{
return null;
}
}
/**
* Deletes the links
*/
private JSONObject deleteLinks(List<String> names, int expectedStatus) throws Exception
{
JSONArray items = new JSONArray();
for (String name : names)
{
items.put(name);
}
JSONObject json = new JSONObject();
json.put("items", items);
Response response = sendRequest(new PostRequest(URL_LINKS_DELETE, json.toString(), "application/json"), expectedStatus);
if (expectedStatus == Status.STATUS_OK)
{
JSONObject result = new JSONObject(response.getContentAsString());
return result;
}
else
{
return null;
}
}
/**
* Monkeys with the created date on a link
*/
private void pushLinkCreatedDateBack(String name, int daysAgo) throws Exception
{
NodeRef container = siteService.getContainer(SITE_SHORT_NAME_LINKS, "links");
NodeRef node = nodeService.getChildByName(container, ContentModel.ASSOC_CONTAINS, name);
Date created = (Date)nodeService.getProperty(node, ContentModel.PROP_CREATED);
Date newCreated = new Date(created.getTime() - daysAgo*24*60*60*1000);
UserTransaction txn = transactionService.getUserTransaction();
txn.begin();
this.policyBehaviourFilter.disableBehaviour(ContentModel.ASPECT_AUDITABLE);
internalNodeService.setProperty(node, ContentModel.PROP_CREATED, newCreated);
this.policyBehaviourFilter.enableBehaviour(ContentModel.ASPECT_AUDITABLE);
txn.commit();
// Now chance something else on the node to have it re-indexed
nodeService.setProperty(node, ContentModel.PROP_CREATED, newCreated);
nodeService.setProperty(node, ContentModel.PROP_DESCRIPTION, "Forced change");
}
/**
* Gets the link name (link- timestamp based) from a returned link
*/
private String getNameFromLink(JSONObject link) throws Exception
{
if (! link.has("name"))
{
throw new IllegalArgumentException("No name in " + link.toString());
}
return link.getString("name");
}
// Tests
/**
* Creating, editing, fetching and deleting a link
*/
public void testCreateEditDeleteEntry() throws Exception
{
JSONObject link;
JSONObject author;
JSONObject permissions;
String name;
// None to start with
link = getLinks(null, null);
assertEquals("Incorrect JSON: " + link.toString(), true, link.has("total"));
assertEquals(0, link.getInt("total"));
// Won't be there to start with
link = getLink(LINK_TITLE_ONE, Status.STATUS_NOT_FOUND);
// Create
// (We don't get much info back)
link = createLink(LINK_TITLE_ONE, "Thing 1", LINK_URL_ONE, false, Status.STATUS_OK);
assertEquals("Incorrect JSON: " + link.toString(), true, link.has("name"));
name = getNameFromLink(link);
assertEquals(name, link.getString("name"));
assertEquals(name, link.getString("message"));
// Fetch
link = getLink(name, Status.STATUS_OK);
assertEquals("Error found " + link.toString(), false, link.has("error"));
assertEquals(LINK_TITLE_ONE, link.getString("title"));
assertEquals("Thing 1", link.getString("description"));
assertEquals(LINK_URL_ONE, link.getString("url"));
assertEquals(false, link.getBoolean("internal"));
assertEquals(0, link.getJSONArray("tags").length());
assertEquals(true, link.has("author"));
author = link.getJSONObject("author");
assertEquals(USER_ONE, author.getString("username"));
assertEquals(USERDETAILS_FIRSTNAME, author.getString("firstName"));
assertEquals(USERDETAILS_LASTNAME, author.getString("lastName"));
// Check the permissions
assertEquals(true, link.has("permissions"));
permissions = link.getJSONObject("permissions");
assertEquals(true, permissions.getBoolean("edit"));
assertEquals(true, permissions.getBoolean("delete"));
// Check the noderef
NodeRef nodeRef = new NodeRef(link.getString("nodeRef"));
assertEquals(true, nodeService.exists(nodeRef));
assertEquals(name, nodeService.getProperty(nodeRef, ContentModel.PROP_NAME));
// Check the comments url
assertEquals(
"/node/workspace/" + nodeRef.getStoreRef().getIdentifier() + "/" + nodeRef.getId() + "/comments",
link.getString("commentsUrl"));
// Check the created date
assertEquals(
ISO8601DateFormat.format((Date)nodeService.getProperty(nodeRef, ContentModel.PROP_CREATED)),
link.getJSONObject("createdOnDate").getString("iso8601"));
// Edit
// We should get a simple message
link = updateLink(name, LINK_TITLE_ONE, "More Thing 1", LINK_URL_ONE, true, Status.STATUS_OK);
assertEquals(
"Incorrect JSON: " + link.toString(),
true, link.has("message"));
assertEquals(
"Incorrect JSON: " + link.toString(),
true, link.getString("message").contains("updated"));
// Fetch
link = getLink(name, Status.STATUS_OK);
assertEquals("Error found " + link.toString(), false, link.has("error"));
assertEquals(LINK_TITLE_ONE, link.getString("title"));
assertEquals("More Thing 1", link.getString("description"));
assertEquals(LINK_URL_ONE, link.getString("url"));
assertEquals(true, link.getBoolean("internal"));
assertEquals(0, link.getJSONArray("tags").length());
assertEquals(true, link.has("author"));
author = link.getJSONObject("author");
assertEquals(USER_ONE, author.getString("username"));
assertEquals(USERDETAILS_FIRSTNAME, author.getString("firstName"));
assertEquals(USERDETAILS_LASTNAME, author.getString("lastName"));
// Fetch as a different user, permissions different
this.authenticationComponent.setCurrentUser(USER_TWO);
link = getLink(name, Status.STATUS_OK);
// Check the basics
assertEquals(LINK_TITLE_ONE, link.getString("title"));
assertEquals("More Thing 1", link.getString("description"));
assertEquals(LINK_URL_ONE, link.getString("url"));
assertEquals(true, link.getBoolean("internal"));
assertEquals(0, link.getJSONArray("tags").length());
// Different user in the site, can edit but not delete
assertEquals(true, link.has("permissions"));
permissions = link.getJSONObject("permissions");
assertEquals(true, permissions.getBoolean("edit"));
assertEquals(false, permissions.getBoolean("delete"));
this.authenticationComponent.setCurrentUser(USER_ONE);
// Delete
link = deleteLinks(Arrays.asList(new String[]{name}), Status.STATUS_OK);
assertEquals(
"Incorrect JSON: " + link.toString(),
true, link.has("message"));
assertEquals(
"Incorrect JSON: " + link.toString(),
true, link.getString("message").contains("deleted"));
// Fetch, will have gone
link = getLink(name, Status.STATUS_NOT_FOUND);
// Can't delete again
deleteLinks(Arrays.asList(new String[]{name}), Status.STATUS_NOT_FOUND);
// Can't edit it when it's deleted
sendRequest(new PutRequest(URL_LINKS_UPDATE + name, "{}", "application/json"), Status.STATUS_NOT_FOUND);
// Do a single delete
link = createLink(LINK_TITLE_ONE, "Thing 1", LINK_URL_ONE, false, Status.STATUS_OK);
name = getNameFromLink(link);
getLink(name, Status.STATUS_OK);
deleteLink(name, Status.STATUS_NO_CONTENT);
getLink(name, Status.STATUS_NOT_FOUND);
deleteLink(name, Status.STATUS_NOT_FOUND);
}
/**
* Listing
*/
public void testOverallListing() throws Exception
{
JSONObject links;
JSONArray entries;
// Initially, there are no events
links = getLinks(null, null);
assertEquals("Incorrect JSON: " + links.toString(), true, links.has("total"));
assertEquals(0, links.getInt("total"));
assertEquals(0, links.getInt("itemCount"));
// Add two links to get started with
createLink(LINK_TITLE_ONE, "Thing 1", LINK_URL_ONE, false, Status.STATUS_OK);
createLink(LINK_TITLE_TWO, "Thing 2", LINK_URL_TWO, false, Status.STATUS_OK);
// Check again
links = getLinks(null, null);
// Should have two links
assertEquals("Incorrect JSON: " + links.toString(), true, links.has("total"));
assertEquals(2, links.getInt("total"));
assertEquals(2, links.getInt("itemCount"));
entries = links.getJSONArray("items");
assertEquals(2, entries.length());
// Sorted by newest created first
assertEquals(LINK_TITLE_TWO, entries.getJSONObject(0).getString("title"));
assertEquals(LINK_TITLE_ONE, entries.getJSONObject(1).getString("title"));
// Add a third, which is internal, and created by the other user
this.authenticationComponent.setCurrentUser(USER_TWO);
JSONObject link3 = createLink(LINK_TITLE_THREE, "Thing 3", LINK_URL_THREE, true, Status.STATUS_OK);
String name3 = getNameFromLink(link3);
updateLink(name3, LINK_TITLE_THREE, "More Where 3", LINK_URL_THREE, false, Status.STATUS_OK);
this.authenticationComponent.setCurrentUser(USER_ONE);
// Check now, should have three links
links = getLinks(null, null);
assertEquals(3, links.getInt("total"));
assertEquals(3, links.getInt("itemCount"));
entries = links.getJSONArray("items");
assertEquals(3, entries.length());
assertEquals(LINK_TITLE_THREE, entries.getJSONObject(0).getString("title"));
assertEquals(LINK_TITLE_TWO, entries.getJSONObject(1).getString("title"));
assertEquals(LINK_TITLE_ONE, entries.getJSONObject(2).getString("title"));
// Ask for filtering by user
links = getLinks(null, USER_ONE);
assertEquals(2, links.getInt("total"));
assertEquals(2, links.getInt("itemCount"));
entries = links.getJSONArray("items");
assertEquals(2, entries.length());
assertEquals(LINK_TITLE_TWO, entries.getJSONObject(0).getString("title"));
assertEquals(LINK_TITLE_ONE, entries.getJSONObject(1).getString("title"));
links = getLinks(null, USER_TWO);
assertEquals(1, links.getInt("total"));
assertEquals(1, links.getInt("itemCount"));
entries = links.getJSONArray("items");
assertEquals(1, entries.length());
assertEquals(LINK_TITLE_THREE, entries.getJSONObject(0).getString("title"));
// Ask for filtering by recent docs
links = getLinks("recent", null);
assertEquals(3, links.getInt("total"));
assertEquals(3, links.getInt("itemCount"));
entries = links.getJSONArray("items");
assertEquals(3, entries.length());
assertEquals(LINK_TITLE_THREE, entries.getJSONObject(0).getString("title"));
assertEquals(LINK_TITLE_TWO, entries.getJSONObject(1).getString("title"));
assertEquals(LINK_TITLE_ONE, entries.getJSONObject(2).getString("title"));
// Push the 3rd event back, it'll fall off
pushLinkCreatedDateBack(name3, 10);
links = getLinks("recent", null);
assertEquals(2, links.getInt("total"));
assertEquals(2, links.getInt("itemCount"));
entries = links.getJSONArray("items");
assertEquals(2, entries.length());
assertEquals(LINK_TITLE_TWO, entries.getJSONObject(0).getString("title"));
assertEquals(LINK_TITLE_ONE, entries.getJSONObject(1).getString("title"));
// Trigger the paging, by going over our page size of 4
createLink(LINK_TITLE_THREE+"a", "Thing 4", LINK_URL_THREE, true, Status.STATUS_OK);
createLink(LINK_TITLE_THREE+"z", "Thing 5", LINK_URL_THREE, true, Status.STATUS_OK);
links = getLinks(null, null);
assertEquals(5, links.getInt("total"));
assertEquals(4, links.getInt("itemCount"));
entries = links.getJSONArray("items");
assertEquals(4, entries.length());
assertEquals(LINK_TITLE_THREE+"z", entries.getJSONObject(0).getString("title"));
assertEquals(LINK_TITLE_THREE+"a", entries.getJSONObject(1).getString("title"));
assertEquals(LINK_TITLE_TWO, entries.getJSONObject(2).getString("title"));
assertEquals(LINK_TITLE_ONE, entries.getJSONObject(3).getString("title"));
// THREE is now the oldest, as we pushed it back in time, so it's on page two
// Now hide the site, and remove the user from it, won't be allowed to see it
this.authenticationComponent.setCurrentUser(AuthenticationUtil.getAdminUserName());
SiteInfo site = siteService.getSite(SITE_SHORT_NAME_LINKS);
site.setVisibility(SiteVisibility.PRIVATE);
siteService.updateSite(site);
siteService.removeMembership(SITE_SHORT_NAME_LINKS, USER_ONE);
this.authenticationComponent.setCurrentUser(USER_ONE);
sendRequest(new GetRequest(URL_LINKS_LIST), Status.STATUS_NOT_FOUND);
}
}