You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by ad...@apache.org on 2018/05/21 18:50:37 UTC
[02/10] wicket git commit: Fixed test for Java 9 date/time changes
Fixed test for Java 9 date/time changes
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/5aec5842
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/5aec5842
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/5aec5842
Branch: refs/heads/master
Commit: 5aec5842d3808d1891c81043c0cc11bcf9c65053
Parents: 6dea0fb
Author: Andrea Del Bene <an...@gmail.com>
Authored: Sat Apr 14 13:17:59 2018 +0200
Committer: Andrea Del Bene <an...@gmail.com>
Committed: Mon May 21 20:38:08 2018 +0200
----------------------------------------------------------------------
.../util/convert/converter/LocalDateTimeConverterTest.java | 4 ++--
.../util/convert/converter/ZonedDateTimeConverterTest.java | 6 +++---
.../apache/wicket/util/convert/converters/ConvertersTest.java | 4 ++--
3 files changed, 7 insertions(+), 7 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aec5842/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java
index f9dc8fc..5ca8182 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/LocalDateTimeConverterTest.java
@@ -35,13 +35,13 @@ public class LocalDateTimeConverterTest extends Assert
public void convertToString() {
LocalDateTimeConverter converter = new LocalDateTimeConverter();
String date = converter.convertToString(LocalDateTime.of(2016, 7, 11, 1, 2, 3), Locale.ENGLISH);
- assertThat(date, is(equalTo("Jul 11, 2016 1:02:03 AM")));
+ assertThat(date, is(equalTo("Jul 11, 2016, 1:02:03 AM")));
}
@Test
public void convertToObject() {
LocalDateTimeConverter converter = new LocalDateTimeConverter();
- LocalDateTime date = converter.convertToObject("Jul 11, 2016 1:02:03 AM", Locale.ENGLISH);
+ LocalDateTime date = converter.convertToObject("Jul 11, 2016, 1:02:03 AM", Locale.ENGLISH);
assertThat(date, is(equalTo(LocalDateTime.of(2016, 7, 11, 1, 2, 3))));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aec5842/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java
index 58a0af9..d40a640 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converter/ZonedDateTimeConverterTest.java
@@ -32,19 +32,19 @@ import org.junit.Test;
*/
public class ZonedDateTimeConverterTest extends Assert
{
- private ZoneId zone = ZoneId.of("UTC");
+ private ZoneId zone = ZoneId.of("Etc/UCT");
@Test
public void convertToString() {
ZonedDateTimeConverter converter = new ZonedDateTimeConverter();
String date = converter.convertToString(ZonedDateTime.of(2016, 7, 11, 1, 2, 3, 0, zone), Locale.ENGLISH);
- assertThat(date, is(equalTo("Jul 11, 2016 1:02:03 AM UTC")));
+ assertThat(date, is(equalTo("Jul 11, 2016, 1:02:03 AM Coordinated Universal Time")));
}
@Test
public void convertToObject() {
ZonedDateTimeConverter converter = new ZonedDateTimeConverter();
- ZonedDateTime date = converter.convertToObject("Jul 11, 2016 1:02:03 AM UTC", Locale.ENGLISH);
+ ZonedDateTime date = converter.convertToObject("Jul 11, 2016, 1:02:03 AM Coordinated Universal Time", Locale.ENGLISH);
assertThat(date, is(equalTo(ZonedDateTime.of(2016, 7, 11, 1, 2, 3, 0, zone))));
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/5aec5842/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
----------------------------------------------------------------------
diff --git a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
index 1f30783..4e025a9 100644
--- a/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
+++ b/wicket-util/src/test/java/org/apache/wicket/util/convert/converters/ConvertersTest.java
@@ -76,7 +76,7 @@ public final class ConvertersTest
// \u00A0 = nbsp
// \u00A4 = currency symbol (unspecified currency)
- String string = "1\u00A0234,00 \u00A4";
+ String string = "1\u00A0234,00\u00A0\u00A4";
assertEquals(string, fc.convertToString(Float.valueOf(1234f), Locale.FRENCH));
assertEquals(Float.valueOf(1234f), fc.convertToObject(string, Locale.FRENCH));
@@ -377,7 +377,7 @@ public final class ConvertersTest
cal.clear();
cal.set(2011, Calendar.MAY, 1);
- assertEquals("1-5-11", converter.convertToString(cal, DUTCH_LOCALE));
+ assertEquals("01-05-11", converter.convertToString(cal, DUTCH_LOCALE));
assertEquals(cal, converter.convertToObject("1-5-11", DUTCH_LOCALE));
cal = Calendar.getInstance(Locale.US);