http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java index 539b495..b9f3c5e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AbstractDefaultAjaxBehaviorTest.java @@ -16,14 +16,15 @@ */ package org.apache.wicket.ajax; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Locale; import org.apache.wicket.Component; import org.apache.wicket.ajax.attributes.AjaxAttributeName; import org.apache.wicket.ajax.attributes.AjaxCallListener; import org.apache.wicket.ajax.attributes.AjaxRequestAttributes; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.mockito.Mockito; /** @@ -31,13 +32,13 @@ import org.mockito.Mockito; * * @since 6.0 */ -public class AbstractDefaultAjaxBehaviorTest extends Assert +class AbstractDefaultAjaxBehaviorTest { /** * Checks the generated JSON for Ajax's attributes */ @Test - public void renderAjaxAttributes() + void renderAjaxAttributes() { AjaxRequestAttributes attributes = new AjaxRequestAttributes(); attributes.getExtraParameters().put("param1", 123);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java index e24a115..e48c78a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorAndMetaDataTest.java @@ -17,7 +17,7 @@ package org.apache.wicket.ajax; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @@ -28,11 +28,11 @@ import org.junit.Test; * @author Rüdiger Schulz <[email protected]> * @version $Revision$ */ -public class AjaxBehaviorAndMetaDataTest extends WicketTestCase +class AjaxBehaviorAndMetaDataTest extends WicketTestCase { /** */ @Test - public void render() + void render() { tester.startPage(AjaxBehaviorAndMetaDataPage.class); tester.assertRenderedPage(AjaxBehaviorAndMetaDataPage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java index 50b0650..a12b2bd 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledPage.java @@ -16,9 +16,11 @@ */ package org.apache.wicket.ajax; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.Label; -import org.junit.Assert; /** * @author marrink @@ -42,7 +44,7 @@ public class AjaxBehaviorEnabledPage extends WebPage @Override protected void onEvent(AjaxRequestTarget target) { - Assert.assertNotNull(target); + assertNotNull(target); } }); add(enabled); @@ -55,7 +57,7 @@ public class AjaxBehaviorEnabledPage extends WebPage @Override protected void onEvent(AjaxRequestTarget target) { - Assert.fail("should never get here with disabled ajax"); + fail("should never get here with disabled ajax"); } }); add(disabled); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java index d6f96bd..333084c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxBehaviorEnabledTest.java @@ -26,13 +26,13 @@ import org.apache.wicket.request.Request; import org.apache.wicket.request.Response; 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; /** * @author marrink */ -public class AjaxBehaviorEnabledTest extends WicketTestCase +class AjaxBehaviorEnabledTest extends WicketTestCase { /** * Custom security strategy to disable all components where the id ends with "disable". @@ -60,8 +60,8 @@ public class AjaxBehaviorEnabledTest extends WicketTestCase /** * */ - @Before - public void before() + @BeforeEach + void before() { final IAuthorizationStrategy strategy = new CustomStrategy(); tester = new WicketTester(new MockApplication() @@ -89,7 +89,7 @@ public class AjaxBehaviorEnabledTest extends WicketTestCase * @see <a href="https://issues.apache.org/jira/browse/WICKET-1575";>1575</a> */ @Test - public void disabledBehavior() throws Exception + void disabledBehavior() throws Exception { executeTest(AjaxBehaviorEnabledPage.class, "AjaxBehaviorEnabled_expected.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java index 776b484..3fad533 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxCallbackFunctionTest.java @@ -20,15 +20,16 @@ import static org.apache.wicket.ajax.attributes.CallbackParameter.context; import static org.apache.wicket.ajax.attributes.CallbackParameter.converted; import static org.apache.wicket.ajax.attributes.CallbackParameter.explicit; import static org.apache.wicket.ajax.attributes.CallbackParameter.resolved; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class AjaxCallbackFunctionTest extends WicketTestCase +class AjaxCallbackFunctionTest extends WicketTestCase { @Test - public void testDefaultCallbackFunction() + void testDefaultCallbackFunction() { AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class); assertEquals(// @@ -52,7 +53,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase } @Test - public void testCallbackFunctionWithContext() + void testCallbackFunctionWithContext() { AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class); assertEquals(// @@ -76,7 +77,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase } @Test - public void testCallbackFunctionWithExplicit() + void testCallbackFunctionWithExplicit() { AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class); assertEquals(// @@ -99,7 +100,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase } @Test - public void testCallbackFunctionWithResolved() + void testCallbackFunctionWithResolved() { AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class); assertEquals(// @@ -127,7 +128,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase } @Test - public void testCallbackFunctionWithConverted() + void testCallbackFunctionWithConverted() { AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class); assertEquals( @@ -157,7 +158,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase } @Test - public void testCallbackFunctionWithAll() + void testCallbackFunctionWithAll() { AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class); assertEquals( @@ -195,7 +196,7 @@ public class AjaxCallbackFunctionTest extends WicketTestCase } @Test - public void testJQueryUIEvent() + void testJQueryUIEvent() { AjaxCallbackPage page = tester.startPage(AjaxCallbackPage.class); assertEquals( http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java index bab9eba..567fd0f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxChannelTest.java @@ -16,20 +16,22 @@ */ package org.apache.wicket.ajax; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Martin Dilger */ -public class AjaxChannelTest extends WicketTestCase +class AjaxChannelTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-4024 */ @Test - public void getChannelNameRetursCorrectStringForStackableChannels() + void getChannelNameRetursCorrectStringForStackableChannels() { String channelName = "channelName"; String expectedForStackables = channelName + "|s"; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java index 735b7a7..41c9491 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxComponentVisibilityTest.java @@ -16,15 +16,18 @@ */ package org.apache.wicket.ajax; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.Component; 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; /** * @author Gerolf Seitz */ -public class AjaxComponentVisibilityTest extends WicketTestCase +class AjaxComponentVisibilityTest extends WicketTestCase { private Component test1; @@ -34,8 +37,8 @@ public class AjaxComponentVisibilityTest extends WicketTestCase /** * */ - @Before - public void before() + @BeforeEach + void before() { tester.startPage(new AjaxHeaderContributionPage()); test1 = tester.getLastRenderedPage().get("test1"); @@ -47,7 +50,7 @@ public class AjaxComponentVisibilityTest extends WicketTestCase * */ @Test - public void componentsAddedToAjax() + void componentsAddedToAjax() { test2.setVisible(false); test3.setVisible(false).setOutputMarkupPlaceholderTag(true); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java index fbbccea3..085bdda 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxEventBehaviorTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.ajax; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.concurrent.atomic.AtomicInteger; import org.apache.wicket.MarkupContainer; @@ -25,19 +28,19 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @since 6.0.1 */ -public class AjaxEventBehaviorTest extends WicketTestCase +class AjaxEventBehaviorTest extends WicketTestCase { /** * Tests execution of the second configured event * https://issues.apache.org/jira/browse/WICKET-4748 */ @Test - public void executeSecondEvent() + void executeSecondEvent() { AtomicInteger counter = new AtomicInteger(0); SecondEventTestPage page = new SecondEventTestPage(counter); @@ -54,28 +57,37 @@ public class AjaxEventBehaviorTest extends WicketTestCase assertEquals(2, counter.get()); } - @Test(expected = IllegalArgumentException.class) - public void nullName() + @Test + void nullName() { - new EventNamesBehavior(null); + assertThrows(IllegalArgumentException.class, () -> { + new EventNamesBehavior(null); + + }); } - @Test(expected = IllegalArgumentException.class) - public void emptyName() + @Test + void emptyName() { - new EventNamesBehavior(""); + assertThrows(IllegalArgumentException.class, () -> { + new EventNamesBehavior(""); + }); } - @Test(expected = IllegalArgumentException.class) - public void spacesName() + @Test + void spacesName() { - new EventNamesBehavior(" "); + assertThrows(IllegalArgumentException.class, () -> { + new EventNamesBehavior(" "); + }); } - @Test(expected = IllegalArgumentException.class) - public void tabName() + @Test + void tabName() { - new EventNamesBehavior("\t"); + assertThrows(IllegalArgumentException.class, () -> { + new EventNamesBehavior("\t"); + }); } private static class EventNamesBehavior extends AjaxEventBehavior @@ -83,9 +95,10 @@ public class AjaxEventBehaviorTest extends WicketTestCase /** * Construct. * - * @param event the event this behavior will be attached to + * @param event + * the event this behavior will be attached to */ - public EventNamesBehavior(String event) + EventNamesBehavior(String event) { super(event); } @@ -99,7 +112,9 @@ public class AjaxEventBehaviorTest extends WicketTestCase /** * Test page for #executeSecondEvent() */ - private static class SecondEventTestPage extends WebPage implements IMarkupResourceStreamProvider + private static class SecondEventTestPage extends WebPage + implements + IMarkupResourceStreamProvider { private SecondEventTestPage(final AtomicInteger counter) { @@ -118,9 +133,11 @@ public class AjaxEventBehaviorTest extends WicketTestCase } @Override - public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass) + public IResourceStream getMarkupResourceStream(MarkupContainer container, + Class<?> containerClass) { - return new StringResourceStream("<html><body><span wicket:id='comp'></span></body></html>"); + return new StringResourceStream( + "<html><body><span wicket:id='comp'></span></body></html>"); } } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java index 9c0eb8e..3182176 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxHeaderContributionTest.java @@ -17,18 +17,18 @@ package org.apache.wicket.ajax; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author jcompagner */ -public class AjaxHeaderContributionTest extends WicketTestCase +class AjaxHeaderContributionTest extends WicketTestCase { /** * @throws Exception */ @Test - public void ajaxHeaderContribution() throws Exception + void ajaxHeaderContribution() throws Exception { tester.startPage(AjaxHeaderContributionPage.class); tester.assertResultPage(AjaxHeaderContributionPage.class, @@ -44,7 +44,7 @@ public class AjaxHeaderContributionTest extends WicketTestCase * @throws Exception */ @Test - public void doubleAjaxHeaderContribution() throws Exception + void doubleAjaxHeaderContribution() throws Exception { tester.startPage(AjaxHeaderContributionPage2.class); tester.assertResultPage(AjaxHeaderContributionPage2.class, http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java index 8c90304..3e9738d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxRequestHandlerTest.java @@ -16,6 +16,11 @@ */ package org.apache.wicket.ajax; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; + import java.io.IOException; import java.lang.reflect.Constructor; import java.nio.charset.Charset; @@ -37,7 +42,7 @@ import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.DiffUtil; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.time.Time; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -46,7 +51,7 @@ import org.slf4j.LoggerFactory; * * @author Frank Bille */ -public class AjaxRequestHandlerTest extends WicketTestCase +class AjaxRequestHandlerTest extends WicketTestCase { private static final Logger log = LoggerFactory.getLogger(AjaxRequestHandlerTest.class); @@ -56,7 +61,7 @@ public class AjaxRequestHandlerTest extends WicketTestCase * @throws IOException */ @Test - public void headerContribution1() throws IOException + void headerContribution1() throws IOException { executeHeaderTest(MockComponent1.class, "MockComponent1-expected.html"); } @@ -68,7 +73,7 @@ public class AjaxRequestHandlerTest extends WicketTestCase * @throws IOException */ @Test - public void headerContribution2() throws IOException + void headerContribution2() throws IOException { executeHeaderTest(MockComponent2.class); } @@ -79,7 +84,7 @@ public class AjaxRequestHandlerTest extends WicketTestCase * @throws IOException */ @Test - public void headerContribution3() throws IOException + void headerContribution3() throws IOException { executeHeaderTest(MockComponent3.class, "MockComponent3-expected.html"); } @@ -95,7 +100,8 @@ public class AjaxRequestHandlerTest extends WicketTestCase { final MockPageWithLinkAndComponent page = new MockPageWithLinkAndComponent(); - page.add(new WebComponent(MockPageWithLinkAndComponent.COMPONENT_ID).setOutputMarkupId(true)); + page.add( + new WebComponent(MockPageWithLinkAndComponent.COMPONENT_ID).setOutputMarkupId(true)); page.add(new AjaxLink<Void>(MockPageWithLinkAndComponent.LINK_ID) { @@ -107,7 +113,8 @@ public class AjaxRequestHandlerTest extends WicketTestCase // Create an instance of the component try { - Constructor<? extends Component> con = componentClass.getConstructor(new Class[] { String.class }); + Constructor<? extends Component> con = componentClass + .getConstructor(new Class[] { String.class }); Component comp = con.newInstance(MockPageWithLinkAndComponent.COMPONENT_ID); page.replace(comp); @@ -145,8 +152,8 @@ public class AjaxRequestHandlerTest extends WicketTestCase // This means that it doesn't exist at all if (expectedFile == null) { - assertNull("There was a header contribution on the response " + - "(though we didn't expect one): <" + headerContribution + ">", headerContribution); + assertNull(headerContribution, "There was a header contribution on the response " + + "(though we didn't expect one): <" + headerContribution + ">"); } else if (headerContribution == null) { @@ -162,7 +169,7 @@ public class AjaxRequestHandlerTest extends WicketTestCase * WICKET-2328 */ @Test - public void renderMyPage() + void renderMyPage() { // start and render the test page tester.startPage(HomePage2.class); @@ -186,16 +193,16 @@ public class AjaxRequestHandlerTest extends WicketTestCase * WICKET-6568 */ @Test - public void lastFocusedEncoding() + void lastFocusedEncoding() { FocusPage page = new FocusPage(); - + tester.startPage(page); // wicket-ajax-jquery encodes non ASCII id String encoded = UrlEncoder.QUERY_INSTANCE.encode("â¬uro", Charset.forName("UTF-8")); tester.getRequest().setHeader("Wicket-FocusedElementId", encoded); - + tester.executeAjaxEvent("link", "click"); assertEquals("â¬uro", page.lastFocusedElementId); @@ -205,14 +212,15 @@ public class AjaxRequestHandlerTest extends WicketTestCase * WICKET-2543 */ @Test - public void varargsAddComponent() + void varargsAddComponent() { tester.startPage(VarargsAddComponentPage.class); for (int i = 0; i < VarargsAddComponentPage.NUMBER_OF_LABELS; i++) { final String labelMarkupId = "label" + i; - final String expectedContent = String.format(VarargsAddComponentPage.INITIAL_CONTENT, i); + final String expectedContent = String.format(VarargsAddComponentPage.INITIAL_CONTENT, + i); tester.assertLabel(labelMarkupId, expectedContent); } @@ -221,8 +229,8 @@ public class AjaxRequestHandlerTest extends WicketTestCase for (int i = 0; i < VarargsAddComponentPage.NUMBER_OF_LABELS; i++) { final String labelMarkupId = "label" + i; - final String expectedContent = String.format(VarargsAddComponentPage.INITIAL_CONTENT, i) + - VarargsAddComponentPage.AJAX_APPENDED_SUFFIX; + final String expectedContent = String.format(VarargsAddComponentPage.INITIAL_CONTENT, + i) + VarargsAddComponentPage.AJAX_APPENDED_SUFFIX; tester.assertLabel(labelMarkupId, expectedContent); } } @@ -231,7 +239,7 @@ public class AjaxRequestHandlerTest extends WicketTestCase * Testing the default event raised whenever Wicket begins to create an AJAX response */ @Test - public void defaultEventRaisedOnAjaxResponse() + void defaultEventRaisedOnAjaxResponse() { tester.startPage(TestEventPage.class); tester.clickLink(MockPageWithLinkAndComponent.LINK_ID, true); @@ -243,7 +251,7 @@ public class AjaxRequestHandlerTest extends WicketTestCase * @see <a href="https://issues.apache.org/jira/browse/WICKET-3263";>WICKET-3263</a> */ @Test - public void globalAjaxRequestTargetListeners() + void globalAjaxRequestTargetListeners() { final ValidatingAjaxRequestTargetListener listener = new ValidatingAjaxRequestTargetListener(); @@ -260,20 +268,20 @@ public class AjaxRequestHandlerTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-3921 */ @Test - public void ajaxRedirectSetsNoCachingHeaders() + void ajaxRedirectSetsNoCachingHeaders() { tester.startPage(new Wicket3921()); tester.clickLink("updatePage"); - assertEquals(Time.START_OF_UNIX_TIME.toRfc1123TimestampString(), tester.getLastResponse() - .getHeader("Expires")); + assertEquals(Time.START_OF_UNIX_TIME.toRfc1123TimestampString(), + tester.getLastResponse().getHeader("Expires")); assertEquals("no-cache", tester.getLastResponse().getHeader("Pragma")); assertEquals("no-cache, no-store", tester.getLastResponse().getHeader("Cache-Control")); tester.clickLink("updateComponent"); - assertEquals(Time.START_OF_UNIX_TIME.toRfc1123TimestampString(), tester.getLastResponse() - .getHeader("Expires")); + assertEquals(Time.START_OF_UNIX_TIME.toRfc1123TimestampString(), + tester.getLastResponse().getHeader("Expires")); assertEquals("no-cache", tester.getLastResponse().getHeader("Pragma")); assertEquals("no-cache, no-store", tester.getLastResponse().getHeader("Cache-Control")); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java index d8c2392..db459b6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/AjaxTimerBehaviorTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.ajax; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.Component; import org.apache.wicket.MockPageWithLinkAndComponent; import org.apache.wicket.ajax.markup.html.AjaxLink; @@ -26,18 +28,17 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.model.Model; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.time.Duration; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * Tests that an AbstractAjaxTimerBehavior injects itself into the markup once and only once. Also * tests the callback URL to make sure the timer reinjects itself * * @author Jim McLaughlin */ -public class AjaxTimerBehaviorTest extends WicketTestCase +class AjaxTimerBehaviorTest extends WicketTestCase { private static final Logger log = LoggerFactory.getLogger(AjaxTimerBehaviorTest.class); @@ -45,7 +46,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase * Tests timer behavior in a component added to an AjaxRequestTarget */ @Test - public void addedInAjaxSetsTimout() + void addedInAjaxSetsTimout() { Duration dur = Duration.seconds(20); final AjaxSelfUpdatingTimerBehavior timer = new AjaxSelfUpdatingTimerBehavior(dur); @@ -87,7 +88,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase * tests timer behavior in a WebPage. */ @Test - public void pageRenderSetsTimeout() + void pageRenderSetsTimeout() { Duration dur = Duration.seconds(20); final AjaxSelfUpdatingTimerBehavior timer = new AjaxSelfUpdatingTimerBehavior(dur); @@ -124,7 +125,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase * tests timer behavior in a WebPage. */ @Test - public void ajaxUpdateDoesNotSetTimeout() + void ajaxUpdateDoesNotSetTimeout() { Duration dur = Duration.seconds(20); final AjaxSelfUpdatingTimerBehavior timer = new AjaxSelfUpdatingTimerBehavior(dur); @@ -161,7 +162,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase /** */ @Test - public void setVisibleSetsTimeout() + void setVisibleSetsTimeout() { Duration dur = Duration.seconds(20); final AjaxSelfUpdatingTimerBehavior timer = new AjaxSelfUpdatingTimerBehavior(dur); @@ -200,7 +201,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase /** */ @Test - public void setDisabledClearsTimeout() + void setDisabledClearsTimeout() { final AbstractAjaxTimerBehavior timer = new AbstractAjaxTimerBehavior(Duration.seconds(20)) { @@ -250,7 +251,7 @@ public class AjaxTimerBehaviorTest extends WicketTestCase * WICKET-1525, WICKET-2152 */ @Test - public void restartResultsInAddTimeout() + void restartResultsInAddTimeout() { final Integer labelInitialValue = Integer.valueOf(0); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java index 27a6447..19b0387 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderPage.java @@ -47,7 +47,7 @@ public class DomReadyOrderPage extends WebPage * * @param id */ - public Link(String id) + Link(String id) { super(id); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java index 9f09c10..ea1e3b4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/DomReadyOrderTest.java @@ -17,14 +17,14 @@ package org.apache.wicket.ajax; 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; /** * @author jcompagner */ -public class DomReadyOrderTest extends WicketTestCase +class DomReadyOrderTest extends WicketTestCase { /** log. */ private static final Logger log = LoggerFactory.getLogger(DomReadyOrderTest.class); @@ -33,7 +33,7 @@ public class DomReadyOrderTest extends WicketTestCase * @throws Exception */ @Test - public void domReadyOrder() throws Exception + void domReadyOrder() throws Exception { tester.startPage(DomReadyOrderPage.class); tester.assertResultPage(DomReadyOrderPage.class, "DomReadyOrderPage_expected.html"); @@ -46,7 +46,7 @@ public class DomReadyOrderTest extends WicketTestCase * @throws Exception */ @Test - public void domReadyOrder2() throws Exception + void domReadyOrder2() throws Exception { tester.startPage(DomReadyOrderPage.class); tester.assertResultPage(DomReadyOrderPage.class, "DomReadyOrderPage_expected.html"); @@ -59,7 +59,7 @@ public class DomReadyOrderTest extends WicketTestCase * */ @Test - public void ajaxSubmitWhileAnotherButtonIsNotVisible() + void ajaxSubmitWhileAnotherButtonIsNotVisible() { // start and render the test page tester.startPage(HomePage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java index d427172..265ae0a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/GlobalUpdateAjaxAttributesTest.java @@ -25,12 +25,12 @@ import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class GlobalUpdateAjaxAttributesTest extends WicketTestCase +class GlobalUpdateAjaxAttributesTest extends WicketTestCase { @Override protected WebApplication newApplication() @@ -53,7 +53,7 @@ public class GlobalUpdateAjaxAttributesTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-4958 */ @Test - public void globalUpdateAjaxAttributes() + void globalUpdateAjaxAttributes() { tester.startPage(new GlobalUpdateAjaxAttributesPage()); // System.err.println(tester.getLastResponseAsString()); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java index bc0b5cb..ece6ccc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/HomePage.java @@ -39,7 +39,7 @@ public class HomePage extends WebPage { private static final long serialVersionUID = 1L; - int rows = 1; + private int rows = 1; /** */ http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java index d6f089a..7e5f34f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/InternalErrorCallsAjaxOnFailureTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.ajax; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.markup.html.pages.ExceptionErrorPage; import org.apache.wicket.markup.html.pages.InternalErrorPage; import org.apache.wicket.protocol.http.mock.MockHttpServletResponse; @@ -24,7 +27,7 @@ import org.apache.wicket.settings.ExceptionSettings; import org.apache.wicket.util.tester.BaseWicketTester; 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 that for internal errors in Ajax requests Wicket will send the error response immediately @@ -35,7 +38,7 @@ import org.junit.Test; * See WICKET-3143 No Exception page are rendered when using ajax * */ -public class InternalErrorCallsAjaxOnFailureTest extends WicketTestCase +class InternalErrorCallsAjaxOnFailureTest extends WicketTestCase { /** @@ -43,7 +46,7 @@ public class InternalErrorCallsAjaxOnFailureTest extends WicketTestCase * {@link org.apache.wicket.settings.ExceptionSettings.AjaxErrorStrategy#REDIRECT_TO_ERROR_PAGE} */ @Test - public void showsInternalErrorPage() + void showsInternalErrorPage() { tester.setExposeExceptions(false); @@ -68,7 +71,7 @@ public class InternalErrorCallsAjaxOnFailureTest extends WicketTestCase * but will preserve the current page and send http status 500 to wicket-ajax.js */ @Test - public void callsOnFailure() + void callsOnFailure() { WicketTester tester = new WicketTester(new DummyApplication() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/StatelessPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/StatelessPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/StatelessPage.java index e4bc3a8..58a6c92 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/StatelessPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/StatelessPage.java @@ -47,11 +47,11 @@ public class StatelessPage extends WebPage public static final String FORM_SUBMIT = "form submit"; - static int itemCount = 0; + private static int itemCount = 0; private static final long serialVersionUID = 1L; - static List<String> getList() + private static List<String> getList() { final ArrayList<String> list = new ArrayList<String>(itemCount); final int count = ++itemCount; @@ -100,10 +100,10 @@ public class StatelessPage extends WebPage System.out.println(_data); listView.setModelObject(_data); - + target.ifPresent(ajaxTarget -> ajaxTarget.add(list, "new")); } - + @Override protected boolean getStatelessHint() { @@ -124,7 +124,7 @@ public class StatelessPage extends WebPage Form<String> form = new StatelessForm<String>("inputForm") { /** - * + * */ private static final long serialVersionUID = -6554405700693024016L; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java index 4b2d173..15161ff 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/attributes/AjaxAttributeNameTest.java @@ -16,29 +16,31 @@ */ package org.apache.wicket.ajax.attributes; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.HashSet; import java.util.Set; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * provide some refactoring safety * * @author mosmann */ -public class AjaxAttributeNameTest extends Assert +class AjaxAttributeNameTest { /** * do not let json parameter names collide */ @Test - public void jsonNamesDoNotCollide() + void jsonNamesDoNotCollide() { Set<String> jsonNames = new HashSet<>(); for (AjaxAttributeName name : AjaxAttributeName.values()) { - assertTrue("Attribute: " + name, jsonNames.add(name.jsonName())); + assertTrue(jsonNames.add(name.jsonName()), "Attribute: " + name); } } @@ -47,7 +49,7 @@ public class AjaxAttributeNameTest extends Assert * names */ @Test - public void nobodyDidChangeAnyAjaxAttributeName() + void nobodyDidChangeAnyAjaxAttributeName() { StringBuilder sb = new StringBuilder(); for (AjaxAttributeName name : AjaxAttributeName.values()) @@ -56,8 +58,8 @@ public class AjaxAttributeNameTest extends Assert sb.append('|'); } - assertEquals("all known json parameter names", + assertEquals( "tr|p|d|id|dt|wr|rt|pd|sp|ch|e|async|dep|ep|pre|coh|fh|sh|ah|bsh|bh|ih|dh|i|sc|mp|f|c|m|u|sel|sr|", - sb.toString()); + sb.toString(), "all known json parameter names"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java index 1e8e1ab..86d1f1d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormChoiceComponentUpdatingBehaviorTest.java @@ -16,17 +16,21 @@ */ package org.apache.wicket.ajax.form; +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.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class AjaxFormChoiceComponentUpdatingBehaviorTest extends WicketTestCase +class AjaxFormChoiceComponentUpdatingBehaviorTest extends WicketTestCase { /** * WICKET-5230 nested FormComponent with error message makes group invalid */ @Test - public void nestedInvalidFormComponent() + void nestedInvalidFormComponent() { ChoiceComponentPage page = tester.startPage(ChoiceComponentPage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java index a0cab5d..0628908 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitBehaviorTest.java @@ -16,16 +16,17 @@ */ package org.apache.wicket.ajax.form; -import org.apache.wicket.Component; -import org.apache.wicket.ajax.AjaxRequestTarget; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.ajax.markup.html.form.AjaxButton; import org.apache.wicket.markup.html.form.Form; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.NestedFormPage; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class AjaxFormSubmitBehaviorTest extends WicketTestCase +class AjaxFormSubmitBehaviorTest extends WicketTestCase { /** * Test case for WICKET-1743 @@ -33,7 +34,7 @@ public class AjaxFormSubmitBehaviorTest extends WicketTestCase * @see <a href="https://issues.apache.org/jira/browse/WICKET-1743";>WICKET-1743</a> */ @Test - public void ajaxFormSubmitBehavior() + void ajaxFormSubmitBehavior() { // start and render the test page tester.startPage(AjaxFormSubmitBehaviorTestPage.class); @@ -50,7 +51,7 @@ public class AjaxFormSubmitBehaviorTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-6455 */ @Test - public void innerFormSubmit() + void innerFormSubmit() { tester.startPage(NestedFormTestPage.class); @@ -69,7 +70,7 @@ public class AjaxFormSubmitBehaviorTest extends WicketTestCase * onSubmit must be called once. */ @Test - public void formReplacement() + void formReplacement() { PanelEdit panelEdit = tester.startComponentInPage(PanelEdit.class); FormTester formTester = tester.newFormTester(panelEdit.getId() + ":form"); @@ -86,14 +87,14 @@ public class AjaxFormSubmitBehaviorTest extends WicketTestCase private static final long serialVersionUID = -515262294201762225L; - public NestedFormTestPage() + public NestedFormTestPage() { - Form<?> inner = new Form("inner") { + Form<Void> inner = new Form<>("inner") { @Override protected boolean wantSubmitOnParentFormSubmit() { return false; } - + @Override protected void onSubmit() { super.onSubmit(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java index da7c2e0..58b8d22 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTest.java @@ -16,17 +16,21 @@ */ package org.apache.wicket.ajax.form; +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.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author marrink */ -public class AjaxFormSubmitTest extends WicketTestCase +class AjaxFormSubmitTest extends WicketTestCase { @Test - public void submit() + void submit() { AjaxFormSubmitTestPage page = new AjaxFormSubmitTestPage(true); @@ -56,7 +60,7 @@ public class AjaxFormSubmitTest extends WicketTestCase * @see <a href="https://issues.apache.org/jira/browse/WICKET-1291";>WICKET-1291</a> */ @Test - public void submitNoDefProcessing() + void submitNoDefProcessing() { AjaxFormSubmitTestPage page = new AjaxFormSubmitTestPage(false); @@ -83,7 +87,7 @@ public class AjaxFormSubmitTest extends WicketTestCase * @see <a href="https://issues.apache.org/jira/browse/WICKET-6324";>WICKET-6324</a> */ @Test - public void submitFallbackErrors() + void submitFallbackErrors() { AjaxFormSubmitTestPage page = new AjaxFormSubmitTestPage(true); @@ -110,7 +114,7 @@ public class AjaxFormSubmitTest extends WicketTestCase * @throws Exception */ @Test - public void eventJavaScriptEscaped() throws Exception + void eventJavaScriptEscaped() throws Exception { tester.startPage(new AjaxFormSubmitTestPage(false)); tester.assertResultPage(AjaxFormSubmitTestPage.class, http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java index a13a653..f258b28 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormSubmitTestPage.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.ajax.form; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.Optional; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTest.java index 1e8b515..a5259e2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTest.java @@ -17,19 +17,19 @@ package org.apache.wicket.ajax.form; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author shuraa */ -public class AjaxFormValidatingBehaviorTest extends WicketTestCase +class AjaxFormValidatingBehaviorTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-5999 */ @Test - public void ajaxUpdateOrdinaryFeedbackComponents() throws Exception + void ajaxUpdateOrdinaryFeedbackComponents() throws Exception { tester.startPage(AjaxFormValidatingBehaviorTestPage.class); tester.assertRenderedPage(AjaxFormValidatingBehaviorTestPage.class); @@ -42,7 +42,7 @@ public class AjaxFormValidatingBehaviorTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-5999 */ @Test - public void ajaxUpdateInitiallyInvisibleFeedbackComponents() throws Exception + void ajaxUpdateInitiallyInvisibleFeedbackComponents() throws Exception { tester.startPage(AjaxFormValidatingBehaviorTestPage.class); tester.assertRenderedPage(AjaxFormValidatingBehaviorTestPage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTestPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTestPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTestPage.java index 4960445..0bd06a0 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTestPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/AjaxFormValidatingBehaviorTestPage.java @@ -79,7 +79,7 @@ public class AjaxFormValidatingBehaviorTestPage extends WebPage * @param id * @param markupContainer */ - public HiddenFeedbackPanel(String id, MarkupContainer markupContainer) + HiddenFeedbackPanel(String id, MarkupContainer markupContainer) { super(id, new ContainerFeedbackMessageFilter(markupContainer)); setOutputMarkupPlaceholderTag(true); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/ChoiceComponentPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/ChoiceComponentPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/ChoiceComponentPage.java index c1dd6c6..30a6462 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/ChoiceComponentPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/ChoiceComponentPage.java @@ -37,7 +37,7 @@ public class ChoiceComponentPage extends WebPage public final RadioGroup<Boolean> group; - public final Radio<Boolean> radioTrue; + private final Radio<Boolean> radioTrue; public final Radio<Boolean> radioFalse; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java index 60036e8..61ac5cb 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/form/OnChangeAjaxBehaviorTest.java @@ -19,18 +19,18 @@ package org.apache.wicket.ajax.form; import java.util.Locale; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Janne Hietamäki (janne) */ -public class OnChangeAjaxBehaviorTest extends WicketTestCase +class OnChangeAjaxBehaviorTest extends WicketTestCase { /** * @throws Exception */ @Test - public void rendering() throws Exception + void rendering() throws Exception { tester.getSession().setLocale(Locale.ENGLISH); @@ -44,7 +44,7 @@ public class OnChangeAjaxBehaviorTest extends WicketTestCase * */ @Test - public void ajaxSubmitWhileAnotherButtonIsNotVisible() + void ajaxSubmitWhileAnotherButtonIsNotVisible() { // start and render the test page tester.startPage(HomePage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/json/JsonUtilsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/json/JsonUtilsTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/json/JsonUtilsTest.java index b78003b..b4bfb48 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/json/JsonUtilsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/json/JsonUtilsTest.java @@ -16,22 +16,23 @@ */ package org.apache.wicket.ajax.json; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Map; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @since 6.0.0 */ -public class JsonUtilsTest extends Assert +class JsonUtilsTest { @Test - public void asArray() throws Exception + void asArray() throws Exception { Map<String, Object> map = new HashMap<String, Object>(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java index 0441436..e320773 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/AjaxFallbackLinkTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.ajax.markup.html; +import static org.junit.jupiter.api.Assertions.assertThrows; + import java.util.Optional; import org.apache.wicket.MarkupContainer; @@ -26,29 +28,35 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @since 6.0.0 */ -public class AjaxFallbackLinkTest extends WicketTestCase +class AjaxFallbackLinkTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-4641 * * AjaxFallbackLink can be used only with <a>, <area> or <link> markup elements */ - @Test(expected = MarkupException.class) - public void onlyAnchorAreaAndLink() + @Test + void onlyAnchorAreaAndLink() { - tester.startPage(new OnlyAnchorAreaAndLinkPage()); + assertThrows(MarkupException.class, () -> { + tester.startPage(new OnlyAnchorAreaAndLinkPage()); + + }); } - private static class OnlyAnchorAreaAndLinkPage extends WebPage implements IMarkupResourceStreamProvider + private static class OnlyAnchorAreaAndLinkPage extends WebPage + implements + IMarkupResourceStreamProvider { private OnlyAnchorAreaAndLinkPage() { - add(new AjaxFallbackLink<Void>("l") { + add(new AjaxFallbackLink<Void>("l") + { @Override public void onClick(Optional<AjaxRequestTarget> optional) @@ -58,9 +66,11 @@ public class AjaxFallbackLinkTest extends WicketTestCase } @Override - public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass) + public IResourceStream getMarkupResourceStream(MarkupContainer container, + Class<?> containerClass) { - return new StringResourceStream("<html><body><bla wicket:id='l'>Ajax fallback link</bla></body></html>"); + return new StringResourceStream( + "<html><body><bla wicket:id='l'>Ajax fallback link</bla></body></html>"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPage.java index 5d06ea3..9c40cdc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPage.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPage.java @@ -69,7 +69,7 @@ public class ComponentNotOnPage extends WebPage { private static final long serialVersionUID = 1L; - public LastSelectedPanel(String id, WebMarkupContainer refresher) + LastSelectedPanel(String id, WebMarkupContainer refresher) { super(id); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPageTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPageTest.java index 14e8255..4b6739f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ComponentNotOnPageTest.java @@ -16,18 +16,20 @@ */ package org.apache.wicket.ajax.markup.html; +import static org.junit.jupiter.api.Assertions.assertThrows; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.wicket.RuntimeConfigurationType; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for checking whether or not a component is attached to the component hierarchy when * updating through AJAX. */ -public class ComponentNotOnPageTest extends WicketTestCase +class ComponentNotOnPageTest extends WicketTestCase { private RuntimeConfigurationType configuration = RuntimeConfigurationType.DEVELOPMENT; @@ -52,25 +54,16 @@ public class ComponentNotOnPageTest extends WicketTestCase * the developers part that a component that is not part of the page is being refreshed in the * AJAX response, resulting in a no-op (which is not the intended result). */ - @Test(expected = IllegalArgumentException.class) - public void responseTargetInDevelopmentModeShouldFail() + @Test + void responseTargetInDevelopmentModeShouldFail() { configuration = RuntimeConfigurationType.DEVELOPMENT; - try - { - // this should not fail - ComponentNotOnPage page = tester.startPage(ComponentNotOnPage.class); - tester.clickLink("listview:0:link", true); - tester.startPage(page); - } - catch (Exception e) - { - Assert.fail("Unexpected exception: " + e); - } + clickLinkFailOnError(); - // this should fail - tester.clickLink("refresher:refresh", true); + assertThrows(IllegalArgumentException.class, () -> { + tester.clickLink("refresher:refresh", true); + }); } /** @@ -81,10 +74,17 @@ public class ComponentNotOnPageTest extends WicketTestCase * (which happened in Wicket 7). */ @Test - public void responseTargetInDeploymentModeShouldNotFail() + void responseTargetInDeploymentModeShouldNotFail() { configuration = RuntimeConfigurationType.DEPLOYMENT; + clickLinkFailOnError(); + + // this shouldn't fail as well + tester.clickLink("refresher:refresh", true); + } + + private void clickLinkFailOnError() { try { // this should not fail @@ -94,10 +94,7 @@ public class ComponentNotOnPageTest extends WicketTestCase } catch (Exception e) { - Assert.fail("Unexpected exception: " + e); + fail("Unexpected exception: " + e); } - - // this shouldn't fail as well - tester.clickLink("refresher:refresh", true); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreatePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreatePage.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreatePage.java index 8f8a26f..5092933 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreatePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreatePage.java @@ -83,7 +83,7 @@ public class StatelessAjaxFallbackLinkDoNotRecreatePage extends WebPage return value.toString(); } - protected final void updateParams(final PageParameters pageParameters, final int counter) + private void updateParams(final PageParameters pageParameters, final int counter) { pageParameters.set(COUNTER_PARAM, Integer.toString(counter + 1)); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreateTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreateTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreateTest.java index bc087fc..e5e2377 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreateTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkDoNotRecreateTest.java @@ -16,16 +16,18 @@ */ package org.apache.wicket.ajax.markup.html; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.Page; import org.apache.wicket.Session; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.After; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.Test; -public class StatelessAjaxFallbackLinkDoNotRecreateTest extends WicketTestCase +class StatelessAjaxFallbackLinkDoNotRecreateTest extends WicketTestCase { - @After - public void after() + @AfterEach + void after() { // things must stay stateless assertTrue(Session.get().isTemporary()); @@ -35,7 +37,7 @@ public class StatelessAjaxFallbackLinkDoNotRecreateTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-6349 */ @Test - public void statelessPagesAreAlwaysRecreated() + void statelessPagesAreAlwaysRecreated() { tester.getApplication().getPageSettings().setRecreateBookmarkablePagesAfterExpiry(false); tester.startPage(StatelessAjaxFallbackLinkDoNotRecreatePage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkTest.java index 5cf7ff2..763d0e2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/StatelessAjaxFallbackLinkTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.ajax.markup.html; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.List; @@ -26,22 +26,22 @@ import org.apache.wicket.ajax.StatelessPage; import org.apache.wicket.behavior.Behavior; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -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; -public class StatelessAjaxFallbackLinkTest +class StatelessAjaxFallbackLinkTest { - protected WicketTester tester; + private WicketTester tester; - @Before - public void setUp() + @BeforeEach + void setUp() { tester = new WicketTester(new MockApplication()); } - @After - public void teardown() + @AfterEach + void teardown() { // things must stay stateless assertTrue(Session.get().isTemporary()); @@ -49,7 +49,7 @@ public class StatelessAjaxFallbackLinkTest @Test @SuppressWarnings("unchecked") - public void testGetStatelessHint() + void testGetStatelessHint() { tester.startPage(StatelessPage.class); @@ -64,7 +64,7 @@ public class StatelessAjaxFallbackLinkTest final AjaxEventBehavior behavior = (AjaxEventBehavior)behaviors.get(0); behavior.onRequest(); - + assertTrue(link.isStateless()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java index e18fa29..8802913 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/ajaxLink/AjaxLinkTest.java @@ -16,25 +16,26 @@ */ package org.apache.wicket.ajax.markup.html.ajaxLink; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.Component; import org.apache.wicket.Page; import org.apache.wicket.behavior.AbstractAjaxBehavior; import org.apache.wicket.util.tester.TagTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * */ -public class AjaxLinkTest extends WicketTestCase +class AjaxLinkTest extends WicketTestCase { /** * If the AjaxLink is attached to an "a" tag the href value should be replaced with "#" because * we use the onclick to execute the javascript. */ @Test - public void anchorGetsHrefReplaced() + void anchorGetsHrefReplaced() { tester.startPage(AjaxLinkPage.class); @@ -48,7 +49,7 @@ public class AjaxLinkTest extends WicketTestCase * Tests setting the request target to a normal page request from an ajax request. */ @Test - public void fromAjaxRequestToNormalPage() + void fromAjaxRequestToNormalPage() { tester.startPage(AjaxLinkPageToNormalPage.class); tester.assertRenderedPage(AjaxLinkPageToNormalPage.class); @@ -64,7 +65,7 @@ public class AjaxLinkTest extends WicketTestCase * @throws Exception */ @Test - public void page_2() throws Exception + void page_2() throws Exception { executeTest(AjaxPage2.class, "AjaxPage2_ExpectedResult.html"); @@ -80,7 +81,7 @@ public class AjaxLinkTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_1() throws Exception + void renderHomePage_1() throws Exception { executeTest(AjaxLinkPage.class, "AjaxLinkPageExpectedResult.html"); } @@ -90,7 +91,7 @@ public class AjaxLinkTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_2() throws Exception + void renderHomePage_2() throws Exception { executeTest(AjaxLinkWithBorderPage.class, "AjaxLinkWithBorderPageExpectedResult.html"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelBase.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelBase.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelBase.java index e855996..71e4b70 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelBase.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelBase.java @@ -26,14 +26,14 @@ public class SimpleTestPanelBase extends Panel { private static final long serialVersionUID = 1L; - protected WebMarkupContainer baseSpan; + WebMarkupContainer baseSpan; /** * Construct. * * @param name */ - public SimpleTestPanelBase(String name) + SimpleTestPanelBase(String name) { super(name); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java index e3bf94c..f1dc955 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/componentMap/SimpleTestPanelTest.java @@ -19,7 +19,7 @@ package org.apache.wicket.ajax.markup.html.componentMap; import org.apache.wicket.Page; import org.apache.wicket.util.tester.DiffUtil; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** @@ -27,13 +27,13 @@ import org.junit.Test; * * @author Juergen Donnerstag */ -public class SimpleTestPanelTest extends WicketTestCase +class SimpleTestPanelTest extends WicketTestCase { /** * @throws Exception */ @Test - public void renderHomePage_2() throws Exception + void renderHomePage_2() throws Exception { executeTest(SimpleTestPage.class, "SimpleTestPageExpectedResult.html"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java index c699262..2b34f65 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/AjaxButtonTest.java @@ -16,19 +16,21 @@ */ package org.apache.wicket.ajax.markup.html.form; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Simple test using the WicketTester */ -public class AjaxButtonTest extends WicketTestCase +class AjaxButtonTest extends WicketTestCase { /** * */ @Test - public void ajaxButtonWhenCancelButtonHasAModelValue() + void ajaxButtonWhenCancelButtonHasAModelValue() { // start and render the test page tester.startPage(HomePage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/StatelessAjaxSubmitLinkTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/StatelessAjaxSubmitLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/StatelessAjaxSubmitLinkTest.java index 51f7840..33b1d9c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/StatelessAjaxSubmitLinkTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/ajax/markup/html/form/StatelessAjaxSubmitLinkTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.ajax.markup.html.form; -import static org.junit.Assert.assertTrue; +import static org.junit.jupiter.api.Assertions.assertTrue; import org.apache.wicket.Session; import org.apache.wicket.ajax.StatelessPage; @@ -24,48 +24,48 @@ import org.apache.wicket.mock.MockApplication; import org.apache.wicket.page.XmlPartialPageUpdate; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTester; -import org.junit.After; -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; -public class StatelessAjaxSubmitLinkTest +class StatelessAjaxSubmitLinkTest { - protected WicketTester tester; + private WicketTester tester; - @Before - public void setUp() + @BeforeEach + void setUp() { tester = new WicketTester(new MockApplication()); } - @After - public void teardown() + @AfterEach + void teardown() { // things must stay stateless assertTrue(Session.get().isTemporary()); } - + @Test - public void testSubmitForm() throws Exception + void testSubmitForm() throws Exception { - tester.startPage(StatelessPage.class); - - FormTester formTester = tester.newFormTester("inputForm"); - formTester.setValue("name", "myname"); - formTester.setValue("surname", "mysurname"); - - tester.executeAjaxEvent("inputForm:submit", "click"); - - String response = tester.getLastResponseAsString(); - - boolean isAjaxResponse = response.contains(XmlPartialPageUpdate.START_ROOT_ELEMENT) - && response.contains(XmlPartialPageUpdate.END_ROOT_ELEMENT); - - assertTrue(isAjaxResponse); - - boolean formAjaxSubmit = response.contains(StatelessPage.FORM_SUBMIT) && - response.contains(StatelessPage.AJAX_SUBMIT); - - assertTrue(formAjaxSubmit); + tester.startPage(StatelessPage.class); + + FormTester formTester = tester.newFormTester("inputForm"); + formTester.setValue("name", "myname"); + formTester.setValue("surname", "mysurname"); + + tester.executeAjaxEvent("inputForm:submit", "click"); + + String response = tester.getLastResponseAsString(); + + boolean isAjaxResponse = response.contains(XmlPartialPageUpdate.START_ROOT_ELEMENT) && + response.contains(XmlPartialPageUpdate.END_ROOT_ELEMENT); + + assertTrue(isAjaxResponse); + + boolean formAjaxSubmit = response.contains(StatelessPage.FORM_SUBMIT) && + response.contains(StatelessPage.AJAX_SUBMIT); + + assertTrue(formAjaxSubmit); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java b/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java index e6ac55c..f0eadb9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/authorization/ComponentIsRenderedAllowedTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.authorization; +import static org.junit.jupiter.api.Assertions.assertFalse; + import org.apache.wicket.Component; import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.IMarkupResourceStreamProvider; @@ -26,14 +28,14 @@ import org.apache.wicket.protocol.http.WebApplication; 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; /** * Checks whether or not authorization strategy blocks rendering of components * * @author igor */ -public class ComponentIsRenderedAllowedTest extends WicketTestCase +class ComponentIsRenderedAllowedTest extends WicketTestCase { @Override protected WebApplication newApplication() @@ -43,7 +45,7 @@ public class ComponentIsRenderedAllowedTest extends WicketTestCase /** */ @Test - public void onBeforeRenderNotCalledOnVetoedComponents() + void onBeforeRenderNotCalledOnVetoedComponents() { TestPage page = new TestPage(); tester.startPage(page); @@ -52,7 +54,7 @@ public class ComponentIsRenderedAllowedTest extends WicketTestCase /** */ @Test - public void vetoedComponentNotRendered() + void vetoedComponentNotRendered() { TestPage page = new TestPage(); tester.startPage(page); @@ -60,12 +62,12 @@ public class ComponentIsRenderedAllowedTest extends WicketTestCase } /** */ - public class TestPage extends WebPage implements IMarkupResourceStreamProvider + class TestPage extends WebPage implements IMarkupResourceStreamProvider { private final NormalContainer normal; /** */ - public TestPage() + TestPage() { ForbiddenContainer forbidden = new ForbiddenContainer("forbidden"); normal = new NormalContainer("normal"); @@ -89,7 +91,7 @@ public class ComponentIsRenderedAllowedTest extends WicketTestCase private boolean onBeforeRenderCalled = false; private boolean onAfterRenderCalled = false; - public NormalContainer(String id) + NormalContainer(String id) { super(id); } @@ -112,7 +114,7 @@ public class ComponentIsRenderedAllowedTest extends WicketTestCase private static class ForbiddenContainer extends WebMarkupContainer implements Forbidden { - public ForbiddenContainer(String id) + ForbiddenContainer(String id) { super(id); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/behavior/AjaxCallbackUrlTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/AjaxCallbackUrlTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/AjaxCallbackUrlTest.java index 57d4eb1..33d9433 100644 --- a/wicket-core/src/test/java/org/apache/wicket/behavior/AjaxCallbackUrlTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/behavior/AjaxCallbackUrlTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.behavior; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.IMarkupResourceStreamProvider; import org.apache.wicket.markup.html.WebMarkupContainer; @@ -26,26 +28,23 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; 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 static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; +import org.junit.jupiter.api.Test; /** * Test for https://issues.apache.org/jira/browse/WICKET-6192 */ -public class AjaxCallbackUrlTest extends WicketTestCase { +class AjaxCallbackUrlTest extends WicketTestCase { @Test - public void withoutPathParameters() { + void withoutPathParameters() { String callbackUrl = getCallbackUrl("/a/b/c"); - assertThat(callbackUrl, is(equalTo("./a/b/c?0-1.0-link"))); + assertEquals("./a/b/c?0-1.0-link", callbackUrl); } @Test - public void withPathParameters() { + void withPathParameters() { String callbackUrl = getCallbackUrl("/a/${b}/${c}"); - assertThat(callbackUrl, is(equalTo("./a/BBB/CCC?0-1.0-link"))); + assertEquals("./a/BBB/CCC?0-1.0-link", callbackUrl); } private String getCallbackUrl(final String pageMountPath) { http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/behavior/BehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/BehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/BehaviorTest.java index ed4f473..29f69d4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/behavior/BehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/behavior/BehaviorTest.java @@ -16,24 +16,24 @@ */ package org.apache.wicket.behavior; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.wicket.MockPageWithOneComponent; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.util.tester.TagTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link Behavior} */ -public class BehaviorTest extends WicketTestCase +class BehaviorTest extends WicketTestCase { @Test - public void onTagTest() + void onTagTest() { - WebMarkupContainer component = new WebMarkupContainer(MockPageWithOneComponent.COMPONENT_ID); + WebMarkupContainer component = new WebMarkupContainer( + MockPageWithOneComponent.COMPONENT_ID); MockPageWithOneComponent page = new MockPageWithOneComponent(); page.add(component); String value = "value"; @@ -44,14 +44,15 @@ public class BehaviorTest extends WicketTestCase tester.startPage(page); TagTester tagTester = tester.getTagByWicketId(MockPageWithOneComponent.COMPONENT_ID); - assertThat(tagTester.getAttribute(key), is(equalTo(value))); - assertThat(tagTester.getAttribute("class"), is(equalTo("zzz"))); + assertEquals(value, tagTester.getAttribute(key)); + assertEquals("zzz", tagTester.getAttribute("class")); } - + @Test - public void onAttributeTest() + void onAttributeTest() { - WebMarkupContainer component = new WebMarkupContainer(MockPageWithOneComponent.COMPONENT_ID); + WebMarkupContainer component = new WebMarkupContainer( + MockPageWithOneComponent.COMPONENT_ID); MockPageWithOneComponent page = new MockPageWithOneComponent(); page.add(component); String value = "value"; @@ -61,6 +62,6 @@ public class BehaviorTest extends WicketTestCase tester.startPage(page); TagTester tagTester = tester.getTagByWicketId(MockPageWithOneComponent.COMPONENT_ID); - assertThat(tagTester.getAttribute(key), is(equalTo(value))); + assertEquals(value, tagTester.getAttribute(key)); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java index b622e7c..7c22e4c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/behavior/ImmutableBehaviorIdsTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.behavior; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.List; import org.apache.wicket.AttributeModifier; @@ -30,14 +33,14 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; 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; /** IBehavior array management tests */ -public class ImmutableBehaviorIdsTest extends WicketTestCase +class ImmutableBehaviorIdsTest extends WicketTestCase { /** Tests simple behavior */ @Test - public void simple() + void simple() { MyPage page = new MyPage(); page.getContainer().add(new AttributeModifier("class", "border")); @@ -50,7 +53,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase * Tests the fact that url-behavior indexes do not change even if behaviors are removed/added */ @Test - public void urlIndexRendering() + void urlIndexRendering() { Behavior border = new AttributeModifier("class", "border"); Behavior border2 = new AttributeModifier("class2", "border"); @@ -96,7 +99,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase * Tests that removal of behaviors properly cleans up the data array */ @Test - public void behaviorDataArrayCleanup() + void behaviorDataArrayCleanup() { Behavior border = new AttributeModifier("class", "border"); Behavior border2 = new AttributeModifier("class2", "border"); @@ -157,7 +160,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase private final String attr; - public LinkBehavior(String attr) + LinkBehavior(String attr) { this.attr = attr; } @@ -180,7 +183,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase private static final long serialVersionUID = 1L; private final WebMarkupContainer container; - public MyPage() + MyPage() { container = new WebMarkupContainer("container"); add(container); @@ -194,7 +197,7 @@ public class ImmutableBehaviorIdsTest extends WicketTestCase "<html><body><a wicket:id='container'></a></body></html>"); } - public WebMarkupContainer getContainer() + WebMarkupContainer getContainer() { return container; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java b/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java index 6b94bb0..3d23abb 100644 --- a/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/behavior/SharedBehaviorTest.java @@ -26,12 +26,12 @@ import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @since 1.5.8 */ -public class SharedBehaviorTest extends WicketTestCase +class SharedBehaviorTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-4570 @@ -45,7 +45,7 @@ public class SharedBehaviorTest extends WicketTestCase * @throws Exception */ @Test - public void sharedBehaviorRenderHead() throws Exception + void sharedBehaviorRenderHead() throws Exception { TestPage page = new TestPage(); executeTest(page, "SharedBehaviorTest_renderHead_expected.html"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/component/replacewith/BaseReplaceWithPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/BaseReplaceWithPanel.java b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/BaseReplaceWithPanel.java index 52b3c27..a808c52 100644 --- a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/BaseReplaceWithPanel.java +++ b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/BaseReplaceWithPanel.java @@ -25,9 +25,9 @@ import org.apache.wicket.util.resource.StringResourceStream; /** * A base panel for all replaceWith panels */ -public class BaseReplaceWithPanel extends Panel implements IMarkupResourceStreamProvider +class BaseReplaceWithPanel extends Panel implements IMarkupResourceStreamProvider { - public BaseReplaceWithPanel(String id) + BaseReplaceWithPanel(String id) { super(id); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/component/replacewith/PanelB.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/PanelB.java b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/PanelB.java index f38889b..f17e7e8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/component/replacewith/PanelB.java +++ b/wicket-core/src/test/java/org/apache/wicket/component/replacewith/PanelB.java @@ -18,7 +18,7 @@ package org.apache.wicket.component.replacewith; import org.apache.wicket.markup.html.panel.Panel; -public class PanelB extends Panel +class PanelB extends Panel { public PanelB(String id) {
