removed import, added some imports
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/9afecd50 Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/9afecd50 Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/9afecd50 Branch: refs/heads/master Commit: 9afecd504a78d8f980388f4067ecec4f8bcc570f Parents: 978ea5c Author: renoth <[email protected]> Authored: Tue Jul 31 12:45:28 2018 +0200 Committer: Martin Tzvetanov Grigorov <[email protected]> Committed: Wed Sep 26 15:36:17 2018 +0300 ---------------------------------------------------------------------- .../markup/xhtml/WellFormedXmlTestCase.java | 1 - .../util/convert/converters/ConvertersTest.java | 22 ++++++-------------- .../wicket/util/io/FullyBufferedReaderTest.java | 15 ++++--------- 3 files changed, 10 insertions(+), 28 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/9afecd50/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java index bf330de..1ad3a27 100644 --- a/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java +++ b/wicket-util/src/main/java/org/apache/wicket/util/markup/xhtml/WellFormedXmlTestCase.java @@ -17,7 +17,6 @@ package org.apache.wicket.util.markup.xhtml; import org.junit.jupiter.api.Test; -import org.testng.annotations.Test; import org.xml.sax.*; import javax.xml.parsers.DocumentBuilder; http://git-wip-us.apache.org/repos/asf/wicket/blob/9afecd50/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 b520a72..0f4d69c 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 @@ -16,10 +16,6 @@ */ package org.apache.wicket.util.convert.converters; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNull; -import static org.junit.Assert.fail; - import java.math.BigDecimal; import java.text.ChoiceFormat; import java.text.NumberFormat; @@ -28,18 +24,12 @@ import java.util.Date; import java.util.Locale; import org.apache.wicket.util.convert.ConversionException; -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.Test; +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.fail; @SuppressWarnings("javadoc") public final class ConvertersTest http://git-wip-us.apache.org/repos/asf/wicket/blob/9afecd50/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java b/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java index d2f1738..d9fef49 100644 --- a/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java +++ b/wicket-util/src/test/java/org/apache/wicket/util/io/FullyBufferedReaderTest.java @@ -18,15 +18,14 @@ package org.apache.wicket.util.io; import java.text.ParseException; -import org.junit.Assert; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; + +import static org.junit.jupiter.api.Assertions.assertEquals; /** * Tests for {@link FullyBufferedReader} */ -public class FullyBufferedReaderTest extends Assert +public class FullyBufferedReaderTest { /** @@ -70,12 +69,6 @@ public class FullyBufferedReaderTest extends Assert } /** - * A rule for expecting ParseExceptions - */ - @Rule - public ExpectedException thrown = ExpectedException.none(); - - /** * https://issues.apache.org/jira/browse/WICKET-4117 * * Test exception when we forgot to close quote
