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

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

Browse Source 
130179 gjames: Merged searchapi (5.2.1) to 5.2.N (5.2.1)
      129819 gjames: SEARCH-113: The Json representation is immutable.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@130330 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2016-09-06 22:04:33 +00:00
parent a0a62612f4
commit e9783d8e04
4 changed files with 36 additions and 47 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
source/test-java/org/alfresco/rest/api/search/SearchMapperTests.java
View File

@@ -55,7 +55,7 @@ public class SearchMapperTests
@Test(expected = IllegalArgumentException.class)
public void testMandatory() throws Exception
{
SearchParameters searchParameters = searchMapper.toSearchParameters(new SearchQuery());
SearchParameters searchParameters = searchMapper.toSearchParameters(SearchQuery.EMPTY);
}
@Test
@@ -75,15 +75,14 @@ public class SearchMapperTests
SearchParameters searchParameters = new SearchParameters();
try
{
searchMapper.fromQuery(searchParameters, new Query());
searchMapper.fromQuery(searchParameters, new Query(null,null, null));
fail();
} catch (IllegalArgumentException iae)
{
assertTrue(iae.getLocalizedMessage().contains("query is a mandatory parameter"));
}
Query q = new Query();
q.setQuery("hello");
Query q = new Query(null,"hello", null);
try
{
@@ -94,7 +93,7 @@ public class SearchMapperTests
assertTrue(iae.getLocalizedMessage().contains("language is a mandatory parameter"));
}
q.setLanguage("world");
q = new Query("world", "hello", null);
try
{
@@ -106,21 +105,21 @@ public class SearchMapperTests
//world is not a valid language type
}
q.setLanguage("afts");
q = new Query("afts", "hello", null);
searchMapper.fromQuery(searchParameters, q);
assertEquals(LANGUAGE_FTS_ALFRESCO, searchParameters.getLanguage());
q.setLanguage("cMiS");
q = new Query("cMiS", "hello", null);
searchMapper.fromQuery(searchParameters, q);
assertEquals(LANGUAGE_CMIS_ALFRESCO, searchParameters.getLanguage());
q.setLanguage("LuCENE");
q = new Query("LuCENE", "hello", null);
searchMapper.fromQuery(searchParameters, q);
assertEquals(LANGUAGE_LUCENE, searchParameters.getLanguage());
assertEquals("hello", searchParameters.getQuery());
q.setUserQuery("Heload");
q = new Query("LuCENE", "hello", "Heload");
searchMapper.fromQuery(searchParameters, q);
assertEquals("Heload", searchParameters.getSearchTerm());
}
@@ -139,11 +138,8 @@ public class SearchMapperTests
private SearchQuery minimalQuery()
{
SearchQuery sq = new SearchQuery();
Query query = new Query();
sq.setQuery(query);
query.setQuery("foo");
query.setLanguage("cmis");
Query query = new Query("cmis", "foo", "");
SearchQuery sq = new SearchQuery(query,null);
return sq;
}
}