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

130184 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129824 gjames: SEARCH-115: Implementing Sort


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130335 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 22:05:22 +00:00
parent cd362c3c75
commit 5d442553f5
6 changed files with 242 additions and 25 deletions

View File

@@ -48,43 +48,30 @@ import java.io.StringReader;
*
* @author Gethin James
*/
public class SearchQuerySerializerTests implements RequestReader
public class SearchQuerySerializerTests
{
static JacksonHelper jsonHelper = null;
private static SerializerTestHelper helper;
@BeforeClass
public static void setupTests() throws Exception
{
jsonHelper = new JacksonHelper();
RestJsonModule module = new RestJsonModule();
jsonHelper.setModule(module);
jsonHelper.afterPropertiesSet();
helper = new SerializerTestHelper();
}
@Test
public void testDeserializeQuery() throws IOException
{
String json = "{ \"query\": {\"query\": \"g*\",\"userQuery\": \"great\",\"language\": \"bob\"}, "
+ "\"paging\": {\"maxItems\": \"99\",\"skipCount\": \"4\"}, \"include\": [\"bob\", \"hope\"]}";
SearchQuery searchQuery = extractFromJson(json);
SearchQuery searchQuery = helper.searchQueryFromJson();
assertEquals(SearchQuery.class, searchQuery.getClass());
assertEquals("bob", searchQuery.getQuery().getLanguage());
assertEquals("afts", searchQuery.getQuery().getLanguage());
assertEquals("g*", searchQuery.getQuery().getQuery());
assertEquals("great", searchQuery.getQuery().getUserQuery());
assertEquals(99, searchQuery.getPaging().getMaxItems());
assertEquals(4, searchQuery.getPaging().getSkipCount());
assertEquals(2, searchQuery.getInclude().size());
assertTrue(searchQuery.getInclude().contains("bob"));
assertTrue(searchQuery.getInclude().contains("hope"));
}
private SearchQuery extractFromJson(String json) throws IOException
{
Content content = mock(Content.class);
when(content.getReader()).thenReturn(new StringReader(json));
WebScriptRequest request = mock(WebScriptRequest.class);
when(request.getContent()).thenReturn(content);
return extractJsonContent(request, jsonHelper, SearchQuery.class);
assertTrue(searchQuery.getInclude().contains("aspectNames"));
assertTrue(searchQuery.getInclude().contains("properties"));
}
}