Repository: isis Updated Branches: refs/heads/master a98cbfdd6 -> 4dd4a435e
ISIS-1335: fixes time-zone sensitive unit test. Project: http://git-wip-us.apache.org/repos/asf/isis/repo Commit: http://git-wip-us.apache.org/repos/asf/isis/commit/4dd4a435 Tree: http://git-wip-us.apache.org/repos/asf/isis/tree/4dd4a435 Diff: http://git-wip-us.apache.org/repos/asf/isis/diff/4dd4a435 Branch: refs/heads/master Commit: 4dd4a435ea4a89dc77c31a1963b4ee22f51c147d Parents: a98cbfd Author: Dan Haywood <d...@haywood-associates.co.uk> Authored: Thu Jun 23 17:08:47 2016 +0100 Committer: Dan Haywood <d...@haywood-associates.co.uk> Committed: Thu Jun 23 17:08:47 2016 +0100 ---------------------------------------------------------------------- .../facets/value/JavaSqlTimeValueSemanticsProviderTest.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/isis/blob/4dd4a435/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java ---------------------------------------------------------------------- diff --git a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java index 999cf9fa..87010f3 100644 --- a/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java +++ b/core/metamodel/src/test/java/org/apache/isis/core/metamodel/facets/value/JavaSqlTimeValueSemanticsProviderTest.java @@ -19,10 +19,9 @@ package org.apache.isis.core.metamodel.facets.value; -import static org.junit.Assert.assertEquals; - import java.sql.Time; import java.util.Calendar; +import java.util.TimeZone; import org.jmock.Expectations; import org.junit.Before; @@ -32,6 +31,8 @@ import org.apache.isis.core.metamodel.facetapi.FacetHolder; import org.apache.isis.core.metamodel.facetapi.FacetHolderImpl; import org.apache.isis.core.metamodel.facets.value.timesql.JavaSqlTimeValueSemanticsProvider; +import static org.junit.Assert.assertEquals; + public class JavaSqlTimeValueSemanticsProviderTest extends ValueSemanticsProviderAbstractTestCase { private Time twoOClock; @@ -48,7 +49,7 @@ public class JavaSqlTimeValueSemanticsProviderTest extends ValueSemanticsProvide }); final Calendar c = Calendar.getInstance(); - // c.setTimeZone(TestClock.timeZone); + c.setTimeZone(TimeZone.getTimeZone("GMT")); c.set(Calendar.MILLISECOND, 0);