http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java index a64ae61..d1c6809 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/UrlRendererTest.java @@ -17,27 +17,28 @@ package org.apache.wicket.request.cycle; import static java.util.Arrays.asList; -import static org.hamcrest.CoreMatchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; +import static org.junit.jupiter.api.Assertions.fail; import java.util.Arrays; import org.apache.wicket.mock.MockWebRequest; import org.apache.wicket.request.Url; import org.apache.wicket.request.UrlRenderer; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Matej Knopp */ -public class UrlRendererTest extends Assert +class UrlRendererTest { /** * */ @Test - public void test1() + void test1() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("foo/bar/baz?a=b"))); assertEquals("./xyz?x=y", r1.renderUrl(Url.parse("foo/bar/xyz?x=y"))); @@ -50,7 +51,7 @@ public class UrlRendererTest extends Assert * */ @Test - public void test2() + void test2() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("foo/bar/baz?a=b"))); assertEquals("../../foo?x=y", r1.renderUrl(Url.parse("foo?x=y"))); @@ -61,7 +62,7 @@ public class UrlRendererTest extends Assert * */ @Test - public void test3() + void test3() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("?a=b"))); assertEquals("./a/b/c?x=y", r1.renderUrl(Url.parse("a/b/c?x=y"))); @@ -71,7 +72,7 @@ public class UrlRendererTest extends Assert * */ @Test - public void test5() + void test5() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("url"))); assertEquals("./url?1", r1.renderUrl(Url.parse("url?1"))); @@ -81,7 +82,7 @@ public class UrlRendererTest extends Assert * */ @Test - public void test6() + void test6() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("url/"))); assertEquals("./x?1", r1.renderUrl(Url.parse("url/x?1"))); @@ -91,7 +92,7 @@ public class UrlRendererTest extends Assert * */ @Test - public void test7() + void test7() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest( Url.parse("MyTestPage/indexed1/indexed2/indexed3?10-27.ILinkListener-l2&p1=v1"))); @@ -102,7 +103,7 @@ public class UrlRendererTest extends Assert * */ @Test - public void test8() + void test8() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest( Url.parse("en/first-test-page?16-1.ILinkListener-l1"))); @@ -114,7 +115,7 @@ public class UrlRendererTest extends Assert * */ @Test - public void test9() + void test9() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("a/b/q/d/e"))); assertEquals("../../../q/c/d/e", r1.renderUrl(Url.parse("a/q/c/d/e"))); @@ -124,7 +125,7 @@ public class UrlRendererTest extends Assert * */ @Test - public void test10() + void test10() { MockWebRequest request = new MockWebRequest(Url.parse("a/b/q/d/e"), "/contextPath", "/filterPath", "../"); @@ -150,7 +151,7 @@ public class UrlRendererTest extends Assert * <a href="https://issues.apache.org/jira/browse/WICKET-3337";>WICKET-3337</a> */ @Test - public void test11() + void test11() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("a"))); assertEquals(".", r1.renderUrl(Url.parse(""))); @@ -160,7 +161,7 @@ public class UrlRendererTest extends Assert * <a href="https://issues.apache.org/jira/browse/WICKET-3567";>WICKET-3567</a> */ @Test - public void test12() + void test12() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("?0"))); assertEquals("./", r1.renderUrl(Url.parse(""))); @@ -173,7 +174,7 @@ public class UrlRendererTest extends Assert * '../' works better. */ @Test - public void test13() + void test13() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("foo/bar"))); assertEquals("../", r1.renderUrl(Url.parse(""))); @@ -183,7 +184,7 @@ public class UrlRendererTest extends Assert * WICKET-4920 prevent double slash */ @Test - public void test14() + void test14() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest(new Url())); @@ -193,7 +194,7 @@ public class UrlRendererTest extends Assert } @Test - public void rendersRelativeUrl() + void rendersRelativeUrl() { Url contextRelativeUrl = new Url(); contextRelativeUrl.setProtocol("http"); @@ -203,14 +204,14 @@ public class UrlRendererTest extends Assert contextRelativeUrl.getSegments().addAll(asList("", "")); UrlRenderer r1 = new UrlRenderer(new MockWebRequest(contextRelativeUrl)); - assertThat(r1.renderRelativeUrl(Url.parse("foo")), is("../foo")); + assertEquals("../foo", r1.renderRelativeUrl(Url.parse("foo"))); } /** * WICKET-4935 prevent another double slash */ @Test - public void test15() + void test15() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("private/AdminPage"))); @@ -222,7 +223,7 @@ public class UrlRendererTest extends Assert * prevent another double slash when common prefix is present */ @Test - public void test16() + void test16() { UrlRenderer r1 = new UrlRenderer( new MockWebRequest(Url.parse("private/AdminPage")).setContextPath("context")); @@ -235,7 +236,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5468 */ @Test - public void renderUrlWithTrailingDotsInQueryString() + void renderUrlWithTrailingDotsInQueryString() { UrlRenderer r1 = new UrlRenderer(new MockWebRequest(Url.parse("some/path"))); @@ -249,7 +250,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-4466 */ @Test - public void renderAbsoluteUrl() + void renderAbsoluteUrl() { String absoluteUrl = "http://www.example.com/some/path.ext";; Url url = Url.parse(absoluteUrl); @@ -259,7 +260,7 @@ public class UrlRendererTest extends Assert } @Test - public void renderFullUrlWithRelativeArgument() + void renderFullUrlWithRelativeArgument() { Url baseUrl = Url.parse("one/two/three"); baseUrl.setProtocol("http"); @@ -275,7 +276,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-4514 */ @Test - public void renderFullUrlWithAbsoluteArgument() + void renderFullUrlWithAbsoluteArgument() { Url baseUrl = Url.parse("one/two/three"); baseUrl.setProtocol("http"); @@ -293,7 +294,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-4562 */ @Test - public void renderUrlWithRelativeArgument() + void renderUrlWithRelativeArgument() { Url baseUrl = Url.parse("one/two/three"); UrlRenderer renderer = new UrlRenderer(new MockWebRequest(baseUrl)); @@ -334,7 +335,7 @@ public class UrlRendererTest extends Assert } @Test - public void renderFullUrlAsRelativeToAnAbsoluteBaseUrl() + void renderFullUrlAsRelativeToAnAbsoluteBaseUrl() { Url baseUrl = Url.parse("http://host:8080/contextPath/filterPath/a/b/c/d";); Url encodedFullUrl = Url.parse("http://host:8080/contextPath/filterPath/a/b;jsessionid=123456";); @@ -346,7 +347,7 @@ public class UrlRendererTest extends Assert } @Test - public void renderFullUrlAsRelativeToBaseUrlWithoutSchemeHostnameAndPort() + void renderFullUrlAsRelativeToBaseUrlWithoutSchemeHostnameAndPort() { Url baseUrl = Url.parse("/contextPath/filterPath/a/b/c/d"); Url encodedFullUrl = Url.parse("http://host:8080/contextPath/filterPath/a/b;jsessionid=123456";); @@ -358,7 +359,7 @@ public class UrlRendererTest extends Assert } @Test - public void renderFullUrlAsRelativeToBaseUrlWithoutContextAndFilterPaths() + void renderFullUrlAsRelativeToBaseUrlWithoutContextAndFilterPaths() { Url baseUrl = Url.parse("a/b/c/d"); // base url without context path and filter path Url encodedFullUrl = Url.parse("http://host:8080/contextPath/filterPath/a/b;jsessionid=123456";); @@ -373,7 +374,7 @@ public class UrlRendererTest extends Assert } @Test - public void renderFullUrlAsRelativeToBaseUrlWithoutComposedContextAndFilterPaths() + void renderFullUrlAsRelativeToBaseUrlWithoutComposedContextAndFilterPaths() { Url baseUrl = Url.parse("a/b/c/d"); // base url without context path and filter path Url encodedFullUrl = Url.parse("http://host:8080/context/path/filter/path/a/b;jsessionid=123456";); @@ -388,7 +389,7 @@ public class UrlRendererTest extends Assert } @Test - public void renderFullUrlAsRelativeToBaseUrlWithoutContextPath() + void renderFullUrlAsRelativeToBaseUrlWithoutContextPath() { Url baseUrl = Url.parse("a/b/c/d"); // base url without context path and filter path Url encodedFullUrl = Url.parse("http://host:8080/filterPath/a/b;jsessionid=123456";); @@ -402,7 +403,7 @@ public class UrlRendererTest extends Assert } @Test - public void renderFullUrlAsRelativeToBaseUrlWithoutComposedContextPath() + void renderFullUrlAsRelativeToBaseUrlWithoutComposedContextPath() { Url baseUrl = Url.parse("a/b/c/d"); // base url without context path and filter path Url encodedFullUrl = Url.parse("http://host:8080/filter/path/a/b;jsessionid=123456";); @@ -416,7 +417,7 @@ public class UrlRendererTest extends Assert } @Test - public void renderFullUrlAsRelativeToBaseUrlWithoutFilterPath() + void renderFullUrlAsRelativeToBaseUrlWithoutFilterPath() { Url baseUrl = Url.parse("a/b/c/d"); // base url without context path and filter path Url encodedFullUrl = Url.parse("http://host:8080/contextPath/a/b;jsessionid=123456";); @@ -430,7 +431,7 @@ public class UrlRendererTest extends Assert } @Test - public void renderFullUrlAsRelativeToBaseUrlWithoutComposedFilterPath() + void renderFullUrlAsRelativeToBaseUrlWithoutComposedFilterPath() { Url baseUrl = Url.parse("a/b/c/d"); // base url without context path and filter path Url encodedFullUrl = Url.parse("http://host:8080/context/path/a/b;jsessionid=123456";); @@ -444,7 +445,7 @@ public class UrlRendererTest extends Assert } @Test - public void renderFullUrlAsRelativeToBaseUrlWithFirstSegmentsEqualToTheContextPath() + void renderFullUrlAsRelativeToBaseUrlWithFirstSegmentsEqualToTheContextPath() { // base url without context path and filter path // 'contextPath' here is a normal segment with the same value @@ -462,7 +463,7 @@ public class UrlRendererTest extends Assert } @Test - public void renderFullUrlAsRelativeToBaseUrlWithFirstSegmentsEqualToTheContextAndFilterPaths() + void renderFullUrlAsRelativeToBaseUrlWithFirstSegmentsEqualToTheContextAndFilterPaths() { // base url without context path and filter path // 'filterPath' here is a normal segment with the same value @@ -481,7 +482,7 @@ public class UrlRendererTest extends Assert } @Test - public void renderFullUrlAsRelativeToBaseUrlWithFirstSegmentsEqualToTheFilterPath() + void renderFullUrlAsRelativeToBaseUrlWithFirstSegmentsEqualToTheFilterPath() { // base url without context path and filter path // 'filterPath' here is a normal segment with the same value @@ -502,7 +503,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5123 */ @Test - public void renderHomeUrl() + void renderHomeUrl() { Url baseUrl = Url.parse("login"); @@ -519,7 +520,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5065 */ @Test - public void renderAbsoluteWithoutHost() + void renderAbsoluteWithoutHost() { Url baseUrl = Url.parse("a/b"); @@ -536,7 +537,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5065 */ @Test - public void renderAbsoluteWithoutScheme() + void renderAbsoluteWithoutScheme() { Url baseUrl = Url.parse("a/b"); @@ -553,7 +554,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5065 */ @Test - public void renderAbsoluteWithoutSchemeWithPort() + void renderAbsoluteWithoutSchemeWithPort() { Url baseUrl = Url.parse("a/b"); @@ -570,7 +571,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5073 */ @Test - public void removeCommonPrefixesWicket5073() + void removeCommonPrefixesWicket5073() { Url baseUrl = new Url(Arrays.asList(""), Arrays.<Url.QueryParameter> asList()); @@ -588,7 +589,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5202 */ @Test - public void removeCommonPrefixesWithJSessionId() + void removeCommonPrefixesWithJSessionId() { Url baseUrl = new Url(Arrays.asList("", "SomePage;jsessionid=1234"), Arrays.<Url.QueryParameter> asList()); @@ -607,7 +608,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5774 */ @Test - public void renderFullUrlWithNoOpLeadingSegments() + void renderFullUrlWithNoOpLeadingSegments() { UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("any/thing"))); @@ -625,7 +626,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5774 */ @Test - public void renderContextAbsoluteUrlWithNoOpLeadingSegments() + void renderContextAbsoluteUrlWithNoOpLeadingSegments() { UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("any/thing"))); @@ -643,7 +644,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5970 */ @Test - public void renderFullUrlWithFragment() + void renderFullUrlWithFragment() { UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("authorize"))); @@ -658,7 +659,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5970 */ @Test - public void renderRelativeUrlWithFragment() + void renderRelativeUrlWithFragment() { UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("authorize"))); @@ -673,7 +674,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5970 */ @Test - public void renderUrlWithFragment() + void renderUrlWithFragment() { UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("authorize"))); @@ -688,7 +689,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-6230 */ @Test - public void renderUrlWithManyDotsAtTheBeginning1() + void renderUrlWithManyDotsAtTheBeginning1() { UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("a"))); @@ -701,7 +702,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-6230 */ @Test - public void renderUrlWithManyDotsAtTheBeginning2() + void renderUrlWithManyDotsAtTheBeginning2() { UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("a/b"))); @@ -713,7 +714,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-6230 */ @Test - public void renderUrlWithManyDotsAtTheEnd1() + void renderUrlWithManyDotsAtTheEnd1() { UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("a"))); @@ -725,7 +726,7 @@ public class UrlRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-6230 */ @Test - public void renderUrlWithManyDotsAtTheEnd2() + void renderUrlWithManyDotsAtTheEnd2() { UrlRenderer renderer = new UrlRenderer(new MockWebRequest(Url.parse("a/b")));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java index 978e87b..71b0dc5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/PageIdPoliticTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.request.handler; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.nio.charset.Charset; import org.apache.wicket.IPageManagerProvider; @@ -37,15 +40,14 @@ import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTester; import org.apache.wicket.versioning.InMemoryPageStore; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Pedro Santos */ -public class PageIdPoliticTest extends Assert +class PageIdPoliticTest { private WicketTester tester; private InMemoryPageStore dataStore; @@ -59,7 +61,7 @@ public class PageIdPoliticTest extends Assert * @see <a href="https://issues.apache.org/jira/browse/WICKET-3667";>WICKET-3667</a> */ @Test - public void testPageGetsTouchedInAjaxRequest() + void testPageGetsTouchedInAjaxRequest() { TestPage testPage = new TestPage(); tester.startPage(TestPage.class); @@ -73,7 +75,7 @@ public class PageIdPoliticTest extends Assert * */ @Test - public void testPageIdDontGetIncreasedInAjaxRequest() + void testPageIdDontGetIncreasedInAjaxRequest() { TestPage testPage = new TestPage(); tester.startPage(testPage); @@ -83,8 +85,8 @@ public class PageIdPoliticTest extends Assert assertTrue(testPage.ajaxCallbackExecuted); } - @Before - public void setUp() throws Exception + @BeforeEach + void setUp() throws Exception { application = new MockApplication(); dataStore = new InMemoryPageStore() @@ -116,8 +118,8 @@ public class PageIdPoliticTest extends Assert }; } - @After - public void tearDown() throws Exception + @AfterEach + void tearDown() throws Exception { tester.destroy(); } @@ -133,7 +135,7 @@ public class PageIdPoliticTest extends Assert /** * Construct. */ - public TestPage() + public TestPage() { WebComponent component; component = new WebComponent("component"); @@ -155,7 +157,7 @@ public class PageIdPoliticTest extends Assert * @param encoding * @return ajaxUrl */ - public Url getAjaxUrl(String encoding) + Url getAjaxUrl(String encoding) { return Url.parse(eventBehavior.getCallbackUrl().toString(), Charset.forName(encoding)); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java index 3f87b08..b7ad145 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/PageProviderTest.java @@ -16,7 +16,10 @@ */ package org.apache.wicket.request.handler; -import static org.hamcrest.CoreMatchers.is; +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 static org.junit.jupiter.api.Assertions.fail; import java.io.IOException; import java.text.ParseException; @@ -40,19 +43,19 @@ import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.ResourceStreamNotFoundException; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author pedro */ -public class PageProviderTest extends WicketTestCase +class PageProviderTest extends WicketTestCase { /** * <a href="https://issues.apache.org/jira/browse/WICKET-4046";>WICKET-4046</a> */ @Test - public void pageProviderDontDeserializeOnePageTwice() + void pageProviderDontDeserializeOnePageTwice() { int oldState = 0; int newState = 1; @@ -72,7 +75,7 @@ public class PageProviderTest extends WicketTestCase // simulation an test call to isNewPageInstance boolean isNewPageInstance = pageProvider.isNewPageInstance(); - assertFalse("test page is already stored", isNewPageInstance); + assertFalse(isNewPageInstance, "test page is already stored"); // changing some sate StatefullMockPage providedPage = (StatefullMockPage)pageProvider.getPageInstance(); @@ -98,7 +101,7 @@ public class PageProviderTest extends WicketTestCase * @see <a href="https://issues.apache.org/jira/browse/WICKET-3252";>WICKET-3252</a> * */ @Test - public void testStalePageException() + void testStalePageException() { tester.startPage(TestPage.class); TestPage testPage = (TestPage)tester.getLastRenderedPage(); @@ -133,7 +136,7 @@ public class PageProviderTest extends WicketTestCase * */ @Test - public void testStalePageExceptionOnAjaxRequest() throws IOException, + void testStalePageExceptionOnAjaxRequest() throws IOException, ResourceStreamNotFoundException, ParseException { tester.startPage(TestPage.class); @@ -178,7 +181,7 @@ public class PageProviderTest extends WicketTestCase * href="https://issues.apache.org/jira/browse/WICKET-3339";>WICKET-3339</a> */ @Test - public void test() + void test() { tester.setFollowRedirects(false); tester.startPage(TestPage.class); @@ -187,7 +190,7 @@ public class PageProviderTest extends WicketTestCase } @Test - public void testPageProperties_provided() + void testPageProperties_provided() { PageProvider provider = new PageProvider(new StatelessPageTest()); assertTrue(provider.hasPageInstance()); @@ -195,7 +198,7 @@ public class PageProviderTest extends WicketTestCase } @Test - public void testPageProperties_bookmarkable() + void testPageProperties_bookmarkable() { PageProvider provider = new PageProvider(StatelessPageTest.class); assertTrue(provider.doesProvideNewPage()); @@ -208,7 +211,7 @@ public class PageProviderTest extends WicketTestCase } @Test - public void testPageProperties_stored() + void testPageProperties_stored() { TestMapperContext mapperContext = new TestMapperContext(); Page page = new TestPage(); @@ -231,7 +234,7 @@ public class PageProviderTest extends WicketTestCase * the requested and the found page classes do not match. */ @Test - public void ignorePageFoundByIdIfItsClassDoesntMatch() + void ignorePageFoundByIdIfItsClassDoesntMatch() { TestMapperContext mapperContext = new TestMapperContext(); Page page = new TestPage(); @@ -248,7 +251,7 @@ public class PageProviderTest extends WicketTestCase } @Test - public void pageProviderIsSerializeble() throws Exception + void pageProviderIsSerializeble() throws Exception { TestMapperContext mapperContext = new TestMapperContext(); Page page = new TestPage(); @@ -261,7 +264,7 @@ public class PageProviderTest extends WicketTestCase PageProvider deserialized = (PageProvider)javaSerializer.deserialize(serialized); deserialized.setPageSource(mapperContext); - assertThat(deserialized.getPageInstance(), is(page)); + assertEquals(page, deserialized.getPageInstance()); } /** */ http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/AbstractVariations.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/AbstractVariations.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/AbstractVariations.java index af97e14..af4fe15 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/AbstractVariations.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/AbstractVariations.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.request.handler.render; -public abstract class AbstractVariations +abstract class AbstractVariations { protected abstract VariationIterator<?> last(); @@ -32,7 +32,7 @@ public abstract class AbstractVariations last().next(); } - protected void toString(StringBuilder sb, String label, VariationIterator<?> iterator) + void toString(StringBuilder sb, String label, VariationIterator<?> iterator) { sb.append(label).append('=').append(iterator.current()).append(','); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRedirectToTargetUrl.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRedirectToTargetUrl.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRedirectToTargetUrl.java index d8b2daf..55486d6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRedirectToTargetUrl.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRedirectToTargetUrl.java @@ -22,15 +22,15 @@ import org.apache.wicket.request.Url; public class ShouldRedirectToTargetUrl extends AbstractVariations { - VariationIterator<Boolean> ajax = VariationIterator.of(Variation.ofBoolean()); - VariationIterator<RenderPageRequestHandler.RedirectPolicy> redirectPolicy = VariationIterator.of(ajax,Variation.of(RenderPageRequestHandler.RedirectPolicy.class)); - VariationIterator<Boolean> redirectToRender = VariationIterator.of(redirectPolicy,Variation.ofBoolean()); - VariationIterator<Boolean> targetEqualsCurrentUrl = VariationIterator.of(redirectToRender,Variation.ofBoolean()); - VariationIterator<Boolean> newPageInstance = VariationIterator.of(targetEqualsCurrentUrl,Variation.ofBoolean()); - VariationIterator<Boolean> pageStateless = VariationIterator.of(newPageInstance,Variation.ofBoolean()); - VariationIterator<Boolean> sessionTemporary = VariationIterator.of(pageStateless,Variation.ofBoolean()); + private VariationIterator<Boolean> ajax = VariationIterator.of(Variation.ofBoolean()); + private VariationIterator<RenderPageRequestHandler.RedirectPolicy> redirectPolicy = VariationIterator.of(ajax, Variation.of(RenderPageRequestHandler.RedirectPolicy.class)); + private VariationIterator<Boolean> redirectToRender = VariationIterator.of(redirectPolicy, Variation.ofBoolean()); + private VariationIterator<Boolean> targetEqualsCurrentUrl = VariationIterator.of(redirectToRender, Variation.ofBoolean()); + private VariationIterator<Boolean> newPageInstance = VariationIterator.of(targetEqualsCurrentUrl, Variation.ofBoolean()); + private VariationIterator<Boolean> pageStateless = VariationIterator.of(newPageInstance, Variation.ofBoolean()); + private VariationIterator<Boolean> sessionTemporary = VariationIterator.of(pageStateless, Variation.ofBoolean()); - VariationIterator<Boolean> last = sessionTemporary; + private VariationIterator<Boolean> last = sessionTemporary; @Override public String toString() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRenderPageAndWriteResponseVariations.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRenderPageAndWriteResponseVariations.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRenderPageAndWriteResponseVariations.java index 939ad5a..4a7ed37 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRenderPageAndWriteResponseVariations.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/ShouldRenderPageAndWriteResponseVariations.java @@ -21,16 +21,16 @@ import org.apache.wicket.request.Url; public class ShouldRenderPageAndWriteResponseVariations extends AbstractVariations { - VariationIterator<RenderPageRequestHandler.RedirectPolicy> redirectPolicy = VariationIterator.of(Variation.of(RenderPageRequestHandler.RedirectPolicy.class)); - VariationIterator<Boolean> ajax = VariationIterator.of(redirectPolicy, Variation.ofBoolean()); - VariationIterator<Boolean> onePassRender = VariationIterator.of(ajax,Variation.ofBoolean()); - VariationIterator<Boolean> redirectToRender = VariationIterator.of(onePassRender,Variation.ofBoolean()); - VariationIterator<Boolean> shouldPreserveClientUrl = VariationIterator.of(redirectToRender,Variation.ofBoolean()); - VariationIterator<Boolean> targetEqualsCurrentUrl = VariationIterator.of(shouldPreserveClientUrl,Variation.ofBoolean()); - VariationIterator<Boolean> newPageInstance = VariationIterator.of(targetEqualsCurrentUrl,Variation.ofBoolean()); - VariationIterator<Boolean> pageStateless = VariationIterator.of(newPageInstance,Variation.ofBoolean()); + private VariationIterator<RenderPageRequestHandler.RedirectPolicy> redirectPolicy = VariationIterator.of(Variation.of(RenderPageRequestHandler.RedirectPolicy.class)); + private VariationIterator<Boolean> ajax = VariationIterator.of(redirectPolicy, Variation.ofBoolean()); + private VariationIterator<Boolean> onePassRender = VariationIterator.of(ajax, Variation.ofBoolean()); + private VariationIterator<Boolean> redirectToRender = VariationIterator.of(onePassRender, Variation.ofBoolean()); + private VariationIterator<Boolean> shouldPreserveClientUrl = VariationIterator.of(redirectToRender, Variation.ofBoolean()); + private VariationIterator<Boolean> targetEqualsCurrentUrl = VariationIterator.of(shouldPreserveClientUrl, Variation.ofBoolean()); + private VariationIterator<Boolean> newPageInstance = VariationIterator.of(targetEqualsCurrentUrl, Variation.ofBoolean()); + private VariationIterator<Boolean> pageStateless = VariationIterator.of(newPageInstance, Variation.ofBoolean()); - VariationIterator<Boolean> last = pageStateless; + private VariationIterator<Boolean> last = pageStateless; @Override protected VariationIterator<?> last() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/SkipRenderWithSetResponsePageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/SkipRenderWithSetResponsePageTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/SkipRenderWithSetResponsePageTest.java index f20e3a1..885c8ca 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/SkipRenderWithSetResponsePageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/SkipRenderWithSetResponsePageTest.java @@ -16,28 +16,30 @@ */ package org.apache.wicket.request.handler.render; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.basic.SimplePage; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test if rendering phase is skipped if we invoke setResponsePage inside page constructor * * https://issues.apache.org/jira/browse/WICKET-4636 */ -public class SkipRenderWithSetResponsePageTest extends WicketTestCase +class SkipRenderWithSetResponsePageTest extends WicketTestCase { @Test - public void setResponsePageInsideConstructor() + void setResponsePageInsideConstructor() { tester.startPage(NotToRenderConstructorPage.class); tester.assertRenderedPage(SimplePage.class); } - public static class NotToRenderConstructorPage extends WebPage + public static class NotToRenderConstructorPage extends WebPage { - public NotToRenderConstructorPage() + public NotToRenderConstructorPage() { setResponsePage(SimplePage.class); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/StatelessPageManipulatingPageParametersTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/StatelessPageManipulatingPageParametersTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/StatelessPageManipulatingPageParametersTest.java index 1665001..efb11f2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/StatelessPageManipulatingPageParametersTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/StatelessPageManipulatingPageParametersTest.java @@ -26,17 +26,17 @@ 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.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * https://issues.apache.org/jira/browse/WICKET-5666 * https://issues.apache.org/jira/browse/WICKET-5643 */ -public class StatelessPageManipulatingPageParametersTest extends WicketTestCase { +class StatelessPageManipulatingPageParametersTest extends WicketTestCase { - @Before - public void before() + @BeforeEach + void before() { WebApplication application = tester.getApplication(); application.mountPage("first", FirstPage.class); @@ -44,7 +44,7 @@ public class StatelessPageManipulatingPageParametersTest extends WicketTestCase } @Test - public void submitAndRedirect() { + void submitAndRedirect() { tester.startPage(FirstPage.class); FormTester failingFormTester = tester.newFormTester("form"); failingFormTester.submit(); @@ -82,7 +82,7 @@ public class StatelessPageManipulatingPageParametersTest extends WicketTestCase return new StringResourceStream(markup); } } - + public static class SecondPage extends WebPage implements IMarkupResourceStreamProvider { public SecondPage(PageParameters parameters) http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/TestVariations.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/TestVariations.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/TestVariations.java index 8a47659..4473c73 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/TestVariations.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/TestVariations.java @@ -16,20 +16,23 @@ */ package org.apache.wicket.request.handler.render; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertTrue; -public class TestVariations +import org.junit.jupiter.api.Test; + +class TestVariations { @Test - public void testSingle() + void testSingle() { VariationIterator<Boolean> single = VariationIterator.of(Variation.ofBoolean()); - Assert.assertTrue(single.hasNext()); + assertTrue(single.hasNext()); single.next(); - Assert.assertTrue(single.hasNext()); + assertTrue(single.hasNext()); single.next(); - Assert.assertFalse(single.hasNext()); + assertFalse(single.hasNext()); Exception ex = null; try @@ -40,29 +43,29 @@ public class TestVariations { ex = e; } - Assert.assertNotNull(ex); + assertNotNull(ex); } @Test - public void testDouble() + void testDouble() { VariationIterator<Integer> numbers = VariationIterator.of(new Variation<>(1,2,3)); VariationIterator<Boolean> flag = VariationIterator.of(numbers,Variation.ofBoolean()); VariationIterator<?> last=flag; - Assert.assertTrue(last.hasNext()); + assertTrue(last.hasNext()); last.next(); - Assert.assertTrue(last.hasNext()); + assertTrue(last.hasNext()); last.next(); - Assert.assertTrue(last.hasNext()); + assertTrue(last.hasNext()); last.next(); - Assert.assertTrue(last.hasNext()); + assertTrue(last.hasNext()); last.next(); - Assert.assertTrue(last.hasNext()); + assertTrue(last.hasNext()); last.next(); - Assert.assertTrue(last.hasNext()); + assertTrue(last.hasNext()); last.next(); - Assert.assertFalse(last.hasNext()); + assertFalse(last.hasNext()); Exception ex = null; try @@ -73,6 +76,6 @@ public class TestVariations { ex = e; } - Assert.assertNotNull(ex); + assertNotNull(ex); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/VariationIterator.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/VariationIterator.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/VariationIterator.java index 1f34ef8..14480ba 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/VariationIterator.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/VariationIterator.java @@ -27,11 +27,11 @@ public class VariationIterator<T> implements Iterator<T> private int idx = -1; - public VariationIterator(Variation<T> variation) { + private VariationIterator(Variation<T> variation) { this(null, variation); } - public VariationIterator(VariationIterator<?> prev, Variation<T> variation) { + private VariationIterator(VariationIterator<?> prev, Variation<T> variation) { this.prev = prev; this.variation = variation; } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java index c2094fa..882c39d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java @@ -16,10 +16,13 @@ */ package org.apache.wicket.request.handler.render; -import static org.mockito.ArgumentMatchers.isNull; +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 static org.mockito.ArgumentMatchers.any; import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.eq; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.never; import static org.mockito.Mockito.verify; @@ -27,8 +30,6 @@ import static org.mockito.Mockito.when; import java.util.concurrent.atomic.AtomicBoolean; -import junit.framework.AssertionFailedError; - import org.apache.wicket.core.request.handler.IPageProvider; import org.apache.wicket.core.request.handler.RenderPageRequestHandler; import org.apache.wicket.core.request.handler.RenderPageRequestHandler.RedirectPolicy; @@ -39,14 +40,14 @@ import org.apache.wicket.request.component.IRequestablePage; import org.apache.wicket.request.cycle.RequestCycle; import org.apache.wicket.request.http.WebRequest; import org.apache.wicket.request.http.WebResponse; -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.opentest4j.AssertionFailedError; /** * Tests for the calculation whether or not to redirect or directly render a page */ -public class WebPageRendererTest extends Assert +class WebPageRendererTest { private RenderPageRequestHandler handler; @@ -60,8 +61,8 @@ public class WebPageRendererTest extends Assert /** * Common setup */ - @Before - public void before() + @BeforeEach + void before() { provider = mock(IPageProvider.class); @@ -87,7 +88,7 @@ public class WebPageRendererTest extends Assert * is configured there wont be a redirect issued */ @Test - public void testOnePassRender() + void testOnePassRender() { TestPageRenderer renderer = new TestPageRenderer(handler); @@ -113,7 +114,7 @@ public class WebPageRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5522 */ @Test - public void testOnePassRenderDifferentProtocols() + void testOnePassRenderDifferentProtocols() { final AtomicBoolean responseBuffered = new AtomicBoolean(false); @@ -151,7 +152,7 @@ public class WebPageRendererTest extends Assert * is configured but the {@link RedirectPolicy} says that it needs to redirect it will redirect. */ @Test - public void testOnePassRenderWithAlwaysRedirect() + void testOnePassRenderWithAlwaysRedirect() { PageRenderer renderer = new TestPageRenderer(handler) @@ -186,7 +187,7 @@ public class WebPageRendererTest extends Assert * is configured but the current request is Ajax then a redirect should be issued */ @Test - public void testOnePassRenderAndAjaxRequest() + void testOnePassRenderAndAjaxRequest() { TestPageRenderer renderer = new TestPageRenderer(handler); @@ -212,7 +213,7 @@ public class WebPageRendererTest extends Assert * {@link RedirectPolicy#NEVER_REDIRECT} there wont be a redirect issued */ @Test - public void testRedirectPolicyNever() + void testRedirectPolicyNever() { PageRenderer renderer = new TestPageRenderer(handler) @@ -243,7 +244,7 @@ public class WebPageRendererTest extends Assert * is configured there wont be a redirect issued */ @Test - public void testSameUrlsAndRedirectToRender() + void testSameUrlsAndRedirectToRender() { PageRenderer renderer = new TestPageRenderer(handler) @@ -275,7 +276,7 @@ public class WebPageRendererTest extends Assert * be a redirect issued */ @Test - public void testSameUrlsAndStatefulPage() + void testSameUrlsAndStatefulPage() { when(provider.isNewPageInstance()).thenReturn(false); when(page.isPageStateless()).thenReturn(false); @@ -301,7 +302,7 @@ public class WebPageRendererTest extends Assert * should occur */ @Test - public void testShouldPreserveClientUrl() + void testShouldPreserveClientUrl() { TestPageRenderer renderer = new TestPageRenderer(handler); @@ -325,7 +326,7 @@ public class WebPageRendererTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5486 */ @Test - public void testShouldPreserveClientUrlOverruledByRedirectPolicyAlwaysRedirect() + void testShouldPreserveClientUrlOverruledByRedirectPolicyAlwaysRedirect() { TestPageRenderer renderer = new TestPageRenderer(handler); renderer.shouldPreserveClientUrl = true; @@ -346,7 +347,7 @@ public class WebPageRendererTest extends Assert * {@link RedirectPolicy#ALWAYS_REDIRECT} there a redirect must be issued */ @Test - public void testRedirectPolicyAlways() + void testRedirectPolicyAlways() { TestPageRenderer renderer = new TestPageRenderer(handler); renderer.redirectPolicy = RedirectPolicy.ALWAYS_REDIRECT; @@ -367,7 +368,7 @@ public class WebPageRendererTest extends Assert * Tests that when the current request is Ajax then a redirect should happen */ @Test - public void testSameUrlsAndAjaxRequest() + void testSameUrlsAndAjaxRequest() { TestPageRenderer renderer = new TestPageRenderer(handler); renderer.ajax = true; @@ -389,7 +390,7 @@ public class WebPageRendererTest extends Assert * is configured then no matter what are the fromUrl and toUrl a redirect will happen */ @Test - public void testRedirectToRender() + void testRedirectToRender() { TestPageRenderer renderer = new TestPageRenderer(handler); @@ -414,7 +415,7 @@ public class WebPageRendererTest extends Assert * buffer */ @Test - public void testDifferentUrlsTemporarySessionAndStatelessPage() + void testDifferentUrlsTemporarySessionAndStatelessPage() { TestPageRenderer renderer = new TestPageRenderer(handler); renderer.redirectToBuffer = true; @@ -436,7 +437,7 @@ public class WebPageRendererTest extends Assert * redirect to the url which will instantiate the instance of us */ @Test - public void testDifferentUrlsAndNewPageInstance() + void testDifferentUrlsAndNewPageInstance() { TestPageRenderer renderer = new TestPageRenderer(handler); renderer.redirectToBuffer = true; @@ -457,7 +458,7 @@ public class WebPageRendererTest extends Assert * want to overwrite the response, so we need to let it */ @Test - public void testRedirectToBufferNoPageToRender() + void testRedirectToBufferNoPageToRender() { final AtomicBoolean stored = new AtomicBoolean(false); @@ -486,7 +487,7 @@ public class WebPageRendererTest extends Assert verify(response, never()).write(any(byte[].class)); verify(response, never()).write(any(CharSequence.class)); verify(response, never()).sendRedirect(anyString()); - Assert.assertFalse(stored.get()); + assertFalse(stored.get()); } /** @@ -494,7 +495,7 @@ public class WebPageRendererTest extends Assert * page should be written without redirect */ @Test - public void testRedirectToBufferStatelessPageAndRedirectIsDisabled() + void testRedirectToBufferStatelessPageAndRedirectIsDisabled() { final AtomicBoolean stored = new AtomicBoolean(false); @@ -523,7 +524,7 @@ public class WebPageRendererTest extends Assert verify(response).write(any(byte[].class)); verify(response, never()).sendRedirect(anyString()); - Assert.assertFalse(stored.get()); + assertFalse(stored.get()); } /** @@ -531,7 +532,7 @@ public class WebPageRendererTest extends Assert * should be a redirect */ @Test - public void testRedirectToBufferStatelessPageAndRedirectIsEsabled() + void testRedirectToBufferStatelessPageAndRedirectIsEsabled() { final AtomicBoolean stored = new AtomicBoolean(false); @@ -560,7 +561,7 @@ public class WebPageRendererTest extends Assert verify(response, never()).write(any(byte[].class)); verify(response).sendRedirect(isNull()); - Assert.assertTrue(stored.get()); + assertTrue(stored.get()); } /** @@ -568,7 +569,7 @@ public class WebPageRendererTest extends Assert * redirect */ @Test - public void testRedirectToBufferStatefulPage() + void testRedirectToBufferStatefulPage() { final AtomicBoolean stored = new AtomicBoolean(false); @@ -595,11 +596,11 @@ public class WebPageRendererTest extends Assert verify(response, never()).write(any(byte[].class)); verify(response).sendRedirect(isNull()); - Assert.assertTrue(stored.get()); + assertTrue(stored.get()); } @Test - public void testShouldRenderPageAndWriteResponseCondition() { + void testShouldRenderPageAndWriteResponseCondition() { TestPageRenderer renderer = new TestPageRenderer(handler); // if @@ -612,7 +613,7 @@ public class WebPageRendererTest extends Assert renderer.newPageInstance = true; renderer.pageStateless = true; - Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, + assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, Url.parse("test"), Url.parse("test"))); renderer.ajax = false; @@ -622,7 +623,7 @@ public class WebPageRendererTest extends Assert renderer.newPageInstance = false; renderer.pageStateless = false; - Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, + assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, Url.parse("test1"), Url.parse("test2"))); // or @@ -634,7 +635,7 @@ public class WebPageRendererTest extends Assert renderer.ajax = false; renderer.onePassRender = true; - Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, + assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, Url.parse("test1"), Url.parse("test2"))); renderer.redirectPolicy = RedirectPolicy.ALWAYS_REDIRECT; @@ -643,21 +644,21 @@ public class WebPageRendererTest extends Assert renderer.newPageInstance = false; renderer.pageStateless = false; - Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, + assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, Url.parse("test"), Url.parse("test"))); // or // the targetUrl matches current url and it's redirect-to-render renderer.redirectToRender = true; - Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, + assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, Url.parse("test"), Url.parse("test"))); renderer.pageStateless = true; renderer.newPageInstance = true; renderer.redirectToRender = true; - Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, + assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, Url.parse("test"), Url.parse("test"))); // or @@ -672,13 +673,13 @@ public class WebPageRendererTest extends Assert renderer.newPageInstance = true; renderer.pageStateless = true; - Assert.assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, + assertTrue(renderer.shouldRenderPageAndWriteResponse(requestCycle, Url.parse("test1"), Url.parse("test2"))); } @Test - public void testShouldNOTRenderPageAndWriteResponseCondition() { + void testShouldNOTRenderPageAndWriteResponseCondition() { TestPageRenderer renderer = new TestPageRenderer(handler); @@ -704,25 +705,25 @@ public class WebPageRendererTest extends Assert renderer.newPageInstance = true; renderer.pageStateless = true; - Assert.assertFalse(renderer.shouldRenderPageAndWriteResponse(requestCycle, + assertFalse(renderer.shouldRenderPageAndWriteResponse(requestCycle, Url.parse("test1"), Url.parse("test2"))); renderer.redirectToRender = false; renderer.newPageInstance = false; renderer.pageStateless = false; - Assert.assertFalse(renderer.shouldRenderPageAndWriteResponse(requestCycle, + assertFalse(renderer.shouldRenderPageAndWriteResponse(requestCycle, Url.parse("test"), Url.parse("test"))); } @Test - public void testShouldRenderPageAndWriteResponseVariationIntegrity() { + void testShouldRenderPageAndWriteResponseVariationIntegrity() { int count = countVariations(new ShouldRenderPageAndWriteResponseVariations()); - Assert.assertEquals(2 * 2 * 2 * 2 * 2 * 2 * 2 * 3, count); + assertEquals(2 * 2 * 2 * 2 * 2 * 2 * 2 * 3, count); } @Test - public void shouldRenderPageAndWriteResponseVariation() { + void shouldRenderPageAndWriteResponseVariation() { String match = " X X " + @@ -754,13 +755,13 @@ public class WebPageRendererTest extends Assert } @Test - public void testShouldRedirectToTargetUrlIntegrity() { + void testShouldRedirectToTargetUrlIntegrity() { int count = countVariations(new ShouldRedirectToTargetUrl()); - Assert.assertEquals(2 * 3 * 2 * 2 * 2 * 2 * 2, count); + assertEquals(2 * 3 * 2 * 2 * 2 * 2 * 2, count); } @Test - public void testShouldRedirectToTargetUrl() { + void testShouldRedirectToTargetUrl() { String match = "XXXXXXXXXXXXXXXX" + @@ -780,7 +781,7 @@ public class WebPageRendererTest extends Assert } @Test - public void shouldRedirectToTargetUrlCondition() { + void shouldRedirectToTargetUrlCondition() { TestPageRenderer renderer = new TestPageRenderer(handler); @@ -794,7 +795,7 @@ public class WebPageRendererTest extends Assert renderer.pageStateless = false; renderer.sessionTemporary = false; - Assert.assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"), + assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"), Url.parse("test2"))); // or @@ -802,7 +803,7 @@ public class WebPageRendererTest extends Assert renderer.redirectPolicy = RedirectPolicy.AUTO_REDIRECT; renderer.redirectToRender = true; - Assert.assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"), + assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"), Url.parse("test2"))); // or @@ -810,7 +811,7 @@ public class WebPageRendererTest extends Assert renderer.redirectToRender = false; renderer.ajax = true; - Assert.assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test"), + assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test"), Url.parse("test"))); // or @@ -821,20 +822,20 @@ public class WebPageRendererTest extends Assert renderer.ajax = false; renderer.newPageInstance = true; - Assert.assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"), + assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"), Url.parse("test2"))); renderer.newPageInstance = false; renderer.sessionTemporary = true; renderer.pageStateless = true; - Assert.assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"), + assertTrue(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"), Url.parse("test2"))); // just redirect } @Test - public void shouldNOTRedirectToTargetUrlCondition() { + void shouldNOTRedirectToTargetUrlCondition() { TestPageRenderer renderer = new TestPageRenderer(handler); @@ -857,7 +858,7 @@ public class WebPageRendererTest extends Assert renderer.pageStateless=false; renderer.sessionTemporary=false; - Assert.assertFalse(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"), + assertFalse(renderer.shouldRedirectToTargetUrl(requestCycle, Url.parse("test1"), Url.parse("test2"))); } @@ -874,12 +875,12 @@ public class WebPageRendererTest extends Assert int idx=0; while (variations.hasNextVariation()) { variations.nextVariation(); - Assert.assertEquals(variations.toString(), match.charAt(idx) == 'X', variations.getResult()); + assertEquals(match.charAt(idx) == 'X', variations.getResult(), variations.toString()); idx++; } } - private void printVariations(AbstractVariations variations) { + void printVariations(AbstractVariations variations) { int idx=0; System.out.print("\""); while (variations.hasNextVariation()) { @@ -899,7 +900,7 @@ public class WebPageRendererTest extends Assert * directly */ @Test - public void testRedirectToBufferStatefulPageAndSameUrls() + void testRedirectToBufferStatefulPageAndSameUrls() { final AtomicBoolean stored = new AtomicBoolean(false); @@ -930,14 +931,14 @@ public class WebPageRendererTest extends Assert verify(response).write(any(byte[].class)); verify(response, never()).sendRedirect(anyString()); - Assert.assertFalse(stored.get()); + assertFalse(stored.get()); } /** * Tests that when all the conditions fail the redirect_to_buffer should be used as a fallback */ @Test - public void testRedirectToBufferIsFallback() + void testRedirectToBufferIsFallback() { final AtomicBoolean stored = new AtomicBoolean(false); @@ -985,7 +986,7 @@ public class WebPageRendererTest extends Assert verify(response, never()).write(any(byte[].class)); verify(response).sendRedirect(isNull()); - Assert.assertTrue(stored.get()); + assertTrue(stored.get()); } /** @@ -993,7 +994,7 @@ public class WebPageRendererTest extends Assert * current request is Ajax then a redirect should be issued */ @Test - public void testShouldPreserveClientUrlAndAjaxRequest() + void testShouldPreserveClientUrlAndAjaxRequest() { TestPageRenderer renderer = new TestPageRenderer(handler); renderer.ajax = true; @@ -1017,7 +1018,7 @@ public class WebPageRendererTest extends Assert * is Ajax then a redirect should still be issued */ @Test - public void testNeverRedirectButAjaxRequest() + void testNeverRedirectButAjaxRequest() { TestPageRenderer renderer = new TestPageRenderer(handler); renderer.redirectPolicy = RedirectPolicy.NEVER_REDIRECT; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/handler/resource/ResourceAuthorizationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/resource/ResourceAuthorizationTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/resource/ResourceAuthorizationTest.java index 8edf57b..36db7c5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/resource/ResourceAuthorizationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/resource/ResourceAuthorizationTest.java @@ -16,22 +16,22 @@ */ package org.apache.wicket.request.handler.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertThrows; + import javax.servlet.http.HttpServletResponse; import org.apache.wicket.authorization.IAuthorizationStrategy; -import org.apache.wicket.authorization.IUnauthorizedResourceRequestListener; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.request.resource.AbstractResource; import org.apache.wicket.request.resource.IResource; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Rule; -import org.junit.Test; -import org.junit.rules.ExpectedException; +import org.junit.jupiter.api.Test; /** * Tests authorization of IResources */ -public class ResourceAuthorizationTest extends WicketTestCase +class ResourceAuthorizationTest extends WicketTestCase { private static class RejectingAuthorizationStrategy extends IAuthorizationStrategy.AllowAllAuthorizationStrategy { @@ -61,7 +61,7 @@ public class ResourceAuthorizationTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-5012 */ @Test - public void rejectWith403() + void rejectWith403() { tester.getApplication().getSecuritySettings().setAuthorizationStrategy(new RejectingAuthorizationStrategy()); @@ -72,30 +72,23 @@ public class ResourceAuthorizationTest extends WicketTestCase tester.getLastResponse().getErrorMessage()); } - @Rule - public ExpectedException expectedException = ExpectedException.none(); - /** * https://issues.apache.org/jira/browse/WICKET-5012 */ @Test - public void rejectWithException() + void rejectWithException() { tester.getApplication().getSecuritySettings().setAuthorizationStrategy(new RejectingAuthorizationStrategy()); - tester.getApplication().getSecuritySettings().setUnauthorizedResourceRequestListener(new IUnauthorizedResourceRequestListener() - { - @Override - public void onUnauthorizedRequest(IResource resource, PageParameters parameters) - { - throw new RuntimeException("Not authorized to request: " + resource); - } + tester.getApplication().getSecuritySettings().setUnauthorizedResourceRequestListener((resource, parameters) -> { + throw new RuntimeException("Not authorized to request: " + resource); }); TestResource resource = new TestResource(); - expectedException.expect(RuntimeException.class); - expectedException.expectMessage("Not authorized to request: " + resource); + Exception e = assertThrows(RuntimeException.class, () -> { + tester.startResource(resource); + }); - tester.startResource(resource); + assertEquals("Not authorized to request: " + resource, e.getMessage()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/mapper/CustomHomePageTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/CustomHomePageTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/CustomHomePageTest.java index dd1774a..ecdefe4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/CustomHomePageTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/CustomHomePageTest.java @@ -22,19 +22,19 @@ import org.apache.wicket.protocol.http.mock.MockHttpServletRequest; import org.apache.wicket.resource.DummyApplication; import org.apache.wicket.util.tester.DummyHomePage; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * A test case for <a href="https://issues.apache.org/jira/browse/WICKET-3126";>WICKET-3126</a> */ -public class CustomHomePageTest +class CustomHomePageTest { /** * Tests no custom home page. The home page is get from {@link Application#getHomePage()} */ @Test - public void defaultHomePage() + void defaultHomePage() { final WebApplication dummyApplication = new DummyApplication(); final WicketTester tester = new WicketTester(dummyApplication); @@ -49,7 +49,7 @@ public class CustomHomePageTest * Tests mounting of a custom home page via {@link WebApplication#mountPage(String, Class)} */ @Test - public void customHomePage() + void customHomePage() { final WebApplication dummyApplication = new DummyApplication() { http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java index c543f87..21df52e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/ComponentInfoTest.java @@ -16,20 +16,22 @@ */ package org.apache.wicket.request.mapper.info; -import org.junit.Assert; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNull; + +import org.junit.jupiter.api.Test; /** * * @author Matej Knopp */ -public class ComponentInfoTest extends Assert +class ComponentInfoTest { /** * */ @Test - public void test1() + void test1() { String s = "-component-path"; ComponentInfo info = ComponentInfo.parse(s); @@ -43,7 +45,7 @@ public class ComponentInfoTest extends Assert * */ @Test - public void test2() + void test2() { String s = "component-path"; ComponentInfo info = ComponentInfo.parse(s); @@ -54,7 +56,7 @@ public class ComponentInfoTest extends Assert * */ @Test - public void test3() + void test3() { String s = ".-"; ComponentInfo info = ComponentInfo.parse(s); @@ -66,7 +68,7 @@ public class ComponentInfoTest extends Assert * */ @Test - public void test4() + void test4() { String s = "-"; ComponentInfo info = ComponentInfo.parse(s); @@ -77,7 +79,7 @@ public class ComponentInfoTest extends Assert * */ @Test - public void test5() + void test5() { String s = "abcd"; assertEquals(null, ComponentInfo.parse(s)); @@ -87,7 +89,7 @@ public class ComponentInfoTest extends Assert * */ @Test - public void test6() + void test6() { String s = "-compo~~nent-path"; ComponentInfo info = ComponentInfo.parse(s); @@ -101,7 +103,7 @@ public class ComponentInfoTest extends Assert * */ @Test - public void test7() + void test7() { String s = "-co~mpo~~nent-path"; ComponentInfo info = ComponentInfo.parse(s); @@ -115,7 +117,7 @@ public class ComponentInfoTest extends Assert * */ @Test - public void test8() + void test8() { String s = ".12-component-path"; ComponentInfo info = ComponentInfo.parse(s); @@ -129,7 +131,7 @@ public class ComponentInfoTest extends Assert * */ @Test - public void test9() + void test9() { String s = "4.-a-b"; ComponentInfo info = ComponentInfo.parse(s); @@ -142,7 +144,7 @@ public class ComponentInfoTest extends Assert * */ @Test - public void test10() + void test10() { String s = "4.5-a-b"; ComponentInfo info = ComponentInfo.parse(s); @@ -156,7 +158,7 @@ public class ComponentInfoTest extends Assert * */ @Test - public void encodeDecode() + void encodeDecode() { final Integer renderCount = 1; final String componentPath = "-nav-container-:-nav:1:link"; http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java index 9fe3a4f..a657b88 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/mapper/info/PageComponentInfoTest.java @@ -16,15 +16,17 @@ */ package org.apache.wicket.request.mapper.info; -import org.junit.Test; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; -import junit.framework.TestCase; +import org.junit.jupiter.api.Test; /** * * @author Matej Knopp */ -public class PageComponentInfoTest extends TestCase +class PageComponentInfoTest { private void testPageInfoOnly(PageComponentInfo info, Integer pageId) @@ -49,7 +51,7 @@ public class PageComponentInfoTest extends TestCase * */ @Test - public void test1() + void test1() { String s = "2--foo-bar-baz"; PageComponentInfo info = PageComponentInfo.parse(s); @@ -61,7 +63,7 @@ public class PageComponentInfoTest extends TestCase * */ @Test - public void test2() + void test2() { String s = "2"; PageComponentInfo info = PageComponentInfo.parse(s); @@ -73,9 +75,10 @@ public class PageComponentInfoTest extends TestCase * <a href="https://issues.apache.org/jira/browse/WICKET-3490";>WICKET-3490</a> */ @Test - public void parsePageInfo() + void parsePageInfo() { - PageComponentInfo pageComponentInfo = PageComponentInfo.parse("99999999999999999999999999999999999999999999999999999999999999999999999"); + PageComponentInfo pageComponentInfo = PageComponentInfo + .parse("99999999999999999999999999999999999999999999999999999999999999999999999"); assertNull(pageComponentInfo); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java index 73b1295..6c163fe 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java @@ -16,30 +16,31 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; import static org.mockito.ArgumentMatchers.eq; import static org.mockito.ArgumentMatchers.same; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.verify; +import javax.servlet.http.HttpServletResponse; + import org.apache.wicket.request.http.WebRequest; import org.apache.wicket.request.http.WebResponse; import org.apache.wicket.request.resource.IResource.Attributes; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; - -import javax.servlet.http.HttpServletResponse; +import org.junit.jupiter.api.Test; /** * Unit tests for {@link ByteArrayResource} */ -public class ByteArrayResourceTest extends WicketTestCase +class ByteArrayResourceTest extends WicketTestCase { /** * Unit test for {@link ByteArrayResource} with static byte array. */ @Test - public void staticResource() + void staticResource() { String contentType = "application/octet-stream"; byte[] array = new byte[] { 1, 2, 3 }; @@ -69,7 +70,7 @@ public class ByteArrayResourceTest extends WicketTestCase * Unit test for {@link ByteArrayResource} with dynamically generated byte array. */ @Test - public void dynamicResource() + void dynamicResource() { String contentType = "application/octet-stream"; final byte[] array = new byte[] { 1, 2, 3 }; @@ -112,7 +113,7 @@ public class ByteArrayResourceTest extends WicketTestCase * See https://issues.apache.org/jira/browse/WICKET-4119 */ @Test - public void contentType() + void contentType() { String userSpecifiedContentType = "text/custom"; ByteArrayResource userSpecified = new ByteArrayResource(userSpecifiedContentType, @@ -140,7 +141,7 @@ public class ByteArrayResourceTest extends WicketTestCase * Verify that HttpServletResponse#SC_NOT_FOUND is returned if there is no data. */ @Test - public void noData() { + void noData() { ByteArrayResource resource = new ByteArrayResource("text/plain"); tester.startResource(resource); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/CharSequenceResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/CharSequenceResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/CharSequenceResourceTest.java index 0fdbb00..ef3239a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/CharSequenceResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/CharSequenceResourceTest.java @@ -16,38 +16,37 @@ */ package org.apache.wicket.request.resource; -import static org.hamcrest.Matchers.is; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.nio.charset.Charset; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link CharSequenceResource} */ -public class CharSequenceResourceTest extends Assert +class CharSequenceResourceTest { @Test - public void getLength_whenNoUnicodeSymbols_thenReturnTheStringLength() throws Exception + void getLength_whenNoUnicodeSymbols_thenReturnTheStringLength() throws Exception { CharSequenceResource resource = new CharSequenceResource("plain/text"); - assertThat(resource.getLength("abcd"), is(4L)); + assertEquals(Long.valueOf(4L), resource.getLength("abcd")); } @Test - public void getLength_UTF8_whenUnicodeSymbols_thenReturnTheBytesLength() throws Exception + void getLength_UTF8_whenUnicodeSymbols_thenReturnTheBytesLength() throws Exception { CharSequenceResource resource = new CharSequenceResource("plain/text"); resource.setCharset(Charset.forName("UTF-8")); - assertThat(resource.getLength("a\u1234d"), is(5L)); + assertEquals(Long.valueOf(5L), resource.getLength("a\u1234d")); } @Test - public void getLength_UTF16_whenUnicodeSymbols_thenReturnTheBytesLength() throws Exception + void getLength_UTF16_whenUnicodeSymbols_thenReturnTheBytesLength() throws Exception { CharSequenceResource resource = new CharSequenceResource("plain/text"); resource.setCharset(Charset.forName("UTF-16")); - assertThat(resource.getLength("a\u1234d"), is(8L)); + assertEquals(Long.valueOf(8L), resource.getLength("a\u1234d")); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java index a589357..2153310 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ContextRelativeResourceReferenceTest.java @@ -16,43 +16,43 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.WicketTestCase; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Assert; -import org.junit.Test; - +import org.junit.jupiter.api.Test; -public class ContextRelativeResourceReferenceTest extends WicketTestCase +class ContextRelativeResourceReferenceTest extends WicketTestCase { - static final String RESOURCE_NAME = "/foo/baar/myLibrary"; - static final String ALREADY_MINIFIED = RESOURCE_NAME + ".min.js"; - static final String TO_BE_MINIFIED = RESOURCE_NAME + ".js"; - static final String CUSTOM_SUFFIX = "compress"; + private static final String RESOURCE_NAME = "/foo/baar/myLibrary"; + private static final String ALREADY_MINIFIED = RESOURCE_NAME + ".min.js"; + private static final String TO_BE_MINIFIED = RESOURCE_NAME + ".js"; + private static final String CUSTOM_SUFFIX = "compress"; @Test - public void testMinifyResource() throws Exception + void testMinifyResource() throws Exception { ContextRelativeResourceReference resourceReference = new ContextRelativeResourceReference(TO_BE_MINIFIED); - Assert.assertTrue(testResourceKey(resourceReference, ALREADY_MINIFIED)); + assertTrue(testResourceKey(resourceReference, ALREADY_MINIFIED)); } @Test - public void testDontMinifyResource() throws Exception + void testDontMinifyResource() throws Exception { ContextRelativeResourceReference resourceReference = new ContextRelativeResourceReference(ALREADY_MINIFIED, false); - Assert.assertTrue(testResourceKey(resourceReference, ALREADY_MINIFIED)); + assertTrue(testResourceKey(resourceReference, ALREADY_MINIFIED)); resourceReference = new ContextRelativeResourceReference(TO_BE_MINIFIED, false); - Assert.assertTrue(testResourceKey(resourceReference, TO_BE_MINIFIED)); + assertTrue(testResourceKey(resourceReference, TO_BE_MINIFIED)); } @Test - public void testCustomSuffix() throws Exception + void testCustomSuffix() throws Exception { ContextRelativeResourceReference resourceReference = new ContextRelativeResourceReference(TO_BE_MINIFIED, CUSTOM_SUFFIX); - Assert.assertTrue(testResourceKey(resourceReference, RESOURCE_NAME + "." + CUSTOM_SUFFIX + ".js")); + assertTrue(testResourceKey(resourceReference, RESOURCE_NAME + "." + CUSTOM_SUFFIX + ".js")); } @Override http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java index e65aaf3..7820e4c 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/CssPackageResourceTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Locale; import org.apache.wicket.css.ICssCompressor; @@ -23,12 +25,12 @@ import org.apache.wicket.markup.html.PackageResourceTest; import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * */ -public class CssPackageResourceTest extends WicketTestCase +class CssPackageResourceTest extends WicketTestCase { private static final String APP_COMPRESSED = "APP_COMPRESSED"; @@ -61,7 +63,7 @@ public class CssPackageResourceTest extends WicketTestCase * Tests that a {@link CssPackageResource} can have its custom {@link ICssCompressor} */ @Test - public void customResourceCompressor() + void customResourceCompressor() { CssPackageResource resource = new CssPackageResource(PackageResourceTest.class, "packaged1.txt", null, null, null) @@ -92,7 +94,7 @@ public class CssPackageResourceTest extends WicketTestCase * when there is no custom */ @Test - public void appLevelCompressor() + void appLevelCompressor() { CssPackageResource resource = new CssPackageResource(PackageResourceTest.class, "packaged1.txt", null, null, null); @@ -106,7 +108,7 @@ public class CssPackageResourceTest extends WicketTestCase * {@link ICssCompressor} */ @Test - public void noCompressor() + void noCompressor() { CssPackageResource resource = new CssPackageResource(PackageResourceTest.class, "packaged1.txt", null, null, null); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java index 2121714..ccee98f 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/DynamicImageResourceTest.java @@ -16,23 +16,25 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertArrayEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; + import javax.servlet.http.HttpServletResponse; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for {@link DynamicImageResource} */ -public class DynamicImageResourceTest extends WicketTestCase +class DynamicImageResourceTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-3935 */ @Test - public void emptyImageDataIs404() + void emptyImageDataIs404() { DynamicImageResource resource = new DynamicImageResource() { @@ -53,7 +55,7 @@ public class DynamicImageResourceTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-3935 */ @Test - public void nonEmptyImageDataIs200() + void nonEmptyImageDataIs200() { final byte[] expected = new byte[] { 1, 2, 3 }; @@ -68,6 +70,6 @@ public class DynamicImageResourceTest extends WicketTestCase tester.startResource(resource); assertEquals(HttpServletResponse.SC_OK, tester.getLastResponse().getStatus()); - Assert.assertArrayEquals(expected, tester.getLastResponse().getBinaryContent()); + assertArrayEquals(expected, tester.getLastResponse().getBinaryContent()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java index 022f9d4..14a63cb 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/JavaScriptPackageResourceTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.io.IOException; import java.util.Locale; @@ -25,12 +27,12 @@ import org.apache.wicket.mock.MockApplication; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.resource.ResourceStreamNotFoundException; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for JavaScriptPackageResource */ -public class JavaScriptPackageResourceTest extends WicketTestCase +class JavaScriptPackageResourceTest extends WicketTestCase { private static final String APP_COMPRESSED = "APP_COMPRESSED"; @@ -63,7 +65,7 @@ public class JavaScriptPackageResourceTest extends WicketTestCase * {@link IJavaScriptCompressor} */ @Test - public void customResourceCompressor() + void customResourceCompressor() { JavaScriptPackageResource resource = new JavaScriptPackageResource( PackageResourceTest.class, "packaged1.txt", null, null, null) @@ -96,7 +98,7 @@ public class JavaScriptPackageResourceTest extends WicketTestCase * same as the one used for the actual response */ @Test - public void cacheableStreamIsCompressed() throws ResourceStreamNotFoundException, IOException + void cacheableStreamIsCompressed() throws ResourceStreamNotFoundException, IOException { JavaScriptPackageResource resource = new JavaScriptPackageResource( PackageResourceTest.class, "packaged1.txt", null, null, null) @@ -127,7 +129,7 @@ public class JavaScriptPackageResourceTest extends WicketTestCase * {@link IJavaScriptCompressor} when there is no custom */ @Test - public void appLevelCompressor() + void appLevelCompressor() { JavaScriptPackageResource resource = new JavaScriptPackageResource( PackageResourceTest.class, "packaged1.txt", null, null, null); @@ -141,7 +143,7 @@ public class JavaScriptPackageResourceTest extends WicketTestCase * {@link IJavaScriptCompressor} */ @Test - public void noCompressor() + void noCompressor() { JavaScriptPackageResource resource = new JavaScriptPackageResource( PackageResourceTest.class, "packaged1.txt", null, null, null); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java index 17264f4..7e4b6d5 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/LessResourceReferenceTest.java @@ -16,6 +16,9 @@ */ package org.apache.wicket.request.resource; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.concurrent.atomic.AtomicBoolean; import org.apache.wicket.MarkupContainer; @@ -30,8 +33,8 @@ import org.apache.wicket.util.file.Files; 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; /** * <a href"https://issues.apache.org/jira/browse/WICKET-4732";>WICKET-4732</a> @@ -67,8 +70,8 @@ public class LessResourceReferenceTest extends WicketTestCase } } - @Before - public void before() + @BeforeEach + void before() { PROCESS_RESPONSE_CALLED.set(false); } @@ -105,7 +108,7 @@ public class LessResourceReferenceTest extends WicketTestCase * instead of automatically created PackageResourceReference */ @Test - public void processLessResources() + void processLessResources() { // load the page to register the resource LessResourcePage page = new LessResourcePage(); @@ -122,7 +125,7 @@ public class LessResourceReferenceTest extends WicketTestCase * Tests that a LessResourceReference is request-able without being registered in ResourceReferenceRegistry */ @Test - public void processLessResourcesWithoutStartingAPage() + void processLessResourcesWithoutStartingAPage() { // make a request to the resource that is not registered in the ResourceReferenceRegistry CharSequence urlToReference = "./wicket/resource/org.apache.wicket.request.resource.LessResourceReferenceTest/LessResourceReference.less";
