uncommented and migrated ConvertersTest.java
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/d08641fa Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/d08641fa Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/d08641fa Branch: refs/heads/master Commit: d08641fae05a34f3263d0b6566729a06564aa099 Parents: 512c421 Author: renoth <[email protected]> Authored: Fri Sep 7 08:44:45 2018 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Sep 26 16:25:38 2018 +0300 ---------------------------------------------------------------------- .../apache/wicket/util/tester/WicketTester.java | 6 +- .../util/convert/converters/ConvertersTest.java | 65 ++++++++++++-------- 2 files changed, 43 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/d08641fa/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java index 74bab6c..df096ae 100644 --- a/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java +++ b/wicket-core/src/main/java/org/apache/wicket/util/tester/WicketTester.java @@ -598,8 +598,7 @@ public class WicketTester extends BaseWicketTester final List<FeedbackMessage> renderedMessages = model.getObject(); if (renderedMessages == null) { - fail( - String.format("feedback panel at path [%s] returned null messages", path)); + fail(String.format("feedback panel at path [%s] returned null messages", path)); } if (messages.length != renderedMessages.size()) @@ -750,7 +749,8 @@ public class WicketTester extends BaseWicketTester * @param expectedDocument * expected output <code>String</code> */ - public void assertResultPage(final String expectedDocument) { + public void assertResultPage(final String expectedDocument) + { // Validate the document String document = getLastResponseAsString(); assertEquals(expectedDocument, document); http://git-wip-us.apache.org/repos/asf/wicket/blob/d08641fa/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 35be426..ebca9ac 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,6 +17,10 @@ package org.apache.wicket.util.convert.converters; +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.NumberFormat; @@ -28,20 +32,27 @@ import org.apache.wicket.util.convert.ConversionException; import org.apache.wicket.util.convert.converter.*; import org.junit.jupiter.api.Test; -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 static org.junit.jupiter.api.Assertions.fail; +import org.apache.wicket.util.convert.converter.BigDecimalConverter; +import org.apache.wicket.util.convert.converter.BooleanConverter; +import org.apache.wicket.util.convert.converter.ByteConverter; +import org.apache.wicket.util.convert.converter.CalendarConverter; +import org.apache.wicket.util.convert.converter.CharacterConverter; +import org.apache.wicket.util.convert.converter.DateConverter; +import org.apache.wicket.util.convert.converter.DoubleConverter; +import org.apache.wicket.util.convert.converter.FloatConverter; +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; @SuppressWarnings("javadoc") -public final class ConvertersTest +final class ConvertersTest { - /** Dutch locale for localized testing. **/ + /** Dutch locale for localized testing. */ private static final Locale DUTCH_LOCALE = new Locale("nl", "NL"); @Test - public void thousandSeperator() - { + void thousandSeperator() { BigDecimalConverter bdc = new BigDecimalConverter(); assertEquals(new BigDecimal(3000), bdc.convertToObject("3 000", Locale.FRENCH)); @@ -75,14 +86,18 @@ public final class ConvertersTest } @Test - public void validBooleanConversions() + void validBooleanConversions() { BooleanConverter converter = new BooleanConverter(); assertEquals(Boolean.FALSE, converter.convertToObject("", Locale.US)); - assertEquals("true", converter.convertToString(Boolean.TRUE, Locale.getDefault(Locale.Category.FORMAT))); - assertEquals("false", converter.convertToString(Boolean.FALSE, Locale.getDefault(Locale.Category.FORMAT))); - assertEquals(Boolean.TRUE, converter.convertToObject("true", Locale.getDefault(Locale.Category.FORMAT))); - assertEquals(Boolean.FALSE, converter.convertToObject("false", Locale.getDefault(Locale.Category.FORMAT))); + assertEquals("true", + converter.convertToString(Boolean.TRUE, Locale.getDefault(Locale.Category.FORMAT))); + assertEquals("false", + converter.convertToString(Boolean.FALSE, Locale.getDefault(Locale.Category.FORMAT))); + assertEquals(Boolean.TRUE, + converter.convertToObject("true", Locale.getDefault(Locale.Category.FORMAT))); + assertEquals(Boolean.FALSE, + converter.convertToObject("false", Locale.getDefault(Locale.Category.FORMAT))); } @Test @@ -96,7 +111,7 @@ public final class ConvertersTest } @Test - public void validByteConversions() + void validByteConversions() { ByteConverter converter = new ByteConverter(); assertNull(converter.convertToObject("", Locale.US)); @@ -132,7 +147,7 @@ public final class ConvertersTest } @Test - public void validDoubleConversions() + void validDoubleConversions() { DoubleConverter converter = new DoubleConverter(); assertEquals("7.1", converter.convertToString(7.1, Locale.US)); @@ -170,7 +185,7 @@ public final class ConvertersTest } @Test - public void validFloatConversions() + void validFloatConversions() { FloatConverter converter = new FloatConverter(); assertNull(converter.convertToObject("", Locale.US)); @@ -206,7 +221,7 @@ public final class ConvertersTest } @Test - public void validIntegerConversions() + void validIntegerConversions() { IntegerConverter converter = new IntegerConverter(); assertEquals("7", converter.convertToString(7, Locale.US)); @@ -252,7 +267,7 @@ public final class ConvertersTest } @Test - public void validLongConversions() + void validLongConversions() { LongConverter converter = new LongConverter(); assertNull(converter.convertToObject("", Locale.US)); @@ -316,12 +331,12 @@ public final class ConvertersTest } @Test - public void shortConversions() + void shortConversions() { ShortConverter converter = new ShortConverter(); assertNull(converter.convertToObject("", Locale.US)); assertEquals(Short.valueOf((short)10), converter.convertToObject("10", Locale.US)); - assertEquals("10", converter.convertToString((short) 10, Locale.US)); + assertEquals("10", converter.convertToString((short)10, Locale.US)); } @Test @@ -352,7 +367,7 @@ public final class ConvertersTest } @Test - public void validCharacterConverter() + void validCharacterConverter() { CharacterConverter converter = new CharacterConverter(); @@ -371,7 +386,7 @@ public final class ConvertersTest } @Test - public void validDateConverters() + void validDateConverters() { DateConverter converter = new DateConverter(); @@ -408,7 +423,7 @@ public final class ConvertersTest } @Test - public void calendarConverter() + void calendarConverter() { CalendarConverter converter = new CalendarConverter(); @@ -449,7 +464,7 @@ public final class ConvertersTest * http://java.sun.com/j2se/1.4.2/docs/api/java/math/BigDecimal.html#BigDecimal%28double%29 */ @Test - public void bigDecimalConverter() + void bigDecimalConverter() { BigDecimal bd = new BigDecimalConverter().convertToObject("0.1", Locale.US); assertEquals(new BigDecimal("0.1"), bd); @@ -463,7 +478,7 @@ public final class ConvertersTest } @Test - public void customFormat() + void customFormat() { @SuppressWarnings("serial") IntegerConverter converter = new IntegerConverter()
