Index: /trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java (revision 10486)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java (revision 10487)
@@ -9,4 +9,5 @@
import java.net.URL;
import java.net.UnknownHostException;
+import java.util.TimeZone;
import org.junit.BeforeClass;
@@ -22,4 +23,5 @@
import org.openstreetmap.josm.io.auth.CredentialsManager;
import org.openstreetmap.josm.tools.date.DateUtils;
+import org.openstreetmap.josm.tools.date.DateUtilsTest;
/**
@@ -124,4 +126,8 @@
assertEquals("Closing of changeset 1 failed
because it has already been closed.",
ExceptionUtil.explainConflict(new OsmApiException(code, "The changeset 1 was closed at xxx", "")));
+ assertEquals("Closing of changeset 1 failed
because it has already been closed on 2016-01-01 12:34:56.",
+ ExceptionUtil.explainConflict(new OsmApiException(code, "The changeset 1 was closed at 2016-01-01 12:34:56 UTC", "")));
+ DateUtilsTest.setTimeZone(TimeZone.getTimeZone("Europe/Berlin"));
+ TimeZone.setDefault(TimeZone.getTimeZone("Europe/Berlin"));
assertEquals("Closing of changeset 1 failed
because it has already been closed on 2016-01-01 13:34:56.",
ExceptionUtil.explainConflict(new OsmApiException(code, "The changeset 1 was closed at 2016-01-01 12:34:56 UTC", "")));