http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java index ac88a6f..ec7e69e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/XmlPullParserTest.java @@ -16,27 +16,32 @@ */ package org.apache.wicket.markup.parser; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.UnsupportedEncodingException; import java.text.ParseException; import org.apache.wicket.markup.parser.IXmlPullParser.HttpTagType; import org.apache.wicket.util.resource.StringResourceStream; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Quite some tests are already with MarkupParser. * * @author Juergen Donnerstag */ -public class XmlPullParserTest extends Assert +class XmlPullParserTest { /** * * @throws Exception */ @Test - public final void basics() throws Exception + final void basics() throws Exception { final XmlPullParser parser = new XmlPullParser(); parser.parse("This is a text"); @@ -128,7 +133,7 @@ public class XmlPullParserTest extends Assert * @throws Exception */ @Test - public final void encoding() throws Exception + final void encoding() throws Exception { final XmlPullParser parser = new XmlPullParser(); parser.parse( @@ -197,7 +202,7 @@ public class XmlPullParserTest extends Assert * WICKET-5398 parsing from String */ @Test - public void encodingOfString() throws Exception + void encodingOfString() throws Exception { // use an encoding that is not the system's file encoding final String encoding; @@ -220,7 +225,7 @@ public class XmlPullParserTest extends Assert * @throws Exception */ @Test - public final void attributes() throws Exception + final void attributes() throws Exception { final XmlPullParser parser = new XmlPullParser(); parser.parse("<tag>"); @@ -286,7 +291,7 @@ public class XmlPullParserTest extends Assert * @throws Exception */ @Test - public final void comments() throws Exception + final void comments() throws Exception { final XmlPullParser parser = new XmlPullParser(); parser.parse("<!-- test --><tag>"); @@ -320,7 +325,7 @@ public class XmlPullParserTest extends Assert * @throws Exception */ @Test - public final void compressWhitespace() throws Exception + final void compressWhitespace() throws Exception { final XmlPullParser parser = new XmlPullParser(); parser.parse("<?xml version=\"1.0\" encoding=\"iso-8859-1\" ?>"); @@ -331,7 +336,7 @@ public class XmlPullParserTest extends Assert * @throws Exception */ @Test - public final void script() throws Exception + final void script() throws Exception { final XmlPullParser parser = new XmlPullParser(); parser.parse("<html><script language=\"JavaScript\">... <x a> ...</script></html>"); @@ -354,7 +359,7 @@ public class XmlPullParserTest extends Assert * @throws Exception */ @Test - public final void conditionalComments() throws Exception + final void conditionalComments() throws Exception { final XmlPullParser parser = new XmlPullParser(); parser.parse("<!--[if IE]><a href='test.html'>my link</a><![endif]-->"); @@ -373,7 +378,7 @@ public class XmlPullParserTest extends Assert * @throws Exception */ @Test - public final void conditionalComments2() throws Exception + final void conditionalComments2() throws Exception { final XmlPullParser parser = new XmlPullParser(); parser.parse("<!--[if IE]><a href='test.html'>my link</a><![endif]-->"); @@ -399,7 +404,7 @@ public class XmlPullParserTest extends Assert * @throws Exception */ @Test - public final void names() throws Exception + final void names() throws Exception { final XmlPullParser parser = new XmlPullParser(); parser.parse("<filter-mapping>"); @@ -423,7 +428,7 @@ public class XmlPullParserTest extends Assert * @throws Exception */ @Test - public final void doctype() throws Exception + final void doctype() throws Exception { final XmlPullParser parser = new XmlPullParser(); parser.parse("<!DOCTYPE html>"); @@ -436,7 +441,7 @@ public class XmlPullParserTest extends Assert * @throws Exception */ @Test - public final void downlevelRevealedConditionalComments() throws Exception + final void downlevelRevealedConditionalComments() throws Exception { final XmlPullParser parser = new XmlPullParser(); parser.parse("<!--[if (gt IE 9)|!(IE)]><!--><html lang=\"en\" class=\"no-js\"><!--<![endif]--> <span>test</span>");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java index 6075132..81dd152 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/AbstractTest14WebPage.java @@ -28,7 +28,7 @@ public abstract class AbstractTest14WebPage extends WebPage /** * */ - public AbstractTest14WebPage() + AbstractTest14WebPage() { // Create border and add it to the page add(new HeaderSectionBorder_2("border")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/CustomMarkupLabel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/CustomMarkupLabel.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/CustomMarkupLabel.java index b609f12..508e200 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/CustomMarkupLabel.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/CustomMarkupLabel.java @@ -35,7 +35,7 @@ import org.apache.wicket.util.resource.StringResourceStream; * https://issues.apache.org/jira/browse/WICKET-4494 * @see HtmlHandlerTest */ -public class CustomMarkupLabel +class CustomMarkupLabel extends MarkupContainer implements IMarkupCacheKeyProvider, IMarkupResourceStreamProvider { @@ -75,7 +75,7 @@ public class CustomMarkupLabel { private final CustomMarkupLabel markupProvider; - public MyMarkupSourcingStrategy(final CustomMarkupLabel markupProvider) + MyMarkupSourcingStrategy(final CustomMarkupLabel markupProvider) { this.markupProvider = markupProvider; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageTest.java index 1eec781..4d67c34 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/DoubleHeaderPartPageTest.java @@ -17,20 +17,20 @@ package org.apache.wicket.markup.parser.filter; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author jcompagner * */ -public class DoubleHeaderPartPageTest extends WicketTestCase +class DoubleHeaderPartPageTest extends WicketTestCase { /** * @throws Exception */ @Test - public void testRenderHeaderPartPage() throws Exception + void testRenderHeaderPartPage() throws Exception { executeTest(DoubleHeaderPartPage.class, "DoubleHeaderPartPageExpectedResult.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java index 09444c5..4122a0a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionBasePage_12.java @@ -31,7 +31,7 @@ public class HeaderSectionBasePage_12 extends WebPage /** * */ - public HeaderSectionBasePage_12() + HeaderSectionBasePage_12() { // Create border and add it to the page add(new HeaderSectionBorder("border")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_20.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_20.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_20.java index 5d3aefd..398c378 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_20.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionPage_20.java @@ -16,8 +16,8 @@ */ package org.apache.wicket.markup.parser.filter; -import org.apache.wicket.markup.head.StringHeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; +import org.apache.wicket.markup.head.StringHeaderItem; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; @@ -48,7 +48,7 @@ public class HeaderSectionPage_20 extends WebPage * * @param id */ - public MyLabel(final String id) + MyLabel(final String id) { super(id); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java index 1d63c8f..d8225c2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HeaderSectionTest.java @@ -16,10 +16,13 @@ */ package org.apache.wicket.markup.parser.filter; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.markup.MarkupException; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Simple application that demonstrates the mock http application code (and checks that it is @@ -27,13 +30,13 @@ import org.junit.Test; * * @author Chris Turner */ -public class HeaderSectionTest extends WicketTestCase +class HeaderSectionTest extends WicketTestCase { /** * @throws Exception */ @Test - public void renderHomePage_1() throws Exception + void renderHomePage_1() throws Exception { executeTest(HeaderSectionPage_1.class, "HeaderSectionPageExpectedResult_1.html"); } @@ -42,7 +45,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_2() throws Exception + void renderHomePage_2() throws Exception { executeTest(HeaderSectionPage_2.class, "HeaderSectionPageExpectedResult_2.html"); } @@ -51,7 +54,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_3() throws Exception + void renderHomePage_3() throws Exception { executeTest(HeaderSectionPage_3.class, "HeaderSectionPageExpectedResult_3.html"); } @@ -60,7 +63,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_4() throws Exception + void renderHomePage_4() throws Exception { executeTest(HeaderSectionPage_4.class, "HeaderSectionPageExpectedResult_4.html"); } @@ -69,7 +72,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_5() throws Exception + void renderHomePage_5() throws Exception { executeTest(HeaderSectionPage_5.class, "HeaderSectionPageExpectedResult_5.html"); } @@ -78,7 +81,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_6() throws Exception + void renderHomePage_6() throws Exception { executeTest(HeaderSectionPage_6.class, "HeaderSectionPageExpectedResult_6.html"); } @@ -87,7 +90,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_7() throws Exception + void renderHomePage_7() throws Exception { executeTest(HeaderSectionPage_7.class, "HeaderSectionPageExpectedResult_7.html"); } @@ -96,7 +99,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_8() throws Exception + void renderHomePage_8() throws Exception { executeTest(HeaderSectionPage_8.class, "HeaderSectionPageExpectedResult_8.html"); } @@ -105,7 +108,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_9() throws Exception + void renderHomePage_9() throws Exception { executeTest(HeaderSectionPage_9.class, "HeaderSectionPageExpectedResult_9.html"); } @@ -114,7 +117,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_9a() throws Exception + void renderHomePage_9a() throws Exception { executeTest(HeaderSectionPage_9a.class, "HeaderSectionPageExpectedResult_9a.html"); } @@ -123,7 +126,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_10() throws Exception + void renderHomePage_10() throws Exception { executeTest(HeaderSectionPage_10.class, "HeaderSectionPageExpectedResult_10.html"); } @@ -132,7 +135,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_11() throws Exception + void renderHomePage_11() throws Exception { executeTest(HeaderSectionPage_11.class, "HeaderSectionPageExpectedResult_11.html"); } @@ -141,7 +144,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_13() throws Exception + void renderHomePage_13() throws Exception { boolean hit = false; try @@ -152,14 +155,14 @@ public class HeaderSectionTest extends WicketTestCase { hit = true; } - assertTrue("Expected a MarkupException to be thrown", hit); + assertTrue(hit, "Expected a MarkupException to be thrown"); } /** * @throws Exception */ @Test - public void renderHomePage_14() throws Exception + void renderHomePage_14() throws Exception { executeTest(HeaderSectionPage_14.class, "HeaderSectionPageExpectedResult_14.html"); } @@ -168,7 +171,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_15() throws Exception + void renderHomePage_15() throws Exception { executeTest(HeaderSectionPage_15.class, "HeaderSectionPageExpectedResult_15.html"); } @@ -177,7 +180,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_16() throws Exception + void renderHomePage_16() throws Exception { executeTest(HeaderSectionPage_16.class, "HeaderSectionPageExpectedResult_16.html"); } @@ -186,7 +189,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_17() throws Exception + void renderHomePage_17() throws Exception { executeTest(HeaderSectionPage_17.class, "HeaderSectionPageExpectedResult_17.html"); } @@ -195,7 +198,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_18() throws Exception + void renderHomePage_18() throws Exception { executeTest(HeaderSectionPage_18.class, "HeaderSectionPageExpectedResult_18.html"); } @@ -204,7 +207,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_19() throws Exception + void renderHomePage_19() throws Exception { executeTest(HeaderSectionPage_19.class, "HeaderSectionPageExpectedResult_19.html"); } @@ -213,7 +216,7 @@ public class HeaderSectionTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_20() throws Exception + void renderHomePage_20() throws Exception { executeTest(HeaderSectionPage_20.class, "HeaderSectionPageExpectedResult_20.html"); } @@ -221,9 +224,11 @@ public class HeaderSectionTest extends WicketTestCase /** * https://issues.apache.org/jira/browse/WICKET-5908 */ - @Test(expected = MarkupException.class) - public void doubleHeadTagPage() + @Test + void doubleHeadTagPage() { - tester.startPage(DoubleHeadTagPage.class); + assertThrows(MarkupException.class, () -> { + tester.startPage(DoubleHeadTagPage.class); + }); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java index 2bd2ee6..4b3379e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHandlerTest.java @@ -22,12 +22,12 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @since 1.5.6 */ -public class HtmlHandlerTest extends WicketTestCase +class HtmlHandlerTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-4494 @@ -38,7 +38,7 @@ public class HtmlHandlerTest extends WicketTestCase * @throws Exception */ @Test - public void loadMarkupWithNonClosedTagsDynamically() throws Exception + void loadMarkupWithNonClosedTagsDynamically() throws Exception { CustomMarkupPage page = new CustomMarkupPage(); tester.executeTest(HtmlHandlerTest.class, page, "DynamicMarkupPageWithNonClosedTags_expected.html"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java index fb74ded..954bc8d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/HtmlHeaderSectionHandlerTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.markup.parser.filter; +import static org.junit.jupiter.api.Assertions.assertThrows; + import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.MarkupException; @@ -23,9 +25,9 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class HtmlHeaderSectionHandlerTest extends WicketTestCase +class HtmlHeaderSectionHandlerTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-4511 @@ -35,11 +37,16 @@ public class HtmlHeaderSectionHandlerTest extends WicketTestCase * * @throws Exception */ - @Test(expected = MarkupException.class) - public void loadMarkupWithBodyInsideHead() throws Exception + @Test + void loadMarkupWithBodyInsideHead() throws Exception { CustomMarkupPage customMarkupPage = new CustomMarkupPage(); - tester.startPage(customMarkupPage); + + assertThrows(MarkupException.class, () -> { + tester.startPage(customMarkupPage); + }); + + } private static class CustomMarkupPage extends WebPage implements IMarkupResourceStreamProvider http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java index c71db14..c81125f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java @@ -16,7 +16,9 @@ */ package org.apache.wicket.markup.parser.filter; -import static org.hamcrest.CoreMatchers.instanceOf; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.text.ParseException; @@ -28,19 +30,18 @@ import org.apache.wicket.markup.parser.IMarkupFilter; import org.apache.wicket.markup.parser.XmlTag; import org.apache.wicket.markup.resolver.HtmlHeaderResolver; import org.apache.wicket.util.tester.WicketTestCase; -import org.hamcrest.CoreMatchers; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class OpenCloseTagExpanderTest extends WicketTestCase +class OpenCloseTagExpanderTest extends WicketTestCase { /** * @throws Exception */ @Test - public void renderHomePage() throws Exception + void renderHomePage() throws Exception { executeTest(OpenCloseTagExpanderPage_1.class, "OpenCloseTagExpanderPageExpectedResult_1.html"); @@ -52,7 +53,7 @@ public class OpenCloseTagExpanderTest extends WicketTestCase * @throws ParseException */ @Test - public void doNotExpandVoidElements() throws ParseException + void doNotExpandVoidElements() throws ParseException { String[] htmlVoidElements = new String[] { "area", "base", "br", "col", "command", "embed", "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr" }; @@ -88,7 +89,7 @@ public class OpenCloseTagExpanderTest extends WicketTestCase MarkupElement markupElement = expander.nextElement(); // assert the next element is returned by the parent - assertThat(markupElement, instanceOf(TestMarkupElement.class)); + assertThat(markupElement).isInstanceOf(TestMarkupElement.class); } } @@ -98,7 +99,7 @@ public class OpenCloseTagExpanderTest extends WicketTestCase * @throws ParseException */ @Test - public void expandNonVoidElements() throws ParseException + void expandNonVoidElements() throws ParseException { for (String htmlNonVoidElement : OpenCloseTagExpander.REPLACE_FOR_TAGS) { @@ -143,7 +144,7 @@ public class OpenCloseTagExpanderTest extends WicketTestCase * @throws ParseException */ @Test - public void expandWicketTagWithSameNamespace() throws ParseException + void expandWicketTagWithSameNamespace() throws ParseException { final String namespace = "customNS"; @@ -162,14 +163,14 @@ public class OpenCloseTagExpanderTest extends WicketTestCase MarkupElement markupElement = expander.nextElement(); - assertThat(markupElement, CoreMatchers.instanceOf(WicketTag.class)); + assertThat(markupElement).isInstanceOf(WicketTag.class); assertTrue(markupElement.closes(tag)); assertEquals(namespace, ((ComponentTag) markupElement).getNamespace()); } private static class TestMarkupElement extends WicketTag { - public TestMarkupElement() + TestMarkupElement() { super(new XmlTag()); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java index df814b3..c197329 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/StyleAndScriptIdentifierTest.java @@ -16,15 +16,18 @@ */ package org.apache.wicket.markup.parser.filter; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + import org.apache.wicket.markup.Markup; import org.apache.wicket.markup.MarkupElement; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @since 6.0 */ -public class StyleAndScriptIdentifierTest extends WicketTestCase +class StyleAndScriptIdentifierTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-4425 @@ -36,13 +39,13 @@ public class StyleAndScriptIdentifierTest extends WicketTestCase * @throws Exception */ @Test - public void doNotWrapScriptTemplates() throws Exception + void doNotWrapScriptTemplates() throws Exception { executeTest(PageWithScriptTemplate.class, "PageWithScriptTemplate_expected.html"); } @Test - public void showWrapInCdata() + void showWrapInCdata() { StyleAndScriptIdentifier filter = new StyleAndScriptIdentifier(); @@ -84,7 +87,7 @@ public class StyleAndScriptIdentifierTest extends WicketTestCase * The second time it realizes that the element body is already wrapped and skips it. */ @Test - public void postProcess() + void postProcess() { String rawMarkup = "<script>someJS()</script>"; Markup createMarkupElementsMarkup = Markup.of(rawMarkup); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java index 9d5db6d..62466dd 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/renderStrategy/ChildFirstHeaderRenderStrategyTest.java @@ -16,23 +16,25 @@ */ package org.apache.wicket.markup.renderStrategy; -import org.apache.wicket.Page; -import org.apache.wicket.util.tester.WicketTestCase; -import org.apache.wicket.util.tester.WicketTester; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; import java.util.regex.Matcher; import java.util.regex.Pattern; +import org.apache.wicket.Page; +import org.apache.wicket.util.tester.WicketTestCase; +import org.apache.wicket.util.tester.WicketTester; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; + /** * * @author juergen donnerstag */ -public class ChildFirstHeaderRenderStrategyTest extends WicketTestCase +class ChildFirstHeaderRenderStrategyTest extends WicketTestCase { /** Log. */ private static final Logger log = LoggerFactory.getLogger(ChildFirstHeaderRenderStrategyTest.class); @@ -41,7 +43,7 @@ public class ChildFirstHeaderRenderStrategyTest extends WicketTestCase * @throws Exception */ @Test - public void test1() throws Exception + void test1() throws Exception { executeCombinedTest(SimplePage1.class, "SimplePage1_ExpectedResult.html"); } @@ -50,7 +52,7 @@ public class ChildFirstHeaderRenderStrategyTest extends WicketTestCase * @throws Exception */ @Test - public void test2() throws Exception + void test2() throws Exception { executeCombinedTest(SimplePage2.class, "SimplePage2_ExpectedResult.html"); } @@ -63,7 +65,7 @@ public class ChildFirstHeaderRenderStrategyTest extends WicketTestCase * */ @Test - public void testAjaxAndEnclosures() throws Exception + void testAjaxAndEnclosures() throws Exception { tester.startPage(EnclosureAjaxRenderPage.class); @@ -111,8 +113,8 @@ public class ChildFirstHeaderRenderStrategyTest extends WicketTestCase * @param filename * @throws Exception */ - private <T extends Page> void executeCombinedTestPre1_5(final Class<T> pageClass, - final String filename) throws Exception + <T extends Page> void executeCombinedTestPre1_5(final Class<T> pageClass, + final String filename) throws Exception { // Default Config: parent first header render strategy log.error("=== PARENT first header render strategy ==="); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java index d517fcc..7381757 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/AutoLinkResolverTest.java @@ -17,23 +17,24 @@ package org.apache.wicket.markup.resolver; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; import java.util.Locale; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Pedro Santos */ -public class AutoLinkResolverTest extends WicketTestCase +class AutoLinkResolverTest extends WicketTestCase { private static final Locale DEFAULT_LOCALE = Locale.US; private static final Locale EXISTENT_RESOURCE_LOCALE = Locale.CANADA; private static final Locale NON_EXISTENT_RESOURCE_LOCALE = Locale.FRANCE; @Test - public void shouldAutoLinkLocalizedResources() + void shouldAutoLinkLocalizedResources() { PageWithAutoLinkedLocalResource instance = new PageWithAutoLinkedLocalResource(); @@ -50,7 +51,7 @@ public class AutoLinkResolverTest extends WicketTestCase } @Test - public void shouldAutoLinkExistentLocalizedResources() + void shouldAutoLinkExistentLocalizedResources() { tester.getSession().setLocale(NON_EXISTENT_RESOURCE_LOCALE); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleBasePage_6.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleBasePage_6.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleBasePage_6.java index 3003306..f9d1586 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleBasePage_6.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/SimpleBasePage_6.java @@ -31,7 +31,7 @@ public abstract class SimpleBasePage_6 extends WebPage /** * Construct. */ - public SimpleBasePage_6() + SimpleBasePage_6() { } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java index 0754d44..ba5a431 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/TestHomePage.java @@ -17,16 +17,16 @@ package org.apache.wicket.markup.resolver; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Simple test using the WicketTester */ -public class TestHomePage extends WicketTestCase +class TestHomePage extends WicketTestCase { @Test - public void testRenderMyPage_1() + void testRenderMyPage_1() { // start and render the test page tester.startPage(HomePage_1.class); @@ -50,7 +50,7 @@ public class TestHomePage extends WicketTestCase } @Test - public void testRenderMyPage_2() + void testRenderMyPage_2() { // start and render the test page tester.startPage(HomePage_2.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java index 028188f..06217b9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketContainerResolverTest.java @@ -17,19 +17,19 @@ package org.apache.wicket.markup.resolver; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class WicketContainerResolverTest extends WicketTestCase +class WicketContainerResolverTest extends WicketTestCase { /** * @throws Exception */ @Test - public void test_1() throws Exception + void test_1() throws Exception { executeTest(SimpleContainerPage_1.class, "SimpleContainerPageExpectedResult_1.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java index bdb986e..e5a8c3a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/WicketMessageResolverTest.java @@ -16,21 +16,24 @@ */ package org.apache.wicket.markup.resolver; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.wicket.WicketRuntimeException; import org.apache.wicket.util.string.StringValueConversionException; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class WicketMessageResolverTest extends WicketTestCase +class WicketMessageResolverTest extends WicketTestCase { /** * @throws Exception */ @Test - public void test_1() throws Exception + void test_1() throws Exception { tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(false); executeTest(SimplePage_1.class, "SimplePageExpectedResult_1.html"); @@ -40,7 +43,7 @@ public class WicketMessageResolverTest extends WicketTestCase * @throws Exception */ @Test - public void test_2() throws Exception + void test_2() throws Exception { executeTest(SimplePage_2.class, "SimplePageExpectedResult_2.html"); } @@ -49,7 +52,7 @@ public class WicketMessageResolverTest extends WicketTestCase * @throws Exception */ @Test - public void test_2a() throws Exception + void test_2a() throws Exception { tester.getApplication().getMarkupSettings().setStripWicketTags(true); executeTest(SimplePage_2.class, "SimplePageExpectedResult_2a.html"); @@ -59,7 +62,7 @@ public class WicketMessageResolverTest extends WicketTestCase * @throws Exception */ @Test - public void test_3() throws Exception + void test_3() throws Exception { executeTest(SimplePage_3.class, "SimplePageExpectedResult_3.html"); } @@ -68,7 +71,7 @@ public class WicketMessageResolverTest extends WicketTestCase * @throws Exception */ @Test - public void test_4() throws Exception + void test_4() throws Exception { try { @@ -88,7 +91,7 @@ public class WicketMessageResolverTest extends WicketTestCase * @throws Exception */ @Test - public void test_5() throws Exception + void test_5() throws Exception { executeTest(SimplePage_5.class, "SimplePageExpectedResult_5.html"); } @@ -97,19 +100,19 @@ public class WicketMessageResolverTest extends WicketTestCase * @throws Exception */ @Test - public void test_6() throws Exception + void test_6() throws Exception { executeTest(SimplePage_6.class, "SimplePageExpectedResult_6.html"); } @Test - public void shouldEscapeMessageWhenEscapeAttributeIsSetToTrue() throws Exception + void shouldEscapeMessageWhenEscapeAttributeIsSetToTrue() throws Exception { executeTest(WicketMessageResolverEscapePage.class, "WicketMessageResolverEscapePageExpectedResult.html"); } @Test - public void shouldFailWithEscapeSetToUnsupportedValue() + void shouldFailWithEscapeSetToUnsupportedValue() { try http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java index 025fe43..df2ba14 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/BasePage.java @@ -33,7 +33,7 @@ public class BasePage extends WebPage /** * Construct. */ - public BasePage() + BasePage() { super(); } @@ -43,7 +43,7 @@ public class BasePage extends WebPage * @param child * @return child */ - public final MarkupContainer add(final Component child) + final MarkupContainer add(final Component child) { if (borderMustBeInitialized()) { http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java index 448bbcc..6fef633 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/border/WicketMessageResolverTest.java @@ -17,18 +17,18 @@ package org.apache.wicket.markup.resolver.border; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class WicketMessageResolverTest extends WicketTestCase +class WicketMessageResolverTest extends WicketTestCase { /** * @throws Exception */ @Test - public void test_1() throws Exception + void test_1() throws Exception { executeTest(HomePage.class, "HomePageExpectedResult.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java index 120e2b7..a73ee21 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/inparent/AutoLinkResolveInParentsMarkupTest.java @@ -20,13 +20,13 @@ import org.apache.wicket.markup.resolver.inparent.base.BasePage; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test validating that an auto linked resource from the parent's page is properly resolved in the * child page */ -public class AutoLinkResolveInParentsMarkupTest extends WicketTestCase +class AutoLinkResolveInParentsMarkupTest extends WicketTestCase { @Override @@ -60,7 +60,7 @@ public class AutoLinkResolveInParentsMarkupTest extends WicketTestCase * @throws Exception */ @Test - public void resolveResourceFromMarkupInParent() throws Exception + void resolveResourceFromMarkupInParent() throws Exception { tester.startPage(HomePage.class); tester.assertContains("wicket/resource/org.apache.wicket.markup.resolver.inparent.base.BasePage/theme/logo.png"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/BasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/BasePage.java index 910fc0d..f3a4c24 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/BasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/BasePage.java @@ -28,7 +28,7 @@ public class BasePage extends WebPage /** * Construct. */ - public BasePage() + BasePage() { add(new MenuPanel("menu")); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java index ba67996..463d966 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/MyTest.java @@ -16,20 +16,22 @@ */ package org.apache.wicket.markup.resolver.issue3559; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.apache.wicket.Page; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * issue-3559 */ -public class MyTest extends WicketTestCase +class MyTest extends WicketTestCase { /** * */ @Test - public void test1() + void test1() { tester.startPage(HomePage.class); Page page = tester.getLastRenderedPage(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/WicketApplication.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/WicketApplication.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/WicketApplication.java index 58d0a5b..60ef358 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/WicketApplication.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3559/WicketApplication.java @@ -21,7 +21,7 @@ import org.apache.wicket.protocol.http.WebApplication; /** * */ -public class WicketApplication extends WebApplication +class WicketApplication extends WebApplication { @Override public Class<HomePage> getHomePage() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3989/Issue3989Test.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3989/Issue3989Test.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3989/Issue3989Test.java index 2835e4f..570ae24 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3989/Issue3989Test.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue3989/Issue3989Test.java @@ -17,7 +17,7 @@ package org.apache.wicket.markup.resolver.issue3989; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * When the {@link org.apache.wicket.Component#markup markup of a component} has been reset at the @@ -26,14 +26,14 @@ import org.junit.Test; * The cause is that the {@code PanelMarkupSourcingStrategy} fails to look for markup in * {@code IComponentResolver}s like {@code TransparentWebMarkupContainer}. */ -public class Issue3989Test +class Issue3989Test { /** * This will fail unless the markup sourcing strategies look for the label {@code innerpanel} in * the transparent markup container. */ @Test - public void ajaxRenderOfTransparentlyResolvedLabel() + void ajaxRenderOfTransparentlyResolvedLabel() { WicketTester tester = new WicketTester(); tester.startPage(HomePage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/HomePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/HomePage.java index 84eafac..c2fd6bc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/HomePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/HomePage.java @@ -66,7 +66,7 @@ public class HomePage extends WebPage { private final MarkupContainer resolveTarget; - public ComponentResolvingWebMarkupContainer(String id, MarkupContainer resolveTarget) + ComponentResolvingWebMarkupContainer(String id, MarkupContainer resolveTarget) { super(id); this.resolveTarget = resolveTarget; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java index bacb17f..7f9f455 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/resolver/issue5569/Issue5569Test.java @@ -17,12 +17,12 @@ package org.apache.wicket.markup.resolver.issue5569; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class Issue5569Test extends WicketTestCase +class Issue5569Test extends WicketTestCase { @Test - public void testIssue5569() + void testIssue5569() { tester.startPage(HomePage.class); tester.assertRenderedPage(HomePage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java index adc3024..0384bb8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/transformer/AbstractTransformerBehaviorTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.markup.transformer; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -26,16 +28,16 @@ import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Pedro Santos */ -public class AbstractTransformerBehaviorTest extends WicketTestCase +class AbstractTransformerBehaviorTest extends WicketTestCase { /** */ @Test - public void responseTransformation() + void responseTransformation() { TestPage testPage = new TestPage(); testPage.add(new AbstractTransformerBehavior() @@ -58,7 +60,7 @@ public class AbstractTransformerBehaviorTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-4105 */ @Test - public void transformationInAjaxRequest() + void transformationInAjaxRequest() { tester.startPage(new AjaxTestPage()); tester.assertRenderedPage(AjaxTestPage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java b/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java index 26123f5..1a2a86f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markupFragments/MarkupFragmentTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.markupFragments; +import static org.junit.jupiter.api.Assertions.assertNull; + import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.Page; @@ -25,12 +27,12 @@ import org.apache.wicket.markup.html.panel.Fragment; import org.apache.wicket.markup.html.panel.InlinePanelPage_1; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class MarkupFragmentTest extends WicketTestCase +class MarkupFragmentTest extends WicketTestCase { /** * page.getAssociatedMarkup(), page.getMarkup() and page.getMarkup(null) must all return the @@ -39,7 +41,7 @@ public class MarkupFragmentTest extends WicketTestCase * @throws Exception */ @Test - public void page() throws Exception + void page() throws Exception { IMarkupFragment markup = new MyPage().getAssociatedMarkup(); compareMarkupWithFile(markup, "MyPage_ExpectedResult.html", MyPage.class); @@ -56,7 +58,7 @@ public class MarkupFragmentTest extends WicketTestCase * @throws Exception */ @Test - public void panel() throws Exception + void panel() throws Exception { Page page = new MyPage(); Panel panel = new MyPanel("panel"); @@ -91,7 +93,7 @@ public class MarkupFragmentTest extends WicketTestCase * @throws Exception */ @Test - public void panelWithAutoComponent() throws Exception + void panelWithAutoComponent() throws Exception { Page page = new MyPage(); Panel panel = new MyPanelWithAutoComponent("panel"); @@ -123,7 +125,7 @@ public class MarkupFragmentTest extends WicketTestCase * @throws Exception */ @Test - public void label() throws Exception + void label() throws Exception { Component label = new MyPage().get("label"); IMarkupFragment markup = label.getMarkup(); @@ -139,7 +141,7 @@ public class MarkupFragmentTest extends WicketTestCase * @throws Exception */ @Test - public void webMarkupContainer() throws Exception + void webMarkupContainer() throws Exception { MarkupContainer container = (MarkupContainer)new MyPage().get("container"); IMarkupFragment markup = container.getMarkup(); @@ -159,7 +161,7 @@ public class MarkupFragmentTest extends WicketTestCase * @throws Exception */ @Test - public void border() throws Exception + void border() throws Exception { Page page = new MyBorderPage(); Border border = (Border)page.get("border"); @@ -198,7 +200,7 @@ public class MarkupFragmentTest extends WicketTestCase * @throws Exception */ @Test - public void border2() throws Exception + void border2() throws Exception { Page page = new MyBorderPage(); Border border = (Border)page.get("border2"); @@ -236,7 +238,7 @@ public class MarkupFragmentTest extends WicketTestCase * @throws Exception */ @Test - public void fragments() throws Exception + void fragments() throws Exception { Page page = new InlinePanelPage_1(); Fragment fragment = (Fragment)page.get("myPanel1"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java b/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java index 1d141fc..ec90011 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/AbstractPropertyModelObjectClassTest.java @@ -16,11 +16,12 @@ */ package org.apache.wicket.model; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + import java.io.Serializable; -import junit.framework.TestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * <p> @@ -31,14 +32,14 @@ import org.junit.Test; * @see <a href="https://issues.apache.org/jira/browse/WICKET-2937";>WICKET-2937</a> * @author Pedro Santos */ -public class AbstractPropertyModelObjectClassTest extends Assert +public class AbstractPropertyModelObjectClassTest { /** * */ @Test - public void testCompoundPropertyModel() + void testCompoundPropertyModel() { assertPropertyModelTargetTypeIsInteger(new CompoundPropertyModel<CustomType>( new CustomType())); @@ -48,7 +49,7 @@ public class AbstractPropertyModelObjectClassTest extends Assert * */ @Test - public void testCompoundPropertyModelBind() + void testCompoundPropertyModelBind() { CompoundPropertyModel<CustomBean> compoundPropertyModel = new CompoundPropertyModel<CustomBean>( new CustomBean()); @@ -60,7 +61,7 @@ public class AbstractPropertyModelObjectClassTest extends Assert * */ @Test - public void testModel() + void testModel() { assertPropertyModelTargetTypeIsInteger(new Model<CustomType>(new CustomType())); } @@ -84,7 +85,7 @@ public class AbstractPropertyModelObjectClassTest extends Assert * @see <a href="https://issues.apache.org/jira/browse/WICKET-3253";>WICKET-3253</a> */ @Test - public void testLazyClassResolution() + void testLazyClassResolution() { Model<CustomBean> modelCustomBean = new Model<CustomBean>(null); PropertyModel<CustomType> customTypeModel = new PropertyModel<CustomType>(modelCustomBean, http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/ChainingModelTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/ChainingModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/ChainingModelTest.java index 3239136..6ef6be7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/ChainingModelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/ChainingModelTest.java @@ -16,30 +16,21 @@ */ package org.apache.wicket.model; -import static org.hamcrest.core.StringContains.containsString; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertSame; -import static org.junit.Assert.assertThat; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertSame; +import static org.junit.jupiter.api.Assertions.assertTrue; -import java.io.StringWriter; - -import org.apache.log4j.Level; -import org.apache.log4j.SimpleLayout; -import org.apache.log4j.WriterAppender; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link ChainingModel}. * * @author svenmeier */ -public class ChainingModelTest +class ChainingModelTest { @Test - public void testNonModel() { + void testNonModel() { ChainingModel<Integer> model = new ChainingModel<>(1); assertEquals(Integer.valueOf(1), model.getObject()); @@ -48,12 +39,12 @@ public class ChainingModelTest } @Test - public void testNonSerializable() { + void testNonSerializable() { new ChainingModel<>(Thread.currentThread()); } @Test - public void testDetachable() { + void testDetachable() { class TestDetachable implements IDetachable { boolean detached = false; @@ -78,7 +69,7 @@ public class ChainingModelTest } @Test - public void testModel() { + void testModel() { class TestModel implements IModel<Integer> { boolean detached = false; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java index 19c2b84..d4cd222 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTest.java @@ -17,15 +17,15 @@ package org.apache.wicket.model; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for CompoundPropertyModel */ -public class CompoundPropertyModelTest extends WicketTestCase +class CompoundPropertyModelTest extends WicketTestCase { @Test - public void twoLevelsDeepHierarchy() + void twoLevelsDeepHierarchy() { tester.startPage(CompoundPropertyModelTwoLevelsDeepPage.class); tester.assertRenderedPage(CompoundPropertyModelTwoLevelsDeepPage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java index 8b993e7..01c3392 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/CompoundPropertyModelTwoLevelsDeepPage.java @@ -41,12 +41,12 @@ public class CompoundPropertyModelTwoLevelsDeepPage extends WebPage addressContainer.add(new Label("address.street1")); } - public static class Person implements Serializable + static class Person implements Serializable { private String name; private Address address; - public Person(String name, Address address) + Person(String name, Address address) { this.name = name; this.address = address; @@ -67,7 +67,7 @@ public class CompoundPropertyModelTwoLevelsDeepPage extends WebPage { private String street1; - public Address(String street1) + Address(String street1) { this.street1 = street1; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java b/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java index f1ea647..3aad02d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/DetachableTest.java @@ -16,25 +16,28 @@ */ package org.apache.wicket.model; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.Serializable; import org.apache.wicket.Component; import org.apache.wicket.behavior.Behavior; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Pedro Santos */ -public class DetachableTest extends WicketTestCase +class DetachableTest extends WicketTestCase { /** * <a href="https://issues.apache.org/jira/browse/WICKET-3872";>WICKET-3872</a> */ @Test - public void testDetachRemovedChildrenTree() + void testDetachRemovedChildrenTree() { DetachableComponent a = new DetachableComponent("a"); DetachableComponent ab = new DetachableComponent("b"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java index 6c6820d..e9449f1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/HomePage.java @@ -53,7 +53,7 @@ public class HomePage extends WebPage String name; - public BookingForm(String s) + BookingForm(String s) { super(s); setDefaultModel(new CompoundPropertyModel<Booking>(booking)); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java index 8f7b585..e0cf82d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/IModelTest.java @@ -16,30 +16,29 @@ */ package org.apache.wicket.model; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.not; -import static org.hamcrest.Matchers.nullValue; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.apache.wicket.core.util.lang.WicketObjects; import org.apache.wicket.model.lambda.Address; import org.apache.wicket.model.lambda.Person; import org.danekja.java.util.function.serializable.SerializableBiFunction; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link IModel}'s methods */ -public class IModelTest extends Assert +class IModelTest { private Person person; private final String name = "John"; private final String street = "Strasse"; - @Before - public void before() + @BeforeEach + void before() { person = new Person(); person.setName(name); @@ -51,114 +50,128 @@ public class IModelTest extends Assert } @Test - public void filterMatch() + void filterMatch() { IModel<Person> johnModel = Model.of(person).filter((p) -> p.getName().equals(name)); - assertThat(johnModel.getObject(), is(person)); + assertEquals(person, johnModel.getObject()); } @Test - public void filterNoMatch() + void filterNoMatch() { IModel<Person> johnModel = Model.of(person).filter((p) -> p.getName().equals("Jane")); - assertThat(johnModel.getObject(), is(nullValue())); + assertNull(johnModel.getObject()); } - @Test(expected = IllegalArgumentException.class) - public void nullFilter() + @Test + void nullFilter() { - Model.of(person).filter(null); + assertThrows(IllegalArgumentException.class, () -> { + Model.of(person).filter(null); + }); } @Test - public void map() + void map() { IModel<String> personNameModel = Model.of(person).map(Person::getName); - assertThat(personNameModel.getObject(), is(equalTo(name))); + assertEquals(name, personNameModel.getObject()); } @Test - public void map2() + void map2() { IModel<String> streetModel = Model.of(person) .map(Person::getAddress) .map(Address::getStreet); - assertThat(streetModel.getObject(), is(equalTo(street))); + assertEquals(street, streetModel.getObject()); } - @Test(expected = IllegalArgumentException.class) - public void nullMapper() + @Test + void nullMapper() { - Model.of(person).map(null); + assertThrows(IllegalArgumentException.class, () -> { + Model.of(person).map(null); + }); + } @Test - public void combineWith() + void combineWith() { IModel<String> janeModel = Model.of("Jane"); SerializableBiFunction<Person, String, String> function = (SerializableBiFunction<Person, String, String>)( person1, other) -> person1.getName() + " is in relationship with " + other; IModel<String> relationShipModel = Model.of(person).combineWith(janeModel, function); - assertThat(relationShipModel.getObject(), is(equalTo("John is in relationship with Jane"))); + assertEquals("John is in relationship with Jane", relationShipModel.getObject()); } @Test - public void combineWithNullObject() + void combineWithNullObject() { IModel<String> janeModel = Model.of((String)null); SerializableBiFunction<Person, String, String> function = (SerializableBiFunction<Person, String, String>)( person1, other) -> person1.getName() + " is in relationship with " + other; IModel<String> relationShipModel = Model.of(person).combineWith(janeModel, function); - assertThat(relationShipModel.getObject(), is(nullValue())); + assertNull(relationShipModel.getObject()); } - @Test(expected = IllegalArgumentException.class) - public void combineWithNullModel() + @Test + void combineWithNullModel() { IModel<String> janeModel = null; SerializableBiFunction<Person, String, String> function = (SerializableBiFunction<Person, String, String>)( person1, other) -> person1.getName() + " is in relationship with " + other; - Model.of(person).combineWith(janeModel, function); + + assertThrows(IllegalArgumentException.class, () -> { + Model.of(person).combineWith(janeModel, function); + }); + } - @Test(expected = IllegalArgumentException.class) - public void combineWithNullCombiner() + @Test + void combineWithNullCombiner() { - Model.of(person).combineWith(Model.of("Jane"), null); + assertThrows(IllegalArgumentException.class, () -> { + Model.of(person).combineWith(Model.of("Jane"), null); + }); + } @Test - public void flatMap() + void flatMap() { IModel<String> heirModel = Model.of(person) .flatMap(john -> LambdaModel.of(() -> john.getName() + " is my parent", john::setName)); - assertThat(heirModel.getObject(), is(equalTo("John is my parent"))); + assertEquals("John is my parent", heirModel.getObject()); String newValue = "Matthias"; heirModel.setObject(newValue); - assertThat(heirModel.getObject(), is(equalTo("Matthias is my parent"))); + assertEquals("Matthias is my parent", heirModel.getObject()); } - @Test(expected = IllegalArgumentException.class) - public void nullFlatMapper() + @Test + void nullFlatMapper() { - Model.of(person).flatMap(null); + assertThrows(IllegalArgumentException.class, () -> { + Model.of(person).flatMap(null); + }); } @Test - public void orElse() + void orElse() { person.setName(null); String defaultName = "Default name"; IModel<String> defaultNameModel = Model.of(person).map(Person::getName).orElse(defaultName); - assertThat(defaultNameModel.getObject(), is(equalTo(defaultName))); + assertEquals(defaultName, defaultNameModel.getObject()); } @Test - public void orElseGet() + void orElseGet() { person.setName(null); String defaultName = "Default name"; @@ -166,33 +179,35 @@ public class IModelTest extends Assert .map(Person::getName) .orElseGet(() -> defaultName); - assertThat(defaultNameModel.getObject(), is(equalTo(defaultName))); + assertEquals(defaultName, defaultNameModel.getObject()); } - @Test(expected = IllegalArgumentException.class) - public void orElseGetNullOther() + @Test + void orElseGetNullOther() { - Model.of(person).map(Person::getName).orElseGet(null); + assertThrows(IllegalArgumentException.class, () -> { + Model.of(person).map(Person::getName).orElseGet(null); + }); } @Test - public void isPresent() + void isPresent() { - assertThat(Model.of(person).isPresent().getObject(), is(equalTo(true))); + assertEquals(true, Model.of(person).isPresent().getObject()); } @Test - public void isPresentNot() + void isPresentNot() { - assertThat(Model.of((Person)null).isPresent().getObject(), is(equalTo(false))); + assertEquals(false, Model.of((Person)null).isPresent().getObject()); } @Test - public void serializableMethodReference() + void serializableMethodReference() { Person p = new Person(); IModel<String> m = p::getName; - assertThat(WicketObjects.cloneObject(m), is(not(nullValue()))); + assertNotNull(WicketObjects.cloneObject(m)); } static class Account @@ -202,21 +217,21 @@ public class IModelTest extends Assert person.setName("Some Name"); } - public Person getPerson() + Person getPerson() { return person; } } @Test - public void serializableMethodChainReference() + void serializableMethodChainReference() { IModel<Account> accountModel = LoadableDetachableModel.of(Account::new); IModel<Person> personModel = accountModel.map(Account::getPerson); IModel<String> nameModel = personModel.map(Person::getName); IModel<String> clone = WicketObjects.cloneObject(nameModel); - assertThat(clone, is(not(nullValue()))); - assertThat(clone.getObject(), is("Some Name")); + assertNotNull(clone); + assertEquals("Some Name", clone.getObject()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/InheritedModelTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/InheritedModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/InheritedModelTest.java index 3d407ab..6b46916 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/InheritedModelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/InheritedModelTest.java @@ -16,22 +16,24 @@ */ package org.apache.wicket.model; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.value.ValueMap; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the inheritance of models. */ -public class InheritedModelTest extends WicketTestCase +class InheritedModelTest extends WicketTestCase { /** * Tests the CPM inheritance by setting a different root model using a rendered scenario. */ @Test - public void testCompoundPropertyModelRendered() + void testCompoundPropertyModelRendered() { ValueMap data1 = new ValueMap(); data1.put("label", "foo"); @@ -55,7 +57,7 @@ public class InheritedModelTest extends WicketTestCase * Tests the CPM by setting a different root model using a direct scenario. */ @Test - public void testCompoundPropertyModelDirect() + void testCompoundPropertyModelDirect() { ValueMap data1 = new ValueMap(); data1.put("label", "foo"); @@ -81,7 +83,7 @@ public class InheritedModelTest extends WicketTestCase * Tests if Component#FLAG_INHERITABLE_MODEL reset after model change (WICKET-3413). */ @Test - public void testResetInheritedModelFlag() + void testResetInheritedModelFlag() { ValueMap data1 = new ValueMap(); data1.put("label", "foo"); @@ -109,7 +111,7 @@ public class InheritedModelTest extends WicketTestCase * Tests if Component#FLAG_INHERITABLE_MODEL reset after model change (WICKET-5655). */ @Test - public void testResetInheritedModelFlag2() + void testResetInheritedModelFlag2() { ValueMap data1 = new ValueMap(); data1.put("label", "foo"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/LambdaModelTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/LambdaModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/LambdaModelTest.java index 3a51a02..905ed62 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/LambdaModelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/LambdaModelTest.java @@ -16,23 +16,23 @@ */ package org.apache.wicket.model; -import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import static org.junit.Assert.assertThat; +import static org.assertj.core.api.Assertions.assertThat; +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 org.apache.wicket.core.util.lang.WicketObjects; import org.apache.wicket.model.lambda.Person; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link LambdaModel} */ @SuppressWarnings("javadoc") -public class LambdaModelTest +class LambdaModelTest { @Test - public void methodReference() + void methodReference() { Person person = new Person(); IModel<String> personNameModel = LambdaModel.of(person::getName, person::setName); @@ -40,7 +40,7 @@ public class LambdaModelTest } @Test - public void explicitLambdas() + void explicitLambdas() { Person person = new Person(); IModel<String> personNameModel = LambdaModel.<String>of( @@ -50,7 +50,7 @@ public class LambdaModelTest } @Test - public void targetModel() + void targetModel() { IModel<Person> target = Model.of(new Person()); @@ -59,32 +59,35 @@ public class LambdaModelTest } @Test - public void targetModelNull() + void targetModelNull() { IModel<Person> target = Model.of((Person)null); IModel<String> personNameModel = LambdaModel.of(target, Person::getName, Person::setName); personNameModel.setObject("new name"); - assertThat(personNameModel.getObject(), is(nullValue())); + assertNull(personNameModel.getObject()); } - @Test(expected=UnsupportedOperationException.class) - public void targetReadOnly() + @Test + void targetReadOnly() { IModel<Person> target = Model.of(new Person()); IModel<String> personNameModel = LambdaModel.of(target, Person::getName); - check(personNameModel); + + assertThrows(UnsupportedOperationException.class, () -> { + check(personNameModel); + }); } private void check(IModel<String> personNameModel) { - assertThat(personNameModel.getObject(), is(nullValue())); + assertNull(personNameModel.getObject()); final String personName = "new name"; personNameModel.setObject(personName); - assertThat(personNameModel.getObject(), is(personName)); + assertEquals(personName, personNameModel.getObject()); serialize(personNameModel, personName); } @@ -92,7 +95,7 @@ public class LambdaModelTest private void serialize(IModel<String> personNameModel, String personName) { final IModel<String> clone = WicketObjects.cloneObject(personNameModel); - assertThat(clone, is(instanceOf(LambdaModel.class))); - assertThat(clone.getObject(), is(personName)); + assertThat(clone).isInstanceOf(LambdaModel.class); + assertEquals(personName, clone.getObject()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java index fe599fe..6035a08 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/LoadableDetachableModelTest.java @@ -16,7 +16,9 @@ */ package org.apache.wicket.model; -import static org.hamcrest.core.Is.is; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; import java.io.ByteArrayInputStream; import java.io.ByteArrayOutputStream; @@ -26,19 +28,19 @@ import java.io.ObjectOutputStream; import java.io.Serializable; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the states of a LoadableDetachableModel */ @SuppressWarnings("javadoc") -public class LoadableDetachableModelTest extends WicketTestCase +class LoadableDetachableModelTest extends WicketTestCase { /** * Checks whether the LDM can escape recursive calls. */ @Test - public void recursiveGetObjectDoesntCauseInfiteLoop() + void recursiveGetObjectDoesntCauseInfiteLoop() { class RecursiveLoad extends LoadableDetachableModel<Integer> { @@ -57,13 +59,13 @@ public class LoadableDetachableModelTest extends WicketTestCase RecursiveLoad ldm = new RecursiveLoad(); - assertThat(ldm.isAttached(), is(false)); - assertThat(ldm.getObject(), is(1)); - assertThat(ldm.isAttached(), is(true)); + assertEquals(false, ldm.isAttached()); + assertThat(ldm.getObject()).isEqualTo(1); + assertEquals(true, ldm.isAttached()); } @Test - public void onAttachCalled() + void onAttachCalled() { class AttachingLoadableModel extends LoadableDetachableModel<Integer> { @@ -87,15 +89,15 @@ public class LoadableDetachableModelTest extends WicketTestCase AttachingLoadableModel m = new AttachingLoadableModel(); m.getObject(); - assertThat(m.isAttached(), is(true)); - assertThat(m.attachCalled, is(true)); + assertEquals(true, m.isAttached()); + assertEquals(true, m.attachCalled); } /** * Checks whether the LDM can escape recursive calls. */ @Test - public void exceptionDuringLoadKeepsLDMDetached() + void exceptionDuringLoadKeepsLDMDetached() { class ExceptionalLoad extends LoadableDetachableModel<Integer> { @@ -118,18 +120,18 @@ public class LoadableDetachableModelTest extends WicketTestCase ExceptionalLoad ldm = new ExceptionalLoad(); - assertThat(ldm.isAttached(), is(false)); + assertEquals(false, ldm.isAttached()); try { - assertThat(ldm.getObject(), is(1)); + assertThat(ldm.getObject()).isEqualTo(1); fail("shouldn't get here"); } catch (RuntimeException e) { } ldm.detach(); - assertThat(ldm.isAttached(), is(false)); - assertThat(ldm.detachCalled, is(true)); + assertEquals(false, ldm.isAttached()); + assertEquals(true, ldm.detachCalled); } private static class SerializedLoad extends LoadableDetachableModel<Integer> @@ -151,21 +153,21 @@ public class LoadableDetachableModelTest extends WicketTestCase * @throws Exception */ @Test - public void serializationDeserializationRetainsInternalState() throws Exception + void serializationDeserializationRetainsInternalState() throws Exception { SerializedLoad ldm = new SerializedLoad(); - assertThat(ldm.getObject(), is(1)); + assertThat(ldm.getObject()).isEqualTo(1); ldm.detach(); byte[] serialized = serialize(ldm); LoadableDetachableModel<Integer> deserialized = deserialize(serialized); - assertThat(deserialized.isAttached(), is(false)); - assertThat(deserialized.getObject(), is(2)); - assertThat(deserialized.isAttached(), is(true)); + assertEquals(false, deserialized.isAttached()); + assertThat(deserialized.getObject()).isEqualTo(2); + assertEquals(true, deserialized.isAttached()); deserialized.detach(); - assertThat(deserialized.isAttached(), is(false)); + assertEquals(false, deserialized.isAttached()); } /** Serialization helper */ http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/ModelDetachTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/ModelDetachTest.java b/wicket-core/src/test/java/org/apache/wicket/model/ModelDetachTest.java index 460e68b..a8f684c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/ModelDetachTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/ModelDetachTest.java @@ -16,33 +16,21 @@ */ package org.apache.wicket.model; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertTrue; + +import org.junit.jupiter.api.Test; /** * Tests the detach behavior for compatibility with IDetachable nested objects, ensuring that the * detach method is called for those nested objects. */ -public class ModelDetachTest extends Assert +class ModelDetachTest { - static class Detachable implements IDetachable - { - private static final long serialVersionUID = 1L; - - private boolean detached = false; - - @Override - public void detach() - { - detached = true; - } - } - /** * Performs the nested test for CompoundPropertyModel. */ @Test - public void compoundPropertyModelDetach() + void compoundPropertyModelDetach() { Detachable detachable = new Detachable(); IModel<Detachable> model = new CompoundPropertyModel<Detachable>(detachable); @@ -54,7 +42,7 @@ public class ModelDetachTest extends Assert * Performs the nested test for BoundCompoundPropertyModel. */ @Test - public void boundCompoundPropertyModelDetach() + void boundCompoundPropertyModelDetach() { Detachable detachable = new Detachable(); IModel<Detachable> model = new CompoundPropertyModel<Detachable>(detachable); @@ -66,7 +54,7 @@ public class ModelDetachTest extends Assert * Performs the nested test for AbstractPropertyModel. */ @Test - public void abstractPropertyModelDetach() + void abstractPropertyModelDetach() { Detachable detachable = new Detachable(); IModel<?> model = new AbstractPropertyModel<Void>(detachable) @@ -87,11 +75,24 @@ public class ModelDetachTest extends Assert * Performs the nested test for PropertyModel. */ @Test - public void propertyModelDetach() + void propertyModelDetach() { Detachable detachable = new Detachable(); IModel<?> model = new PropertyModel<Void>(detachable, "foo"); model.detach(); assertTrue(detachable.detached); } + + static class Detachable implements IDetachable + { + private static final long serialVersionUID = 1L; + + private boolean detached = false; + + @Override + public void detach() + { + detached = true; + } + } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java b/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java index f248916..c21f77d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/model/ModelToStringTest.java @@ -16,16 +16,18 @@ */ package org.apache.wicket.model; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.Properties; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * Tests the toString() method on the models in the org.apache.wicket.model package. */ -public class ModelToStringTest extends WicketTestCase +class ModelToStringTest extends WicketTestCase { /** * Used for models in testing. @@ -54,7 +56,7 @@ public class ModelToStringTest extends WicketTestCase * Tests the BoundCompoundPropertyModel.toString() method. */ @Test - public void boundCompoundPropertyModel() + void boundCompoundPropertyModel() { CompoundPropertyModel<String> emptyModel = new CompoundPropertyModel<String>(""); String expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[]"; @@ -85,7 +87,7 @@ public class ModelToStringTest extends WicketTestCase * Tests the CompoundPropertyModel.toString() method. */ @Test - public void compoundPropertyModel() + void compoundPropertyModel() { CompoundPropertyModel<?> emptyModel = new CompoundPropertyModel<String>(""); String expected = "Model:classname=[org.apache.wicket.model.CompoundPropertyModel]:nestedModel=[]"; @@ -116,7 +118,7 @@ public class ModelToStringTest extends WicketTestCase * Tests LoadableDetachableModel.toString() */ @Test - public void loadableDetachableModel() + void loadableDetachableModel() { LoadableDetachableModel<String> model = new MyLoadableDetachableModel(); assertTrue(model.toString().contains(":attached=false")); @@ -136,7 +138,7 @@ public class ModelToStringTest extends WicketTestCase * Tests the Model.toString() method. */ @Test - public void model() + void model() { Model<?> emptyModel = new Model<String>(); String expected = "Model:classname=[org.apache.wicket.model.Model]:object=[null]"; @@ -151,7 +153,7 @@ public class ModelToStringTest extends WicketTestCase * Tests the PropertyModel.toString() method. */ @Test - public void propertyModel() + void propertyModel() { PropertyModel<Void> emptyModel = new PropertyModel<Void>("", null); String expected = "Model:classname=[org.apache.wicket.model.PropertyModel]:nestedModel=[]:expression=[null]";
