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

130190 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129956 gjames: SEARCH-115: Testing sort of DOCUMENT


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130341 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 22:06:16 +00:00
parent 4d46955480
commit aeb8af8c94

View File

@@ -164,8 +164,8 @@ public class SearchMapperTests
assertNotNull(iae);
}
searchMapper.fromSort(searchParameters, Arrays.asList(new SortDef("FIELD", "my", true), new SortDef("SCORE", null, false)));
assertEquals(2 , searchParameters.getSortDefinitions().size());
searchMapper.fromSort(searchParameters, Arrays.asList(new SortDef("FIELD", "my", true), new SortDef("SCORE", null, false), new SortDef("DOCUMENT", null, true)));
assertEquals(3 , searchParameters.getSortDefinitions().size());
searchParameters.getSortDefinitions().forEach(sortDefinition ->
{
switch (sortDefinition.getSortType())
@@ -178,6 +178,10 @@ public class SearchMapperTests
assertNull(sortDefinition.getField());
assertEquals(false, sortDefinition.isAscending());
break;
case DOCUMENT:
assertNull(sortDefinition.getField());
assertEquals(true, sortDefinition.isAscending());
break;
default:
fail("Invalid sortDefinition");
}