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

136814 gjames: SEARCH-348: Better timezone handling


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@137061 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Gethin James
2017-06-01 11:11:11 +00:00
parent 5879077705
commit a298d3053e
2 changed files with 66 additions and 21 deletions

View File

@@ -549,12 +549,34 @@ public class SearchMapperTests
assertEquals("Europe/Madrid", searchParameters.getTimezone());
searchMapper.fromTimezone(searchParameters, "GMT+1");
assertEquals("GMT+01:00", searchParameters.getTimezone());
searchMapper.fromTimezone(searchParameters, "GMT+01:00");
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());
try
{
searchMapper.fromTimezone(searchParameters, "UTC+5");
fail();
}
catch (IllegalArgumentException iae)
{
assertTrue("UTC is not support by java.util.timezone",iae.getLocalizedMessage().contains("Incompatible timezoneId"));
}
try
{
searchMapper.fromTimezone(searchParameters, "UTC+06:00");
fail();
}
catch (IllegalArgumentException iae)
{
assertTrue(iae.getLocalizedMessage().contains("Incompatible timezoneId"));
}
}
@Test