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.2) to HEAD (5.2)

Browse Source 
137044 gjames: Merged searchrep (5.2.1) to 5.2.N (5.2.1)
      136707 gjames: SEARCH-348: Adding timezone to search api


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137559 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andrei Rebegea
2017-06-15 11:14:14 +00:00
parent 1ceecf1ebf
commit d6ccfa432f
3 changed files with 84 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -511,6 +511,50 @@ public class SearchMapperTests
}
}
@Test
public void fromTimezone() throws Exception
{
SearchParameters searchParameters = new SearchParameters();
//Doesn't error
searchMapper.fromTimezone(searchParameters, null);
searchMapper.fromTimezone(searchParameters, "");
try
{
searchMapper.fromTimezone(searchParameters, "nonsense");
fail();
} catch (IllegalArgumentException iae)
{
assertTrue(iae.getLocalizedMessage().contains("Invalid timezone"));
}
try
{
searchMapper.fromTimezone(searchParameters, "GMT+25");
fail();
} catch (IllegalArgumentException iae)
{
assertTrue(iae.getLocalizedMessage().contains("Invalid timezone"));
}
searchMapper.fromTimezone(searchParameters, "America/New_York");
assertEquals("America/New_York", searchParameters.getTimezone());
searchMapper.fromTimezone(searchParameters, "America/Denver");
assertEquals("America/Denver", searchParameters.getTimezone());
searchMapper.fromTimezone(searchParameters, "America/Los_Angeles");
assertEquals("America/Los_Angeles", searchParameters.getTimezone());
searchMapper.fromTimezone(searchParameters, "Europe/Madrid");
assertEquals("Europe/Madrid", searchParameters.getTimezone());
searchMapper.fromTimezone(searchParameters, "GMT+1");
assertEquals("GMT+01:00", searchParameters.getTimezone());
searchMapper.fromTimezone(searchParameters, "GMT-9");
assertEquals("GMT-09:00", searchParameters.getTimezone());
searchMapper.fromTimezone(searchParameters, "GMT+08:00");
assertEquals("GMT+08:00", searchParameters.getTimezone());
searchMapper.fromTimezone(searchParameters, "GMT-12:00");
assertEquals("GMT-12:00", searchParameters.getTimezone());
}
@Test
public void fromFacetFields() throws Exception
{
@@ -866,7 +910,9 @@ public class SearchMapperTests
private SearchQuery minimalQuery()
{
Query query = new Query("cmis", "foo", "");
SearchQuery sq = new SearchQuery(query, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null,null);
SearchQuery sq = new SearchQuery(query, null, null, null, null, null, null, null,
null, null, null, null, null, null, null, null,
null, null,null, null);
return sq;
}