You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2019/06/13 13:42:35 UTC
[wicket] branch master updated (7b6fa03 -> 96bda7f)
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git.
from 7b6fa03 WICKET-6673 javadoc improvements
new 534d889 Fix Converter related tests to pass with latest Java 13 (build 21+)
new 96bda7f Update Jetty to 9.4.19
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
pom.xml | 2 +-
.../convert/converter/AbstractNumberConverter.java | 6 ++-
.../util/convert/converters/ConvertersTest.java | 63 +++++++++++++++++++---
3 files changed, 60 insertions(+), 11 deletions(-)
[wicket] 02/02: Update Jetty to 9.4.19
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 96bda7f1fd32ec5c8d1a8dfa5512fa643e2479a7
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Thu Jun 13 16:42:07 2019 +0300
Update Jetty to 9.4.19
---
pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pom.xml b/pom.xml
index 90a6f64..4d36932 100644
--- a/pom.xml
+++ b/pom.xml
@@ -140,7 +140,7 @@
<commons-lang3.version>3.9</commons-lang3.version>
<jacoco.version>0.8.2</jacoco.version>
<jackson.version>2.9.8</jackson.version>
- <jetty.version>9.4.18.v20190429</jetty.version>
+ <jetty.version>9.4.19.v20190610</jetty.version>
<junit.version>5.4.2</junit.version>
<spring.version>5.1.6.RELEASE</spring.version>
<servlet-api.version>3.1.0</servlet-api.version>
[wicket] 01/02: Fix Converter related tests to pass with latest
Java 13 (build 21+)
Posted by mg...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
mgrigorov pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/wicket.git
commit 534d8894844d4ab4c8cca8657065eaaef6c07bf8
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
AuthorDate: Thu Jun 13 16:40:47 2019 +0300
Fix Converter related tests to pass with latest Java 13 (build 21+)
---
.../convert/converter/AbstractNumberConverter.java | 6 ++-
.../util/convert/converters/ConvertersTest.java | 63 +++++++++++++++++++---
2 files changed, 59 insertions(+), 10 deletions(-)
diff --git a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java
index de237d2..f179826 100644
--- a/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java
+++ b/wicket-util/src/main/java/org/apache/wicket/util/convert/converter/AbstractNumberConverter.java
@@ -18,6 +18,7 @@ package org.apache.wicket.util.convert.converter;
import java.math.BigDecimal;
import java.text.DecimalFormat;
+import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
import java.util.Locale;
import java.util.concurrent.ConcurrentHashMap;
@@ -102,9 +103,10 @@ public abstract class AbstractNumberConverter<N extends Number> extends Abstract
}
else if (value instanceof String)
{
- // Convert spaces to no-break space (U+00A0) as required by Java formats:
+ char groupingSeparator = DecimalFormatSymbols.getInstance(locale).getGroupingSeparator();
+ // Convert spaces to no-break space (groupingSeparator) as required by Java formats:
// http://bugs.sun.com/view_bug.do?bug_id=4510618
- value = ((String)value).replaceAll("(\\d+)\\s(?=\\d)", "$1\u00A0");
+ value = ((String)value).replaceAll("(\\d+)\\s(?=\\d)", "$1" + groupingSeparator);
}
final NumberFormat numberFormat = getNumberFormat(locale);
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 2760080..e09c645 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
@@ -17,14 +17,15 @@
package org.apache.wicket.util.convert.converters;
+import static java.lang.String.format;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
import static org.junit.jupiter.api.Assertions.assertThrows;
import java.math.BigDecimal;
import java.text.ChoiceFormat;
+import java.text.DecimalFormatSymbols;
import java.text.NumberFormat;
-import java.text.ParsePosition;
import java.util.Calendar;
import java.util.Date;
import java.util.Locale;
@@ -42,6 +43,8 @@ import org.apache.wicket.util.convert.converter.IntegerConverter;
import org.apache.wicket.util.convert.converter.LongConverter;
import org.apache.wicket.util.convert.converter.ShortConverter;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.condition.EnabledOnJre;
+import org.junit.jupiter.api.condition.JRE;
@SuppressWarnings("javadoc")
final class ConvertersTest
@@ -74,13 +77,15 @@ final class ConvertersTest
return NumberFormat.getCurrencyInstance(locale);
}
};
+ final Locale locale = Locale.FRENCH;
+ final DecimalFormatSymbols decimalFormatSymbols = DecimalFormatSymbols.getInstance(locale);
+ char groupingSeparator = decimalFormatSymbols.getGroupingSeparator();
+ String currencySymbol = decimalFormatSymbols.getCurrencySymbol();
- // \u00A0 = nbsp
- // \u00A4 = currency symbol (unspecified currency)
- String string = "1\u00A0234,00\u00A0\u00A4";
+ String expected = format("1%s234,00\u00A0%s", groupingSeparator, currencySymbol);
- assertEquals(string, fc.convertToString(1234f, Locale.FRENCH));
- assertEquals(Float.valueOf(1234f), fc.convertToObject(string, Locale.FRENCH));
+ assertEquals(expected, fc.convertToString(1234f, locale));
+ assertEquals(Float.valueOf(1234f), fc.convertToObject(expected, locale));
}
@Test
@@ -383,8 +388,9 @@ final class ConvertersTest
});
}
+ @EnabledOnJre({JRE.JAVA_11, JRE.JAVA_12})
@Test
- void validDateConverters()
+ void validDateConverters_upToJava12()
{
DateConverter converter = new DateConverter();
@@ -402,6 +408,26 @@ final class ConvertersTest
assertEquals(date, converter.convertToObject("10/24/02", Locale.US));
}
+ @EnabledOnJre({JRE.JAVA_13})
+ @Test
+ void validDateConverters_Java13()
+ {
+ DateConverter converter = new DateConverter();
+
+ assertNull(new DateConverter().convertToObject("", Locale.US));
+
+ Calendar cal = Calendar.getInstance(DUTCH_LOCALE);
+ cal.clear();
+ cal.set(2002, Calendar.OCTOBER, 24);
+ Date date = cal.getTime();
+
+ assertEquals("24-10-2002", converter.convertToString(date, DUTCH_LOCALE));
+ assertEquals(date, converter.convertToObject("24-10-02", DUTCH_LOCALE));
+
+ assertEquals("10/24/02", converter.convertToString(date, Locale.US));
+ assertEquals(date, converter.convertToObject("10/24/02", Locale.US));
+ }
+
@Test
public void invalidDateConversion1()
{
@@ -420,8 +446,9 @@ final class ConvertersTest
});
}
+ @EnabledOnJre({JRE.JAVA_11, JRE.JAVA_12})
@Test
- void calendarConverter()
+ void calendarConverter_upToJava12()
{
CalendarConverter converter = new CalendarConverter();
@@ -439,6 +466,26 @@ final class ConvertersTest
assertEquals(cal, converter.convertToObject("5/1/11", Locale.US));
}
+ @EnabledOnJre({JRE.JAVA_13})
+ @Test
+ void calendarConverter_Java13()
+ {
+ CalendarConverter converter = new CalendarConverter();
+
+ Calendar cal = Calendar.getInstance(DUTCH_LOCALE);
+ cal.clear();
+ cal.set(2011, Calendar.MAY, 1);
+
+ assertEquals("01-05-2011", converter.convertToString(cal, DUTCH_LOCALE));
+ assertEquals(cal, converter.convertToObject("1-5-11", DUTCH_LOCALE));
+
+ cal = Calendar.getInstance(Locale.US);
+ cal.clear();
+ cal.set(2011, Calendar.MAY, 1);
+ assertEquals("5/1/11", converter.convertToString(cal, Locale.US));
+ assertEquals(cal, converter.convertToObject("5/1/11", Locale.US));
+ }
+
@Test
public void invalidCalendarConversion1()
{