http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperTest.java index af21bda..e307c10 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/XForwardedRequestWrapperTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.protocol.http.servlet; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; + import javax.servlet.http.HttpServletRequest; import org.apache.wicket.markup.html.basic.SimplePage; @@ -24,23 +27,23 @@ import org.apache.wicket.protocol.http.mock.MockHttpServletRequest; import org.apache.wicket.protocol.http.mock.MockHttpServletResponse; 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 Juergen Donnerstag */ -public class XForwardedRequestWrapperTest extends WicketTestCase +class XForwardedRequestWrapperTest extends WicketTestCase { - MockHttpServletRequest request; - XForwardedRequestWrapperFactory filter; + private MockHttpServletRequest request; + private XForwardedRequestWrapperFactory filter; /** * @throws Exception */ - @Before - public void before() throws Exception + @BeforeEach + void before() throws Exception { filter = new XForwardedRequestWrapperFactory(); request = tester.getRequest(); @@ -48,7 +51,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase /** */ @Test - public void test1() + void test1() { HttpServletRequest resp = filter.getWrapper(request); assertEquals("127.0.0.1", resp.getRemoteAddr()); @@ -62,7 +65,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase /** */ @Test - public void test2() + void test2() { filter.getConfig().setProtocolHeader("x-forwarded-proto"); @@ -80,7 +83,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase * Sample with internal proxies */ @Test - public void test3() + void test3() { filter.getConfig().setAllowedInternalProxies("192\\.168\\.0\\.10, 192\\.168\\.0\\.11"); filter.getConfig().setRemoteIPHeader("x-forwarded-for"); @@ -109,7 +112,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase * Sample with trusted proxies */ @Test - public void test4() + void test4() { filter.getConfig().setAllowedInternalProxies("192\\.168\\.0\\.10, 192\\.168\\.0\\.11"); filter.getConfig().setRemoteIPHeader("x-forwarded-for"); @@ -129,7 +132,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase * Sample with internal and trusted proxies */ @Test - public void test5() + void test5() { filter.getConfig().setAllowedInternalProxies("192\\.168\\.0\\.10, 192\\.168\\.0\\.11"); filter.getConfig().setRemoteIPHeader("x-forwarded-for"); @@ -149,7 +152,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase * Sample with an untrusted proxy */ @Test - public void test6() + void test6() { filter.getConfig().setAllowedInternalProxies("192\\.168\\.0\\.10, 192\\.168\\.0\\.11"); filter.getConfig().setRemoteIPHeader("x-forwarded-for"); @@ -189,7 +192,7 @@ public class XForwardedRequestWrapperTest extends WicketTestCase * */ @Test - public void test7() throws Exception + void test7() throws Exception { MyApplication app = new MyApplication(); tester = new WicketTester(app);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplication.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplication.java b/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplication.java index e35e839..80ec25a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplication.java +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplication.java @@ -19,7 +19,7 @@ package org.apache.wicket.protocol.https; import org.apache.wicket.Page; import org.apache.wicket.protocol.http.WebApplication; -public class HttpsMapperApplication extends WebApplication +class HttpsMapperApplication extends WebApplication { private HttpsConfig config; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java index 47d0177..4faa508 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperApplicationTest.java @@ -16,17 +16,17 @@ */ package org.apache.wicket.protocol.https; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import org.apache.wicket.Page; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for proper switching of http and https in {@link WicketTester} */ -public class HttpsMapperApplicationTest +class HttpsMapperApplicationTest { @SuppressWarnings({ "unchecked" }) private <T extends Page> T requestPage(WicketTester tester, Class<T> pageClass) @@ -40,7 +40,7 @@ public class HttpsMapperApplicationTest } @Test - public void switchDefaultToHttpsWithDefaultPorts() + void switchDefaultToHttpsWithDefaultPorts() { WicketTester tester = new WicketTester(new HttpsMapperApplication()); @@ -50,7 +50,7 @@ public class HttpsMapperApplicationTest } @Test - public void switchDefaultToHttpsWithCustomPort() + void switchDefaultToHttpsWithCustomPort() { WicketTester tester = new WicketTester(new HttpsMapperApplication(123, 456)); @@ -61,7 +61,7 @@ public class HttpsMapperApplicationTest } @Test - public void switchHttpsToHttpWithDefaultPorts() + void switchHttpsToHttpWithDefaultPorts() { WicketTester tester = new WicketTester(new HttpsMapperApplication()); @@ -74,7 +74,7 @@ public class HttpsMapperApplicationTest } @Test - public void switchHttpsToHttpWithCustomPorts() + void switchHttpsToHttpWithCustomPorts() { WicketTester tester = new WicketTester(new HttpsMapperApplication(123, 456)); @@ -88,7 +88,7 @@ public class HttpsMapperApplicationTest } @Test - public void switchHttpToHttpsWithDefaultPorts() + void switchHttpToHttpsWithDefaultPorts() { WicketTester tester = new WicketTester(new HttpsMapperApplication()); @@ -100,7 +100,7 @@ public class HttpsMapperApplicationTest } @Test - public void switchHttpToHttpsWithCustomPorts() + void switchHttpToHttpsWithCustomPorts() { WicketTester tester = new WicketTester(new HttpsMapperApplication(123, 456)); @@ -114,7 +114,7 @@ public class HttpsMapperApplicationTest } @Test - public void testProtocolSwitchForNextRequest() + void testProtocolSwitchForNextRequest() { WicketTester tester = new WicketTester(new HttpsMapperApplication()); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperTest.java index cc55338..fabac6b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/protocol/https/HttpsMapperTest.java @@ -18,9 +18,9 @@ package org.apache.wicket.protocol.https; import static org.hamcrest.MatcherAssert.assertThat; import static org.hamcrest.Matchers.instanceOf; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; -import static org.hamcrest.Matchers.sameInstance; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertSame; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.reset; import static org.mockito.Mockito.when; @@ -35,40 +35,40 @@ import org.apache.wicket.protocol.https.HttpsMapper.RedirectHandler; import org.apache.wicket.request.IRequestHandler; import org.apache.wicket.request.IRequestMapper; import org.apache.wicket.request.Url; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class HttpsMapperTest +class HttpsMapperTest { @Test - public void getDesiredSchemeOfPageClass() + void getDesiredSchemeOfPageClass() { IRequestMapper delegate = mock(IRequestMapper.class); HttpsMapper mapper = new HttpsMapper(delegate, new HttpsConfig()); - assertThat(mapper.getDesiredSchemeFor(SecurePage.class), is(Scheme.HTTPS)); - assertThat(mapper.getDesiredSchemeFor(SecureDecendantPage.class), is(Scheme.HTTPS)); - assertThat(mapper.getDesiredSchemeFor(SecureMixinPage.class), is(Scheme.HTTPS)); - assertThat(mapper.getDesiredSchemeFor(InsecurePage.class), is(Scheme.HTTP)); + assertEquals(Scheme.HTTPS, mapper.getDesiredSchemeFor(SecurePage.class)); + assertEquals(Scheme.HTTPS, mapper.getDesiredSchemeFor(SecureDecendantPage.class)); + assertEquals(Scheme.HTTPS, mapper.getDesiredSchemeFor(SecureMixinPage.class)); + assertEquals(Scheme.HTTP, mapper.getDesiredSchemeFor(InsecurePage.class)); } @Test - public void getDesiredSchemeOfHandler() + void getDesiredSchemeOfHandler() { IRequestMapper delegate = mock(IRequestMapper.class); HttpsMapper mapper = new HttpsMapper(delegate, new HttpsConfig()); IRequestHandler handler = new RenderPageRequestHandler(new PageProvider(SecurePage.class)); - assertThat(mapper.getDesiredSchemeFor(handler), is(Scheme.HTTPS)); + assertEquals(Scheme.HTTPS, mapper.getDesiredSchemeFor(handler)); handler = new RenderPageRequestHandler(new PageProvider(InsecurePage.class)); - assertThat(mapper.getDesiredSchemeFor(handler), is(Scheme.HTTP)); + assertEquals(Scheme.HTTP, mapper.getDesiredSchemeFor(handler)); handler = mock(IRequestHandler.class); - assertThat(mapper.getDesiredSchemeFor(handler), is(Scheme.ANY)); + assertEquals(Scheme.ANY, mapper.getDesiredSchemeFor(handler)); } @Test - public void getSchemeOfRequest() + void getSchemeOfRequest() { IRequestMapper delegate = mock(IRequestMapper.class); HttpsMapper mapper = new HttpsMapper(delegate, new HttpsConfig()); @@ -78,15 +78,15 @@ public class HttpsMapperTest when(request.getContainerRequest()).thenReturn(req); when(req.getScheme()).thenReturn("https"); - assertThat(mapper.getSchemeOf(request), is(Scheme.HTTPS)); + assertEquals(Scheme.HTTPS, mapper.getSchemeOf(request)); reset(req); when(req.getScheme()).thenReturn("hTTps"); - assertThat(mapper.getSchemeOf(request), is(Scheme.HTTPS)); + assertEquals(Scheme.HTTPS, mapper.getSchemeOf(request)); reset(req); when(req.getScheme()).thenReturn("http"); - assertThat(mapper.getSchemeOf(request), is(Scheme.HTTP)); + assertEquals(Scheme.HTTP, mapper.getSchemeOf(request)); try { @@ -102,7 +102,7 @@ public class HttpsMapperTest } @Test - public void mapHandler() + void mapHandler() { IRequestMapper delegate = mock(IRequestMapper.class); HttpsMapper mapper = new HttpsMapper(delegate, new HttpsConfig()); @@ -117,8 +117,8 @@ public class HttpsMapperTest when(delegate.mapHandler(handler)).thenReturn(url); when(req.getScheme()).thenReturn("http"); mapper.mapHandler(handler, request); - assertThat(url.getProtocol(), is("https")); - assertThat(url.getPort(), is(443)); + assertEquals("https", url.getProtocol()); + assertEquals(Integer.valueOf(443), url.getPort()); // render url to http page on http, ignore protocol handler = new RenderPageRequestHandler(new PageProvider(InsecurePage.class)); @@ -127,7 +127,7 @@ public class HttpsMapperTest when(delegate.mapHandler(handler)).thenReturn(url); when(req.getScheme()).thenReturn("http"); mapper.mapHandler(handler, request); - assertThat(url.getProtocol(), is(nullValue())); + assertNull(url.getProtocol()); // render url to http page on https, set protocol handler = new RenderPageRequestHandler(new PageProvider(InsecurePage.class)); @@ -136,13 +136,13 @@ public class HttpsMapperTest when(delegate.mapHandler(handler)).thenReturn(url); when(req.getScheme()).thenReturn("https"); mapper.mapHandler(handler, request); - assertThat(url.getProtocol(), is("http")); - assertThat(url.getPort(), is(80)); + assertEquals("http", url.getProtocol()); + assertEquals(Integer.valueOf(80), url.getPort()); } @Test - public void mapRequest() + void mapRequest() { IRequestMapper delegate = mock(IRequestMapper.class); HttpsMapper mapper = new HttpsMapper(delegate, new HttpsConfig()); @@ -156,8 +156,8 @@ public class HttpsMapperTest IRequestHandler handler = new RenderPageRequestHandler(new PageProvider(SecurePage.class)); when(delegate.mapRequest(request)).thenReturn(handler); IRequestHandler resolved = mapper.mapRequest(request); - assertThat(resolved, is(instanceOf(RedirectHandler.class))); - assertThat(((RedirectHandler)resolved).getUrl(), is("https://localhost/ctx?foo=bar";)); + assertThat(resolved, instanceOf(RedirectHandler.class)); + assertEquals("https://localhost/ctx?foo=bar";, ((RedirectHandler)resolved).getUrl()); // http handler on http request, return the original handler handler = new RenderPageRequestHandler(new PageProvider(InsecurePage.class)); @@ -165,11 +165,11 @@ public class HttpsMapperTest when(delegate.mapRequest(request)).thenReturn(handler); setupRequest(req, "http", "localhost", 80, "/ctx", "foo=bar"); resolved = mapper.mapRequest(request); - assertThat(resolved, is(sameInstance(handler))); + assertSame(handler, resolved); } @Test - public void mapRequestWithCustomPorts() + void mapRequestWithCustomPorts() { IRequestMapper delegate = mock(IRequestMapper.class); HttpsMapper mapper = new HttpsMapper(delegate, new HttpsConfig(10, 20)); @@ -183,8 +183,8 @@ public class HttpsMapperTest IRequestHandler handler = new RenderPageRequestHandler(new PageProvider(SecurePage.class)); when(delegate.mapRequest(request)).thenReturn(handler); IRequestHandler resolved = mapper.mapRequest(request); - assertThat(resolved, is(instanceOf(RedirectHandler.class))); - assertThat(((RedirectHandler)resolved).getUrl(), is("https://localhost:20/ctx?foo=bar";)); + assertThat(resolved, instanceOf(RedirectHandler.class)); + assertEquals("https://localhost:20/ctx?foo=bar";, ((RedirectHandler)resolved).getUrl()); // http handler on http request, return the original handler handler = new RenderPageRequestHandler(new PageProvider(InsecurePage.class)); @@ -192,8 +192,8 @@ public class HttpsMapperTest when(delegate.mapRequest(request)).thenReturn(handler); setupRequest(req, "https", "localhost", 20, "/ctx", "foo=bar"); resolved = mapper.mapRequest(request); - assertThat(resolved, is(instanceOf(RedirectHandler.class))); - assertThat(((RedirectHandler)resolved).getUrl(), is("http://localhost:10/ctx?foo=bar";)); + assertThat(resolved, instanceOf(RedirectHandler.class)); + assertEquals("http://localhost:10/ctx?foo=bar";, ((RedirectHandler)resolved).getUrl()); } private static void setupRequest(HttpServletRequest mock, String scheme, String host, int port, http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingPerformanceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingPerformanceTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingPerformanceTest.java index ed7d341..722478e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingPerformanceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingPerformanceTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.queueing; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.HashMap; import java.util.Iterator; import java.util.Map; @@ -34,15 +36,15 @@ import org.apache.wicket.mock.MockApplication; import org.apache.wicket.model.IModel; import org.apache.wicket.model.LoadableDetachableModel; import org.apache.wicket.model.PropertyModel; -import org.apache.wicket.util.SlowTests; +import org.apache.wicket.util.WicketTestTag; 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.experimental.categories.Category; +import org.junit.jupiter.api.Tag; +import org.junit.jupiter.api.Test; -@Category(SlowTests.class) +@Tag(WicketTestTag.SLOW) public class ComponentQueueingPerformanceTest extends WicketTestCase { private void run(Class<? extends Page> pageClass) @@ -59,7 +61,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase } @Test - public void performance() + void performance() { final int warmup = 30; final int performance = 60; @@ -97,7 +99,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase @Test - public void consistency() + void consistency() { tester.startPage(new QueueContactsPage()); String queue = tester.getLastResponseAsString(); @@ -134,7 +136,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase } - static Store store = new Store(); + private static Store store = new Store(); private static class Store { @@ -159,7 +161,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase throw new RuntimeException(); } - public Store() + Store() { for (int i = 0; i < 250; i++) { @@ -174,7 +176,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase { private String id; - public ContactModel(Contact contact) + ContactModel(Contact contact) { super(contact); this.id = contact.id; @@ -190,7 +192,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase private static abstract class AbstractPhonePanel extends TestPanel { - public AbstractPhonePanel(String id, IModel<PhoneNumber> phone) + AbstractPhonePanel(String id, IModel<PhoneNumber> phone) { super(id); setPanelMarkup("<wicket:panel><span wicket:id='areacode'></span> <span wicket:id='prefix'></span>-<span wicket:id='suffix'></span></wicket:panel>"); @@ -199,7 +201,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase private static class AddPhonePanel extends AbstractPhonePanel { - public AddPhonePanel(String id, IModel<PhoneNumber> phone) + AddPhonePanel(String id, IModel<PhoneNumber> phone) { super(id, phone); add(new Label("areacode", new PropertyModel(phone, "areacode"))); @@ -220,7 +222,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase private static abstract class AbstractAddressPanel extends TestPanel { - public AbstractAddressPanel(String id, IModel<Address> addr) + AbstractAddressPanel(String id, IModel<Address> addr) { super(id); setPanelMarkup("<wicket:panel><span wicket:id='street'></span><br/><span wicket:id='city'></span>, <span wicket:id='state'></span> <span wicket:id='zipcode'></span></wicket:panel>"); @@ -229,7 +231,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase private static class AddAddressPanel extends AbstractAddressPanel { - public AddAddressPanel(String id, IModel<Address> addr) + AddAddressPanel(String id, IModel<Address> addr) { super(id, addr); add(new Label("street", new PropertyModel(addr, "street"))); @@ -340,7 +342,7 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase { private String markup; - public TestPage() + TestPage() { } @@ -349,12 +351,12 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase this.markup = markup; } - protected String getPageMarkup() + String getPageMarkup() { return markup; } - public void setPageMarkup(String markup) + void setPageMarkup(String markup) { this.markup = markup; } @@ -373,17 +375,17 @@ public class ComponentQueueingPerformanceTest extends WicketTestCase private String markup; - public TestPanel(String id) + TestPanel(String id) { super(id); } - protected void setPanelMarkup(String markup) + void setPanelMarkup(String markup) { this.markup = markup; } - protected String getPanelMarkup() + String getPanelMarkup() { return markup; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java index 2b4ea15..8cfefb7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/ComponentQueueingTest.java @@ -17,8 +17,11 @@ package org.apache.wicket.queueing; import static org.apache.wicket.queueing.WicketMatchers.hasPath; -import static org.hamcrest.Matchers.is; -import static org.hamcrest.Matchers.nullValue; +import static org.hamcrest.MatcherAssert.assertThat; +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.util.ArrayList; @@ -49,14 +52,13 @@ import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class ComponentQueueingTest extends WicketTestCase +class ComponentQueueingTest extends WicketTestCase { /** {@code [a,b,c] -> [a[b[c]]] } */ @Test - public void dequeue1() + void dequeue1() { TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>"); @@ -71,7 +73,7 @@ public class ComponentQueueingTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-6361 */ @Test - public void dequeueComponentsOnInitialization() + void dequeueComponentsOnInitialization() { TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>"); @@ -89,7 +91,7 @@ public class ComponentQueueingTest extends WicketTestCase /** {@code [a[b,c]] -> [a[b[c]]] } */ @Test - public void dequeue2() + void dequeue2() { TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>"); @@ -105,7 +107,7 @@ public class ComponentQueueingTest extends WicketTestCase /** {@code [a[b[c]] -> [a[b[c]]] } */ @Test - public void dequeue3() + void dequeue3() { TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>"); @@ -122,7 +124,7 @@ public class ComponentQueueingTest extends WicketTestCase /** {@code [a[b],c] -> [a[b[c]]] } */ @Test - public void dequeue4() + void dequeue4() { TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>"); @@ -138,7 +140,7 @@ public class ComponentQueueingTest extends WicketTestCase /** {@code [a(b)],c] -> [a[b[c]]] } */ @Test - public void dequeue5() + void dequeue5() { TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>"); @@ -153,7 +155,7 @@ public class ComponentQueueingTest extends WicketTestCase /** {@code [a,b,c] -> [a[b,c]] } */ @Test - public void dequeue6() + void dequeue6() { TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'></p><p wicket:id='c'></p></p>"); @@ -171,7 +173,7 @@ public class ComponentQueueingTest extends WicketTestCase * {a[b{e}[d,f{g}]],c} -> [a[b[c,d[e],f[g]]]] */ @Test - public void dequeue7() + void dequeue7() { TestPage p = new TestPage(); @@ -209,7 +211,7 @@ public class ComponentQueueingTest extends WicketTestCase /** {@code [a,c[b]] ->| [a[b[c]]] } */ @Test - public void dequeueError1() + void dequeueError1() { TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='a'><p wicket:id='b'><p wicket:id='c'></p></p></p>"); @@ -221,7 +223,7 @@ public class ComponentQueueingTest extends WicketTestCase try { tester.startPage(p); - Assert.fail(); + fail(); } catch (WicketRuntimeException e) { @@ -231,7 +233,7 @@ public class ComponentQueueingTest extends WicketTestCase /** {@code [a,q[r,s]] - > [a[q[r[s]]]] } */ @Test - public void panel1() + void panel1() { MarkupContainer a = new A(), r = new R(), s = new S(); @@ -251,7 +253,7 @@ public class ComponentQueueingTest extends WicketTestCase /** panel has leading markup */ @Test - public void panel2() + void panel2() { MarkupContainer r = new R(); @@ -270,7 +272,7 @@ public class ComponentQueueingTest extends WicketTestCase /** panel with a static header section */ @Test - public void panel3() + void panel3() { MarkupContainer r = new R(); @@ -293,7 +295,7 @@ public class ComponentQueueingTest extends WicketTestCase * test with inner panels */ @Test - public void nestedPanels() + void nestedPanels() { MarkupContainer r = new R(), s = new S(); @@ -317,7 +319,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void repeater1() + void repeater1() { TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='lv'><p wicket:id='b'><p wicket:id='c'></p></p></p>"); @@ -335,7 +337,7 @@ public class ComponentQueueingTest extends WicketTestCase tester.startPage(p); - assertThat(l.size(), is(3)); + assertEquals(3, l.size()); for (Component item : l) { assertThat(p, hasPath(new Path(l, item, new B(), new C()))); @@ -344,7 +346,7 @@ public class ComponentQueueingTest extends WicketTestCase /** repeater */ @Test - public void repeater2() + void repeater2() { TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='a'><p wicket:id='lv'><p wicket:id='b'><p wicket:id='c'></p></p></p></p>"); @@ -363,7 +365,7 @@ public class ComponentQueueingTest extends WicketTestCase tester.startPage(p); - assertThat(l.size(), is(3)); + assertEquals(3, l.size()); for (Component item : l) { assertThat(p, hasPath(new Path(a, l, item, new B(), new C()))); @@ -372,7 +374,7 @@ public class ComponentQueueingTest extends WicketTestCase /** repeater with a panel inside */ @Test - public void repeater3() + void repeater3() { TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='a'><p wicket:id='lv'><p wicket:id='b'><p wicket:id='q'></p></p></p></p>"); @@ -395,7 +397,7 @@ public class ComponentQueueingTest extends WicketTestCase tester.startPage(p); - assertThat(l.size(), is(3)); + assertEquals(3, l.size()); for (Component item : l) { assertThat(p, hasPath(new Path(a, l, item, new B()).add("q").add(new R(), new S()))); @@ -404,7 +406,7 @@ public class ComponentQueueingTest extends WicketTestCase /** dequeue, then rerender the page instance after a callback is executed */ @Test - public void callback() + void callback() { TestPage p = new TestPage(); p.setPageMarkup("<p wicket:id='a'><a wicket:id='l'><p wicket:id='b'></p></a></p>"); @@ -415,23 +417,22 @@ public class ComponentQueueingTest extends WicketTestCase tester.startPage(p); assertThat(p, hasPath(new Path(a, l, b))); - assertThat(l.isClicked(), is(false)); + assertEquals(false, l.isClicked()); tester.clickLink(l); - assertThat(l.isClicked(), is(true)); + assertEquals(true, l.isClicked()); } /** queuing two components with the same id */ @Test - public void queueIdCollission() + void queueIdCollission() { try { new A().queue(new B(), new B()); - Assert - .fail("Should not be able to queue two components with the same id under the same parent"); + fail("Should not be able to queue two components with the same id under the same parent"); } catch (WicketRuntimeException e) { @@ -441,7 +442,7 @@ public class ComponentQueueingTest extends WicketTestCase @Test - public void autos1() + void autos1() { TestPage p = new TestPage(); p.setPageMarkup("<wicket:enclosure child='a'><div wicket:id='a'></div><div wicket:id='b'></div></wicket:enclosure>"); @@ -467,7 +468,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void autos2() + void autos2() { TestPage p = new TestPage(); p.setPageMarkup("<wicket:enclosure child='a'><div wicket:id='a'></div><div wicket:id='b'></div></wicket:enclosure>"); @@ -493,7 +494,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void autos3() + void autos3() { TestPage p = new TestPage(); p.setPageMarkup("<wicket:enclosure child='a'><div wicket:id='a'></div><div wicket:id='b'></div></wicket:enclosure>"); @@ -520,7 +521,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void autos4() + void autos4() { TestPage p = new TestPage(); p.setPageMarkup("<wicket:enclosure child='a'><div wicket:id='a'></div><div wicket:id='b'></div></wicket:enclosure>"); @@ -547,7 +548,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void autos5() + void autos5() { TestPage p = new TestPage(); p.setPageMarkup("<wicket:enclosure child='a'><div wicket:id='a'></div><div wicket:id='b'></div></wicket:enclosure>"); @@ -578,7 +579,7 @@ public class ComponentQueueingTest extends WicketTestCase * Test InlineEnclosure */ @Test - public void autos6() + void autos6() { TestPage p = new TestPage(); p.setPageMarkup("<div wicket:enclosure='a'><div wicket:id='a'></div><div wicket:id='b'></div></div>"); @@ -607,7 +608,7 @@ public class ComponentQueueingTest extends WicketTestCase * Test empty child attribute */ @Test - public void autos7() + void autos7() { TestPage p = new TestPage(); p.setPageMarkup("<wicket:enclosure child=''><div wicket:id='a'></div></wicket:enclosure>"); @@ -636,7 +637,7 @@ public class ComponentQueueingTest extends WicketTestCase * Test autocomponent inside not-queue region */ @Test - public void autosInsideNotQueueRegion() + void autosInsideNotQueueRegion() { TestPage p = new TestPage(); p.setPageMarkup("<div wicket:id='outerContainer'><wicket:enclosure><div wicket:id='a'></div></wicket:enclosure></div>"); @@ -651,7 +652,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void border1() + void border1() { MarkupContainer a = new A(), b = new B(), r = new R(), s = new S(); @@ -671,7 +672,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void queueBorderBody() throws Exception + void queueBorderBody() throws Exception { TestBorder border = new TestBorder("border"); @@ -687,7 +688,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void border_nested() + void border_nested() { MarkupContainer a = new A(), b = new B(), c= new C(), d = new D(), r = new R(), s = new S(); @@ -714,7 +715,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void fragment1() { + void fragment1() { MarkupContainer a = new A(), b = new B(), r = new R(), s = new S(); TestPage page = new TestPage(); @@ -733,7 +734,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void fragment_doesNotDequeueAcrossRegion() + void fragment_doesNotDequeueAcrossRegion() { MarkupContainer a = new A(); @@ -745,12 +746,12 @@ public class ComponentQueueingTest extends WicketTestCase page.queue(a, fragment); assertThat(page, hasPath(new Path(fragment))); - assertThat(a.getParent(), is(nullValue())); + assertNull(a.getParent()); } @Test - public void containerTag1() + void containerTag1() { MarkupContainer a = new A(), b = new B(); @@ -763,7 +764,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void queueInsideHeader() + void queueInsideHeader() { TestPage page = new TestPage(); page.setPageMarkup("<html>" @@ -781,7 +782,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void queueInsideAutoLink() + void queueInsideAutoLink() { TestPage page = new TestPage(); page.setPageMarkup("<wicket:link>" @@ -795,7 +796,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void queueInsideLabelComponent() + void queueInsideLabelComponent() { TestPage page = new TestPage(); page.setPageMarkup("<label wicket:for='input'>" @@ -809,7 +810,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void queueInsideTransparentContainer() throws Exception + void queueInsideTransparentContainer() throws Exception { TestPage page = new TestPage(); page.setPageMarkup("<div wicket:id='transparentContainer'>" @@ -827,7 +828,7 @@ public class ComponentQueueingTest extends WicketTestCase } @Test - public void queueNestedEnclosure() + void queueNestedEnclosure() { TestPage page = new TestPage(); page.setPageMarkup( "<div wicket:enclosure='outer'>" + @@ -855,7 +856,7 @@ public class ComponentQueueingTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-6088 */ @Test - public void queueComponentInsideWcAndEnclosure() + void queueComponentInsideWcAndEnclosure() { TestPage page = new TestPage(); page.setPageMarkup(" <div wicket:id=\"container\">\n" + @@ -885,7 +886,7 @@ public class ComponentQueueingTest extends WicketTestCase tester.startPage(page); } @Test - public void queueComponentInsideBorderAndEnclosure() + void queueComponentInsideBorderAndEnclosure() { TestPage page = new TestPage(); page.setPageMarkup(" <div wicket:id=\"panel\"></div>"); @@ -913,7 +914,7 @@ public class ComponentQueueingTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-6036 */ @Test - public void nestedTags() + void nestedTags() { IncorrectCloseTagPanel p = new IncorrectCloseTagPanel("test"); tester.startComponentInPage(p); @@ -923,7 +924,7 @@ public class ComponentQueueingTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-6077 */ @Test - public void bodyIsAChild() { + void bodyIsAChild() { tester.startPage(BodyIsAChildPage.class); tester.assertRenderedPage(BodyIsAChildPage.class); @@ -943,7 +944,7 @@ public class ComponentQueueingTest extends WicketTestCase private static class A extends WebMarkupContainer { - public A() + A() { super("a"); } @@ -951,7 +952,7 @@ public class ComponentQueueingTest extends WicketTestCase private static class B extends WebMarkupContainer { - public B() + B() { super("b"); } @@ -959,7 +960,7 @@ public class ComponentQueueingTest extends WicketTestCase private static class C extends WebMarkupContainer { - public C() + C() { super("c"); } @@ -967,7 +968,7 @@ public class ComponentQueueingTest extends WicketTestCase private static class D extends WebMarkupContainer { - public D() + D() { super("d"); } @@ -975,7 +976,7 @@ public class ComponentQueueingTest extends WicketTestCase private static class E extends WebMarkupContainer { - public E() + E() { super("e"); } @@ -983,14 +984,14 @@ public class ComponentQueueingTest extends WicketTestCase private static class F extends WebMarkupContainer { - public F() + F() { super("f"); } } private static class G extends WebMarkupContainer { - public G() + G() { super("g"); } @@ -998,7 +999,7 @@ public class ComponentQueueingTest extends WicketTestCase private static class R extends WebMarkupContainer { - public R() + R() { super("r"); } @@ -1006,7 +1007,7 @@ public class ComponentQueueingTest extends WicketTestCase private static class S extends WebMarkupContainer { - public S() + S() { super("s"); } @@ -1014,7 +1015,7 @@ public class ComponentQueueingTest extends WicketTestCase private static abstract class LV extends ListView<Integer> { - public LV(int size) + LV(int size) { super("lv"); ArrayList<Integer> values = new ArrayList<>(); @@ -1028,7 +1029,7 @@ public class ComponentQueueingTest extends WicketTestCase { private boolean clicked = false; - public L() + L() { super("l"); } @@ -1039,7 +1040,7 @@ public class ComponentQueueingTest extends WicketTestCase clicked = true; } - public boolean isClicked() + boolean isClicked() { return clicked; } @@ -1050,7 +1051,7 @@ public class ComponentQueueingTest extends WicketTestCase { private String markup; - public TestPage() + TestPage() { } @@ -1059,12 +1060,12 @@ public class ComponentQueueingTest extends WicketTestCase this.markup = markup; } - protected String getPageMarkup() + String getPageMarkup() { return markup; } - public void setPageMarkup(String markup) + void setPageMarkup(String markup) { this.markup = markup; } @@ -1082,17 +1083,17 @@ public class ComponentQueueingTest extends WicketTestCase { private String markup; - public TestPanel(String id) + TestPanel(String id) { super(id); } - protected void setPanelMarkup(String markup) + void setPanelMarkup(String markup) { this.markup = markup; } - protected String getPanelMarkup() + String getPanelMarkup() { return markup; } @@ -1109,17 +1110,17 @@ public class ComponentQueueingTest extends WicketTestCase { private String markup; - public TestBorder(String id) + TestBorder(String id) { super(id); } - protected void setBorderMarkup(String markup) + void setBorderMarkup(String markup) { this.markup = markup; } - protected String getBorderMarkup() + String getBorderMarkup() { return markup; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/Path.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/Path.java b/wicket-core/src/test/java/org/apache/wicket/queueing/Path.java index 7e0aa9a..444c8f4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/Path.java +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/Path.java @@ -27,7 +27,7 @@ class Path implements Iterable<Path.Segment> private List<Segment> segments; - public Path() + private Path() { segments = new ArrayList<>(); } @@ -38,7 +38,7 @@ class Path implements Iterable<Path.Segment> add(components); } - public Path add(Class<?> type, String id) + private Path add(Class<?> type, String id) { segments.add(new Segment(type, id)); return this; @@ -81,7 +81,7 @@ class Path implements Iterable<Path.Segment> Class<?> type; String id; - public Segment(Class<?> type, String id) + Segment(Class<?> type, String id) { this.type = type; this.id = id; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/FormGroup.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/FormGroup.java b/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/FormGroup.java index beaf770..f9cbe60 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/FormGroup.java +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/FormGroup.java @@ -16,6 +16,10 @@ */ package org.apache.wicket.queueing.bodyisachild; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + import org.apache.wicket.AttributeModifier; import org.apache.wicket.Component; import org.apache.wicket.feedback.FeedbackMessage; @@ -31,14 +35,10 @@ import org.apache.wicket.util.string.Strings; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; - /** * Simplified copy from Wicket-Bootstrap */ -public class FormGroup extends Border +class FormGroup extends Border { private Component label; private Component help; @@ -63,7 +63,7 @@ public class FormGroup extends Border * * @param id the wicket component id */ - public FormGroup(final String id, final IModel<String> label, final IModel<String> help) + private FormGroup(final String id, final IModel<String> label, final IModel<String> help) { super(id, Model.of("")); @@ -79,7 +79,7 @@ public class FormGroup extends Border * @param model the content model for this component * @return new label */ - protected Component newLabel(final String id, final IModel<String> model) + private Component newLabel(final String id, final IModel<String> model) { return new Label(id, model); } @@ -90,7 +90,7 @@ public class FormGroup extends Border * @param id the component id * @return new feedback message container */ - protected Component newFeedbackMessageContainer(final String id) + private Component newFeedbackMessageContainer(final String id) { return new Label(id, new Model<String>()); } @@ -103,7 +103,7 @@ public class FormGroup extends Border * @param model the content model for this component * @return new help label */ - protected Component newHelpLabel(final String id, final IModel<String> model) + private Component newHelpLabel(final String id, final IModel<String> model) { return new Label(id, model); } @@ -174,7 +174,7 @@ public class FormGroup extends Border * * @param formComponents the form components to add the output markup id */ - protected void addOutputMarkupId(List<FormComponent<?>> formComponents) + private void addOutputMarkupId(List<FormComponent<?>> formComponents) { for (final FormComponent<?> fc : formComponents) { @@ -216,7 +216,7 @@ public class FormGroup extends Border /** * @return all form components that are assigned to this {@link FormGroup} */ - List<FormComponent<?>> findFormComponents() + private List<FormComponent<?>> findFormComponents() { final List<FormComponent<?>> components = new ArrayList<>(); getBodyContainer().visitChildren(FormComponent.class, new IVisitor<FormComponent, Void>() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/LoginPanel.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/LoginPanel.java b/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/LoginPanel.java index a8a3792..336b0ec 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/LoginPanel.java +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/bodyisachild/LoginPanel.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.queueing.bodyisachild; +import java.io.Serializable; + import org.apache.wicket.markup.html.form.FormComponent; import org.apache.wicket.markup.html.form.PasswordTextField; import org.apache.wicket.markup.html.form.StatelessForm; @@ -24,8 +26,6 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.CompoundPropertyModel; import org.apache.wicket.model.Model; -import java.io.Serializable; - public class LoginPanel extends Panel { public final Pojo pojo = new Pojo(); @@ -44,7 +44,7 @@ public class LoginPanel extends Panel class LoginForm extends StatelessForm { - public LoginForm(String id) { + LoginForm(String id) { super(id); setModel(new CompoundPropertyModel<>(pojo)); add(createValidatingFormField(new TextField("username").setRequired(true), "yourUsernameHeadline")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java index cae1951..2fd010b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/BasePage.java @@ -22,7 +22,7 @@ import org.apache.wicket.request.mapper.parameter.PageParameters; public class BasePage extends WebPage { private static final long serialVersionUID = 1L; - public BasePage(final PageParameters parameters) { + BasePage(final PageParameters parameters) { super(parameters); add(new HtmlTag("html")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java index 6ac7d4a..16e3a49 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/DequeueingTransparentWebMarkupContainerTest.java @@ -16,15 +16,17 @@ */ package org.apache.wicket.queueing.transparentresolvers; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.Component; import org.apache.wicket.Page; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.visit.IVisit; import org.apache.wicket.util.visit.IVisitor; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class DequeueingTransparentWebMarkupContainerTest extends WicketTestCase +class DequeueingTransparentWebMarkupContainerTest extends WicketTestCase { /** * Test case for: @@ -33,7 +35,7 @@ public class DequeueingTransparentWebMarkupContainerTest extends WicketTestCase * - https://issues.apache.org/jira/browse/WICKET-5728 */ @Test - public void startSubPageWithTWMCinTheParentPage() + void startSubPageWithTWMCinTheParentPage() { tester.startPage(SubPage.class); tester.assertRenderedPage(SubPage.class); @@ -52,7 +54,7 @@ public class DequeueingTransparentWebMarkupContainerTest extends WicketTestCase * Queuing a component within an enclosure */ @Test - public void queuedComponentsInsideTransparentContainer() + void queuedComponentsInsideTransparentContainer() { tester.startPage(TransparentContainerQueuePage.class); tester.assertRenderedPage(TransparentContainerQueuePage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/HtmlTag.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/HtmlTag.java b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/HtmlTag.java index 2083604..5bec434 100644 --- a/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/HtmlTag.java +++ b/wicket-core/src/test/java/org/apache/wicket/queueing/transparentresolvers/HtmlTag.java @@ -21,7 +21,7 @@ import org.apache.wicket.markup.html.TransparentWebMarkupContainer; /** * */ -public class HtmlTag extends TransparentWebMarkupContainer +class HtmlTag extends TransparentWebMarkupContainer { /** * Construct. http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java b/wicket-core/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java index ab9570f..7d0b398 100644 --- a/wicket-core/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/redirect/RestartWithMountedPageTest.java @@ -17,18 +17,18 @@ package org.apache.wicket.redirect; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** */ -public class RestartWithMountedPageTest extends WicketTestCase +class RestartWithMountedPageTest extends WicketTestCase { /** * Tests that a protected page can redirect to a login page from mounted pages. */ @Test - public void testWithMountedLoginPage() + void testWithMountedLoginPage() { tester.getApplication().mountPage("/login", LoginPage.class); tester.startPage(ProtectedPage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java b/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java index cf361c2..cb3bb2b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/redirect/abort/AbortExceptionTest.java @@ -16,11 +16,13 @@ */ package org.apache.wicket.redirect.abort; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.wicket.request.http.flow.AbortWithHttpErrorCodeException; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Testcase for WICKET-1418, throwing an abortexception during rendering. @@ -30,36 +32,36 @@ import org.junit.Test; * * @see <a href="https://issues.apache.org/jira/browse/WICKET-1418";>WICKET-1418</a> */ -public class AbortExceptionTest extends WicketTestCase +class AbortExceptionTest extends WicketTestCase { /** * Test page without throwing abort. */ @Test - public void testNoAbort() + void testNoAbort() { tester.startPage(AbortExceptionPage.class, new PageParameters().set("trigger", false)); - Assert.assertEquals(1234, tester.getLastResponse().getStatus()); + assertEquals(1234, tester.getLastResponse().getStatus()); } /** * Test page with throwing abort. */ @Test - public void testAbort() + void testAbort() { try { tester.startPage(AbortExceptionPage.class, new PageParameters().set("trigger", true)); - Assert.assertEquals(1234, tester.getLastResponse().getStatus()); // this will + assertEquals(1234, tester.getLastResponse().getStatus()); // this will // fail } catch (RuntimeException x) { final Throwable reason = x.getCause(); - Assert.assertEquals(reason.getClass(), AbortWithHttpErrorCodeException.class); - Assert.fail("this must not happen (we expect a redirect happen here and handled by wicket request processor)"); + assertEquals(reason.getClass(), AbortWithHttpErrorCodeException.class); + fail("this must not happen (we expect a redirect happen here and handled by wicket request processor)"); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java b/wicket-core/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java index 469fc87..d3e5829 100644 --- a/wicket-core/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/redirect/intercept/InterceptTest.java @@ -23,7 +23,7 @@ import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.request.component.IRequestableComponent; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Testcase for bug WICKET-1292. @@ -31,7 +31,7 @@ import org.junit.Test; * @see <a href="https://issues.apache.org/jira/browse/WICKET-1292";>WICKET-1292</a> * @author marrink */ -public class InterceptTest extends WicketTestCase +class InterceptTest extends WicketTestCase { @Override @@ -76,7 +76,7 @@ public class InterceptTest extends WicketTestCase * Tests a non homepage class. */ @Test - public void testRestartResponseAtInterceptPageAndContinueTorOriginalDestination() + void testRestartResponseAtInterceptPageAndContinueTorOriginalDestination() { tester.startPage(TargetPage.class); tester.assertRenderedPage(InterceptPage.class); @@ -89,7 +89,7 @@ public class InterceptTest extends WicketTestCase * Tests homepage class. */ @Test - public void testRestartResponseAtInterceptPageAndContinueTorOriginalDestination2() + void testRestartResponseAtInterceptPageAndContinueTorOriginalDestination2() { tester.startPage(HomePage.class); tester.assertRenderedPage(InterceptPage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderApplication.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderApplication.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderApplication.java index e75d140..aa057e7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderApplication.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderApplication.java @@ -48,7 +48,7 @@ class MultiRequestCycleListenerCallOrderApplication extends WebApplication { private String name; - public CallRecordingListener(String name) + CallRecordingListener(String name) { this.name = name; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderTest.java index ca203df..f0b5723 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/MultiRequestCycleListenerCallOrderTest.java @@ -17,28 +17,29 @@ package org.apache.wicket.request.cycle; import static java.util.Arrays.asList; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.List; import org.apache.wicket.protocol.http.WebApplication; 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; /** * Checks whether multiple registered requestcycle listeners are called in the right order: * similarly to servlet filters. */ -public class MultiRequestCycleListenerCallOrderTest extends WicketTestCase +class MultiRequestCycleListenerCallOrderTest extends WicketTestCase { private MultiRequestCycleListenerCallOrderApplication application; /** * */ - @Before - public void before() + @BeforeEach + void before() { application = (MultiRequestCycleListenerCallOrderApplication)tester.getApplication(); application.callSequence.clear(); @@ -53,7 +54,7 @@ public class MultiRequestCycleListenerCallOrderTest extends WicketTestCase /** */ @Test - public void bookmarkableCallSequenceIsFirstInLastOut() + void bookmarkableCallSequenceIsFirstInLastOut() { // start and render the test page tester.startPage(MultiRequestCycleListenerCallOrderPage.class); @@ -79,7 +80,7 @@ public class MultiRequestCycleListenerCallOrderTest extends WicketTestCase /** */ @Test - public void sessionRelativePageRequestCallSequenceIsFirstInLastOut() + void sessionRelativePageRequestCallSequenceIsFirstInLastOut() { // start and render the test page tester.startPage(new MultiRequestCycleListenerCallOrderPage()); @@ -104,7 +105,7 @@ public class MultiRequestCycleListenerCallOrderTest extends WicketTestCase /** */ @Test - public void linkListenerCallSequenceIsFirstInLastOut() + void linkListenerCallSequenceIsFirstInLastOut() { // start and render the test page tester.startPage(new MultiRequestCycleListenerCallOrderPage()); @@ -137,7 +138,7 @@ public class MultiRequestCycleListenerCallOrderTest extends WicketTestCase /** */ @Test - public void ajaxlinkListenerCallSequenceIsFirstInLastOut() + void ajaxlinkListenerCallSequenceIsFirstInLastOut() { // start and render the test page tester.startPage(new MultiRequestCycleListenerCallOrderPage()); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java index c0a7d0a..ce684c5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/PageRequestHandlerTrackerTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.request.cycle; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; + import org.apache.wicket.MarkupContainer; import org.apache.wicket.core.request.handler.IPageRequestHandler; import org.apache.wicket.core.request.handler.RequestSettingRequestHandler; @@ -30,17 +33,17 @@ import org.apache.wicket.request.mapper.IRequestMapperDelegate; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; 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; /** * @since 1.5.8 */ -public class PageRequestHandlerTrackerTest extends WicketTestCase +class PageRequestHandlerTrackerTest extends WicketTestCase { - @Before - public void before() + @BeforeEach + void before() { tester.getApplication().getRequestCycleListeners().add(new PageRequestHandlerTracker()); } @@ -50,7 +53,7 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-4624 */ @Test - public void trackPages() + void trackPages() { tester.getApplication().getRequestCycleListeners().add(new IRequestCycleListener() { @@ -78,7 +81,7 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase * Uses PageRequestHandlerTracker to check last IRequestHandler encapsulated in IRequestHandlerDelegate */ @Test - public void trackPagesWithMapperDelegate() + void trackPagesWithMapperDelegate() { IRequestMapper mapper = tester.getApplication().getRootRequestMapper(); tester.getApplication().setRootRequestMapper(new MapperDelegate(mapper)); @@ -92,7 +95,7 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase */ private static class PageA extends WebPage implements IMarkupResourceStreamProvider { - public PageA() + PageA() { // make stateful so it is rendered in first requestCycle (without redirect) setStatelessHint(false); @@ -105,7 +108,7 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase IPageRequestHandler lastHandler = PageRequestHandlerTracker.getLastHandler(getRequestCycle()); - assertNotNull("Last handler is null: probably issue in IRequestHandlerDelegate support", lastHandler); + assertNotNull(lastHandler, "Last handler is null: probably issue in IRequestHandlerDelegate support"); setResponsePage(new PageB()); } @@ -136,7 +139,7 @@ public class PageRequestHandlerTrackerTest extends WicketTestCase { IRequestMapper mapper; - public MapperDelegate(IRequestMapper mapper) + MapperDelegate(IRequestMapper mapper) { this.mapper = mapper; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerDetachOrderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerDetachOrderTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerDetachOrderTest.java index ae527b4..70e82f7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerDetachOrderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerDetachOrderTest.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.request.cycle; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.List; @@ -27,7 +27,7 @@ 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.WicketTester; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** @@ -41,7 +41,7 @@ import org.junit.Test; public class RequestCycleListenerDetachOrderTest { @Test - public void pageDetachedBeforeListener() + void pageDetachedBeforeListener() { List<Event> events = new ArrayList<Event>(); @@ -57,7 +57,7 @@ public class RequestCycleListenerDetachOrderTest { private final List<Event> events; - public TestListener(List<Event> events) + TestListener(List<Event> events) { this.events = events; } @@ -73,7 +73,7 @@ public class RequestCycleListenerDetachOrderTest { private final List<Event> events; - public TestPage(List<Event> events) + TestPage(List<Event> events) { this.events = events; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java index 12588a5..f37bbb6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleListenerTest.java @@ -16,8 +16,8 @@ */ package org.apache.wicket.request.cycle; -import static org.junit.Assert.assertEquals; -import static org.junit.Assert.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; import org.apache.wicket.Application; import org.apache.wicket.ThreadContext; @@ -32,14 +32,14 @@ import org.apache.wicket.request.RequestHandlerExecutor.ReplaceHandlerException; import org.apache.wicket.request.Response; import org.apache.wicket.request.Url; import org.apache.wicket.resource.DummyApplication; -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; /** * @author Jeremy Thomerson */ -public class RequestCycleListenerTest extends RequestHandlerExecutorTest +class RequestCycleListenerTest extends RequestHandlerExecutorTest { private IRequestHandler handler; @@ -52,8 +52,8 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest private int exceptionsMapped; /** */ - @Before - public void setUp() + @BeforeEach + void setUp() { DummyApplication application = new DummyApplication(); application.setName("dummyTestApplication"); @@ -64,8 +64,8 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest } /** */ - @After - public void tearDown() + @AfterEach + void tearDown() { ThreadContext.getApplication().internalDestroy(); ThreadContext.detach(); @@ -140,7 +140,7 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest * @throws Exception */ @Test - public void basicOperations() throws Exception + void basicOperations() throws Exception { IncrementingListener incrementingListener = new IncrementingListener(); Application.get().getRequestCycleListeners().add(incrementingListener); @@ -237,7 +237,7 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest /** */ @Test - public void exceptionIsHandledByRegisteredHandler() + void exceptionIsHandledByRegisteredHandler() { IncrementingListener incrementingListener = new IncrementingListener(); Application.get().getRequestCycleListeners().add(incrementingListener); @@ -255,7 +255,7 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest /** */ @Test - public void exceptionIsHandledByFirstAvailableHandler() + void exceptionIsHandledByFirstAvailableHandler() { // when two listeners return a handler Application.get().getRequestCycleListeners().add(new ErrorCodeListener(401)); @@ -272,7 +272,7 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest * @throws Exception */ @Test - public void exceptionHandlingInOnDetach() throws Exception + void exceptionHandlingInOnDetach() throws Exception { // this test is a little flaky because it depends on the ordering of listeners which is not // guaranteed @@ -310,7 +310,7 @@ public class RequestCycleListenerTest extends RequestHandlerExecutorTest { private final int code; - public ErrorCodeListener(int code) + ErrorCodeListener(int code) { this.code = code; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java index 6c99eef..2602643 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java @@ -16,6 +16,7 @@ */ package org.apache.wicket.request.cycle; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; @@ -35,9 +36,8 @@ import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.caching.IStaticCacheableResource; import org.apache.wicket.response.StringResponse; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; import org.mockito.ArgumentMatcher; /** @@ -45,17 +45,17 @@ import org.mockito.ArgumentMatcher; * * https://issues.apache.org/jira/browse/WICKET-4334 */ -public class RequestCycleUrlForTest extends Assert +class RequestCycleUrlForTest { private static final String JSESSIONID = ";jsessionid=1234567890"; private static final String BOOKMARKABLE_PAGE_URL = "bookmarkablePage"; private static final String RES_REF_URL = "resRef"; private static final String RESOURCE_URL = "res"; - RequestCycle requestCycle; + private RequestCycle requestCycle; - @Before - public void before() + @BeforeEach + void before() { Request request = mock(Request.class); Url baseUrl = Url.parse(""); @@ -92,7 +92,7 @@ public class RequestCycleUrlForTest extends Assert * @throws Exception */ @Test - public void urlForClass() throws Exception + void urlForClass() throws Exception { CharSequence url = requestCycle.urlFor(MockHomePage.class, new PageParameters()); assertEquals("./bookmarkablePage"+JSESSIONID, url); @@ -104,7 +104,7 @@ public class RequestCycleUrlForTest extends Assert * @throws Exception */ @Test - public void urlForResourceReference() throws Exception + void urlForResourceReference() throws Exception { final IStaticCacheableResource resource = mock(IStaticCacheableResource.class); ResourceReference reference = new ResourceReference("dummy") @@ -126,7 +126,7 @@ public class RequestCycleUrlForTest extends Assert * @throws Exception */ @Test - public void urlForResourceReferenceWithNonStaticResource() throws Exception + void urlForResourceReferenceWithNonStaticResource() throws Exception { final IResource resource = mock(IResource.class); ResourceReference reference = new ResourceReference("dummy") @@ -148,7 +148,7 @@ public class RequestCycleUrlForTest extends Assert * @throws Exception */ @Test - public void urlForStaticResource() throws Exception + void urlForStaticResource() throws Exception { IStaticCacheableResource resource = mock(IStaticCacheableResource.class); ResourceRequestHandler handler = new ResourceRequestHandler(resource, new PageParameters()); @@ -162,7 +162,7 @@ public class RequestCycleUrlForTest extends Assert * @throws Exception */ @Test - public void urlForDynamicResource() throws Exception + void urlForDynamicResource() throws Exception { ByteArrayResource resource = new ByteArrayResource(null, new byte[] {1, 2}, "test.bin"); ResourceRequestHandler handler = new ResourceRequestHandler(resource, new PageParameters()); @@ -180,7 +180,7 @@ public class RequestCycleUrlForTest extends Assert { private final Class<T> targetClass; - public ExactClassMatcher(Class<T> targetClass) + ExactClassMatcher(Class<T> targetClass) { this.targetClass = targetClass; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerExecutorTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerExecutorTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerExecutorTest.java index 5d9bab3..eb42129 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerExecutorTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestHandlerExecutorTest.java @@ -26,9 +26,9 @@ import org.apache.wicket.request.UrlRenderer; /** * @author Jeremy Thomerson */ -public abstract class RequestHandlerExecutorTest +abstract class RequestHandlerExecutorTest { - protected Response newResponse() + Response newResponse() { return new Response() { @@ -70,7 +70,7 @@ public abstract class RequestHandlerExecutorTest { Response response; - public MockRequestCycle(Response response) + MockRequestCycle(Response response) { this.response = response; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/RerenderPageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RerenderPageTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RerenderPageTest.java index 21af8c4..98d7a4c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RerenderPageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RerenderPageTest.java @@ -17,18 +17,19 @@ package org.apache.wicket.request.cycle; import static org.hamcrest.CoreMatchers.containsString; +import static org.hamcrest.MatcherAssert.assertThat; import org.apache.wicket.core.request.mapper.MountedMapper; import org.apache.wicket.protocol.http.mock.MockHttpServletResponse; import org.apache.wicket.request.cycle.RerenderPage.Supplier; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test cases for re-rendering pages. */ -public class RerenderPageTest extends WicketTestCase +class RerenderPageTest extends WicketTestCase { /** * A testcase for WICKET-5960. @@ -38,7 +39,7 @@ public class RerenderPageTest extends WicketTestCase * because it was already rendered in the first try. */ @Test - public void wicket5960() + void wicket5960() { // mount the page so we have URL segments tester.getApplication().mount(new MountedMapper("/rerender/${value}", RerenderPage.class)); @@ -80,7 +81,7 @@ public class RerenderPageTest extends WicketTestCase * <head>} section to be rendered. This test case walks Wicket through this scenario. */ @Test - public void nonAjaxRequestAfterAjaxUpdatedComponentShouldHaveHtmlHeadSection() + void nonAjaxRequestAfterAjaxUpdatedComponentShouldHaveHtmlHeadSection() { // perform a normal render of the page tester.startPage(RerenderAjaxPage.class);
