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

RM-2470 Change security clearance sorting to be by full name.

Browse Source 
Enable sorting by multiple fields and configure the security clearance page
to use first name, last name and then fall back to user name as a tie
breaker.

The rm-automation test fails for me locally, as the person search is case
sensitive. I'm pushing this anyway because Bamboo didn't protest at the
old sorting method (which also failed locally due to case sensitivity).

Remove "final" from UserQueryParams so it can be mocked.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@109169 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tom Page
2015-07-29 15:16:25 +00:00
parent 10495abb88
commit 9edd378291
3 changed files with 124 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearanceGetUnitTest.java
View File

@@ -23,8 +23,13 @@ import static org.junit.Assert.assertNotNull;
import static org.mockito.Matchers.any;
import static org.mockito.Matchers.anyString;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import com.fasterxml.jackson.databind.JsonNode;
@@ -38,6 +43,7 @@ import org.alfresco.module.org_alfresco_module_rm.test.util.BaseWebScriptUnitTes
import org.alfresco.query.PagingResults;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.security.PersonService.PersonInfo;
import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
import org.json.JSONArray;
import org.json.JSONObject;
@@ -46,6 +52,7 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.Spy;
import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.WebScriptRequest;
/**
* Test for get user security clearance API
@@ -195,6 +202,66 @@ public class UserSecurityClearanceGetUnitTest extends BaseWebScriptUnitTest
assertEquals(expected, mapper.readTree(response.toString()));
}
/**
* Check that when supplying a single field with no sort direction, the UserQueryParams are populated with the
* specified field and the default direction (true).
*/
@Test
public void testSetSortProps_singleField()
{
UserQueryParams userQueryParams = mock(UserQueryParams.class);
WebScriptRequest req = mock(WebScriptRequest.class);
when(req.getParameter("sortField")).thenReturn("field");
when(mockedNamespaceService.getNamespaceURI("")).thenReturn("namespace");
// Call the method under test.
webscript.setSortProps(userQueryParams, req);
// Check the userQueryParams contains the field (and the direction has defaulted to ascending (TRUE)).
Pair<QName, Boolean> sortPair = new Pair<>(QName.createQName("field", mockedNamespaceService), Boolean.TRUE);
List<Pair<QName, Boolean>> expectedSortProps = Arrays.asList(sortPair);
verify(userQueryParams).withSortProps(expectedSortProps);
}
/**
* Check that when supplying three fields with different sort directions (ascending, descending, unspecified), the
* UserQueryParams gets populated correctly.
*/
@Test
public void testSetSortProps_multipleFieldsAndDirections()
{
UserQueryParams userQueryParams = mock(UserQueryParams.class);
WebScriptRequest req = mock(WebScriptRequest.class);
when(req.getParameter("sortField")).thenReturn("fieldA,fieldB,fieldC");
// The sort order for the fields is ascending, descending, unspecified (which should default to ascending).
when(req.getParameter("sortAscending")).thenReturn("true,false");
when(mockedNamespaceService.getNamespaceURI("")).thenReturn("namespace");
// Call the method under test.
webscript.setSortProps(userQueryParams, req);
Pair<QName, Boolean> sortPairA = new Pair<>(QName.createQName("fieldA", mockedNamespaceService), Boolean.TRUE);
Pair<QName, Boolean> sortPairB = new Pair<>(QName.createQName("fieldB", mockedNamespaceService), Boolean.FALSE);
Pair<QName, Boolean> sortPairC = new Pair<>(QName.createQName("fieldC", mockedNamespaceService), Boolean.TRUE);
List<Pair<QName, Boolean>> expectedSortProps = Arrays.asList(sortPairA, sortPairB, sortPairC);
verify(userQueryParams).withSortProps(expectedSortProps);
}
/** Check that if no sort information is given there are no exceptions. */
@Test
public void testSetSortProps_noFields()
{
UserQueryParams userQueryParams = mock(UserQueryParams.class);
WebScriptRequest req = mock(WebScriptRequest.class);
when(req.getParameter("sortField")).thenReturn(null);
when(mockedNamespaceService.getNamespaceURI("")).thenReturn("namespace");
// Call the method under test.
webscript.setSortProps(userQueryParams, req);
verifyNoMoreInteractions(userQueryParams);
}
private String getExpectedResult(int total, int startIndex, int pageSize, int fromIndex, int toIndex, int itemCount)
{
return "{" +