You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2018/09/26 13:39:48 UTC
[18/45] wicket git commit: wicket-core: Migrate to Junit 5
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
index d4a598d..c7f05a2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AbstractLinkTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.link;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.concurrent.atomic.AtomicInteger;
import org.apache.wicket.MockPageWithLink;
@@ -23,20 +25,19 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link AbstractLink}
*/
-public class AbstractLinkTest extends WicketTestCase
+class AbstractLinkTest extends WicketTestCase
{
/**
*
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3338">WICKET-3338</a>
*/
@Test
- public void testSetBodyModel()
+ void testSetBodyModel()
{
final String linkBody = "Link body";
@@ -51,7 +52,7 @@ public class AbstractLinkTest extends WicketTestCase
tester.startPage(mockPageWithLink);
TagTester tagTester = tester.getTagById("link");
- Assert.assertEquals(linkBody, tagTester.getValue());
+ assertEquals(linkBody, tagTester.getValue());
}
/**
@@ -59,7 +60,7 @@ public class AbstractLinkTest extends WicketTestCase
* method can be overridden to provide a dynamic model.
*/
@Test
- public void testRenderUsingGetBody()
+ void testRenderUsingGetBody()
{
final AtomicInteger counter = new AtomicInteger(0);
@@ -79,10 +80,10 @@ public class AbstractLinkTest extends WicketTestCase
tester.startPage(mockPageWithLink);
TagTester tagTester = tester.getTagById("link");
- Assert.assertEquals("0", tagTester.getValue());
+ assertEquals("0", tagTester.getValue());
tester.startPage(mockPageWithLink);
tagTester = tester.getTagById("link");
- Assert.assertEquals("1", tagTester.getValue());
+ assertEquals("1", tagTester.getValue());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java
index 14321f9..d7022b4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/AutolinkTest.java
@@ -17,7 +17,7 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
@@ -25,13 +25,13 @@ import org.junit.Test;
*
* @author Juergen Donnerstag
*/
-public class AutolinkTest extends WicketTestCase
+class AutolinkTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderHomePage_1() throws Exception
+ void renderHomePage_1() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
tester.getApplication().getResourceSettings().setParentFolderPlaceholder("$up$");
@@ -42,7 +42,7 @@ public class AutolinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
tester.getApplication().getMarkupSettings().setStripWicketTags(true);
@@ -53,7 +53,7 @@ public class AutolinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_3() throws Exception
+ void renderHomePage_3() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
executeTest(AutolinkPage_3.class, "AutolinkPageExpectedResult_3.html");
@@ -63,21 +63,21 @@ public class AutolinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_4() throws Exception
+ void renderHomePage_4() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
executeTest(AutolinkPage_4.class, "AutolinkPageExpectedResult_4.html");
}
@Test
- public void imgTagsShouldNotGetOnClick() throws Exception
+ void imgTagsShouldNotGetOnClick() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
executeTest(AutolinkPage_5.class, "AutolinkPageExpectedResult_5.html");
}
@Test
- public void componentInsideAutolink() throws Exception
+ void componentInsideAutolink() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
tester.startPage(AutolinkPage_6.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
index 2c764b6..46ebae8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkableHomePageLinksTest.java
@@ -17,18 +17,18 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class BookmarkableHomePageLinksTest extends WicketTestCase
+class BookmarkableHomePageLinksTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void testLinks() throws Exception
+ void testLinks() throws Exception
{
executeTest(BookmarkableHomePageLinksPage.class,
"BookmarkableHomePageLinksPage_result.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
index c49bf32..4988479 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/BookmarkablePageLinkTest.java
@@ -16,22 +16,23 @@
*/
package org.apache.wicket.markup.html.link;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.MockPageWithLink;
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;
/**
* @author jcompagner
*/
-public class BookmarkablePageLinkTest extends WicketTestCase
+class BookmarkablePageLinkTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void bookmarkableRequest() throws Exception
+ void bookmarkableRequest() throws Exception
{
tester.startPage(BookmarkableHomePageLinksPage.class);
assertEquals(tester.getLastRenderedPage().getClass(), BookmarkableHomePageLinksPage.class);
@@ -41,7 +42,7 @@ public class BookmarkablePageLinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void bookmarkableRequestWithIntercept() throws Exception
+ void bookmarkableRequestWithIntercept() throws Exception
{
tester.startPage(BookmarkableThrowsInterceptPage.class);
@@ -55,7 +56,7 @@ public class BookmarkablePageLinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void bookmarkableRequestWithInterceptWithParams() throws Exception
+ void bookmarkableRequestWithInterceptWithParams() throws Exception
{
PageParameters pp = new PageParameters();
pp.set("test", "test");
@@ -72,7 +73,7 @@ public class BookmarkablePageLinkTest extends WicketTestCase
* @see <a href="https://issues.apache.org/jira/browse/WICKET-3721">WICKET-3721</a>
*/
@Test
- public void customParametersWithSpecialCharacters()
+ void customParametersWithSpecialCharacters()
{
BookmarkablePageLink<MockPageWithLink> link = new BookmarkablePageLink<MockPageWithLink>(
"link", MockPageWithLink.class);
@@ -80,7 +81,7 @@ public class BookmarkablePageLinkTest extends WicketTestCase
tester.startComponentInPage(link, null);
String response = tester.getLastResponse().getDocument();
- Assert.assertEquals(
+ assertEquals(
"<html><body><span wicket:id=\"link\" onclick=\"var win = this.ownerDocument.defaultView || this.ownerDocument.parentWindow; if (win == window) { window.location.href='./bookmarkable/org.apache.wicket.MockPageWithLink?urlEscapeNeeded=someone%27s+%5Eb%25a%26d+pa%22rameter'; } ;return false\"></span></body></html>",
response);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapTest.java
index 4396371..b69922f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ClientSideImageMapTest.java
@@ -19,18 +19,18 @@ package org.apache.wicket.markup.html.link;
import java.util.Locale;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @since 1.5
*/
-public class ClientSideImageMapTest extends WicketTestCase
+class ClientSideImageMapTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void testRenderClientSideImageMapPage_1() throws Exception
+ void testRenderClientSideImageMapPage_1() throws Exception
{
tester.getSession().setLocale(Locale.US);
executeTest(ClientSideImageMapPage_1.class, "ClientSideImageMapPageExpectedResult_1.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
index 4248bb9..5feea33 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/DownloadLinkTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.markup.html.link;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.io.File;
import java.io.IOException;
@@ -25,17 +29,16 @@ import org.apache.wicket.model.IModel;
import org.apache.wicket.model.IWrapModel;
import org.apache.wicket.protocol.http.mock.MockServletContext;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-
/**
* Tests DownloadLink
*
* @author <a href="mailto:jbq@apache.org">Jean-Baptiste Quenot</a>
*/
-public class DownloadLinkTest extends WicketTestCase
+class DownloadLinkTest extends WicketTestCase
{
private static final String APPLICATION_X_CUSTOM = "application/x-custom";
private static final Logger log = LoggerFactory.getLogger(DownloadLinkTest.class);
@@ -44,7 +47,7 @@ public class DownloadLinkTest extends WicketTestCase
* Tests custom type download.
*/
@Test
- public void customTypeDownloadLink()
+ void customTypeDownloadLink()
{
tester.startPage(DownloadPage.class);
((MockServletContext)tester.getApplication().getServletContext()).addMimeType("custom",
@@ -58,7 +61,7 @@ public class DownloadLinkTest extends WicketTestCase
* Tests pdf download.
*/
@Test
- public void pdfDownloadLink()
+ void pdfDownloadLink()
{
tester.startPage(DownloadPage.class);
tester.clickLink(DownloadPage.PDF_DOWNLOAD_LINK);
@@ -70,7 +73,7 @@ public class DownloadLinkTest extends WicketTestCase
* Tests text download.
*/
@Test
- public void textDownloadLink()
+ void textDownloadLink()
{
tester.startPage(DownloadPage.class);
tester.clickLink(DownloadPage.TEXT_DOWNLOAD_LINK);
@@ -84,7 +87,7 @@ public class DownloadLinkTest extends WicketTestCase
* Tests file removal after download
*/
@Test
- public void deleteAfterLink()
+ void deleteAfterLink()
{
DownloadPage page;
@@ -107,7 +110,7 @@ public class DownloadLinkTest extends WicketTestCase
* WICKET-4738 wrapOnAssigment and detach on fileName
*/
@Test
- public void fileNameModel()
+ void fileNameModel()
{
FileNameModel fileNameModel = new FileNameModel();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
index 2093da6..ffbcd67 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/ExternalLinkTest.java
@@ -17,20 +17,20 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test ExternalLink (href="...")
*
* <a href="https://issues.apache.org/jira/browse/WICKET-1016"></<a>
*/
-public class ExternalLinkTest extends WicketTestCase
+class ExternalLinkTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderExternalLink_1() throws Exception
+ void renderExternalLink_1() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
executeTest(ExternalLinkPage_1.class, "ExternalLinkPageExpectedResult_1.html");
@@ -40,7 +40,7 @@ public class ExternalLinkTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderExternalLink_2() throws Exception
+ void renderExternalLink_2() throws Exception
{
tester.getApplication().getMarkupSettings().setAutomaticLinking(true);
executeTest(ExternalLinkPage_2.class, "ExternalLinkPageExpectedResult_2.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java
index 1be89c7..81c9d72 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/HrefTest.java
@@ -17,14 +17,14 @@
package org.apache.wicket.markup.html.link;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple tester that demonstrates the mock http application code (and checks that it is working)
*
* @author Chris Turner
*/
-public class HrefTest extends WicketTestCase
+class HrefTest extends WicketTestCase
{
/**
@@ -33,7 +33,7 @@ public class HrefTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_1() throws Exception
+ void renderHomePage_1() throws Exception
{
tester.getApplication().getMarkupSettings().setStripWicketTags(false);
executeTest(Href_1.class, "HrefExpectedResult_1.html");
@@ -45,7 +45,7 @@ public class HrefTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
tester.getApplication().getMarkupSettings().setStripWicketTags(true);
executeTest(Href_1.class, "HrefExpectedResult_1-1.html");
@@ -57,7 +57,7 @@ public class HrefTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2a() throws Exception
+ void renderHomePage_2a() throws Exception
{
tester.getApplication().getMarkupSettings().setStripWicketTags(true);
executeTest(Href_2.class, "HrefExpectedResult_2.html");
@@ -69,7 +69,7 @@ public class HrefTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_3() throws Exception
+ void renderHomePage_3() throws Exception
{
executeTest(Href_3.class, "HrefExpectedResult_3.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
index 7188083..84ee062 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/MountedPageLinkTest.java
@@ -16,19 +16,17 @@
*/
package org.apache.wicket.markup.html.link;
-import java.util.Arrays;
-import java.util.Collection;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.wicket.core.request.mapper.PageInstanceMapper;
import org.apache.wicket.protocol.http.PageExpiredException;
import org.apache.wicket.request.mapper.parameter.INamedParameters;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.junit.runners.Parameterized;
-import org.junit.runners.Parameterized.Parameters;
+import org.junit.jupiter.params.ParameterizedTest;
+import org.junit.jupiter.params.provider.ValueSource;
/**
* Testcases for links on mounted pages. These links are special, because they refer the page by id
@@ -37,46 +35,36 @@ import org.junit.runners.Parameterized.Parameters;
*
* @author papegaaij
*/
-@RunWith(Parameterized.class)
-public class MountedPageLinkTest extends WicketTestCase
+class MountedPageLinkTest extends WicketTestCase
{
- @Parameters
- public static Collection<Object[]> data()
- {
- return Arrays.asList(new Object[][] { { true }, { false } });
- }
- private boolean mount;
- public MountedPageLinkTest(boolean mount)
+ private void mountPage(boolean argument)
{
- this.mount = mount;
- }
-
- /**
- * Mount the page
- */
- @Before
- public void mountPage()
- {
- if (mount)
+ if (argument) {
tester.getApplication().mountPage("mount/${param}/part2", PageWithLink.class);
+ }
}
/**
* Tests if the page parameters are part of the url of the link, and if the link actually works.
*/
- @Test
- public void testPageParametersInLink()
+ @ParameterizedTest
+ @ValueSource(strings = { "true", "false" })
+ void testPageParametersInLink(boolean doMount)
{
+ mountPage(doMount);
+
PageWithLink page = tester.startPage(PageWithLink.class,
- new PageParameters().add("param", "value"));
+ new PageParameters().add("param", "value"));
Link<?> link = (Link<?>)page.get("link");
String url = link.getURL().toString();
- if (mount)
- assertTrue("URL for link should contain 'mount/value/part2': " + url, url.contains("mount/value/part2"));
+ if (doMount)
+ assertTrue(url.contains("mount/value/part2"),
+ "URL for link should contain 'mount/value/part2': " + url);
else
- assertTrue("URL for link should contain 'param=value': " + url, url.contains("param=value"));
+ assertTrue(url.contains("param=value"),
+ "URL for link should contain 'param=value': " + url);
tester.executeUrl(url);
}
@@ -84,9 +72,12 @@ public class MountedPageLinkTest extends WicketTestCase
* Tests if it is possible to re-instantiate the page if it is expired. The page should be
* instantiated with the same page parameters. The link will not be clicked however.
*/
- @Test
- public void testLinkOnExpiredPage()
+ @ParameterizedTest
+ @ValueSource(strings = { "true", "false" })
+ void testLinkOnExpiredPage(boolean argument)
{
+ mountPage(argument);
+
PageWithLink page = tester.startPage(PageWithLink.class,
new PageParameters().add("param", "value"));
assertEquals("value", page.getPageParameters().get("param").toString());
@@ -102,35 +93,48 @@ public class MountedPageLinkTest extends WicketTestCase
/**
* Tests if the {@link PageInstanceMapper} is used if
- * {@link org.apache.wicket.settings.PageSettings#getRecreateBookmarkablePagesAfterExpiry()}
- * is disabled
+ * {@link org.apache.wicket.settings.PageSettings#getRecreateBookmarkablePagesAfterExpiry()} is
+ * disabled
*/
- @Test
- public void testLinkOnPageWithRecreationDisabled()
+ @ParameterizedTest
+ @ValueSource(strings = { "true", "false" })
+ void testLinkOnPageWithRecreationDisabled(boolean doMount)
{
+ mountPage(doMount);
+
tester.getApplication().getPageSettings().setRecreateBookmarkablePagesAfterExpiry(false);
PageWithLink page = tester.startPage(PageWithLink.class,
new PageParameters().add("param", "value", INamedParameters.Type.MANUAL));
Link<?> link = (Link<?>)page.get("link");
String url = link.getURL().toString();
- assertEquals("./wicket/bookmarkable/org.apache.wicket.markup.html.link.PageWithLink?0-1.-link", url);
+ assertEquals(
+ "./wicket/bookmarkable/org.apache.wicket.markup.html.link.PageWithLink?0-1.-link", url);
tester.executeUrl(url);
}
/**
* ... and this should throw a {@link PageExpiredException} if the page is expired
*/
- @Test(expected = PageExpiredException.class)
- public void testExpiredPageWithRecreationDisabled()
+ @ParameterizedTest
+ @ValueSource(strings = { "true", "false" })
+ void testExpiredPageWithRecreationDisabled(boolean doMount)
{
+ mountPage(doMount);
+
tester.getApplication().getPageSettings().setRecreateBookmarkablePagesAfterExpiry(false);
PageWithLink page = tester.startPage(PageWithLink.class,
new PageParameters().add("param", "value", INamedParameters.Type.MANUAL));
Link<?> link = (Link<?>)page.get("link");
- String url = link.getURL().toString();
- assertEquals("./wicket/bookmarkable/org.apache.wicket.markup.html.link.PageWithLink?0-1.-link", url);
- // simulate a page expiry
- url = url.replace("PageWithLink?0", "PageWithLink?3");
- tester.executeUrl(url);
+
+ assertThrows(PageExpiredException.class, () -> {
+ String url = link.getURL().toString();
+ assertEquals(
+ "./wicket/bookmarkable/org.apache.wicket.markup.html.link.PageWithLink?0-1.-link",
+ url);
+ // simulate a page expiry
+ url = url.replace("PageWithLink?0", "PageWithLink?3");
+
+ tester.executeUrl(url);
+ });
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
index e6af20c..adabef2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/PageWithLink.java
@@ -16,11 +16,12 @@
*/
package org.apache.wicket.markup.html.link;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.markup.head.IHeaderResponse;
import org.apache.wicket.markup.head.StringHeaderItem;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.junit.Assert;
public class PageWithLink extends WebPage
{
@@ -35,7 +36,7 @@ public class PageWithLink extends WebPage
@Override
public void onClick()
{
- Assert.assertEquals("value", getPageParameters().get("param").toString());
+ assertEquals("value", getPageParameters().get("param").toString());
}
});
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2Test.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2Test.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2Test.java
index cae4cb7..6ea07ed 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2Test.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPage2Test.java
@@ -16,77 +16,79 @@
*/
package org.apache.wicket.markup.html.link.submitLink;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class FormPage2Test extends WicketTestCase
+class FormPage2Test extends WicketTestCase
{
/**
*
*/
@Test
- public void submitlinkIsSubmitted()
+ void submitlinkIsSubmitted()
{
tester.startPage(FormPage2.class);
FormPage2 page = (FormPage2)tester.getLastRenderedPage();
- Assert.assertFalse(page.isSubmitLinkSubmitted());
- Assert.assertFalse(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
+ assertFalse(page.isFormSubmitted());
tester.clickLink("form:link", false);
page = (FormPage2)tester.getLastRenderedPage();
- Assert.assertTrue(page.isSubmitLinkSubmitted());
- Assert.assertTrue(page.isFormSubmitted());
+ assertTrue(page.isSubmitLinkSubmitted());
+ assertTrue(page.isFormSubmitted());
}
/**
*
*/
@Test
- public void formIsSubmitted()
+ void formIsSubmitted()
{
tester.startPage(FormPage2.class);
FormPage2 page = (FormPage2)tester.getLastRenderedPage();
- Assert.assertFalse(page.isSubmitLinkSubmitted());
- Assert.assertFalse(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
+ assertFalse(page.isFormSubmitted());
FormTester formTester = tester.newFormTester("form");
formTester.submit();
page = (FormPage2)tester.getLastRenderedPage();
- Assert.assertTrue(page.isFormSubmitted());
- Assert.assertFalse(page.isSubmitLinkSubmitted());
+ assertTrue(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
}
/**
*
*/
@Test
- public void formAndLinkAreSubmitted()
+ void formAndLinkAreSubmitted()
{
tester.startPage(FormPage2.class);
FormPage2 page = (FormPage2)tester.getLastRenderedPage();
- Assert.assertFalse(page.isSubmitLinkSubmitted());
- Assert.assertFalse(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
+ assertFalse(page.isFormSubmitted());
FormTester formTester = tester.newFormTester("form");
formTester.submitLink("link", false);
page = (FormPage2)tester.getLastRenderedPage();
- Assert.assertTrue(page.isFormSubmitted());
- Assert.assertTrue(page.isSubmitLinkSubmitted());
+ assertTrue(page.isFormSubmitted());
+ assertTrue(page.isSubmitLinkSubmitted());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPageTest.java
index afcc983..798b834 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/link/submitLink/FormPageTest.java
@@ -16,77 +16,79 @@
*/
package org.apache.wicket.markup.html.link.submitLink;
-import org.junit.Assert;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.util.tester.FormTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class FormPageTest extends WicketTestCase
+class FormPageTest extends WicketTestCase
{
/**
*
*/
@Test
- public void submitlinkIsSubmitted()
+ void submitlinkIsSubmitted()
{
tester.startPage(FormPage.class);
FormPage page = (FormPage)tester.getLastRenderedPage();
- Assert.assertFalse(page.isSubmitLinkSubmitted());
- Assert.assertFalse(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
+ assertFalse(page.isFormSubmitted());
tester.clickLink("link", false);
page = (FormPage)tester.getLastRenderedPage();
- Assert.assertTrue(page.isSubmitLinkSubmitted());
- Assert.assertTrue(page.isFormSubmitted());
+ assertTrue(page.isSubmitLinkSubmitted());
+ assertTrue(page.isFormSubmitted());
}
/**
*
*/
@Test
- public void formIsSubmitted()
+ void formIsSubmitted()
{
tester.startPage(FormPage.class);
FormPage page = (FormPage)tester.getLastRenderedPage();
- Assert.assertFalse(page.isSubmitLinkSubmitted());
- Assert.assertFalse(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
+ assertFalse(page.isFormSubmitted());
FormTester formTester = tester.newFormTester("form");
formTester.submit();
page = (FormPage)tester.getLastRenderedPage();
- Assert.assertTrue(page.isFormSubmitted());
- Assert.assertFalse(page.isSubmitLinkSubmitted());
+ assertTrue(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
}
/**
*
*/
@Test
- public void formAndLinkAreSubmitted()
+ void formAndLinkAreSubmitted()
{
tester.startPage(FormPage.class);
FormPage page = (FormPage)tester.getLastRenderedPage();
- Assert.assertFalse(page.isSubmitLinkSubmitted());
- Assert.assertFalse(page.isFormSubmitted());
+ assertFalse(page.isSubmitLinkSubmitted());
+ assertFalse(page.isFormSubmitted());
FormTester formTester = tester.newFormTester("form");
formTester.submitLink("link", true);
page = (FormPage)tester.getLastRenderedPage();
- Assert.assertTrue(page.isFormSubmitted());
- Assert.assertTrue(page.isSubmitLinkSubmitted());
+ assertTrue(page.isFormSubmitted());
+ assertTrue(page.isSubmitLinkSubmitted());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
index b02ead5..a59f8aa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/IncrementalTableNavigationTest.java
@@ -19,13 +19,13 @@ package org.apache.wicket.markup.html.list;
import org.apache.wicket.Page;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for simple table behavior.
*/
-public class IncrementalTableNavigationTest extends WicketTestCase
+class IncrementalTableNavigationTest extends WicketTestCase
{
/**
* Test simple table behavior.
@@ -33,7 +33,7 @@ public class IncrementalTableNavigationTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void pagedTable() throws Exception
+ void pagedTable() throws Exception
{
executeTest(IncrementalTableNavigationPage.class,
"IncrementalTableNavigationPage_ExpectedResult_1.html");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
index 451a5a2..4d14625 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/ListViewTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.list;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.ArrayList;
import java.util.List;
@@ -23,14 +25,14 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.model.IModel;
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Test for ListView
*
* @author Juergen Donnerstag
*/
-public class ListViewTest extends WicketTestCase
+class ListViewTest extends WicketTestCase
{
/**
* Create a predefined ListView
@@ -62,7 +64,7 @@ public class ListViewTest extends WicketTestCase
/**
*/
@Test
- public void generics()
+ void generics()
{
// a listView for numbers
class NumberListView<N extends Number> extends ListView<N>
@@ -72,7 +74,7 @@ public class ListViewTest extends WicketTestCase
// since the given list is not changed actually, we can safely
// accept lists accepting subtypes of numbers only
- public NumberListView(String id, IModel<? extends List<N>> model)
+ NumberListView(String id, IModel<? extends List<N>> model)
{
super(id, model);
}
@@ -96,7 +98,7 @@ public class ListViewTest extends WicketTestCase
*
*/
@Test
- public void listView()
+ void listView()
{
ListView<Integer> lv = createListView(4);
assertEquals(4, lv.getList().size());
@@ -133,7 +135,7 @@ public class ListViewTest extends WicketTestCase
*
*/
@Test
- public void emptyListView()
+ void emptyListView()
{
// Empty tables
ListView<?> lv = createListView(0);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
index dd2799f..a3951e1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.markup.html.list;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.List;
import java.util.Locale;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test for simple table behavior.
*/
-public class PagedTableNavigatorTest extends WicketTestCase
+class PagedTableNavigatorTest extends WicketTestCase
{
/**
@@ -37,7 +39,7 @@ public class PagedTableNavigatorTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void pagedTable() throws Exception
+ void pagedTable() throws Exception
{
tester.getSession().setLocale(Locale.ENGLISH);
tester.startPage(PagedTableNavigatorPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
index 7df1da9..2ced96c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithLabelProviderTest.java
@@ -16,18 +16,20 @@
*/
package org.apache.wicket.markup.html.list;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Locale;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test for simple table behavior.
*/
-public class PagedTableNavigatorWithLabelProviderTest extends WicketTestCase
+class PagedTableNavigatorWithLabelProviderTest extends WicketTestCase
{
/**
* Test simple table behavior.
@@ -35,7 +37,7 @@ public class PagedTableNavigatorWithLabelProviderTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void pagedTable() throws Exception
+ void pagedTable() throws Exception
{
tester.getSession().setLocale(Locale.ENGLISH);
tester.startPage(PagedTableNavigatorWithLabelProviderPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
index b4831a5..930dfc8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/PagedTableNavigatorWithMarginTest.java
@@ -16,18 +16,20 @@
*/
package org.apache.wicket.markup.html.list;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import java.util.Locale;
import org.apache.wicket.markup.html.link.Link;
import org.apache.wicket.util.tester.DiffUtil;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test for simple table behavior.
*/
-public class PagedTableNavigatorWithMarginTest extends WicketTestCase
+class PagedTableNavigatorWithMarginTest extends WicketTestCase
{
/**
@@ -36,7 +38,7 @@ public class PagedTableNavigatorWithMarginTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void pagedTable() throws Exception
+ void pagedTable() throws Exception
{
tester.getSession().setLocale(Locale.ENGLISH);
tester.startPage(PagedTableNavigatorWithMarginPage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
index cc01a4a..84d7fdc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/SimpleTableTest.java
@@ -16,15 +16,17 @@
*/
package org.apache.wicket.markup.html.list;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test for simple table behavior.
*/
-public class SimpleTableTest extends WicketTestCase
+class SimpleTableTest extends WicketTestCase
{
/**
* Test simple table behavior.
@@ -32,7 +34,7 @@ public class SimpleTableTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void simpleTable_1() throws Exception
+ void simpleTable_1() throws Exception
{
executeTest(SimpleTablePage_1.class, "SimpleTablePageExpectedResult_1.html");
String document = tester.getLastResponseAsString();
@@ -57,7 +59,7 @@ public class SimpleTableTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void simpleTable_2() throws Exception
+ void simpleTable_2() throws Exception
{
executeTest(SimpleTablePage_2.class, "SimpleTablePageExpectedResult_2.html");
String document = tester.getLastResponseAsString();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
index 7de4d12..7c1899d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/list/TableTest.java
@@ -16,20 +16,21 @@
*/
package org.apache.wicket.markup.html.list;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.ArrayList;
import java.util.List;
import org.apache.wicket.model.util.ListModel;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Test for tables.
*
* @author Juergen Donnerstag
*/
-public class TableTest extends WicketTestCase
+class TableTest extends WicketTestCase
{
/**
@@ -64,7 +65,7 @@ public class TableTest extends WicketTestCase
*
*/
@Test
- public void table()
+ void table()
{
PageableListView<?> table = createTable(20, 4);
assertEquals(4, table.getItemsPerPage());
@@ -97,7 +98,7 @@ public class TableTest extends WicketTestCase
*
*/
@Test
- public void emptyTable()
+ void emptyTable()
{
PageableListView<?> table = createTable(0, 4);
assertEquals(4, table.getItemsPerPage());
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/TestHomePage.java
index 0d76351..7d77dd0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/TestHomePage.java
@@ -18,12 +18,12 @@ package org.apache.wicket.markup.html.markupId;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
@Override
@@ -36,7 +36,7 @@ public class TestHomePage extends WicketTestCase
* testRenderMyPage()
*/
@Test
- public void testRenderMyPage()
+ void testRenderMyPage()
{
// start and render the test page
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/WicketApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/WicketApplication.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/WicketApplication.java
index 5dc983c..e09c13e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/WicketApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/markupId/WicketApplication.java
@@ -24,7 +24,7 @@ import org.apache.wicket.protocol.http.WebApplication;
*
* @see com.mycompany.Start#main(String[])
*/
-public class WicketApplication extends WebApplication
+class WicketApplication extends WebApplication
{
/**
* Constructor
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaComponentsApplication.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaComponentsApplication.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaComponentsApplication.java
index 899f553..ba09f7c 100755
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaComponentsApplication.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaComponentsApplication.java
@@ -22,7 +22,7 @@ import org.apache.wicket.markup.html.SecurePackageResourceGuard;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.request.resource.caching.NoOpResourceCachingStrategy;
-public class MediaComponentsApplication extends WebApplication
+class MediaComponentsApplication extends WebApplication
{
@Override
public Class<? extends Page> getHomePage()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java
index 81b12e5..9e95dc3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/media/MediaTagsTest.java
@@ -16,12 +16,15 @@
*/
package org.apache.wicket.markup.html.media;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.tester.TagTester;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class MediaTagsTest extends WicketTestCase
+class MediaTagsTest extends WicketTestCase
{
@Override
protected WebApplication newApplication()
@@ -30,7 +33,7 @@ public class MediaTagsTest extends WicketTestCase
}
@Test
- public void audioTagIsRenderedRight()
+ void audioTagIsRenderedRight()
{
tester.startPage(MediaTagsTestPage.class);
String lastResponseAsString = tester.getLastResponse().getDocument();
@@ -42,31 +45,27 @@ public class MediaTagsTest extends WicketTestCase
assertTrue(createTagByAttribute.hasAttribute("muted"));
assertEquals("user-credentials", createTagByAttribute.getAttribute("crossorigin"));
String attribute = createTagByAttribute.getAttribute("src");
- assertTrue("The time period is set right in the src attribute",
- attribute.contains("#t=5,10"));
- assertTrue("page parameter is in the url of the src attribute",
- attribute.contains("test=test"));
+ assertTrue(attribute.contains("#t=5,10"), "The time period is set right in the src attribute");
+ assertTrue(attribute.contains("test=test"), "page parameter is in the url of the src attribute");
}
@Test
- public void videoTagIsRenderedRight()
+ void videoTagIsRenderedRight()
{
tester.startPage(MediaTagsTestPage.class);
String lastResponseAsString = tester.getLastResponse().getDocument();
TagTester createTagByAttribute = TagTester.createTagByAttribute(lastResponseAsString,
"video");
String attribute = createTagByAttribute.getAttribute("poster");
- assertTrue("page parameter is in the url of the poster",
- attribute.contains("test2=test2"));
+ assertTrue(attribute.contains("test2=test2"), "page parameter is in the url of the poster");
String attributesrc = createTagByAttribute.getAttribute("src");
- assertTrue("video url is in the src attribute",
- attributesrc.contains("dummyVideo.m4a"));
+ assertTrue(attributesrc.contains("dummyVideo.m4a"), "video url is in the src attribute");
assertEquals("500", createTagByAttribute.getAttribute("width"));
assertEquals("400", createTagByAttribute.getAttribute("height"));
}
@Test
- public void extendedVideoTagIsRenderedRight()
+ void extendedVideoTagIsRenderedRight()
{
tester.startPage(MediaTagsExtendedTestPage.class);
String lastResponseAsString = tester.getLastResponse().getDocument();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java
index 02966e5..5682e89 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/AbstractPagingNavigationTest.java
@@ -16,15 +16,16 @@
*/
package org.apache.wicket.markup.html.navigation.paging;
-import org.apache.wicket.util.tester.WicketTestCase;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import org.apache.wicket.util.tester.WicketTestCase;
/**
* Base class for testing the navigation links, supplies a mock object for exercizing the links.
*
* @author Martijn Dashorst
*/
-public abstract class AbstractPagingNavigationTest extends WicketTestCase
+abstract class AbstractPagingNavigationTest extends WicketTestCase
{
/**
* Mock object for testing the increment link.
@@ -46,12 +47,12 @@ public abstract class AbstractPagingNavigationTest extends WicketTestCase
}
/**
- * @see IPageable#setCurrentPage(int)
+ * @see IPageable#setCurrentPage(long)
*/
@Override
public void setCurrentPage(long page)
{
- assertEquals("setCurrentPage", expectedPage, page);
+ assertEquals(expectedPage, page, "setCurrentPage");
}
/**
@@ -75,8 +76,8 @@ public abstract class AbstractPagingNavigationTest extends WicketTestCase
}
/** mock page count. */
- protected long pagecount = 0;
+ long pagecount = 0;
/** mock current page. */
- protected long currentpage = 0;
+ long currentpage = 0;
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java
index 7d6db88..712c5fa 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationIncrementLinkTest.java
@@ -16,16 +16,19 @@
*/
package org.apache.wicket.markup.html.navigation.paging;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Testcase for the navigation increment link.
*
* @author Martijn Dashorst
*/
-public class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationTest
+class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationTest
{
/** the mock pageable driver. */
@@ -36,8 +39,8 @@ public class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationT
*
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
mock = new MockPageable();
}
@@ -46,7 +49,7 @@ public class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationT
* Performs the forward navigation by incrementing one page.
*/
@Test
- public void getPageNumberPositive()
+ void getPageNumberPositive()
{
PagingNavigationIncrementLink<Void> link = new PagingNavigationIncrementLink<Void>("xx",
mock, 1);
@@ -63,7 +66,7 @@ public class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationT
* Performs the backward navigation by decrementing one page.
*/
@Test
- public void getPageNumberNegative()
+ void getPageNumberNegative()
{
PagingNavigationIncrementLink<Void> link = new PagingNavigationIncrementLink<Void>("xx",
mock, -1);
@@ -83,7 +86,7 @@ public class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationT
* Performs the forward navigation by incrementing two pages.
*/
@Test
- public void getPageNumberTwo()
+ void getPageNumberTwo()
{
PagingNavigationIncrementLink<Void> link = new PagingNavigationIncrementLink<Void>("xx",
mock, 2);
@@ -106,7 +109,7 @@ public class PagingNavigationIncrementLinkTest extends AbstractPagingNavigationT
* Checks the logic behind the isFirst and isLast page methods.
*/
@Test
- public void isFirstLastPage()
+ void isFirstLastPage()
{
PagingNavigationIncrementLink<Void> link = new PagingNavigationIncrementLink<Void>("xx",
mock, 0);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java
index 1be7f40..c8eafa2 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/navigation/paging/PagingNavigationLinkTest.java
@@ -16,16 +16,19 @@
*/
package org.apache.wicket.markup.html.navigation.paging;
-import org.junit.Before;
-import org.junit.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
/**
* Tests the PagingNavigationLink.
*
* @author Martijn Dashorst
*/
-public class PagingNavigationLinkTest extends AbstractPagingNavigationTest
+class PagingNavigationLinkTest extends AbstractPagingNavigationTest
{
/** the mock pageable driver. */
private MockPageable mock;
@@ -35,8 +38,8 @@ public class PagingNavigationLinkTest extends AbstractPagingNavigationTest
*
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
mock = new MockPageable();
}
@@ -45,25 +48,25 @@ public class PagingNavigationLinkTest extends AbstractPagingNavigationTest
* Tests the get page number and is first and last methods.
*/
@Test
- public void getPageNumber_1()
+ void getPageNumber_1()
{
PagingNavigationLink<Void> link = new PagingNavigationLink<Void>("id", mock, 0);
currentpage = 0;
pagecount = 0;
- assertTrue("is first", link.isFirst());
- assertFalse("is last", link.isLast());
+ assertTrue(link.isFirst(), "is first");
+ assertFalse(link.isLast(), "is last");
assertEquals(0, link.getPageNumber());
pagecount = 1;
- assertTrue("is first", link.isFirst());
- assertTrue("is last", link.isLast());
+ assertTrue(link.isFirst(), "is first");
+ assertTrue(link.isLast(), "is last");
assertEquals(0, link.getPageNumber());
pagecount = 2;
- assertTrue("is first", link.isFirst());
- assertFalse("is last", link.isLast());
+ assertTrue(link.isFirst(), "is first");
+ assertFalse(link.isLast(), "is last");
assertEquals(0, link.getPageNumber());
}
@@ -71,25 +74,25 @@ public class PagingNavigationLinkTest extends AbstractPagingNavigationTest
* Tests the get page number and is first and last methods.
*/
@Test
- public void getPageNumber_2()
+ void getPageNumber_2()
{
PagingNavigationLink<Void> link = new PagingNavigationLink<Void>("id", mock, 2);
currentpage = 0;
pagecount = 0;
- assertTrue("is first", link.isFirst());
- assertFalse("is last", link.isLast());
+ assertTrue(link.isFirst(), "is first");
+ assertFalse(link.isLast(), "is last");
assertEquals(0, link.getPageNumber());
pagecount = 2;
- assertFalse("is first", link.isFirst());
- assertTrue("is last", link.isLast());
+ assertFalse(link.isFirst(), "is first");
+ assertTrue(link.isLast(), "is last");
assertEquals(1, link.getPageNumber());
pagecount = 3;
- assertFalse("is first", link.isFirst());
- assertTrue("is last", link.isLast());
+ assertFalse(link.isFirst(), "is first");
+ assertTrue(link.isLast(), "is last");
assertEquals(2, link.getPageNumber());
}
@@ -97,25 +100,25 @@ public class PagingNavigationLinkTest extends AbstractPagingNavigationTest
* Tests the get page number and is first and last methods.
*/
@Test
- public void getPageNumber_3()
+ void getPageNumber_3()
{
PagingNavigationLink<Void> link = new PagingNavigationLink<Void>("id", mock, -1);
currentpage = 0;
pagecount = 0;
- assertTrue("is first", link.isFirst());
- assertFalse("is last", link.isLast());
+ assertTrue(link.isFirst(), "is first");
+ assertFalse(link.isLast(), "is last");
assertEquals(0, link.getPageNumber());
pagecount = 2;
- assertFalse("is first", link.isFirst());
- assertTrue("is last", link.isLast());
+ assertFalse(link.isFirst(), "is first");
+ assertTrue(link.isLast(), "is last");
assertEquals(1, link.getPageNumber());
pagecount = 3;
- assertFalse("is first", link.isFirst());
- assertTrue("is last", link.isLast());
+ assertFalse(link.isFirst(), "is first");
+ assertTrue(link.isLast(), "is last");
assertEquals(2, link.getPageNumber());
}
@@ -123,28 +126,28 @@ public class PagingNavigationLinkTest extends AbstractPagingNavigationTest
* Tests the linksTo method.
*/
@Test
- public void linksTo()
+ void linksTo()
{
PagingNavigationLink<Void> link = new PagingNavigationLink<Void>("id", mock, -1);
currentpage = 0;
pagecount = 0;
- assertTrue("links to", link.linksTo(null));
+ assertTrue(link.linksTo(null), "links to");
currentpage = 0;
pagecount = 1;
- assertTrue("links to", link.linksTo(null));
+ assertTrue(link.linksTo(null), "links to");
currentpage = 0;
pagecount = 3;
- assertFalse("links to", link.linksTo(null));
+ assertFalse(link.linksTo(null), "links to");
currentpage = 2;
pagecount = 3;
- assertTrue("links to", link.linksTo(null));
+ assertTrue(link.linksTo(null), "links to");
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java
index bb7e947..2b4b1c3 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/page/TestHomePage.java
@@ -17,18 +17,18 @@
package org.apache.wicket.markup.html.page;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
/**
*
*/
@Test
- public void testRenderMyPage()
+ void testRenderMyPage()
{
// no exception should occur
tester.startPage(HomePage.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java
index e38815d..0e7c99a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FeedbackPanelTest.java
@@ -27,17 +27,17 @@ import org.apache.wicket.markup.html.basic.Label;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link FeedbackPanel}
*
* @author cgatay
*/
-public class FeedbackPanelTest extends WicketTestCase
+class FeedbackPanelTest extends WicketTestCase
{
@Test
- public void testCssClassesOnFeedbackPanel() throws Exception
+ void testCssClassesOnFeedbackPanel() throws Exception
{
TestPage testPage = new TestPage();
testPage.label.error("Error message");
@@ -47,7 +47,7 @@ public class FeedbackPanelTest extends WicketTestCase
}
@Test
- public void collectSessionMessages() throws Exception
+ void collectSessionMessages() throws Exception
{
TestPage testPage = new TestPage();
@@ -66,7 +66,7 @@ public class FeedbackPanelTest extends WicketTestCase
FeedbackPanel feedbackPanel;
Component label;
- public TestPage()
+ TestPage()
{
feedbackPanel = new FeedbackPanel("feedback")
{
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FencedFeedbackPanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FencedFeedbackPanelTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FencedFeedbackPanelTest.java
index df351cc..2f09613 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FencedFeedbackPanelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FencedFeedbackPanelTest.java
@@ -16,7 +16,8 @@
*/
package org.apache.wicket.markup.html.panel;
-import static org.junit.Assert.*;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.wicket.Component;
import org.apache.wicket.MarkupContainer;
@@ -31,22 +32,22 @@ import org.apache.wicket.markup.html.form.Form;
import org.apache.wicket.markup.html.form.TextField;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.apache.wicket.util.tester.WicketTesterScope;
-import org.junit.Rule;
-import org.junit.Test;
+import org.apache.wicket.util.tester.WicketTesterExtension;
+import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.extension.RegisterExtension;
/**
* Tests {@link FencedFeedbackPanel}
*
* @author igor
*/
-public class FencedFeedbackPanelTest
+class FencedFeedbackPanelTest
{
- @Rule
- public WicketTesterScope scope = new WicketTesterScope();
+ @RegisterExtension
+ public WicketTesterExtension scope = new WicketTesterExtension();
@Test
- public void fencing()
+ void fencing()
{
TestPage page = scope.getTester().startPage(TestPage.class);
page.containerInput.error("error");
@@ -90,7 +91,7 @@ public class FencedFeedbackPanelTest
}
@Test
- public void filtering()
+ void filtering()
{
TestPage page = scope.getTester().startPage(TestPage.class);
@@ -135,7 +136,7 @@ public class FencedFeedbackPanelTest
}
@Test
- public void moving()
+ void moving()
{
TestPage page = scope.getTester().startPage(TestPage.class);
page.containerInput.error("error");
@@ -172,7 +173,7 @@ public class FencedFeedbackPanelTest
}
@Test
- public void reAdding()
+ void reAdding()
{
TestPage page = scope.getTester().startPage(TestPage.class);
MarkupContainer container = page.containerFeedback.getParent();
@@ -188,12 +189,12 @@ public class FencedFeedbackPanelTest
}
- public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
+ public static class TestPage extends WebPage implements IMarkupResourceStreamProvider
{
FencedFeedbackPanel externalFeedback, formFeedback, containerFeedback, containerFeedback2;
Component externalLabel, formInput, containerInput;
- public TestPage()
+ public TestPage()
{
externalFeedback = new FencedFeedbackPanel("feedback");
externalLabel = new Label("externalLabel");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java
index 6eded9a..8c447ab 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTest.java
@@ -16,18 +16,19 @@
*/
package org.apache.wicket.markup.html.panel;
+import static org.hamcrest.MatcherAssert.assertThat;
import static org.hamcrest.Matchers.containsString;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class FragmentTest extends WicketTestCase
+class FragmentTest extends WicketTestCase
{
@Test
- public void testFragments()
+ void testFragments()
{
tester.startComponentInPage(FragmentTestPanel.class);
}
@@ -36,7 +37,7 @@ public class FragmentTest extends WicketTestCase
* WICKET-5060
*/
@Test
- public void testComponentAndFragmentWithSameId()
+ void testComponentAndFragmentWithSameId()
{
tester.startComponentInPage(FragmentTestPanel_2.class);
assertThat(tester.getLastResponseAsString(), containsString("fragment body"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel.java
index 5319a21..be32f84 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel.java
@@ -48,7 +48,7 @@ public class FragmentTestPanel extends Panel
*
* @param id
*/
- public TestFragment(String id)
+ TestFragment(String id)
{
super(id, "testFrag", FragmentTestPanel.this);
add(new Label("label", "Hello!"));
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.java
index a6348d7..1a9b92c 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/FragmentTestPanel_2.java
@@ -50,7 +50,7 @@ public class FragmentTestPanel_2 extends Panel
*
* @param id
*/
- public TestFragment(String id)
+ TestFragment(String id)
{
super(id, "testFrag", FragmentTestPanel_2.this);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
index fec0bcd..cf5e478 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_5.java
@@ -53,7 +53,7 @@ public class InlinePanelPage_5 extends WebPage
* @param id
* @param markupId
*/
- public FragmentWithAssociatedMarkupStream(final String id, final String markupId)
+ FragmentWithAssociatedMarkupStream(final String id, final String markupId)
{
super(id, markupId, null);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java
index a8b1f2b..1735e41 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/InlinePanelPage_8.java
@@ -71,7 +71,7 @@ public class InlinePanelPage_8 extends WebPage
* @param id
* @param number
*/
- public ListNode(String id, int number)
+ ListNode(String id, int number)
{
super(id, "node", InlinePanelPage_8.this);
add(new Label("number", Integer.toString(number)));
@@ -87,7 +87,7 @@ public class InlinePanelPage_8 extends WebPage
* @param number
* @return the added {@link ListNode}
*/
- public ListNode addNext(AjaxRequestTarget target, int number)
+ ListNode addNext(AjaxRequestTarget target, int number)
{
ListNode next = new ListNode("next", number);
nextContainer.add(next);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
index 0ede2a9..b2abc5d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/panel/PanelTest.java
@@ -16,14 +16,16 @@
*/
package org.apache.wicket.markup.html.panel;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.Page;
import org.apache.wicket.markup.MarkupException;
import org.apache.wicket.markup.MarkupNotFoundException;
import org.apache.wicket.markup.html.markupId.MyPanel;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Simple application that demonstrates the mock http application code (and checks that it is
@@ -31,13 +33,13 @@ import org.junit.Test;
*
* @author Chris Turner
*/
-public class PanelTest extends WicketTestCase
+class PanelTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderHomePage_1() throws Exception
+ void renderHomePage_1() throws Exception
{
boolean hit = false;
try
@@ -52,14 +54,14 @@ public class PanelTest extends WicketTestCase
assertTrue(mex.getMessage().contains("Tag does not have a close tag"));
assertTrue(mex.toString().contains("SimplePanel_1.html"));
}
- assertTrue("Did expect a MarkupException", hit);
+ assertTrue(hit, "Did expect a MarkupException");
}
/**
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
boolean hit = false;
try
@@ -73,14 +75,14 @@ public class PanelTest extends WicketTestCase
assertTrue(mex.getMessage().contains("Expected to find <wicket:panel>"));
assertTrue(mex.getMessage().contains("SimplePanel_2.html"));
}
- assertTrue("Did expect a MarkupException", hit);
+ assertTrue(hit, "Did expect a MarkupException");
}
/**
* @throws Exception
*/
@Test
- public void panel3() throws Exception
+ void panel3() throws Exception
{
executeTest(PanelPage_3.class, "PanelPageExpectedResult_3.html");
}
@@ -89,7 +91,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void panel4() throws Exception
+ void panel4() throws Exception
{
executeTest(PanelPage_4.class, "PanelPageExpectedResult_4.html");
}
@@ -98,7 +100,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel() throws Exception
+ void inlinePanel() throws Exception
{
executeTest(InlinePanelPage_1.class, "InlinePanelPageExpectedResult_1.html");
}
@@ -107,7 +109,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel_2() throws Exception
+ void inlinePanel_2() throws Exception
{
executeTest(InlinePanelPage_2.class, "InlinePanelPageExpectedResult_2.html");
}
@@ -116,7 +118,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel_3() throws Exception
+ void inlinePanel_3() throws Exception
{
executeTest(InlinePanelPage_3.class, "InlinePanelPageExpectedResult_3.html");
}
@@ -125,7 +127,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel_4() throws Exception
+ void inlinePanel_4() throws Exception
{
executeTest(InlinePanelPage_4.class, "InlinePanelPageExpectedResult_4.html");
}
@@ -134,7 +136,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel_5() throws Exception
+ void inlinePanel_5() throws Exception
{
executeTest(InlinePanelPage_5.class, "InlinePanelPageExpectedResult_5.html");
}
@@ -145,7 +147,7 @@ public class PanelTest extends WicketTestCase
// TODO FIX the implementation. Fragment markup provider can not be a
// sibling of the panel.
@Test
- public void inlinePanel_6() throws Exception
+ void inlinePanel_6() throws Exception
{
executeTest(InlinePanelPage_6.class, "InlinePanelPageExpectedResult_6.html");
}
@@ -154,7 +156,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void panelWithAttributeModifier() throws Exception
+ void panelWithAttributeModifier() throws Exception
{
executeTest(PanelWithAttributeModifierPage.class,
"PanelWithAttributeModifierPageExpectedResult_1.html");
@@ -164,7 +166,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel_7() throws Exception
+ void inlinePanel_7() throws Exception
{
executeTest(InlinePanelPage_7.class, "InlinePanelPageExpectedResult_7.html");
}
@@ -173,7 +175,7 @@ public class PanelTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inlinePanel_8() throws Exception
+ void inlinePanel_8() throws Exception
{
executeTest(InlinePanelPage_8.class, "InlinePanelPageExpectedResult_8.html");
Page page = tester.getLastRenderedPage();
@@ -187,7 +189,7 @@ public class PanelTest extends WicketTestCase
*
*/
@Test
- public void startPanel()
+ void startPanel()
{
tester.startComponentInPage(MyPanel.class);
tester.assertLabel("label", "Hello, World!");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java
index bca3e8e..c32cf68 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/tags/InputTagNotClosedTest.java
@@ -17,18 +17,18 @@
package org.apache.wicket.markup.html.tags;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author jcompagner
*/
-public class InputTagNotClosedTest extends WicketTestCase
+class InputTagNotClosedTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void inputVisible() throws Exception
+ void inputVisible() throws Exception
{
executeTest(InputTagVisibleWebPage.class, "InputTagVisibleWebPageResult.html");
}
@@ -37,7 +37,7 @@ public class InputTagNotClosedTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void inputNotVisible() throws Exception
+ void inputNotVisible() throws Exception
{
executeTest(InputTagNotVisibleWebPage.class, "InputTagNotVisibleWebPageResult.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java
index 8c753c2..89fac27 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/outputTransformer/OutputTransformerContainerTest.java
@@ -17,19 +17,19 @@
package org.apache.wicket.markup.outputTransformer;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
* @author Juergen Donnerstag
*/
-public class OutputTransformerContainerTest extends WicketTestCase
+class OutputTransformerContainerTest extends WicketTestCase
{
/**
* @throws Exception
*/
@Test
- public void renderHomePage() throws Exception
+ void renderHomePage() throws Exception
{
executeTest(Page_1.class, "PageExpectedResult_1.html");
}
@@ -38,7 +38,7 @@ public class OutputTransformerContainerTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_2() throws Exception
+ void renderHomePage_2() throws Exception
{
executeTest(Page_2.class, "PageExpectedResult_2.html");
}
@@ -47,7 +47,7 @@ public class OutputTransformerContainerTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void renderHomePage_3() throws Exception
+ void renderHomePage_3() throws Exception
{
executeTest(Page_3.class, "PageExpectedResult_3.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java
index 7403c2c..c38b2e7 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/MergedMarkupTest.java
@@ -16,24 +16,26 @@
*/
package org.apache.wicket.markup.parser;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.Page;
import org.apache.wicket.markup.Markup;
import org.apache.wicket.markup.MarkupParser;
import org.apache.wicket.markup.MarkupResourceStream;
import org.apache.wicket.markup.MarkupStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class MergedMarkupTest extends WicketTestCase
+class MergedMarkupTest extends WicketTestCase
{
/**
* test1()
*/
@Test
- public void test1()
+ void test1()
{
Page page = new SubPageWithoutMarkup();
Markup markup = page.getAssociatedMarkup();
@@ -46,7 +48,7 @@ public class MergedMarkupTest extends WicketTestCase
* test2()
*/
@Test
- public void test2()
+ void test2()
{
Page page = new SubPageWithMarkup();
MarkupStream markup = page.getAssociatedMarkupStream(true);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
index db1a21a..40ab93f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/RelativePathPrefixHandlerTest.java
@@ -17,21 +17,21 @@
package org.apache.wicket.markup.parser;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Quite some tests are already with MarkupParser.
*
* @author Juergen Donnerstag
*/
-public class RelativePathPrefixHandlerTest extends WicketTestCase
+class RelativePathPrefixHandlerTest extends WicketTestCase
{
/**
*
* @throws Exception
*/
@Test
- public void basics() throws Exception
+ void basics() throws Exception
{
executeTest(Page_1.class, "PageExpectedResult_1.html");
}
@@ -40,7 +40,7 @@ public class RelativePathPrefixHandlerTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void anchors() throws Exception
+ void anchors() throws Exception
{
executeTest(Page_2.class, "PageExpectedResult_2.html");
}
@@ -49,7 +49,7 @@ public class RelativePathPrefixHandlerTest extends WicketTestCase
* @throws Exception
*/
@Test
- public void transparency() throws Exception
+ void transparency() throws Exception
{
executeTest(Page_3.class, "PageExpectedResult_3.html");
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/parser/TestHomePage.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/TestHomePage.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/TestHomePage.java
index fc57358..323f0ce 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/TestHomePage.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/TestHomePage.java
@@ -17,18 +17,18 @@
package org.apache.wicket.markup.parser;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
*/
-public class TestHomePage extends WicketTestCase
+class TestHomePage extends WicketTestCase
{
/**
* Wicket-2105
*/
@Test
- public void testRenderMyPage()
+ void testRenderMyPage()
{
// start and render the test page
tester.startPage(HomePage.class);