http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java index cb16c69..d39f2cf 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/ComponentMarkupIdTest.java @@ -16,23 +16,24 @@ */ package org.apache.wicket.markup.html; -import org.junit.Assert; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.Component; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.markup.html.panel.EmptyPanel; 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; /** * Unit test to ensure that calling {@link Component#getMarkupId()} still works as advertised in * Wicket 1.4. */ -public class ComponentMarkupIdTest extends WicketTestCase +class ComponentMarkupIdTest extends WicketTestCase { /** */ @Test - public void idGeneratedWhenComponentNotAddedToPage() + void idGeneratedWhenComponentNotAddedToPage() { // In wicket 1.4 the following sequence would not cause an exception Label label = new Label("bla", "Hello, World!"); @@ -41,12 +42,12 @@ public class ComponentMarkupIdTest extends WicketTestCase String markupId = label.getMarkupId(); // instead 1.4 would just generate the missing markup identifier - Assert.assertEquals("bla1", markupId); + assertEquals("bla1", markupId); } /** */ @Test - public void idGeneratedWhenPanelNotAddedToPage() + void idGeneratedWhenPanelNotAddedToPage() { // In wicket 1.4 the following sequence would not cause an exception Panel panel = new EmptyPanel("bla"); @@ -56,7 +57,7 @@ public class ComponentMarkupIdTest extends WicketTestCase String markupId = panel.getMarkupId(); // instead 1.4 would just generate the missing markup identifier - Assert.assertEquals("bla1", markupId); + assertEquals("bla1", markupId); } /** @@ -64,13 +65,13 @@ public class ComponentMarkupIdTest extends WicketTestCase * markup file, when the component has been added to the page. */ @Test - public void idFromMarkupRetrievedWhenPanelAddedToPage() + void idFromMarkupRetrievedWhenPanelAddedToPage() { ComponentMarkupIdTestPage page = new ComponentMarkupIdTestPage(); tester.startPage(page); tester.assertRenderedPage(ComponentMarkupIdTestPage.class); - Assert.assertEquals("markupPanel", page.markupPanel.getMarkupId()); + assertEquals("markupPanel", page.markupPanel.getMarkupId()); } /** @@ -78,41 +79,41 @@ public class ComponentMarkupIdTest extends WicketTestCase * markup file, when the component has been added to the page. */ @Test - public void idFromMarkupRetrievedWhenLabelAddedToPage() + void idFromMarkupRetrievedWhenLabelAddedToPage() { ComponentMarkupIdTestPage page = new ComponentMarkupIdTestPage(); tester.startPage(page); tester.assertRenderedPage(ComponentMarkupIdTestPage.class); - Assert.assertEquals("markupLabel", page.markupLabel.getMarkupId()); + assertEquals("markupLabel", page.markupLabel.getMarkupId()); } /** * Tests that a generated ID is kept, even if an identifier in the markup was set. */ @Test - public void generatedIdOverridesIdFromMarkupWhenLabelAddedToPage() + void generatedIdOverridesIdFromMarkupWhenLabelAddedToPage() { ComponentMarkupIdTestPage page = new ComponentMarkupIdTestPage(); tester.startPage(page); tester.assertRenderedPage(ComponentMarkupIdTestPage.class); - Assert.assertEquals("generatedLabel1", page.generatedLabelMarkupId); - Assert.assertEquals("generatedLabel1", page.generatedLabel.getMarkupId()); + assertEquals("generatedLabel1", page.generatedLabelMarkupId); + assertEquals("generatedLabel1", page.generatedLabel.getMarkupId()); } /** * Tests that a generated ID is kept, even if an identifier in the markup was set. */ @Test - public void generatedIdOverridesIdFromMarkup() + void generatedIdOverridesIdFromMarkup() { ComponentMarkupIdTestPage page = new ComponentMarkupIdTestPage(); tester.startPage(page); tester.assertRenderedPage(ComponentMarkupIdTestPage.class); - Assert.assertEquals("generatedPanel2", page.generatedPanelMarkupId); - Assert.assertEquals("generatedPanel2", page.generatedPanel.getMarkupId()); + assertEquals("generatedPanel2", page.generatedPanelMarkupId); + assertEquals("generatedPanel2", page.generatedPanel.getMarkupId()); } /** @@ -120,13 +121,13 @@ public class ComponentMarkupIdTest extends WicketTestCase * kept, even if an identifier in the markup was set. */ @Test - public void fixedIdFromJavaForLabelOverridesIdFromMarkup() + void fixedIdFromJavaForLabelOverridesIdFromMarkup() { ComponentMarkupIdTestPage page = new ComponentMarkupIdTestPage(); tester.startPage(page); tester.assertRenderedPage(ComponentMarkupIdTestPage.class); - Assert.assertEquals("javaLabel", page.fixedLabel.getMarkupId()); + assertEquals("javaLabel", page.fixedLabel.getMarkupId()); } /** @@ -134,12 +135,12 @@ public class ComponentMarkupIdTest extends WicketTestCase * kept, even if an identifier in the markup was set. */ @Test - public void fixedIdFromJavaForPanelOverridesIdFromMarkup() + void fixedIdFromJavaForPanelOverridesIdFromMarkup() { ComponentMarkupIdTestPage page = new ComponentMarkupIdTestPage(); tester.startPage(page); tester.assertRenderedPage(ComponentMarkupIdTestPage.class); - Assert.assertEquals("javaPanel", page.fixedPanel.getMarkupId()); + assertEquals("javaPanel", page.fixedPanel.getMarkupId()); } }
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java index 30f8d5b..65eb1ca 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/DecoratingHeaderResponseTest.java @@ -16,11 +16,15 @@ */ package org.apache.wicket.markup.html; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.IOException; import java.text.ParseException; import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.IMarkupResourceStreamProvider; +import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.markup.head.JavaScriptHeaderItem; import org.apache.wicket.markup.head.JavaScriptReferenceHeaderItem; @@ -28,17 +32,16 @@ import org.apache.wicket.markup.head.ResourceAggregator; import org.apache.wicket.markup.parser.XmlPullParser; import org.apache.wicket.markup.parser.XmlTag; import org.apache.wicket.request.resource.PackageResourceReference; -import org.apache.wicket.markup.head.HeaderItem; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.ResourceStreamNotFoundException; 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 DecoratingHeaderResponseTest extends WicketTestCase +class DecoratingHeaderResponseTest extends WicketTestCase { /** @@ -49,7 +52,7 @@ public class DecoratingHeaderResponseTest extends WicketTestCase * @throws ParseException */ @Test - public void decoratedStringPrepend() throws IOException, ResourceStreamNotFoundException, + void decoratedStringPrepend() throws IOException, ResourceStreamNotFoundException, ParseException { tester.getApplication().setHeaderResponseDecorator(new IHeaderResponseDecorator() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java index 867dc07..f6d8d54 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/HeaderContributorTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.markup.html; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.concurrent.atomic.AtomicBoolean; import org.apache.wicket.Component; @@ -30,28 +32,27 @@ import org.apache.wicket.markup.head.IHeaderResponse; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests that {@link Component}, {@link Behavior} and {@link org.apache.wicket.ajax.attributes.IAjaxCallListener} that implements * {@link IHeaderContributor} actually contributes to the header */ -public class HeaderContributorTest extends WicketTestCase +class HeaderContributorTest extends WicketTestCase { /** * @see <a href="https://issues.apache.org/jira/browse/WICKET-3059";>WICKET-3059</a> */ @Test - public void testHeaderContribution() + void testHeaderContribution() { HeaderContributorTestPage page = new HeaderContributorTestPage(); tester.startPage(page); - Assert.assertTrue("component", page.component.get()); - Assert.assertTrue("behavior", page.behavior.get()); - Assert.assertTrue("callDecorator", page.callDecorator.get()); + assertTrue(page.component.get(), "component"); + assertTrue(page.behavior.get(), "behavior"); + assertTrue(page.callDecorator.get(), "callDecorator"); } /** @@ -70,7 +71,7 @@ public class HeaderContributorTest extends WicketTestCase /** * Construct. */ - public HeaderContributorTestPage() + HeaderContributorTestPage() { add(new AjaxEventBehavior("dummy") { @@ -130,7 +131,7 @@ public class HeaderContributorTest extends WicketTestCase * * @param callDecorator */ - public HeaderContributingCallDecorator(AtomicBoolean callDecorator) + HeaderContributingCallDecorator(AtomicBoolean callDecorator) { this.callDecorator = callDecorator; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java index 7d54d4a..3abf5f8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupHeadFirstTest.java @@ -25,12 +25,12 @@ import org.apache.wicket.markup.html.panel.Panel; 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; /** * <a href="https://issues.apache.org/jira/browse/WICKET-3761";>WICKET-3761</a> */ -public class MarkupHeadFirstTest extends WicketTestCase +class MarkupHeadFirstTest extends WicketTestCase { /** @@ -44,7 +44,7 @@ public class MarkupHeadFirstTest extends WicketTestCase * @throws Exception */ @Test - public void renderMyPage() throws Exception + void renderMyPage() throws Exception { executeTest(MarkupHeadFirstPage.class, "MarkupHeadFirstPage.html"); } @@ -82,7 +82,7 @@ public class MarkupHeadFirstTest extends WicketTestCase private static final long serialVersionUID = 1L; - public MarkupHeadFirstPanel(String id) + MarkupHeadFirstPanel(String id) { super(id); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage1.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage1.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage1.java index fc15a00..fc98744 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage1.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage1.java @@ -24,7 +24,7 @@ public class MarkupInheritanceResolverTestPage1 extends WebPage private static final long serialVersionUID = 1L; /** */ - public MarkupInheritanceResolverTestPage1() + MarkupInheritanceResolverTestPage1() { add(new Label("test1", "test1")); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage2.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage2.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage2.java index 636a14a..a44ace2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage2.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/MarkupInheritanceResolverTestPage2.java @@ -24,7 +24,7 @@ public class MarkupInheritanceResolverTestPage2 extends MarkupInheritanceResolve private static final long serialVersionUID = 1L; /** */ - public MarkupInheritanceResolverTestPage2() + MarkupInheritanceResolverTestPage2() { add(new Label("test2", "test2")); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java index 42669a7..e146e03 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceGuardTest.java @@ -16,21 +16,25 @@ */ package org.apache.wicket.markup.html; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.File; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Juergen Donnerstag */ -public class PackageResourceGuardTest extends WicketTestCase +class PackageResourceGuardTest extends WicketTestCase { /** * Test acceptance of root folder. */ @Test - public void accept() + void accept() { PackageResourceGuard guard = new PackageResourceGuard(); @@ -48,7 +52,7 @@ public class PackageResourceGuardTest extends WicketTestCase * works on Windows and properly blocks on any other OS). */ @Test - public void acceptAbsolutePath() + void acceptAbsolutePath() { PackageResourceGuard guard = new PackageResourceGuard(); guard.setAllowAccessToRootResources(false); @@ -82,7 +86,7 @@ public class PackageResourceGuardTest extends WicketTestCase * @throws Exception */ @Test - public void markup() throws Exception + void markup() throws Exception { PackageResourceGuard guard = new PackageResourceGuard(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java index 63d6b6a..11bd855 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/PackageResourceTest.java @@ -16,6 +16,11 @@ */ package org.apache.wicket.markup.html; +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.assertTrue; + import java.util.Locale; import org.apache.wicket.Application; @@ -27,8 +32,8 @@ import org.apache.wicket.request.resource.PackageResourceReference; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.util.lang.Packages; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for package resources. @@ -38,13 +43,13 @@ import org.junit.Test; public class PackageResourceTest extends WicketTestCase { /** mock application object */ - public WebApplication application; + private WebApplication application; /** * */ - @Before - public void before() + @BeforeEach + void before() { application = tester.getApplication(); } @@ -55,11 +60,12 @@ public class PackageResourceTest extends WicketTestCase * @throws Exception */ @Test - public void bindAbsolutePackageResource() throws Exception + void bindAbsolutePackageResource() throws Exception { final SharedResources sharedResources = Application.get().getSharedResources(); - assertNotNull("resource packaged1.txt should be available as a packaged resource", - sharedResources.get(PackageResourceTest.class, "packaged1.txt", null, null, null, true)); + assertNotNull( + sharedResources.get(PackageResourceTest.class, "packaged1.txt", null, null, null, true), + "resource packaged1.txt should be available as a packaged resource"); } /** @@ -68,7 +74,7 @@ public class PackageResourceTest extends WicketTestCase * @throws Exception */ @Test - public void packageResourceGuard() throws Exception + void packageResourceGuard() throws Exception { PackageResourceGuard guard = new PackageResourceGuard(); assertTrue(guard.acceptExtension("txt")); @@ -91,24 +97,22 @@ public class PackageResourceTest extends WicketTestCase * @throws Exception */ @Test - public void lenientPackageResourceMatching() throws Exception + void lenientPackageResourceMatching() throws Exception { ResourceReference invalidResource = new PackageResourceReference(PackageResourceTest.class, "i_do_not_exist.txt", Locale.ENGLISH, null, null); - assertNotNull( - "resource i_do_not_exist.txt SHOULD be available as a packaged resource even if it doesn't exist", - invalidResource.getResource()); + assertNotNull(invalidResource.getResource(), "resource i_do_not_exist.txt SHOULD be available as a packaged resource even if it doesn't exist"); - assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1.txt", null, null, - null)); + assertTrue( + PackageResource.exists(PackageResourceTest.class, "packaged1.txt", null, null, null)); assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1.txt", Locale.CHINA, null, null)); assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1.txt", Locale.CHINA, "foo", null)); - assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1.txt", null, "foo", + assertTrue( + PackageResource.exists(PackageResourceTest.class, "packaged1.txt", null, "foo", null)); + assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1_en.txt", null, null, null)); - assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1_en.txt", null, - null, null)); assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1_en_US.txt", null, null, null)); assertTrue(PackageResource.exists(PackageResourceTest.class, "packaged1_en_US.txt", null, @@ -139,7 +143,7 @@ public class PackageResourceTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-4119 */ @Test - public void contentType() + void contentType() { PackageResource textResource = new PackageResource(PackageResourceTest.class, "packaged1.txt", null, null, null) @@ -161,7 +165,7 @@ public class PackageResourceTest extends WicketTestCase } @Test - public void textFileWithEncoding() + void textFileWithEncoding() { final String encoding = "Klingon-8859-42"; final PackageResource resource = new PackageResource(PackageResourceTest.class, @@ -176,7 +180,7 @@ public class PackageResourceTest extends WicketTestCase } @Test - public void javascriptFileWithEncoding() + void javascriptFileWithEncoding() { final String encoding = "Klingon-8859-42"; final JavaScriptPackageResource resource = new JavaScriptPackageResource( http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java index 9507d0a..0df9800 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/SecurePackageResourceGuardTest.java @@ -16,21 +16,24 @@ */ package org.apache.wicket.markup.html; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.Application; import org.apache.wicket.util.lang.Packages; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Juergen Donnerstag */ -public class SecurePackageResourceGuardTest extends WicketTestCase +class SecurePackageResourceGuardTest extends WicketTestCase { /** * */ @Test - public void accept() + void accept() { SecurePackageResourceGuard guard = new SecurePackageResourceGuard(); guard.setAllowAccessToRootResources(false); @@ -63,14 +66,14 @@ public class SecurePackageResourceGuardTest extends WicketTestCase { hit = true; } - assertTrue("Expected an IllegalArgumentException", hit); + assertTrue(hit, "Expected an IllegalArgumentException"); } /** * */ @Test - public void acceptAbsolutePath() + void acceptAbsolutePath() { SecurePackageResourceGuard guard = new SecurePackageResourceGuard(); guard.addPattern("+*.gif"); @@ -84,7 +87,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase * */ @Test - public void fileOnly() + void fileOnly() { SecurePackageResourceGuard guard = new SecurePackageResourceGuard(); guard.setAllowAccessToRootResources(true); @@ -106,7 +109,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase } @Test - public void fileOnly_relative_allowed() + void fileOnly_relative_allowed() { // ".." is allowed as long as we have parent folder placeholder set in resource settings tester.getApplication().getResourceSettings().setParentFolderPlaceholder("::"); @@ -116,7 +119,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase } @Test - public void fileOnly_relative_not_allowed() + void fileOnly_relative_not_allowed() { // ".." is allowed as long as we have parent folder placeholder set in resource settings tester.getApplication().getResourceSettings().setParentFolderPlaceholder(null); @@ -129,7 +132,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase * */ @Test - public void withDirectory() + void withDirectory() { SecurePackageResourceGuard guard = new SecurePackageResourceGuard(); guard.getPattern().clear(); @@ -146,7 +149,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase * */ @Test - public void one() + void one() { SecurePackageResourceGuard guard = new SecurePackageResourceGuard(); guard.getPattern().clear(); @@ -163,7 +166,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase * */ @Test - public void two() + void two() { SecurePackageResourceGuard guard = new SecurePackageResourceGuard(); guard.getPattern().clear(); @@ -183,7 +186,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase * */ @Test - public void three() + void three() { SecurePackageResourceGuard guard = new SecurePackageResourceGuard(); guard.getPattern().clear(); @@ -203,7 +206,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase * */ @Test - public void four() + void four() { SecurePackageResourceGuard guard = new SecurePackageResourceGuard(); guard.getPattern().clear(); @@ -231,7 +234,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase * */ @Test - public void five() + void five() { SecurePackageResourceGuard guard = new SecurePackageResourceGuard(); guard.getPattern().clear(); @@ -249,7 +252,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase * */ @Test - public void six() + void six() { SecurePackageResourceGuard guard = new SecurePackageResourceGuard(); guard.setAllowAccessToRootResources(true); @@ -267,7 +270,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase * */ @Test - public void seven() + void seven() { SecurePackageResourceGuard guard = new SecurePackageResourceGuard(); guard.getPattern().clear(); @@ -284,7 +287,7 @@ public class SecurePackageResourceGuardTest extends WicketTestCase * */ @Test - public void eight() + void eight() { SecurePackageResourceGuard guard = new SecurePackageResourceGuard(); guard.getPattern().clear(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java index 39586e0..da853e4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/TransparentWebMarkupContainerTest.java @@ -16,7 +16,11 @@ */ package org.apache.wicket.markup.html; +import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.containsString; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import org.apache.wicket.Component; import org.apache.wicket.IPageManagerProvider; @@ -40,7 +44,7 @@ import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; 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 Pedro Santos @@ -53,7 +57,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase * @throws Exception */ @Test - public void markupInheritanceResolver() throws Exception + void markupInheritanceResolver() throws Exception { executeTest(MarkupInheritanceResolverTestPage3.class, "MarkupInheritanceResolverTestPage_expected.html"); @@ -63,7 +67,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase * */ @Test - public void unableToFindComponents() + void unableToFindComponents() { try { @@ -72,8 +76,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase } catch (MarkupException e) { - assertTrue(e.getMessage(), - e.getMessage().contains("Unable to find component with id 'c1'")); + assertTrue(e.getMessage().contains("Unable to find component with id 'c1'"), e.getMessage()); } } @@ -82,7 +85,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase * WicketTagIdentifier is generation for internal components. */ @Test - public void usingGeneratedWicketIdAreSafe1() + void usingGeneratedWicketIdAreSafe1() { tester.startPage(TestPage2.class); assertTrue(tester.getLastResponseAsString().contains("test_message")); @@ -93,7 +96,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase * Same test in different scenario */ @Test - public void usingGeneratedWicketIdAreSafe2() + void usingGeneratedWicketIdAreSafe2() { tester.startPage(TestPage3.class); String expected = tester.getApplication() @@ -107,7 +110,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase * Test case for <a href="https://issues.apache.org/jira/browse/WICKET-3719";>WICKET-3719</a> */ @Test - public void ajaxUpdate() + void ajaxUpdate() { WicketTester wicketTester = new WicketTester() { @@ -147,7 +150,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase * that might need rewriting. */ @Test - public void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow() + void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow() { tester.startPage(SingleNestedTransparentContainerPage.class); @@ -166,7 +169,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase * outer TWMC. */ @Test - public void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow2() + void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow2() { tester.startPage(DoubleNestedTransparentContainerPage.class); @@ -185,7 +188,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase * container and trying to update a label that was added to the outer TWMC. */ @Test - public void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow3() + void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow3() { tester.startPage(DoubleNestedTransparentContainerWithSiblingTransparentContainerPage.class); @@ -205,7 +208,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase * the outer TWMC. */ @Test - public void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow4() + void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow4() { tester.startPage(TransparentContainerWithAutoTransparentContainerPage.class); @@ -224,7 +227,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase * label that was added to the outer TWMC. */ @Test - public void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow5() + void ajaxRequestForComponentInTransparentWebMarkupContainerShouldntCauseStackOverflow5() { tester.startPage(TransparentContainerWithManualTransparentContainerPage.class); @@ -242,7 +245,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase * Headers not rendered for components inside TransparentWebMarkupContainer on ajax update */ @Test - public void updateAjaxUpdateOfTransparentContainer() throws Exception + void updateAjaxUpdateOfTransparentContainer() throws Exception { TestEmbeddedAjaxComponet page = new TestEmbeddedAjaxComponet(); tester.startPage(page); @@ -253,7 +256,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase } @Test - public void updateAjaxUpdateOfContainerWithTransparentContainer() throws Exception + void updateAjaxUpdateOfContainerWithTransparentContainer() throws Exception { TestEmbeddedAjaxComponet page = new TestEmbeddedAjaxComponet(); tester.startPage(page); @@ -264,7 +267,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase } @Test - public void nestedTransparentContainer() throws Exception + void nestedTransparentContainer() throws Exception { tester.startPage(TestEmbeddedTransparentMarkupContainer.class); tester.assertRenderedPage(TestEmbeddedTransparentMarkupContainer.class); @@ -280,7 +283,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-6219 */ @Test - public void shouldAllowAFragmentIdConflictingToASibilingTagWicketId() throws Exception + void shouldAllowAFragmentIdConflictingToASibilingTagWicketId() throws Exception { tester.startPage(SubPageWithAFragment.class); assertThat(tester.getLastResponseAsString(), containsString("content")); @@ -387,10 +390,10 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase { private static final long serialVersionUID = 1L; - public int renderHeadCount = 0; + int renderHeadCount = 0; /** */ - public TestEmbeddedAjaxComponet() + TestEmbeddedAjaxComponet() { final WebMarkupContainer container = new WebMarkupContainer("container"); container.setOutputMarkupId(true); @@ -456,10 +459,10 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase { private static final long serialVersionUID = 1L; - public static final String LABEL_MARKUP = "<span wicket:id=\"label\"></span>"; + static final String LABEL_MARKUP = "<span wicket:id=\"label\"></span>"; /** */ - public TestEmbeddedTransparentMarkupContainer() + public TestEmbeddedTransparentMarkupContainer() { add(new TransparentWebMarkupContainer("outer")); add(new TransparentWebMarkupContainer("inner")); @@ -486,7 +489,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase { private static final long serialVersionUID = 1L; - public PageWithAChildInsideATransparentContainer(PageParameters parameters) + public PageWithAChildInsideATransparentContainer(PageParameters parameters) { super(parameters); add(new TransparentWebMarkupContainer("wrapper")); @@ -508,7 +511,7 @@ public class TransparentWebMarkupContainerTest extends WicketTestCase { private static final long serialVersionUID = 1L; - public SubPageWithAFragment(PageParameters parameters) + public SubPageWithAFragment(PageParameters parameters) { super(parameters); Fragment fragment = new Fragment("header", "header", this); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java index 1d4e256..4f280f6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java @@ -16,7 +16,8 @@ */ package org.apache.wicket.markup.html; -import static org.hamcrest.CoreMatchers.instanceOf; +import static org.assertj.core.api.Assertions.assertThat; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.wicket.MarkupContainer; import org.apache.wicket.ajax.AjaxRequestTarget; @@ -26,12 +27,12 @@ import org.apache.wicket.page.IManageablePage; 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 WebPageTest extends WicketTestCase +class WebPageTest extends WicketTestCase { /** @@ -40,7 +41,7 @@ public class WebPageTest extends WicketTestCase * @see <a href="https://issues.apache.org/jira/browse/WICKET-3892";>WICKET-3892</a> */ @Test - public void increaseNewlyCreatedPageId() + void increaseNewlyCreatedPageId() { tester.startPage(MainPage.class); int mainPageId = tester.getLastRenderedPage().getPageId(); @@ -54,8 +55,8 @@ public class WebPageTest extends WicketTestCase IManageablePage mainPage = tester.getSession().getPageManager().getPage(mainPageId); IManageablePage targetPage = tester.getSession().getPageManager().getPage(targetPageId); - assertThat(mainPage, instanceOf(MainPage.class)); - assertThat(targetPage, instanceOf(TargetPage.class)); + assertThat(mainPage).isInstanceOf(MainPage.class); + assertThat(targetPage).isInstanceOf(TargetPage.class); } /** */ @@ -86,7 +87,7 @@ public class WebPageTest extends WicketTestCase } /** */ - public static class TargetPage extends WebPage implements IMarkupResourceStreamProvider + static class TargetPage extends WebPage implements IMarkupResourceStreamProvider { @Override public IResourceStream getMarkupResourceStream(MarkupContainer container, http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java index dba8b4b..95442fe 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/XmlDeclResponseTest.java @@ -16,24 +16,26 @@ */ package org.apache.wicket.markup.html; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.Page; import org.apache.wicket.markup.IMarkupFragment; import org.apache.wicket.markup.Markup; import org.apache.wicket.markup.MarkupType; 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 xml decl in WebResponse */ -public class XmlDeclResponseTest extends WicketTestCase +class XmlDeclResponseTest extends WicketTestCase { private static final String markupWith = "<?xml version='1.0' encoding='UTF-8' ?><html><body></body></html>"; private static final String markupWithout = "<html><body></body></html>"; private static final String acceptString = "text/xml,application/xml,application/xhtml+xml,text/html;q=0.9,text/plain;q=0.8,image/png,*/*;q=0.5"; - public static final String ACCEPT = "Accept"; + private static final String ACCEPT = "Accept"; private int insertXmlDecl = 0; @@ -64,7 +66,7 @@ public class XmlDeclResponseTest extends WicketTestCase /** */ @Test - public void insertAlways() + void insertAlways() { insertXmlDecl = 1; @@ -99,7 +101,7 @@ public class XmlDeclResponseTest extends WicketTestCase /** */ @Test - public void insertNever() + void insertNever() { insertXmlDecl = -1; @@ -134,7 +136,7 @@ public class XmlDeclResponseTest extends WicketTestCase /** */ @Test - public void insertWithRules() + void insertWithRules() { insertXmlDecl = 0; @@ -179,7 +181,7 @@ public class XmlDeclResponseTest extends WicketTestCase /** * @param mime */ - public SimplePage(String mime) + SimplePage(String mime) { this.mime = mime; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java index d5dbff6..b26c414 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/AutocomponetsGenerationTest.java @@ -16,13 +16,15 @@ */ package org.apache.wicket.markup.html.autocomponent; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.Page; import org.apache.wicket.core.util.string.ComponentRenderer; import org.apache.wicket.markup.IMarkupCache; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class AutocomponetsGenerationTest extends WicketTestCase +class AutocomponetsGenerationTest extends WicketTestCase { /* @@ -30,7 +32,7 @@ public class AutocomponetsGenerationTest extends WicketTestCase * and for https://issues.apache.org/jira/browse/WICKET-5908 */ @Test - public void autocomponetsNumberDoesntChange() + void autocomponetsNumberDoesntChange() { AutoComponentsPage autoComponentsPage = new AutoComponentsPage(); tester.startPage(autoComponentsPage); @@ -51,7 +53,7 @@ public class AutocomponetsGenerationTest extends WicketTestCase * Test for https://issues.apache.org/jira/browse/WICKET-6116 */ @Test - public void borderResolvesAutocomponents() throws Exception + void borderResolvesAutocomponents() throws Exception { AutoComponentsBorder border = new AutoComponentsBorder("id"); @@ -71,7 +73,7 @@ public class AutocomponetsGenerationTest extends WicketTestCase * Test for https://issues.apache.org/jira/browse/WICKET-6256 */ @Test - public void autoComponentsIdsGeneration() throws Exception + void autoComponentsIdsGeneration() throws Exception { Page page = new UniqueIdTest(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/UniqueIdTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/UniqueIdTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/UniqueIdTest.java index 43782e9..d30d2d5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/UniqueIdTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autocomponent/UniqueIdTest.java @@ -24,7 +24,7 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; -public class UniqueIdTest extends WebPage { +class UniqueIdTest extends WebPage { @Override protected void onInitialize() { @@ -44,7 +44,7 @@ public class UniqueIdTest extends WebPage { */ private static final long serialVersionUID = -437057755276096255L; - public CacheKeyNullPanel(String id) { + CacheKeyNullPanel(String id) { super(id); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java index 23865c8..0291b43 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutoLinkInPanelsTest.java @@ -22,15 +22,15 @@ import org.apache.wicket.markup.html.autolink.sub.LogoPanel; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Test for WICKET-4681 * * @author Carl-Eric Menzel */ -public class AutoLinkInPanelsTest extends WicketTestCase +class AutoLinkInPanelsTest extends WicketTestCase { public static class TestPage extends WebPage { @@ -40,8 +40,8 @@ public class AutoLinkInPanelsTest extends WicketTestCase } } - @Before - public void setUp() + @BeforeEach + void setUp() { tester = new WicketTester(new WebApplication() { @@ -62,7 +62,7 @@ public class AutoLinkInPanelsTest extends WicketTestCase } @Test - public void imgTagWorksInPanelWithExtraContainer() throws Exception + void imgTagWorksInPanelWithExtraContainer() throws Exception { tester.startPage(TestPage.class); // tester.dumpPage(); @@ -70,7 +70,7 @@ public class AutoLinkInPanelsTest extends WicketTestCase } @Test - public void imgTagWorksInPanelWithoutExtraContainer() throws Exception + void imgTagWorksInPanelWithoutExtraContainer() throws Exception { tester.startPage(TestPage.class); tester.assertContains("<img src=\"\\./wicket/resource/org.apache.wicket.markup.html.autolink.sub.LogoPanel/logo2-ver-\\d+.png\"/>"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java index 1aa6139..567e4c2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/AutolinkTest.java @@ -18,20 +18,20 @@ package org.apache.wicket.markup.html.autolink; import org.apache.wicket.markup.html.autolink.sub.PageB; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class AutolinkTest extends WicketTestCase +class AutolinkTest extends WicketTestCase { /** * * @throws Exception */ @Test - public void test_1() throws Exception + void test_1() throws Exception { executeTest(MyPage.class, "MyPageExpectedResult.html"); } @@ -41,7 +41,7 @@ public class AutolinkTest extends WicketTestCase * @throws Exception */ @Test - public void test_2() throws Exception + void test_2() throws Exception { executeTest(PageA.class, "PageAExpectedResult.html"); } @@ -51,7 +51,7 @@ public class AutolinkTest extends WicketTestCase * @throws Exception */ @Test - public void test_3() throws Exception + void test_3() throws Exception { executeTest(PageB.class, "PageBExpectedResult.html"); } @@ -61,7 +61,7 @@ public class AutolinkTest extends WicketTestCase * @throws Exception */ @Test - public void test_4() throws Exception + void test_4() throws Exception { executeTest(Index.class, "Index_ExpectedResult.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/BasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/BasePage.java index ad2b7ee..405bb89 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/BasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/BasePage.java @@ -29,7 +29,7 @@ public class BasePage extends WebPage * Creates a new instance of BasePanel * */ - public BasePage() + BasePage() { } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/QuickStartPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/QuickStartPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/QuickStartPage.java index af20c04..09ac525 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/QuickStartPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/QuickStartPage.java @@ -32,7 +32,7 @@ public abstract class QuickStartPage extends WebPage /** * Construct. */ - public QuickStartPage() + QuickStartPage() { add(new LinkPanel("linkPanel")); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/sub/BasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/sub/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/sub/BasePage.java index 0ff5403..4a8ec3e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/sub/BasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/autolink/sub/BasePage.java @@ -29,7 +29,7 @@ public class BasePage extends WebPage * Creates a new instance of BasePanel * */ - public BasePage() + BasePage() { } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/EnclosureContainerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/EnclosureContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/EnclosureContainerTest.java index c27121d..19b00fd 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/EnclosureContainerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/EnclosureContainerTest.java @@ -16,19 +16,21 @@ */ package org.apache.wicket.markup.html.basic; +import static org.junit.jupiter.api.Assertions.assertFalse; + import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link EnclosureContainer}. * * @author svenmeier */ -public class EnclosureContainerTest extends WicketTestCase +class EnclosureContainerTest extends WicketTestCase { @Test - public void test() { + void test() { EnclosureContainerPage page = new EnclosureContainerPage(); tester.startPage(page); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java index 6c1c550..b5328dc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/HomePageRedirectTest.java @@ -16,20 +16,22 @@ */ package org.apache.wicket.markup.html.basic; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.util.tester.DiffUtil; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author jcompagner */ -public class HomePageRedirectTest extends WicketTestCase +class HomePageRedirectTest extends WicketTestCase { /** * @throws Exception */ @Test - public void testRenderHomePagePageRedirect() throws Exception + void testRenderHomePagePageRedirect() throws Exception { tester.startPage(HomePagePageRedirect.class); @@ -44,7 +46,7 @@ public class HomePageRedirectTest extends WicketTestCase * @throws Exception */ @Test - public void testRenderHomePageClassRedirect() throws Exception + void testRenderHomePageClassRedirect() throws Exception { tester.startPage(HomePageClassRedirect.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java index 000136b..831ce64 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/LabelTest.java @@ -17,14 +17,14 @@ package org.apache.wicket.markup.html.basic; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for Label components * * @author Eelco Hillenius */ -public class LabelTest extends WicketTestCase +class LabelTest extends WicketTestCase { /** * Test escaping markup. @@ -32,7 +32,7 @@ public class LabelTest extends WicketTestCase * @throws Exception */ @Test - public void labelWithEscapeMarkup() throws Exception + void labelWithEscapeMarkup() throws Exception { executeTest(LabelWithEscapeMarkupPage.class, "LabelWithEscapeMarkupPageExpectedResult.html"); } @@ -43,7 +43,7 @@ public class LabelTest extends WicketTestCase * @throws Exception */ @Test - public void labelWithoutEscapeMarkup() throws Exception + void labelWithoutEscapeMarkup() throws Exception { executeTest(LabelWithoutEscapeMarkupPage.class, "LabelWithoutEscapeMarkupPageExpectedResult.html"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java index 8e8de92..bb591da 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePageTest.java @@ -16,6 +16,11 @@ */ package org.apache.wicket.markup.html.basic; +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.assertTrue; + import org.apache.wicket.markup.MarkupException; import org.apache.wicket.markup.MarkupNotFoundException; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -23,8 +28,7 @@ import org.apache.wicket.markup.html.border.Border; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.value.ValueMap; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * Simple application that demonstrates the mock http application code (and checks that it is @@ -32,13 +36,13 @@ import org.junit.Test; * * @author Chris Turner */ -public class SimplePageTest extends WicketTestCase +class SimplePageTest extends WicketTestCase { /** * @throws Exception */ @Test - public void renderHomePage() throws Exception + void renderHomePage() throws Exception { executeTest(SimplePage.class, "SimplePageExpectedResult.html"); } @@ -47,7 +51,7 @@ public class SimplePageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_2() throws Exception + void renderHomePage_2() throws Exception { executeTest(SimplePage.class, "SimplePageExpectedResult.html"); String document = tester.getLastResponseAsString(); @@ -58,7 +62,8 @@ public class SimplePageTest extends WicketTestCase Panel panel = (Panel)tester.getLastRenderedPage().get("myPanel"); assertNotNull(panel); - assertTrue(document.contains("<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>")); + assertTrue(document.contains( + "<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>")); label = (Label)tester.getLastRenderedPage().get("myPanel:label"); assertNotNull(label); @@ -68,18 +73,21 @@ public class SimplePageTest extends WicketTestCase Border border = (Border)tester.getLastRenderedPage().get("myBorder"); assertNotNull(border); assertFalse("".equals(document)); - assertTrue(document.contains("<wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border>")); + assertTrue(document.contains( + "<wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border>")); border = (Border)tester.getLastRenderedPage().get("myBorder2"); assertNotNull(border); assertFalse("".equals(document)); - assertTrue(document.contains("<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>")); + assertTrue(document.contains( + "<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>")); // do the same test twice. Igor reported a problem with that, so we have to test it. border = (Border)tester.getLastRenderedPage().get("myBorder2"); assertNotNull(border); assertFalse("".equals(document)); - assertTrue(document.contains("<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>")); + assertTrue(document.contains( + "<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>")); WebMarkupContainer container = (WebMarkupContainer)tester.getLastRenderedPage().get("test"); assertNotNull(container); @@ -96,7 +104,7 @@ public class SimplePageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_2a() throws Exception + void renderHomePage_2a() throws Exception { // Render the component without having rendered the page previously SimplePage page = new SimplePage(); @@ -108,7 +116,8 @@ public class SimplePageTest extends WicketTestCase Panel panel = (Panel)page.get("myPanel"); assertNotNull(panel); - assertTrue(document.contains("<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>")); + assertTrue(document.contains( + "<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>")); label = (Label)page.get("myPanel:label"); assertNotNull(label); @@ -116,16 +125,19 @@ public class SimplePageTest extends WicketTestCase Border border = (Border)page.get("myBorder"); assertNotNull(border); - assertTrue(document.contains("<wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border>")); + assertTrue(document.contains( + "<wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border>")); border = (Border)page.get("myBorder2"); assertNotNull(border); - assertTrue(document.contains("<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>")); + assertTrue(document.contains( + "<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>")); // do the same test twice. Igor reported a problem with that, so we have to test it. border = (Border)page.get("myBorder2"); assertNotNull(border); - assertTrue(document.contains("<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>")); + assertTrue(document.contains( + "<span wicket:id=\"myBorder2\" testAttr=\"myValue\"><wicket:border>before body - <wicket:body>border</wicket:body> - after body</wicket:border></span>")); WebMarkupContainer container = (WebMarkupContainer)page.get("test"); assertNotNull(container); @@ -140,7 +152,7 @@ public class SimplePageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_2b() throws Exception + void renderHomePage_2b() throws Exception { // Render the component without having rendered the page previously SimplePage page = new SimplePage(); @@ -199,7 +211,7 @@ public class SimplePageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_3() throws Exception + void renderHomePage_3() throws Exception { executeTest(SimplePage_3.class, "SimplePageExpectedResult_3.html"); } @@ -208,7 +220,7 @@ public class SimplePageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_4() throws Exception + void renderHomePage_4() throws Exception { boolean hit = false; try @@ -223,14 +235,14 @@ public class SimplePageTest extends WicketTestCase assertTrue(mex.getMessage().contains("<span>")); assertTrue(mex.toString().contains("SimplePage_4.html")); } - assertTrue("Did expect a MarkupException", hit); + assertTrue(hit, "Did expect a MarkupException"); } /** * @throws Exception */ @Test - public void renderHomePage_5() throws Exception + void renderHomePage_5() throws Exception { boolean hit = false; try @@ -241,14 +253,14 @@ public class SimplePageTest extends WicketTestCase { hit = true; } - assertTrue("Did expect a MarkupNotFoundException", hit); + assertTrue(hit, "Did expect a MarkupNotFoundException"); } /** * @throws Exception */ @Test - public void renderHomePage_6() throws Exception + void renderHomePage_6() throws Exception { boolean hit = false; try @@ -259,14 +271,14 @@ public class SimplePageTest extends WicketTestCase { hit = true; } - assertTrue("Did expect a MarkupException", hit); + assertTrue(hit, "Did expect a MarkupException"); } /** * @throws Exception */ @Test - public void renderHomePage_7() throws Exception + void renderHomePage_7() throws Exception { tester.getApplication().getResourceSettings().setThrowExceptionOnMissingResource(false); // This is for issue https://issues.apache.org/jira/browse/WICKET-590 @@ -277,7 +289,7 @@ public class SimplePageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_8() throws Exception + void renderHomePage_8() throws Exception { boolean hit = false; try @@ -288,14 +300,14 @@ public class SimplePageTest extends WicketTestCase { hit = true; } - assertTrue("Did expect a MarkupException", hit); + assertTrue(hit, "Did expect a MarkupException"); } /** * @throws Exception */ @Test - public void renderHomePage_9() throws Exception + void renderHomePage_9() throws Exception { executeTest(SimplePage_9.class, "SimplePageExpectedResult_9.html"); } @@ -304,19 +316,20 @@ public class SimplePageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_10() throws Exception + void renderHomePage_10() throws Exception { executeTest(new SimplePage_10(false), "SimplePageExpectedResult_10.html"); tester.startPage(new SimplePage_10(true)); String document = tester.getLastResponseAsString(); - assertTrue(document.contains("<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>")); + assertTrue(document.contains( + "<wicket:panel>Inside the panel<span wicket:id=\"label\">mein Label</span></wicket:panel>")); } /** * @throws Exception */ @Test - public void renderHomePage_11() throws Exception + void renderHomePage_11() throws Exception { executeTest(SimplePage_11.class, "SimplePageExpectedResult_11.html"); } @@ -325,7 +338,7 @@ public class SimplePageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_12() throws Exception + void renderHomePage_12() throws Exception { executeTest(SimplePage_12.class, "SimplePageExpectedResult_12.html"); } @@ -334,7 +347,7 @@ public class SimplePageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_13() throws Exception + void renderHomePage_13() throws Exception { executeTest(SimplePage_13.class, "SimplePageExpectedResult_13.html"); } @@ -343,7 +356,7 @@ public class SimplePageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_14() throws Exception + void renderHomePage_14() throws Exception { executeTest(SimplePage_14.class, "SimplePageExpectedResult_14.html"); } @@ -352,7 +365,7 @@ public class SimplePageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_15() throws Exception + void renderHomePage_15() throws Exception { executeTest(SimplePage_15.class, "SimplePageExpectedResult_15.html"); } @@ -361,7 +374,7 @@ public class SimplePageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_16() throws Exception + void renderHomePage_16() throws Exception { executeTest(SimplePage_16.class, "SimplePageExpectedResult_16.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_9.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_9.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_9.java index c8eb668..23df29e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_9.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimplePage_9.java @@ -49,7 +49,7 @@ public class SimplePage_9 extends WebPage * * @param id */ - public TestContainer(String id) + TestContainer(String id) { super(id); add(new Label("test", "myTest")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java index 54fa671..6f73267 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java @@ -16,23 +16,23 @@ */ package org.apache.wicket.markup.html.basic; -import static org.hamcrest.CoreMatchers.instanceOf; +import static org.assertj.core.api.Assertions.assertThat; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author jcompagner * */ -public class SimpleResponsePageClassTest extends WicketTestCase +class SimpleResponsePageClassTest extends WicketTestCase { /** * @throws Exception */ @Test - public void responsePageClass() throws Exception + void responsePageClass() throws Exception { tester.startPage(SimpleResponsePageClass.class); SimpleResponsePageClass manageBook = (SimpleResponsePageClass)tester.getLastRenderedPage(); @@ -42,6 +42,6 @@ public class SimpleResponsePageClassTest extends WicketTestCase tester.submitForm(form); // assertion failed, getLastRenderedPage() return null. - assertThat(tester.getLastRenderedPage(), instanceOf(SimplePage.class)); + assertThat(tester.getLastRenderedPage()).isInstanceOf(SimplePage.class); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java index 3934366..7fef7c2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlBasePage.java @@ -32,7 +32,7 @@ public class XmlBasePage extends WebPage /** * Construct. */ - public XmlBasePage() + XmlBasePage() { } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java index dbfd25f..352f1cc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/XmlPageTest.java @@ -22,7 +22,7 @@ import org.apache.wicket.resource.IsoPropertiesFilePropertiesLoader; import org.apache.wicket.resource.PropertiesFactory; import org.apache.wicket.resource.XmlFilePropertiesLoader; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -31,7 +31,7 @@ import org.slf4j.LoggerFactory; * * @author Juergen Donnerstag */ -public class XmlPageTest extends WicketTestCase +class XmlPageTest extends WicketTestCase { private static final Logger log = LoggerFactory.getLogger(XmlPageTest.class); @@ -39,7 +39,7 @@ public class XmlPageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_1() throws Exception + void renderHomePage_1() throws Exception { executeTest(XmlPage_1.class, "XmlPageExpectedResult_1.xml"); } @@ -48,7 +48,7 @@ public class XmlPageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_2() throws Exception + void renderHomePage_2() throws Exception { IPropertiesFactory myFac = new MyPropertiesFactory(tester.getApplication()); tester.getApplication().getResourceSettings().setPropertiesFactory(myFac); @@ -60,7 +60,7 @@ public class XmlPageTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_3() throws Exception + void renderHomePage_3() throws Exception { IPropertiesFactory myFac = new MyPropertiesFactory(tester.getApplication()); tester.getApplication().getResourceSettings().setPropertiesFactory(myFac); @@ -75,7 +75,7 @@ public class XmlPageTest extends WicketTestCase * * @param application */ - public MyPropertiesFactory(Application application) + MyPropertiesFactory(Application application) { super(application.getResourceSettings()); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithForm.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithForm.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithForm.java index 9bf4762..13d2011 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithForm.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/BorderWithForm.java @@ -19,7 +19,7 @@ package org.apache.wicket.markup.html.border; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.markup.html.form.Form; -public class BorderWithForm extends Border +class BorderWithForm extends Border { public BorderWithForm(String id) http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java index bc2f2fd..51c1f63 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ComponentBorderTest.java @@ -16,18 +16,22 @@ */ package org.apache.wicket.markup.html.border; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.Page; import org.apache.wicket.ajax.markup.html.AjaxLink; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.model.Model; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author jcompagner */ -public class ComponentBorderTest extends WicketTestCase +class ComponentBorderTest extends WicketTestCase { private static final String TEST_TEXT = "Meaning of life? 42!"; @@ -37,7 +41,7 @@ public class ComponentBorderTest extends WicketTestCase * @throws Exception */ @Test - public void componentUseCheck() throws Exception + void componentUseCheck() throws Exception { /* * Suppose: @@ -65,7 +69,7 @@ public class ComponentBorderTest extends WicketTestCase * @throws Exception */ @Test - public void hideableBorder() throws Exception + void hideableBorder() throws Exception { executeTest(HideableBorderPage.class, "HideableBorderPage_ExpectedResult.html"); @@ -83,72 +87,68 @@ public class ComponentBorderTest extends WicketTestCase ajaxResponse = tester.getLastResponseAsString(); tester.assertComponentOnAjaxResponse(wrapper); } - + @Test - public void borderWithForm() throws Exception + void borderWithForm() throws Exception { /* * Suppose we have a border like this: * - * <div wicket:id="border"> - * <form> - * <body/> - * </form> - * </div> + * <div wicket:id="border"> <form> <body/> </form> </div> * - * Any form components inside its body must be correctly - * submitted with the outer form. + * Any form components inside its body must be correctly submitted with the outer form. */ Model<String> model = Model.of(""); BorderWithFormPage page = new BorderWithFormPage(model); - + tester.startPage(page); - - FormTester formTester = tester. - newFormTester("borderContainer:formBorder:borderContainer:form"); - + + FormTester formTester = tester + .newFormTester("borderContainer:formBorder:borderContainer:form"); + formTester.setValue("formBorder_body:text", TEST_TEXT); formTester.submit(); - + assertEquals(TEST_TEXT, model.getObject()); } - + @Test - public void borderWithEnclosurePage() throws Exception + void borderWithEnclosurePage() throws Exception { tester.startPage(BorderWithEnclosurePage.class); tester.assertRenderedPage(BorderWithEnclosurePage.class); } - + @Test - public void borderWithAutoLabel() throws Exception + void borderWithAutoLabel() throws Exception { tester.startPage(BorderWithAutoLabelPage.class); tester.assertRenderedPage(BorderWithAutoLabelPage.class); } - + @Test - public void borderWithBodyInsideAnotherBody() throws Exception + void borderWithBodyInsideAnotherBody() throws Exception { BorderWithNestedBodyPage page = tester.startPage(BorderWithNestedBodyPage.class); - - Border borderTest = (Border) page.get("outerBorder"); + + Border borderTest = (Border)page.get("outerBorder"); Border nestedBorder = (Border)borderTest.get("nestedBorder"); - + assertNotNull(borderTest.getBodyContainer().getParent()); assertNotNull(nestedBorder.getBodyContainer().getParent()); - - //https://issues.apache.org/jira/browse/WICKET-6303 + + // https://issues.apache.org/jira/browse/WICKET-6303 assertTrue(page.isBehaviorRendered()); } - + /** * https://issues.apache.org/jira/browse/WICKET-6374 + * * @throws Exception */ @Test - public void borderExtendingMarkup() throws Exception - { - tester.startComponentInPage(ExtendedBorder.class); - } + void borderExtendingMarkup() throws Exception + { + tester.startComponentInPage(ExtendedBorder.class); + } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ExtedableBorder.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ExtedableBorder.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ExtedableBorder.java index cdd4a81..bcfe041 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ExtedableBorder.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/border/ExtedableBorder.java @@ -23,7 +23,7 @@ public class ExtedableBorder extends Border */ private static final long serialVersionUID = 1431333408002477444L; - public ExtedableBorder(final String id) + ExtedableBorder(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/html/debug/WicketComponentTreeTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java index 5d33954..2a9613e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/debug/WicketComponentTreeTest.java @@ -17,14 +17,14 @@ package org.apache.wicket.markup.html.debug; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test the component: PageView * * @author Juergen Donnerstag */ -public class WicketComponentTreeTest extends WicketTestCase +class WicketComponentTreeTest extends WicketTestCase { /** @@ -33,7 +33,7 @@ public class WicketComponentTreeTest extends WicketTestCase * @throws Exception */ @Test - public void test1() throws Exception + void test1() throws Exception { // disable the component use check, as this consumes extra // memory (label size doubles to 1.1K) http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java index fbb8567..f875ab1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractCheckGroupTestPage.java @@ -49,7 +49,7 @@ public abstract class AbstractCheckGroupTestPage extends WebPage * * @param list */ - public AbstractCheckGroupTestPage(List<String> list) + AbstractCheckGroupTestPage(List<String> list) { form = new Form<Void>("form"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java index 6e688d9..2d51d77 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AbstractTextComponentConvertEmptyStringsToNullTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.markup.html.form; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import java.util.Locale; import org.apache.wicket.MarkupContainer; @@ -27,18 +30,18 @@ import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** */ -public class AbstractTextComponentConvertEmptyStringsToNullTest extends WicketTestCase +class AbstractTextComponentConvertEmptyStringsToNullTest extends WicketTestCase { /** * @throws Exception */ @Test - public void convertEmptyStringsToNull() throws Exception + void convertEmptyStringsToNull() throws Exception { StringArrayPage page = tester.startPage(StringArrayPage.class); @@ -55,10 +58,10 @@ public class AbstractTextComponentConvertEmptyStringsToNullTest extends WicketTe private static final long serialVersionUID = 1L; /** */ - public String[] array = new String[0]; + String[] array = new String[0]; /** */ - public Form<Void> form; + Form<Void> form; /** * Construct. http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java index 204f949..e3d3908 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/form/AutoFormLabelPickupTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.markup.html.form; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Locale; import org.apache.wicket.Page; @@ -24,24 +26,24 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.model.IModel; import org.apache.wicket.model.Model; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; @SuppressWarnings({ "rawtypes", "serial", "unchecked" }) -public class AutoFormLabelPickupTest extends WicketTestCase +class AutoFormLabelPickupTest extends WicketTestCase { - public static class PrintLabelPage extends WebPage + static class PrintLabelPage extends WebPage { - public PrintLabelPage(IModel labelModel) + PrintLabelPage(IModel labelModel) { Form form = new Form("form"); add(form); form.add(new TextField("input", Model.of("")).setLabel(labelModel)); } } - public static class PickUpLabelPage extends WebPage + static class PickUpLabelPage extends WebPage { - public PickUpLabelPage(IModel labelModel) + PickUpLabelPage(IModel labelModel) { Form form = new Form("form"); add(form); @@ -55,28 +57,28 @@ public class AutoFormLabelPickupTest extends WicketTestCase /** * */ - @Before - public void before() + @BeforeEach + void before() { Session.get().setLocale(Locale.US); } @Test - public void labelIsPrintedFromModel() throws Exception + void labelIsPrintedFromModel() throws Exception { tester.startPage(new PrintLabelPage(Model.of("label from model"))); tester.assertContains("<label wicket:for=\"input\" id=\"input2-w-lbl\" for=\"input2\">\\|label from model\\|</label>"); } @Test - public void labelIsPrintedFromProperties() throws Exception + void labelIsPrintedFromProperties() throws Exception { tester.startPage(new PrintLabelPage(Model.of((String)null))); tester.assertContains("<label wicket:for=\"input\" id=\"input2-w-lbl\" for=\"input2\">\\|label from properties\\|</label>"); } @Test - public void labelIsPickedUpFromMarkup() throws Exception + void labelIsPickedUpFromMarkup() throws Exception { tester.startPage(new PickUpLabelPage(null)); assertEquals( @@ -86,7 +88,7 @@ public class AutoFormLabelPickupTest extends WicketTestCase } @Test - public void labelIsPickedUpFromProperties() throws Exception + void labelIsPickedUpFromProperties() throws Exception { tester.startPage(new PickUpLabelPage(null)); assertEquals( @@ -96,7 +98,7 @@ public class AutoFormLabelPickupTest extends WicketTestCase } @Test - public void withoutAutolabel() throws Exception + void withoutAutolabel() throws Exception { tester.startPage(new PickUpLabelPage(null)); tester.assertContains("<label>label from markup without autolabel</label>"); @@ -107,7 +109,7 @@ public class AutoFormLabelPickupTest extends WicketTestCase } @Test - public void localeChangesAreDetectedWithExplicitMessageKeys() throws Exception + void localeChangesAreDetectedWithExplicitMessageKeys() throws Exception { Session.get().setLocale(Locale.GERMAN); tester.startPage(new PickUpLabelPage(null)); @@ -129,7 +131,7 @@ public class AutoFormLabelPickupTest extends WicketTestCase } @Test - public void localeChangesAreDetectedWithDefaultLabels() throws Exception + void localeChangesAreDetectedWithDefaultLabels() throws Exception { Session.get().setLocale(Locale.GERMAN); tester.startPage(new PickUpLabelPage(null)); @@ -151,7 +153,7 @@ public class AutoFormLabelPickupTest extends WicketTestCase } @Test - public void defaultLabelIsPickedUpFromProperties() throws Exception + void defaultLabelIsPickedUpFromProperties() throws Exception { tester.startPage(new PickUpLabelPage(null)); assertEquals(
