Index: /trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java
===================================================================
--- /trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java (revision 9604)
+++ /trunk/test/unit/org/openstreetmap/josm/tools/ExceptionUtilTest.java (revision 9605)
@@ -46,4 +46,5 @@
host = new URL(serverUrl).getHost();
user = CredentialsManager.getInstance().getUsername();
+ DateUtils.PROP_ISO_DATES.put(Boolean.TRUE);
}
@@ -95,11 +96,8 @@
@Test
public void testExplainChangesetClosedException() {
- // This test relies on the fact that CLDR is not the default local provider (see I18n.init)
- assertEquals("JRE,CLDR", System.getProperty("java.locale.providers"));
-
assertEquals("Failed to upload to changeset 0
because it has already been closed on ?.",
ExceptionUtil.explainChangesetClosedException(new ChangesetClosedException("")));
- assertEquals("Failed to upload to changeset 1
because it has already been closed on Jan 1, 2016 12:00:00 AM.",
+ assertEquals("Failed to upload to changeset 1
because it has already been closed on 2016-01-01 00:00:00.",
ExceptionUtil.explainChangesetClosedException(new ChangesetClosedException(1, DateUtils.fromString("2016-01-01"), null)));
}
@@ -119,7 +117,4 @@
@Test
public void testExplainConflict() {
- // This test relies on the fact that CLDR is not the default local provider (see I18n.init)
- assertEquals("JRE,CLDR", System.getProperty("java.locale.providers"));
-
int code = HttpURLConnection.HTTP_CONFLICT;
assertEquals("The server reported that it has detected a conflict.",
@@ -129,5 +124,5 @@
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 Jan 1, 2016 1:34:56 PM.",
+ 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", "")));
}