http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java index 233dc3b..ae64b6e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/inheritance/InheritanceHeadTest.java @@ -17,7 +17,7 @@ package org.apache.wicket.markup.html.header.inheritance; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** @@ -25,14 +25,14 @@ import org.junit.Test; * * @author Martijn Dashorst */ -public class InheritanceHeadTest extends WicketTestCase +class InheritanceHeadTest extends WicketTestCase { /** * * @throws Exception */ @Test - public void test_2() throws Exception + void test_2() throws Exception { executeTest(ConcretePage2.class, "ExpectedResult2.html"); } @@ -42,7 +42,7 @@ public class InheritanceHeadTest extends WicketTestCase * @throws Exception */ @Test - public void test_3() throws Exception + void test_3() throws Exception { tester.getSession().setStyle("myStyle"); executeTest(ConcretePage2.class, "ExpectedResult3.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/response/PanelWithHeader.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/response/PanelWithHeader.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/response/PanelWithHeader.java index 2121a75..8ac6b1d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/response/PanelWithHeader.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/response/PanelWithHeader.java @@ -33,7 +33,7 @@ public class PanelWithHeader extends Panel private static class StringHeaderItemWithDependency extends StringHeaderItem { - public StringHeaderItemWithDependency(CharSequence string) + StringHeaderItemWithDependency(CharSequence string) { super(string); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java index a031bc0..1d6bb41 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/HeaderTest.java @@ -17,20 +17,20 @@ package org.apache.wicket.markup.html.header.testing; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * * @author Juergen Donnerstag */ -public class HeaderTest extends WicketTestCase +class HeaderTest extends WicketTestCase { /** * * @throws Exception */ @Test - public void test_1() throws Exception + void test_1() throws Exception { executeTest(TestPage.class, "TestPage_ExpectedResult.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestBasePanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestBasePanel.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestBasePanel.java index 0a31d58..59354db 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestBasePanel.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing/TestBasePanel.java @@ -29,7 +29,7 @@ public class TestBasePanel extends Panel /** * Construct. */ - public TestBasePanel() + TestBasePanel() { super("panel"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java index 9aa1eac..a6b18fe 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/HeaderTest.java @@ -17,20 +17,20 @@ package org.apache.wicket.markup.html.header.testing2; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * * @author Juergen Donnerstag */ -public class HeaderTest extends WicketTestCase +class HeaderTest extends WicketTestCase { /** * * @throws Exception */ @Test - public void test_1() throws Exception + void test_1() throws Exception { executeTest(TestExtendedPage.class, "TestExtendedPage_ExpectedResult.html"); } @@ -40,7 +40,7 @@ public class HeaderTest extends WicketTestCase * @throws Exception */ @Test - public void test_2() throws Exception + void test_2() throws Exception { executeTest(TestExtendedPage2.class, "TestExtendedPage2_ExpectedResult.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestBasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestBasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestBasePage.java index 58964e5..be5293e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestBasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing2/TestBasePage.java @@ -29,7 +29,7 @@ public class TestBasePage extends WebPage /** * Construct. */ - public TestBasePage() + TestBasePage() { } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java index 36794ea..57efd00 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/HeaderTest.java @@ -17,13 +17,13 @@ package org.apache.wicket.markup.html.header.testing3; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * * @author Juergen Donnerstag */ -public class HeaderTest extends WicketTestCase +class HeaderTest extends WicketTestCase { /** * Replace a Panel which has a body onLoad modifier @@ -31,7 +31,7 @@ public class HeaderTest extends WicketTestCase * @throws Exception */ @Test - public void test_1() throws Exception + void test_1() throws Exception { executeTest(TestPage.class, "TestPage_ExpectedResult-1.html"); TestPage page = (TestPage)tester.getLastRenderedPage(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java index 8ff4cc3..8a69ec6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/testing3/TestPage.java @@ -56,7 +56,7 @@ public class TestPage extends WebPage /** * */ - public void replacePanel() + private void replacePanel() { current = (current == panel1 ? panel2 : panel1); replace(current); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractBasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractBasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractBasePage.java index 98beb61..34c2ddb 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractBasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractBasePage.java @@ -29,7 +29,7 @@ public abstract class AbstractBasePage extends WebPage /** * Construct. */ - public AbstractBasePage() + AbstractBasePage() { } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractMeldingPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractMeldingPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractMeldingPage.java index efe44a1..bd01a77 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractMeldingPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractMeldingPage.java @@ -29,7 +29,7 @@ public abstract class AbstractMeldingPage extends AbstractSecurePage /** * Construct. */ - public AbstractMeldingPage() + AbstractMeldingPage() { add(new Label("foo", "FooBar")); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractSecurePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractSecurePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractSecurePage.java index 14f958e..911b069 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractSecurePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/AbstractSecurePage.java @@ -29,7 +29,7 @@ public abstract class AbstractSecurePage extends AbstractBasePage /** * Construct. */ - public AbstractSecurePage() + AbstractSecurePage() { add(new Label("username", "Pietje Puk")); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java index 20e5b11..b37d991 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers/InheritanceHeadTest.java @@ -17,21 +17,21 @@ package org.apache.wicket.markup.html.header.threelayers; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the inclusion of the wicket:head section from a panel in a subclassed page. * * @author Martijn Dashorst */ -public class InheritanceHeadTest extends WicketTestCase +class InheritanceHeadTest extends WicketTestCase { /** * * @throws Exception */ @Test - public void test_1() throws Exception + void test_1() throws Exception { executeTest(MeldingPage.class, "ExpectedResult.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractBasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractBasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractBasePage.java index a42407a..5e0f36d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractBasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractBasePage.java @@ -29,7 +29,7 @@ public abstract class AbstractBasePage extends WebPage /** * Construct. */ - public AbstractBasePage() + AbstractBasePage() { } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractMeldingPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractMeldingPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractMeldingPage.java index cae518a..8b37a40 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractMeldingPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractMeldingPage.java @@ -29,7 +29,7 @@ public abstract class AbstractMeldingPage extends AbstractSecurePage /** * Construct. */ - public AbstractMeldingPage() + AbstractMeldingPage() { add(new Label("foo", "FooBar")); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractSecurePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractSecurePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractSecurePage.java index 4b7cadf..d3b7e61 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractSecurePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/AbstractSecurePage.java @@ -29,7 +29,7 @@ public abstract class AbstractSecurePage extends AbstractBasePage /** * Construct. */ - public AbstractSecurePage() + AbstractSecurePage() { add(new Label("username", "Pietje Puk")); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java index 610b585..0243443 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/header/threelayers2/InheritanceHeadTest.java @@ -17,21 +17,21 @@ package org.apache.wicket.markup.html.header.threelayers2; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests the inclusion of the wicket:head section from a panel in a subclassed page. * * @author Martijn Dashorst */ -public class InheritanceHeadTest extends WicketTestCase +class InheritanceHeadTest extends WicketTestCase { /** * * @throws Exception */ @Test - public void test_1() throws Exception + void test_1() throws Exception { executeTest(MeldingPage.class, "ExpectedResult.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java index 68d8a77..012b38e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/AjaxUpdatedImageTest.java @@ -16,37 +16,38 @@ */ package org.apache.wicket.markup.html.image; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.util.tester.TagTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for WICKET-1382 */ -public class AjaxUpdatedImageTest extends WicketTestCase +class AjaxUpdatedImageTest extends WicketTestCase { /** * Tests that Image re-rendered in Ajax request have 'wicket:antiCache' parameter in its 'src' * attribute value */ @Test - public void wicket1382() + void wicket1382() { AjaxyImagesPage page = tester.startPage(AjaxyImagesPage.class); TagTester tagTester = tester.getTagById(page.image.getMarkupId()); final String srcAttr = tagTester.getAttribute("src"); - assertFalse( - "Image has not be rendered in Ajax request so it has no wicket:antiCache' parameter", - srcAttr.contains("antiCache")); + assertFalse(srcAttr.contains("antiCache"), + "Image has not be rendered in Ajax request so it has no wicket:antiCache' parameter"); // make an ajax call tester.clickLink("link", true); page = (AjaxyImagesPage)tester.getLastRenderedPage(); tagTester = tester.getTagById(page.image.getMarkupId()); final String srcAttr1 = tagTester.getAttribute("src"); - assertTrue( - "Image has not be rendered in Ajax request so it has no wicket:antiCache' parameter", - srcAttr1.contains("antiCache")); + assertTrue(srcAttr1.contains("antiCache"), + "Image has not be rendered in Ajax request so it has no wicket:antiCache' parameter"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java index c0a77c7..796b3d7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.markup.html.image; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.Serializable; import java.util.List; @@ -23,8 +26,7 @@ import org.apache.wicket.Component; import org.apache.wicket.model.IModel; import org.apache.wicket.util.tester.TagTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test cases to test the external image components @@ -32,26 +34,26 @@ import org.junit.Test; * @author Tobias Soloschenko * */ -public class ExternalImageTest extends WicketTestCase +class ExternalImageTest extends WicketTestCase { @Test - public void testExternalImage() + void testExternalImage() { tester.startPage(ExternalImageTestPage.class); String lastResponseAsString = tester.getLastResponse().getDocument(); - Assert.assertTrue(lastResponseAsString.contains( + assertTrue(lastResponseAsString.contains( "<img wicket:id=\"externalImage1\" src=\"http://wicket.apache.org/img/wicket-7-bg.jpg\"/>")); - Assert.assertTrue(lastResponseAsString.contains( + assertTrue(lastResponseAsString.contains( "<img id=\"externalImage2\" wicket:id=\"externalImage2\" src=\"http://wicket.apache.org/img/wicket-7-bg.jpg\"; srcset=\"http://wicket.apache.org/img/wicket-7-bg-1.jpg x1, http://wicket.apache.org/img/wicket-7-bg-2.jpg x2\" sizes=\"s1,s2\"/>")); - Assert.assertTrue(lastResponseAsString.contains( + assertTrue(lastResponseAsString.contains( "<source wicket:id=\"externalSource\" srcset=\"http://wicket.apache.org/img/wicket-7-bg-1.jpg , http://wicket.apache.org/img/wicket-7-bg-2.jpg x2\" sizes=\"1\" media=\"(min-width: 650px)\"/>")); - Assert.assertTrue(lastResponseAsString.contains( - "<img wicket:id=\"url\" src=\"http://www.google.de/test.jpg\"/>")); + assertTrue(lastResponseAsString + .contains("<img wicket:id=\"url\" src=\"http://www.google.de/test.jpg\"/>")); } @Test - public void testExternalImageModel() + void testExternalImageModel() { tester.startPage(ExternalImageTestPage.class); tester.getLastResponse().getDocument(); @@ -60,14 +62,14 @@ public class ExternalImageTest extends WicketTestCase ExternalImage externalImage2 = (ExternalImage)externalImage2Component; TagTester tagById = tester.getTagById("externalImage2"); - IModel<List<Serializable>> srcSet = externalImage2.getSrcSetModel(); - for (Serializable model :srcSet.getObject()) + IModel<List<Serializable>> srcSet = externalImage2.getSrcSetModel(); + for (Serializable model : srcSet.getObject()) { String attribute = tagById.getAttribute("srcset"); - Assert.assertTrue(attribute.contains(model.toString())); + assertTrue(attribute.contains(model.toString())); } String attribute = tagById.getAttribute("src"); - Assert.assertEquals(externalImage2.getDefaultModelObject(), attribute); + assertEquals(externalImage2.getDefaultModelObject(), attribute); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java index 5c4a670..4fcc6d9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ExternalImageTestPage.java @@ -97,7 +97,7 @@ public class ExternalImageTestPage extends WebPage * @param url * the url to be used */ - public void setUrl(String url) + void setUrl(String url) { this.url = url; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java index 8cc8c26..04e8ad9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ImageTest.java @@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.image; import java.util.Locale; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Juergen Donnerstag @@ -32,7 +32,7 @@ public class ImageTest extends WicketTestCase * @throws Exception */ @Test - public void test_1() throws Exception + void test_1() throws Exception { Locale.setDefault(new Locale("en", "US")); tester.startPage(Home.class); @@ -60,7 +60,7 @@ public class ImageTest extends WicketTestCase * testParentRelativeImage() */ @Test - public void testParentRelativeImage() + void testParentRelativeImage() { tester.getApplication().getResourceSettings().setParentFolderPlaceholder("$up$"); tester.startPage(Home.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java index f1c5068..5a7d045 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InlineImageTest.java @@ -16,22 +16,21 @@ */ package org.apache.wicket.markup.html.image; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; - -public class InlineImageTest extends WicketTestCase +class InlineImageTest extends WicketTestCase { @Test - public void inlineImageTest() + void inlineImageTest() { tester.startPage(InlineImageTestPage.class); String lastResponseAsString = tester.getLastResponse().getDocument(); - Assert.assertTrue( - "inline image is in html", - lastResponseAsString.contains("<img wicket:id=\"inlineimage\" src=\"data:image/gif;base64,R0lGODlhQAHwAPf8AAAAAAwMDAsNABUZABUXBRIS")); + assertTrue(lastResponseAsString.contains( + "<img wicket:id=\"inlineimage\" src=\"data:image/gif;base64,R0lGODlhQAHwAPf8AAAAAAwMDAsNABUZABUXBRIS"), + "inline image is in html"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java index ccd9d33..230d8ca 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/InvalidImageTest.java @@ -17,17 +17,17 @@ package org.apache.wicket.markup.html.image; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** */ -public class InvalidImageTest extends WicketTestCase +class InvalidImageTest extends WicketTestCase { /** * testInvalidImage() */ @Test - public void invalidImage() + void invalidImage() { tester.startPage(InvalidImagePage.class); tester.assertRenderedPage(InvalidImagePage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/NonCachingImageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/NonCachingImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/NonCachingImageTest.java index 9e9ddf8..6a2d270 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/NonCachingImageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/NonCachingImageTest.java @@ -16,23 +16,25 @@ */ package org.apache.wicket.markup.html.image; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.util.tester.TagTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link NonCachingImage}. * * @author svenmeier */ -public class NonCachingImageTest extends WicketTestCase +class NonCachingImageTest extends WicketTestCase { /** * {@link NonCachingImage} always adds anticache. */ @Test - public void test() + void test() { NonCachingImagePage page = tester.startPage(NonCachingImagePage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java index 56b44f6..30a9b6d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/PubApplication.java @@ -24,7 +24,7 @@ import org.apache.wicket.protocol.http.WebApplication; * * @author Jonathan Locke */ -public class PubApplication extends WebApplication +class PubApplication extends WebApplication { /** * Constructor http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java index 05c3030..c2e330c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/image/ResponsiveImageTest.java @@ -16,13 +16,16 @@ */ package org.apache.wicket.markup.html.image; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.TagTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class ResponsiveImageTest extends WicketTestCase +class ResponsiveImageTest extends WicketTestCase { @Override protected WebApplication newApplication() @@ -31,37 +34,37 @@ public class ResponsiveImageTest extends WicketTestCase } @Test - public void testSrcSetIsNotAvailableOnDefaultUsage() + void testSrcSetIsNotAvailableOnDefaultUsage() { tester.startPage(ImageResourceReferenceTestPage.class); String lastResponseAsString = tester.getLastResponse().getDocument(); TagTester createTagByAttribute = TagTester.createTagByAttribute(lastResponseAsString, "img"); - Assert.assertFalse(createTagByAttribute.hasAttribute("srcset")); - Assert.assertEquals(Image.Cors.ANONYMOUS.getRealName(), createTagByAttribute.getAttribute("crossorigin")); + assertFalse(createTagByAttribute.hasAttribute("srcset")); + assertEquals(Image.Cors.ANONYMOUS.getRealName(), createTagByAttribute.getAttribute("crossorigin")); } @Test - public void testPictureTagIsRenderedRight() + void testPictureTagIsRenderedRight() { tester.startPage(ImagePictureTestPage.class); String lastResponseAsString = tester.getLastResponse().getDocument(); TagTester pictureTagTester = TagTester.createTagByAttribute(lastResponseAsString, "picture"); - Assert.assertTrue(pictureTagTester.hasChildTag("img")); - Assert.assertTrue(pictureTagTester.hasChildTag("source")); + assertTrue(pictureTagTester.hasChildTag("img")); + assertTrue(pictureTagTester.hasChildTag("source")); TagTester sourceTagTester = TagTester.createTagByAttribute(lastResponseAsString, "source"); - Assert.assertTrue(sourceTagTester.hasAttribute("media")); - Assert.assertEquals("(min-width: 650px)", sourceTagTester.getAttribute("media")); - Assert.assertEquals("(min-width: 50em) 33vw", sourceTagTester.getAttribute("sizes")); + assertTrue(sourceTagTester.hasAttribute("media")); + assertEquals("(min-width: 650px)", sourceTagTester.getAttribute("media")); + assertEquals("(min-width: 50em) 33vw", sourceTagTester.getAttribute("sizes")); } @Test - public void testImageTagIsRenderedWithXValuesAndSrcSet() + void testImageTagIsRenderedWithXValuesAndSrcSet() { tester.startPage(ImageSrcSetTestPage.class); String lastResponseAsString = tester.getLastResponse().getDocument(); TagTester imgTagTester = TagTester.createTagByAttribute(lastResponseAsString, "img"); - Assert.assertTrue(imgTagTester.hasAttribute("src")); - Assert.assertTrue(imgTagTester.hasAttribute("srcset")); + assertTrue(imgTagTester.hasAttribute("src")); + assertTrue(imgTagTester.hasAttribute("srcset")); String attribute = imgTagTester.getAttribute("srcset"); String[] srcSetElements = attribute.split(","); int i = 0; @@ -69,19 +72,19 @@ public class ResponsiveImageTest extends WicketTestCase { if (i == 0) { - Assert.assertTrue(srcSetElement.endsWith("320w")); + assertTrue(srcSetElement.endsWith("320w")); } if (i == 1) { - Assert.assertTrue(srcSetElement.endsWith("2x")); + assertTrue(srcSetElement.endsWith("2x")); } if (i == 2) { - Assert.assertTrue(srcSetElement.endsWith("900w")); + assertTrue(srcSetElement.endsWith("900w")); } i++; } - Assert.assertEquals("(min-width: 50em) 33vw,(min-width: 28em) 50vw,100vw", + assertEquals("(min-width: 50em) 33vw,(min-width: 28em) 50vw,100vw", imgTagTester.getAttribute("sizes")); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java index cd72924..5273c78 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/AjaxEnclosureTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.markup.html.internal; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.concurrent.atomic.AtomicInteger; import java.util.regex.Pattern; @@ -28,15 +31,14 @@ import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * Simple test using the WicketTester * * @author Joonas Hamalainen */ -public class AjaxEnclosureTest extends WicketTestCase +class AjaxEnclosureTest extends WicketTestCase { private final String inlineEnclosureIdPrefix = "wicket__InlineEnclosure_"; private final String inlineEnclosureHiddenPattern = "<div id=\"" + inlineEnclosureIdPrefix + @@ -63,7 +65,7 @@ public class AjaxEnclosureTest extends WicketTestCase * Test toggling the controlling child inside the inline enclosure */ @Test - public void ajaxTogglingControllingChildShouldToggleInlineEnclosure() + void ajaxTogglingControllingChildShouldToggleInlineEnclosure() { { // enclosure On @@ -106,7 +108,7 @@ public class AjaxEnclosureTest extends WicketTestCase * Test toggling a non-controlling child inside the inline enclosure */ @Test - public void ajaxTogglingNonControllingChildShouldNotToggleEnclosure() + void ajaxTogglingNonControllingChildShouldNotToggleEnclosure() { { // label 2 On @@ -146,7 +148,7 @@ public class AjaxEnclosureTest extends WicketTestCase * */ @Test - public void nestedInlineEnclosuresShouldToggleNormally() + void nestedInlineEnclosuresShouldToggleNormally() { { // 1. test that enclosure1, enclosure2, label1, label2 are visible, click link1, @@ -234,7 +236,7 @@ public class AjaxEnclosureTest extends WicketTestCase * */ @Test - public void controllingChildShouldDefaultToTheSingleComponentInsideEnclosure() + void controllingChildShouldDefaultToTheSingleComponentInsideEnclosure() { { // enclosure On @@ -272,7 +274,7 @@ public class AjaxEnclosureTest extends WicketTestCase private void ensureEnclosureIsVisible(Page ajaxPage, AtomicInteger n) { InlineEnclosure enclosure = findNthComponent(InlineEnclosure.class, ajaxPage, n); - assertTrue("Is not visible", enclosure.determineVisibility()); + assertTrue(enclosure.determineVisibility(), "Is not visible"); } private void ensureEnclosureIsInvisible(Page ajaxPage, AtomicInteger n) @@ -280,7 +282,7 @@ public class AjaxEnclosureTest extends WicketTestCase InlineEnclosure enclosure = findNthComponent(InlineEnclosure.class, ajaxPage, n); if (enclosure != null) { - assertFalse("Is visible", enclosure.determineVisibility()); + assertFalse(enclosure.determineVisibility(), "Is not visible"); } } @@ -301,7 +303,7 @@ public class AjaxEnclosureTest extends WicketTestCase return type.cast(instance); } - protected void assertVisible(Label label, boolean checkAlsoMarkup) + private void assertVisible(Label label, boolean checkAlsoMarkup) { tester.assertVisible(label.getPageRelativePath()); if (checkAlsoMarkup) @@ -310,15 +312,14 @@ public class AjaxEnclosureTest extends WicketTestCase } } - protected void assertInvisible(Label label) + private void assertInvisible(Label label) { // tester.assertInvisible(label.getPageRelativePath()); assertDoesNotContain(Pattern.quote(label.getInnermostModel().getObject().toString())); } - protected void assertDoesNotContain(String string) + private void assertDoesNotContain(String string) { - assertFalse("Should not contain: " + string, - tester.getLastResponseAsString().contains(string)); + assertFalse(tester.getLastResponseAsString().contains(string), "Should not contain: " + string); } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java index 643c098..b672adb 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/BasePage.java @@ -21,7 +21,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; public class BasePage extends WebPage { - public BasePage(PageParameters parameters) + BasePage(PageParameters parameters) { super(parameters); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_9.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_9.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_9.java index d388aec..78487a8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_9.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosurePage_9.java @@ -33,7 +33,7 @@ public class EnclosurePage_9 extends WebPage private static final long serialVersionUID = 1L; /** */ - public boolean formValidate; + private boolean formValidate; /** */ public boolean inputOnBeforeRender; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java index 7067c7d..b6cebc2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/EnclosureTest.java @@ -16,6 +16,10 @@ */ package org.apache.wicket.markup.html.internal; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.IOException; import org.apache.wicket.Component; @@ -36,20 +40,19 @@ import org.apache.wicket.util.tester.DiffUtil; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * * @author Juergen Donnerstag */ -public class EnclosureTest extends WicketTestCase +class EnclosureTest extends WicketTestCase { /** * @throws Exception */ @Test - public void testRenderHomePage() throws Exception + void testRenderHomePage() throws Exception { executeTest(EnclosurePage_1.class, "EnclosurePageExpectedResult_1.html"); @@ -62,7 +65,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testRenderHomePage2() throws Exception + void testRenderHomePage2() throws Exception { executeTest(EnclosurePage_2.class, "EnclosurePageExpectedResult_2.html"); } @@ -71,7 +74,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testRenderHomePage3() throws Exception + void testRenderHomePage3() throws Exception { executeTest(EnclosurePage_3.class, "EnclosurePageExpectedResult_3.html"); } @@ -80,7 +83,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testRenderHomePage4() throws Exception + void testRenderHomePage4() throws Exception { executeTest(EnclosurePage_4.class, new PageParameters().set("visible", false), "EnclosurePageExpectedResult_4.html"); @@ -90,7 +93,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testRenderHomePage4_1() throws Exception + void testRenderHomePage4_1() throws Exception { executeTest(EnclosurePage_4.class, new PageParameters().set("visible", true), "EnclosurePageExpectedResult_4-1.html"); @@ -100,7 +103,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testRenderHomePage5() throws Exception + void testRenderHomePage5() throws Exception { executeTest(EnclosurePage_5.class, new PageParameters().set("visible", false), "EnclosurePageExpectedResult_5.html"); @@ -110,7 +113,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testRenderHomePage5_1() throws Exception + void testRenderHomePage5_1() throws Exception { executeTest(EnclosurePage_5.class, new PageParameters().set("visible", true), "EnclosurePageExpectedResult_5-1.html"); @@ -122,7 +125,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testVisibilityOfChildren() throws Exception + void testVisibilityOfChildren() throws Exception { // render with enclosure initially visible tester.startPage(EnclosurePage_6.class); @@ -147,7 +150,7 @@ public class EnclosureTest extends WicketTestCase * */ @Test - public void testRender() + void testRender() { tester.startPage(EnclosurePage_7.class); } @@ -157,7 +160,7 @@ public class EnclosureTest extends WicketTestCase * */ @Test - public void testRender8() throws Exception + void testRender8() throws Exception { executeTest(EnclosurePage_8.class, "EnclosurePageExpectedResult_8.html"); } @@ -186,7 +189,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testRender9() throws Exception + void testRender9() throws Exception { executePage(new EnclosurePage_9(), "EnclosurePageExpectedResult_9.html"); EnclosurePage_9 page = (EnclosurePage_9)tester.getLastRenderedPage(); @@ -243,7 +246,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testRender9a() throws Exception + void testRender9a() throws Exception { Class<? extends Page> clazz = EnclosurePage_9.class; @@ -286,7 +289,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testRender10() throws Exception + void testRender10() throws Exception { Class<? extends Page> clazz = EnclosurePage_10.class; executeTest(clazz, "EnclosurePageExpectedResult_10.html"); @@ -327,7 +330,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testRenderPage11() throws Exception + void testRenderPage11() throws Exception { executeTest(EnclosurePage_11.class, "EnclosurePageExpectedResult_11.html"); } @@ -336,7 +339,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testRenderPage12() throws Exception + void testRenderPage12() throws Exception { executeTest(EnclosurePage_12.class, "EnclosurePageExpectedResult_12.html"); } @@ -345,7 +348,7 @@ public class EnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void testRenderPage13() throws Exception + void testRenderPage13() throws Exception { tester = new WicketTester(new MockApplication() { @@ -373,7 +376,7 @@ public class EnclosureTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-3842 */ @Test - public void testAtrribute() + void testAtrribute() { /** * Page for the test @@ -382,7 +385,7 @@ public class EnclosureTest extends WicketTestCase { private static final long serialVersionUID = 1L; - public TestPage() + TestPage() { final Label l = new Label("msg", "$label$"); add(l); @@ -423,7 +426,7 @@ public class EnclosureTest extends WicketTestCase * Test case for https://issues.apache.org/jira/browse/WICKET-4172 */ @Test - public void childWithDeeperPathInTransparentContainer() + void childWithDeeperPathInTransparentContainer() { boolean enclosureChildVisible = true; tester.startPage(new ChildWithDeeperPathInTransparentContainerPage(enclosureChildVisible)); @@ -437,7 +440,7 @@ public class EnclosureTest extends WicketTestCase } @Test - public void nestedEnclousers() + void nestedEnclousers() { TestPageMarkup p = new TestPageMarkup(); p.setPageMarkup("<wicket:enclosure child='labelOuter'>tOuter Enclosure <span wicket:id='labelOuter'/>" @@ -452,7 +455,7 @@ public class EnclosureTest extends WicketTestCase * Test case for https://issues.apache.org/jira/browse/WICKET-6043 */ @Test - public void enclosureInsideContainererAndInheritance() throws Exception + void enclosureInsideContainererAndInheritance() throws Exception { tester.startPage(ListViewInContainerPage.class); tester.assertRenderedPage(ListViewInContainerPage.class); @@ -462,7 +465,7 @@ public class EnclosureTest extends WicketTestCase { private String markup; - public TestPageMarkup() + TestPageMarkup() { } @@ -471,12 +474,12 @@ public class EnclosureTest extends WicketTestCase this.markup = markup; } - protected String getPageMarkup() + String getPageMarkup() { return markup; } - public void setPageMarkup(String markup) + void setPageMarkup(String markup) { this.markup = markup; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java index 6bab883..3e3649b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java @@ -16,6 +16,7 @@ */ package org.apache.wicket.markup.html.internal; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.any; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -37,15 +38,14 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.response.StringResponse; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link IHeaderResponse}'s methods */ -public class HeaderResponseTest +class HeaderResponseTest { private static final String RESOURCE_NAME = "resource.name"; @@ -56,8 +56,8 @@ public class HeaderResponseTest /** * Prepare */ - @Before - public void before() + @BeforeEach + void before() { final Response realResponse = new StringResponse(); @@ -99,8 +99,8 @@ public class HeaderResponseTest /** * Tear down */ - @After - public void after() + @AfterEach + void after() { ThreadContext.setRequestCycle(null); } @@ -109,25 +109,25 @@ public class HeaderResponseTest * Tests the creation of a proper IE conditional comment */ @Test - public void conditionalRenderCSSReference() + void conditionalRenderCSSReference() { headerResponse.render(CssHeaderItem.forReference(reference, null, "screen", "lt IE 8")); String expected = "<!--[if lt IE 8]><link rel=\"stylesheet\" type=\"text/css\" href=\"" + RESOURCE_NAME + "\" media=\"screen\" /><![endif]-->\n"; String actual = headerResponse.getResponse().toString(); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } /** * Tests the creation of a proper IE conditional comment */ @Test - public void conditionalRenderCSSReferenceWithUrl() + void conditionalRenderCSSReferenceWithUrl() { headerResponse.render(CssHeaderItem.forUrl("resource.css", "screen", "lt IE 8")); String expected = "<!--[if lt IE 8]><link rel=\"stylesheet\" type=\"text/css\" href=\""+RESOURCE_NAME+"\" media=\"screen\" /><![endif]-->\n"; String actual = headerResponse.getResponse().toString(); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } @@ -135,14 +135,14 @@ public class HeaderResponseTest * Tests the creation of a proper IE conditional comment */ @Test - public void conditionalRenderCSSContent() + void conditionalRenderCSSContent() { headerResponse.render(CssHeaderItem.forCSS(".className { font-size: 10px}", "id", "lt IE 8")); String expected = "<!--[if lt IE 8]><style type=\"text/css\" id=\"id\">\n" + ".className { font-size: 10px}</style>\n" + "<![endif]-->\n"; String actual = headerResponse.getResponse().toString(); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } /** @@ -151,14 +151,14 @@ public class HeaderResponseTest * WICKET-3661 */ @Test - public void deferJavaScriptReference() + void deferJavaScriptReference() { boolean defer = true; headerResponse.render(JavaScriptHeaderItem.forUrl("js-resource.js", "some-id", defer)); String expected = "<script type=\"text/javascript\" id=\"some-id\" defer=\"defer\" src=\"" + RESOURCE_NAME + "\"></script>\n"; String actual = headerResponse.getResponse().toString(); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } /** @@ -167,14 +167,14 @@ public class HeaderResponseTest * WICKET-3661 */ @Test - public void deferFalseJavaScriptReference() + void deferFalseJavaScriptReference() { boolean defer = false; headerResponse.render(JavaScriptHeaderItem.forUrl("js-resource.js", "some-id", defer)); String expected = "<script type=\"text/javascript\" id=\"some-id\" src=\"" + RESOURCE_NAME + "\"></script>\n"; String actual = headerResponse.getResponse().toString(); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } /** @@ -183,7 +183,7 @@ public class HeaderResponseTest * WICKET-3909 */ @Test - public void charsetSetJavaScriptReference() + void charsetSetJavaScriptReference() { String charset = "foo"; headerResponse.render(JavaScriptHeaderItem.forUrl("js-resource.js", "some-id", false, @@ -191,7 +191,7 @@ public class HeaderResponseTest String expected = "<script type=\"text/javascript\" id=\"some-id\" charset=\"" + charset + "\" src=\"" + RESOURCE_NAME + "\"></script>\n"; String actual = headerResponse.getResponse().toString(); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } /** @@ -200,20 +200,20 @@ public class HeaderResponseTest * WICKET-3909 */ @Test - public void charsetNotSetJavaScriptReference() + void charsetNotSetJavaScriptReference() { headerResponse.render(JavaScriptHeaderItem.forUrl("js-resource.js", "some-id", false, null)); String expected = "<script type=\"text/javascript\" id=\"some-id\" src=\"" + RESOURCE_NAME + "\"></script>\n"; String actual = headerResponse.getResponse().toString(); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } /** * Tests the creation of a proper IE conditional comment */ @Test - public void conditionalRenderJSReference() + void conditionalRenderJSReference() { headerResponse.render( JavaScriptHeaderItem.forReference(reference, new PageParameters(), "id", false, null, "lt IE 8")); @@ -222,14 +222,14 @@ public class HeaderResponseTest String actual = headerResponse.getResponse().toString(); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } /** * Tests the creation of a proper IE conditional comment */ @Test - public void conditionalRenderJSReferenceWithUrl() + void conditionalRenderJSReferenceWithUrl() { headerResponse.render(JavaScriptHeaderItem.forUrl("js-resource.js", "id", true, "cp1251", "lt IE 8")); @@ -238,7 +238,7 @@ public class HeaderResponseTest String actual = headerResponse.getResponse().toString(); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } @@ -246,7 +246,7 @@ public class HeaderResponseTest * Tests the creation of a proper IE conditional comment */ @Test - public void conditionalRenderJSContent() + void conditionalRenderJSContent() { headerResponse.render(JavaScriptHeaderItem.forScript("someJSMethod();", "id", "lt IE 8")); @@ -259,6 +259,6 @@ public class HeaderResponseTest String actual = headerResponse.getResponse().toString(); - Assert.assertEquals(expected, actual); + assertEquals(expected, actual); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java index 6c614fa..a34b58e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HtmlHeaderContainerTest.java @@ -16,27 +16,29 @@ */ package org.apache.wicket.markup.html.internal; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for the {@link org.apache.wicket.markup.html.internal.HtmlHeaderContainer}. * * @author svenmeier */ -public class HtmlHeaderContainerTest extends WicketTestCase +class HtmlHeaderContainerTest extends WicketTestCase { /** * Test clean-up of auto added components after removal of the HtmlHeaderContainer. */ @Test - public void cleanUpOfAutoAddedComponents() + void cleanUpOfAutoAddedComponents() { tester.startPage(ComponentResolvingPage.class); // onEndRequest() of auto added component was not called in // MarkupContainer#internalEndRequest() using an iterator ComponentResolvingPage page = (ComponentResolvingPage)tester.getLastRenderedPage(); - assertTrue("onDetach() should have been called", page.onDetachWasCalledOnAutoAddedComponent); + assertTrue(page.onDetachWasCalledOnAutoAddedComponent, "onDetach() should have been called"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java index cb18393..a3ed468 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.markup.html.internal; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.concurrent.atomic.AtomicInteger; import org.apache.wicket.Component; @@ -26,15 +28,14 @@ import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * Test for {@link InlineEnclosure} and {@link InlineEnclosureHandler}. * * @author Joonas Hamalainen */ -public class InlineEnclosureTest extends WicketTestCase +class InlineEnclosureTest extends WicketTestCase { /** * WICKET-5085: Since {@link InlineEnclosure}s are not removed as other auto-Components, they must be @@ -43,7 +44,7 @@ public class InlineEnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void inlineEnclosuresAreResolvedOnceOnly() throws Exception + void inlineEnclosuresAreResolvedOnceOnly() throws Exception { InlineEnclosurePanelPage page = new InlineEnclosurePanelPage(); @@ -79,7 +80,7 @@ public class InlineEnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void inlineEnclosurePage_1() throws Exception + void inlineEnclosurePage_1() throws Exception { executeTest(InlineEnclosurePage_1.class, "InlineEnclosurePageExpectedResult_1.html"); } @@ -88,7 +89,7 @@ public class InlineEnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void inlineEnclosurePage_2() throws Exception + void inlineEnclosurePage_2() throws Exception { executeTest(InlineEnclosurePage_2.class, "InlineEnclosurePageExpectedResult_2.html"); } @@ -97,13 +98,13 @@ public class InlineEnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void inlineEnclosurePanelPage() throws Exception + void inlineEnclosurePanelPage() throws Exception { executeTest(InlineEnclosurePanelPage.class, "InlineEnclosurePanelPageExpectedResult.html"); } @Test - public void inlineEnclosurePageDifferentNamespace() throws Exception + void inlineEnclosurePageDifferentNamespace() throws Exception { executeTest(InlineEnclosureDifferentNamespacePage.class, "InlineEnclosureDifferentNamespaceExpectedResult.html"); @@ -117,7 +118,7 @@ public class InlineEnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void inlineEnclosureWithWicketMessageVisible() throws Exception + void inlineEnclosureWithWicketMessageVisible() throws Exception { executeTest(new InlineEnclosureWithWicketMessagePage(true), "InlineEnclosureWithWicketMessagePage_visible_expected.html"); @@ -132,7 +133,7 @@ public class InlineEnclosureTest extends WicketTestCase * @throws Exception */ @Test - public void inlineEnclosureWithWicketMessageInvisible() throws Exception + void inlineEnclosureWithWicketMessageInvisible() throws Exception { executeTest(new InlineEnclosureWithWicketMessagePage(false), "InlineEnclosureWithWicketMessagePage_invisible_expected.html"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java index aebf680..f2e56a6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/InlineEnclosureWithWicketMessagePage.java @@ -27,7 +27,7 @@ import org.apache.wicket.markup.html.basic.Label; * * @since 1.5.6 */ -public class InlineEnclosureWithWicketMessagePage extends WebPage +class InlineEnclosureWithWicketMessagePage extends WebPage { public InlineEnclosureWithWicketMessagePage(boolean childVisible) { http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java index 58f9e3f..cb9787f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/ListViewInContainerPage.java @@ -42,7 +42,7 @@ public class ListViewInContainerPage extends BasePage add(new ListView<Integer>("liste", values) { /** - * + * */ private static final long serialVersionUID = 1L; @@ -51,7 +51,7 @@ public class ListViewInContainerPage extends BasePage { final Label testenc = new Label("testenc", Model.of("enclosure " + item.getModelObject())); item.queue(testenc); - + final Label testlib = new Label("testlib", Model.of("no enclosure " + item.getModelObject())); item.queue(testlib); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java index 0c10a51..eaf2a90 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TogglePageTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.markup.html.internal; +import static org.junit.jupiter.api.Assertions.assertFalse; + import java.util.regex.Pattern; import org.apache.wicket.Component; @@ -25,13 +27,12 @@ import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * Simple test using the WicketTester */ -public class TogglePageTest extends WicketTestCase +class TogglePageTest extends WicketTestCase { @Override @@ -50,7 +51,7 @@ public class TogglePageTest extends WicketTestCase } @Test - public void testNoAjaxPage() + void testNoAjaxPage() { { // On @@ -78,7 +79,7 @@ public class TogglePageTest extends WicketTestCase } @Test - public void testTraditionalAjaxEnclosurePage() + void testTraditionalAjaxEnclosurePage() { { // On @@ -109,7 +110,7 @@ public class TogglePageTest extends WicketTestCase } @Test - public void testInlineEnclosureWithAdditionalAjaxTarget() + void testInlineEnclosureWithAdditionalAjaxTarget() { { // On @@ -156,7 +157,7 @@ public class TogglePageTest extends WicketTestCase } @Test - public void testInlineEnclosureAjaxPage() + void testInlineEnclosureAjaxPage() { String inlineEnclosureIdPrefix = "wicket__InlineEnclosure_"; @@ -200,7 +201,7 @@ public class TogglePageTest extends WicketTestCase /** * @param toggleable */ - protected void assertInvisible(Component toggleable) + private void assertInvisible(Component toggleable) { tester.assertInvisible(toggleable.getPageRelativePath()); assertDoesNotContain(toggledText); @@ -210,7 +211,7 @@ public class TogglePageTest extends WicketTestCase /** * @param toggleable */ - protected void assertVisible(Component toggleable) + private void assertVisible(Component toggleable) { tester.assertVisible(toggleable.getPageRelativePath()); tester.assertContains(Pattern.quote(toggledText)); @@ -221,7 +222,7 @@ public class TogglePageTest extends WicketTestCase /** * @param label */ - protected void assertVisible(Label label) + private void assertVisible(Label label) { tester.assertVisible(label.getPageRelativePath()); tester.assertContains(Pattern.quote(label.getInnermostModel().getObject().toString())); @@ -230,7 +231,7 @@ public class TogglePageTest extends WicketTestCase /** * @param label */ - protected void assertInVisible(Label label) + private void assertInVisible(Label label) { tester.assertInvisible(label.getPageRelativePath()); } @@ -240,8 +241,7 @@ public class TogglePageTest extends WicketTestCase */ private void assertDoesNotContain(String string) { - assertFalse("Should not contain: " + string, - tester.getLastResponseAsString().contains(string)); + assertFalse(tester.getLastResponseAsString().contains(string), "Should not contain: " + string); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java index 712a9c8..55ade90 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/TraditionalEnclosureAjaxPage.java @@ -16,13 +16,13 @@ */ package org.apache.wicket.markup.html.internal; -import org.junit.Assert; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.ajax.AjaxRequestTarget; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.WebPage; - /** */ public class TraditionalEnclosureAjaxPage extends WebPage @@ -49,11 +49,13 @@ public class TraditionalEnclosureAjaxPage extends WebPage return get(toggleableChildId).isVisible(); } }).setOutputMarkupPlaceholderTag(true)); - Assert.assertEquals("Ajax requires tag to remain in DOM even if not visible", true, - traditionalAjaxVisibilityToggleRequiresPlaceholder.getOutputMarkupPlaceholderTag()); + assertEquals(true, + traditionalAjaxVisibilityToggleRequiresPlaceholder.getOutputMarkupPlaceholderTag(), + "Ajax requires tag to remain in DOM even if not visible"); { - traditionalAjaxVisibilityToggleRequiresPlaceholder.add((toggleable = new WebMarkupContainer( - toggleableChildId = "toggleable")).setOutputMarkupPlaceholderTag(true)); + traditionalAjaxVisibilityToggleRequiresPlaceholder + .add((toggleable = new WebMarkupContainer(toggleableChildId = "toggleable")) + .setOutputMarkupPlaceholderTag(true)); add(link = new AjaxLink<Void>("link") { @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePage.java index 192bc77..0ca3f70 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePage.java @@ -28,7 +28,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; public class BasePage extends WebPage { private static final long serialVersionUID = 1L; - public BasePage(final PageParameters parameters) { + BasePage(final PageParameters parameters) { super(parameters); add(new PanelA("panel")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePageWithHeaderItems.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePageWithHeaderItems.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePageWithHeaderItems.java index 5b26b3b..9e3bc9f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePageWithHeaderItems.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/BasePageWithHeaderItems.java @@ -26,7 +26,7 @@ public class BasePageWithHeaderItems extends WebPage { private static final long serialVersionUID = 1L; - public BasePageWithHeaderItems(final PageParameters parameters) { + BasePageWithHeaderItems(final PageParameters parameters) { super(parameters); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java index 5141590..9271cdf 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/HtmlHeaderItemsContainerTest.java @@ -16,23 +16,25 @@ */ package org.apache.wicket.markup.html.internal.headeritems; -import static org.hamcrest.number.OrderingComparison.lessThan; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; -import org.apache.wicket.markup.MarkupException; -import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.Page; +import org.apache.wicket.markup.MarkupException; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.tester.DummyPanelPage; +import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for <wicket:header-items/> element */ -public class HtmlHeaderItemsContainerTest extends WicketTestCase +class HtmlHeaderItemsContainerTest extends WicketTestCase { @Test - public void withHeaderItems() + void withHeaderItems() { tester.startPage(PageWithHeaderItems.class); String responseAsString = tester.getLastResponseAsString(); @@ -43,21 +45,21 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase int idxTitleElement = responseAsString.indexOf("<title>Apache Wicket Quickstart</title>"); int idxMetaFromBasePage = responseAsString.indexOf("<meta name='fromBasePage' content='1'"); - assertThat("<meta charset> should be rendered before <meta name=\"panel-wicket-head\"", - idxMetaCharset, lessThan(idxMetaPanelWicketHead)); + assertThat(idxMetaCharset).isLessThan(idxMetaPanelWicketHead).withFailMessage( + "<meta charset> should be rendered before <meta name=\"panel-wicket-head\""); - assertThat("<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>", - idxMetaPanelWicketHead, lessThan(idxWicketAjaxJs)); + assertThat(idxMetaPanelWicketHead).isLessThan(idxWicketAjaxJs).withFailMessage( + "<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>"); - assertThat("<script src=wicket-ajax-jquery.js> should be rendered before the <title> element", - idxWicketAjaxJs, lessThan(idxTitleElement)); + assertThat(idxWicketAjaxJs).isLessThan(idxTitleElement).withFailMessage( + "<script src=wicket-ajax-jquery.js> should be rendered before the <title> element"); - assertThat("<meta name='fromBasePage'> should be rendered before the <title> element", - idxMetaFromBasePage, lessThan(idxTitleElement)); + assertThat(idxMetaFromBasePage).isLessThan(idxTitleElement).withFailMessage( + "<meta name='fromBasePage'> should be rendered before the <title> element"); } @Test - public void withoutHeaderItems() + void withoutHeaderItems() { tester.startPage(PageWithoutHeaderItems.class); String responseAsString = tester.getLastResponseAsString(); @@ -68,21 +70,21 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase int idxTitleElement = responseAsString.indexOf("<title>Apache Wicket Quickstart</title>"); int idxMetaFromBasePage = responseAsString.indexOf("<meta name='fromBasePage' content='1'"); - assertThat("<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>", - idxMetaPanelWicketHead, lessThan(idxWicketAjaxJs)); + assertThat(idxMetaPanelWicketHead).isLessThan(idxWicketAjaxJs).withFailMessage( + "<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>"); - assertThat("<script src=wicket-ajax-jquery.js> should be rendered before <meta charset>", - idxWicketAjaxJs, lessThan(idxMetaCharset)); + assertThat(idxWicketAjaxJs).isLessThan(idxMetaCharset).withFailMessage( + "<script src=wicket-ajax-jquery.js> should be rendered before <meta charset>"); - assertThat("<meta charset> should be rendered before the <title> element", - idxMetaCharset, lessThan(idxTitleElement)); + assertThat(idxMetaCharset).isLessThan(idxTitleElement) + .withFailMessage("<meta charset> should be rendered before the <title> element"); - assertThat("<title> should be rendered before the <meta name='fromBasePage'> element", - idxTitleElement, lessThan(idxMetaFromBasePage)); + assertThat(idxTitleElement).isLessThan(idxMetaFromBasePage).withFailMessage( + "<title> should be rendered before the <meta name='fromBasePage'> element"); } @Test - public void withoutHeaderItemsWithWicketHead() + void withoutHeaderItemsWithWicketHead() { tester.startPage(SubPageWithoutHeaderItemsAndWicketHead.class); String responseAsString = tester.getLastResponseAsString(); @@ -92,26 +94,27 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase int idxWicketAjaxJs = responseAsString.indexOf("wicket-ajax-jquery.js"); int idxTitleElement = responseAsString.indexOf("<title>Apache Wicket Quickstart</title>"); int idxMetaFromBasePage = responseAsString.indexOf("<meta name='fromBasePage' content='1'"); - int idxMetaFromSubPage = responseAsString.indexOf("<meta name=\"SubPageWithoutHeaderItemsAndWicketHead\""); + int idxMetaFromSubPage = responseAsString + .indexOf("<meta name=\"SubPageWithoutHeaderItemsAndWicketHead\""); - assertThat("<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>", - idxMetaPanelWicketHead, lessThan(idxWicketAjaxJs)); + assertThat(idxMetaPanelWicketHead).isLessThan(idxWicketAjaxJs).withFailMessage( + "<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>"); - assertThat("<script src=wicket-ajax-jquery.js> should be rendered before <meta charset>", - idxWicketAjaxJs, lessThan(idxMetaCharset)); + assertThat(idxWicketAjaxJs).isLessThan(idxMetaCharset).withFailMessage( + "<script src=wicket-ajax-jquery.js> should be rendered before <meta charset>"); - assertThat("<meta charset> should be rendered before the <title> element", - idxMetaCharset, lessThan(idxTitleElement)); + assertThat(idxMetaCharset).isLessThan(idxTitleElement) + .withFailMessage("<meta charset> should be rendered before the <title> element"); - assertThat("<title> should be rendered before the <meta name=\"SubPageWithoutHeaderItemsAndWicketHead\" element", - idxTitleElement, lessThan(idxMetaFromSubPage)); + assertThat(idxTitleElement).isLessThan(idxMetaFromSubPage).withFailMessage( + "<title> should be rendered before the <meta name=\"SubPageWithoutHeaderItemsAndWicketHead\" element"); - assertThat("<meta name='fromBasePage'> should be rendered before the <meta name=\"SubPageWithoutHeaderItemsAndWicketHead\" element", - idxMetaFromSubPage, lessThan(idxMetaFromBasePage)); + assertThat(idxMetaFromSubPage).isLessThan(idxMetaFromBasePage).withFailMessage( + "<meta name='fromBasePage'> should be rendered before the <meta name=\"SubPageWithoutHeaderItemsAndWicketHead\" element"); } @Test - public void withHeaderItemsWithWicketHead() + void withHeaderItemsWithWicketHead() { tester.startPage(SubPageWithHeaderItemsAndWicketHead.class); String responseAsString = tester.getLastResponseAsString(); @@ -121,59 +124,68 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase int idxWicketAjaxJs = responseAsString.indexOf("wicket-ajax-jquery.js"); int idxTitleElement = responseAsString.indexOf("<title>Apache Wicket Quickstart</title>"); int idxMetaFromBasePage = responseAsString.indexOf("<meta name='fromBasePage' content='1'"); - int idxMetaFromSubPage = responseAsString.indexOf("<meta name=\"SubPageWithHeaderItemsAndWicketHead\""); + int idxMetaFromSubPage = responseAsString + .indexOf("<meta name=\"SubPageWithHeaderItemsAndWicketHead\""); - assertThat("<meta charset> should be rendered before <meta name=\"panel-wicket-head\"", - idxMetaCharset, lessThan(idxMetaPanelWicketHead)); + assertThat(idxMetaCharset).isLessThan(idxMetaPanelWicketHead).withFailMessage( + "<meta charset> should be rendered before <meta name=\"panel-wicket-head\""); - assertThat("<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>", - idxMetaPanelWicketHead, lessThan(idxWicketAjaxJs)); + assertThat(idxMetaPanelWicketHead).isLessThan(idxWicketAjaxJs).withFailMessage( + "<meta name=\"panel-wicket-head\"> should be rendered before <script src=wicket-ajax-jquery.js>"); - assertThat("<script src=wicket-ajax-jquery.js> should be rendered before the <title> element", - idxWicketAjaxJs, lessThan(idxTitleElement)); + assertThat(idxWicketAjaxJs).isLessThan(idxTitleElement).withFailMessage( + "<script src=wicket-ajax-jquery.js> should be rendered before the <title> element"); - assertThat("<meta name=\"SubPageWithoutHeaderItemsAndWicketHead\"> should be rendered before the <meta name='fromBasePage'> element", - idxMetaFromSubPage, lessThan(idxMetaFromBasePage)); + assertThat(idxMetaFromSubPage).isLessThan(idxMetaFromBasePage).withFailMessage( + "<meta name=\"SubPageWithoutHeaderItemsAndWicketHead\"> should be rendered before the <meta name='fromBasePage'> element"); - assertThat("<meta name='fromBasePage'> should be rendered before the <title> element", - idxMetaFromBasePage, lessThan(idxTitleElement)); + assertThat(idxMetaFromBasePage).isLessThan(idxTitleElement).withFailMessage( + "<meta name='fromBasePage'> should be rendered before the <title> element"); } /** * Only one <wicket:header-items/> is allowed only in <head> + * * @see org.apache.wicket.markup.parser.filter.HtmlHeaderSectionHandler */ - @Test(expected = MarkupException.class) - public void pageWithTwoHeaderItems() + @Test + void pageWithTwoHeaderItems() { - tester.startPage(PageWithTwoHeaderItems.class); + assertThrows(MarkupException.class, () -> { + tester.startPage(PageWithTwoHeaderItems.class); + }); } /** * <wicket:header-items/> is allowed only in <head> + * * @see org.apache.wicket.markup.parser.filter.HtmlHeaderSectionHandler */ - @Test(expected = MarkupException.class) - public void pageWithHeaderItemsOutOfHead() + @Test + void pageWithHeaderItemsOutOfHead() { - tester.startPage(PageWithHeaderItemsOutOfHead.class); + assertThrows(MarkupException.class, () -> { + tester.startPage(PageWithHeaderItemsOutOfHead.class); + }); } /** - * Verifies that all header contributions from <wicket:head> containers - * and IHeaderResponse are rendered exactly once + * Verifies that all header contributions from <wicket:head> containers and IHeaderResponse are + * rendered exactly once * * https://issues.apache.org/jira/browse/WICKET-5531 */ @Test - public void withHeaderItemsWithWicketHeadNoDuplicates() + void withHeaderItemsWithWicketHeadNoDuplicates() { tester.startPage(SubPageWithHeaderItemsAndWicketHead.class); String responseAsString = tester.getLastResponseAsString(); { - int idxMetaPanelWicketHead = responseAsString.indexOf("meta name=\"panel-wicket-head\""); - int lastIdxMetaPanelWicketHead = responseAsString.lastIndexOf("meta name=\"panel-wicket-head\""); + int idxMetaPanelWicketHead = responseAsString + .indexOf("meta name=\"panel-wicket-head\""); + int lastIdxMetaPanelWicketHead = responseAsString + .lastIndexOf("meta name=\"panel-wicket-head\""); assertEquals(idxMetaPanelWicketHead, lastIdxMetaPanelWicketHead); } @@ -184,20 +196,26 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase } { - int idxTitleElement = responseAsString.indexOf("<title>Apache Wicket Quickstart</title>"); - int lastIdxTitleElement = responseAsString.lastIndexOf("<title>Apache Wicket Quickstart</title>"); + int idxTitleElement = responseAsString + .indexOf("<title>Apache Wicket Quickstart</title>"); + int lastIdxTitleElement = responseAsString + .lastIndexOf("<title>Apache Wicket Quickstart</title>"); assertEquals(idxTitleElement, lastIdxTitleElement); } { - int idxMetaFromBasePage = responseAsString.indexOf("<meta name='fromBasePage' content='1'"); - int lastIdxMetaFromBasePage = responseAsString.lastIndexOf("<meta name='fromBasePage' content='1'"); + int idxMetaFromBasePage = responseAsString + .indexOf("<meta name='fromBasePage' content='1'"); + int lastIdxMetaFromBasePage = responseAsString + .lastIndexOf("<meta name='fromBasePage' content='1'"); assertEquals(idxMetaFromBasePage, lastIdxMetaFromBasePage); } { - int idxMetaFromSubPage = responseAsString.indexOf("<meta name=\"SubPageWithHeaderItemsAndWicketHead\""); - int lastIdxMetaFromSubPage = responseAsString.lastIndexOf("<meta name=\"SubPageWithHeaderItemsAndWicketHead\""); + int idxMetaFromSubPage = responseAsString + .indexOf("<meta name=\"SubPageWithHeaderItemsAndWicketHead\""); + int lastIdxMetaFromSubPage = responseAsString + .lastIndexOf("<meta name=\"SubPageWithHeaderItemsAndWicketHead\""); assertEquals(idxMetaFromSubPage, lastIdxMetaFromSubPage); } } @@ -206,7 +224,8 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-5989 */ @Test - public void pageWithBasePageWithHeaderItems() { + void pageWithBasePageWithHeaderItems() + { WicketTesterForBasePageWithHeaderItems tester = new WicketTesterForBasePageWithHeaderItems(); try { @@ -221,14 +240,17 @@ public class HtmlHeaderItemsContainerTest extends WicketTestCase private static class WicketTesterForBasePageWithHeaderItems extends WicketTester { @Override - protected Page createPage() { + protected Page createPage() + { return new PageExtendingBasePageWithHeaderItems(new PageParameters()); } @Override - protected String createPageMarkup(final String componentId) { - return new PageExtendingBasePageWithHeaderItems(new PageParameters()).getMarkup().toString(true); + protected String createPageMarkup(final String componentId) + { + return new PageExtendingBasePageWithHeaderItems(new PageParameters()).getMarkup() + .toString(true); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PageExtendingBasePageWithHeaderItems.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PageExtendingBasePageWithHeaderItems.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PageExtendingBasePageWithHeaderItems.java index 54df07f..e64b37a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PageExtendingBasePageWithHeaderItems.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PageExtendingBasePageWithHeaderItems.java @@ -21,7 +21,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; /** * https://issues.apache.org/jira/browse/WICKET-5989 */ -public class PageExtendingBasePageWithHeaderItems extends BasePageWithHeaderItems +class PageExtendingBasePageWithHeaderItems extends BasePageWithHeaderItems { public PageExtendingBasePageWithHeaderItems(PageParameters parameters) { super(parameters); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PanelA.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PanelA.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PanelA.java index d0ccdb1..2edf47a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PanelA.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/headeritems/PanelA.java @@ -24,7 +24,7 @@ import org.apache.wicket.resource.CoreLibrariesContributor; * A panel that contributes all Ajax header items * and uses <wicket:head> to contribute a <meta> element */ -public class PanelA extends Panel +class PanelA extends Panel { public PanelA(String id) {
![http://wicket.apache.org/img/wicket-7-bg.jpg\"/](http://wicket.apache.org/img/wicket-7-bg.jpg\"/){kind=link}
![http://wicket.apache.org/img/wicket-7-bg.jpg\"](http://wicket.apache.org/img/wicket-7-bg.jpg\"){kind=link}
![http://www.google.de/test.jpg\"/](https://www.google.de/test.jpg\"/){kind=link}