From 9800efdec7180950e9e81bb1c1c885158ffdc7ab Mon Sep 17 00:00:00 2001 From: Gethin James Date: Fri, 24 Mar 2017 13:14:27 +0000 Subject: [PATCH] Merged searchbcr (5.2.1) to 5.2.N (5.2.1) 135579 gjames: SEARCH-339: Better timezone handling for the test git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.2.N/root@136087 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/search/impl/solr/SolrQueryHTTPClientTest.java | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/source/test-java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java b/source/test-java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java index 57bb42f7bb..fde94742f7 100644 --- a/source/test-java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java +++ b/source/test-java/org/alfresco/repo/search/impl/solr/SolrQueryHTTPClientTest.java @@ -39,6 +39,7 @@ import java.util.HashMap; import java.util.List; import java.util.Locale; import java.util.Map; +import java.util.TimeZone; import org.alfresco.model.ContentModel; import org.alfresco.repo.admin.RepositoryState; @@ -242,6 +243,9 @@ public class SolrQueryHTTPClientTest @Test public void testBuildFacetIntervalQuery() throws UnsupportedEncodingException { + TimeZone defaultTimeZone = TimeZone.getDefault(); + TimeZone.setDefault(TimeZone.getTimeZone("UTC")); + SearchParameters params = new SearchParameters(); params.setSearchTerm("bob"); @@ -276,8 +280,10 @@ public class SolrQueryHTTPClientTest assertTrue(url.contains(encoder.encode("{!key=Created}cm:created", "UTF-8"))); assertTrue(url.contains("f.Created.facet.interval.set")); assertTrue(url.contains(encoder.encode("{!afts key=numbers}", "UTF-8"))); - assertTrue(url.contains(encoder.encode("(2015-12-31T22:59:59.999Z", "UTF-8"))); - assertTrue(url.contains(encoder.encode("2016-12-31T22:59:59.999Z]", "UTF-8"))); + assertTrue(url.contains(encoder.encode("(2015-12-31T23:59:59.999Z", "UTF-8"))); + assertTrue(url.contains(encoder.encode("2016-12-31T23:59:59.999Z]", "UTF-8"))); + + TimeZone.setDefault(defaultTimeZone); } }