http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java index 1c7f5c4..d89a036 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/util/string/JavaScriptUtilsTest.java @@ -16,14 +16,15 @@ */ package org.apache.wicket.core.util.string; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.response.StringResponse; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @since 1.5.7 */ -public class JavaScriptUtilsTest extends Assert +class JavaScriptUtilsTest { /** * https://issues.apache.org/jira/browse/WICKET-4546 @@ -31,7 +32,7 @@ public class JavaScriptUtilsTest extends Assert * @throws Exception */ @Test - public void writeJavaScriptUrl() throws Exception + void writeJavaScriptUrl() throws Exception { StringResponse response = new StringResponse(); String url = "some/url;jsessionid=1234?p1=v1&p2=v2"; @@ -49,7 +50,7 @@ public class JavaScriptUtilsTest extends Assert * https://issues.apache.org/jira/browse/WICKET-5715 */ @Test - public void writeJavaScriptUrlAsync() + void writeJavaScriptUrlAsync() { StringResponse response = new StringResponse(); String url = "some/url;jsessionid=1234?p1=v1&p2=v2"; @@ -67,7 +68,7 @@ public class JavaScriptUtilsTest extends Assert /** */ @Test - public void writeJavaScript() + void writeJavaScript() { StringResponse response = new StringResponse(); JavaScriptUtils.writeJavaScript(response, @@ -83,7 +84,7 @@ public class JavaScriptUtilsTest extends Assert /** */ @Test - public void scriptTag() + void scriptTag() { assertEquals("<script type=\"text/javascript\">\n/*<![CDATA[*/\n", JavaScriptUtils.SCRIPT_OPEN_TAG);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererInstanceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererInstanceTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererInstanceTest.java index fe5aafb..dcf98bc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererInstanceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererInstanceTest.java @@ -16,33 +16,33 @@ */ package org.apache.wicket.core.util.string.componentrenderer; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.wicket.core.util.string.ComponentRenderer; import org.apache.wicket.markup.html.basic.Label; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.AfterEach; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * Tests for {@link ComponentRenderer} */ -public class ComponentRendererInstanceTest +class ComponentRendererInstanceTest { private ComponentRenderer renderer; - @Before - public void setup() { + @BeforeEach + void setup() { renderer = new ComponentRenderer(); } - @After - public void destroy() { + @AfterEach + void destroy() { renderer.destroy(); } @Test - public void render() + void render() { CharSequence html = renderer.renderComponent(() -> new Label("id", "Hello renderer")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java index 56573b0..515ee34 100644 --- a/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/core/util/string/componentrenderer/ComponentRendererTest.java @@ -16,14 +16,16 @@ */ package org.apache.wicket.core.util.string.componentrenderer; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.core.util.string.ComponentRenderer; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for ComponentRenderer */ -public class ComponentRendererTest extends WicketTestCase +class ComponentRendererTest extends WicketTestCase { /** @@ -33,7 +35,7 @@ public class ComponentRendererTest extends WicketTestCase * Enclosure won't know its child component without being initialized */ @Test - public void componentsAreInitialized() + void componentsAreInitialized() { ComponentRenderer.renderComponent(new EnclosurePanel("anyId")); } @@ -45,7 +47,7 @@ public class ComponentRendererTest extends WicketTestCase * markup if available */ @Test - public void renderListViewItems() + void renderListViewItems() { PageWithRepeater page = new PageWithRepeater(); CharSequence listViewOutput = ComponentRenderer.renderComponent(page.get("listView")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/BasePage.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/BasePage.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/BasePage.java index 93cde7d..542e642 100644 --- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/BasePage.java +++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/BasePage.java @@ -26,7 +26,7 @@ import org.apache.wicket.model.IModel; class BasePage extends WebPage { private static final long serialVersionUID = 1L; - public BasePage() { + BasePage() { add(new Label("className", new IModel<String>() { http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java index 9a0d771..2e77026 100644 --- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageOnePassRenderTest.java @@ -23,7 +23,7 @@ import org.apache.wicket.settings.RequestCycleSettings; /** * https://issues.apache.org/jira/browse/WICKET-5415 */ -public class DontStoreNotRenderedPageOnePassRenderTest extends DontStoreNotRenderedPageTestCase +class DontStoreNotRenderedPageOnePassRenderTest extends DontStoreNotRenderedPageTestCase { @Override protected WebApplication newApplication() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java index 5dfadf9..45fed79 100644 --- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToBufferTest.java @@ -23,7 +23,7 @@ import org.apache.wicket.settings.RequestCycleSettings; /** * https://issues.apache.org/jira/browse/WICKET-5415 */ -public class DontStoreNotRenderedPageRedirectToBufferTest extends DontStoreNotRenderedPageTestCase +class DontStoreNotRenderedPageRedirectToBufferTest extends DontStoreNotRenderedPageTestCase { @Override protected WebApplication newApplication() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java index 3c46306..a8bdf8a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageRedirectToRenderTest.java @@ -23,7 +23,7 @@ import org.apache.wicket.settings.RequestCycleSettings; /** * https://issues.apache.org/jira/browse/WICKET-5415 */ -public class DontStoreNotRenderedPageRedirectToRenderTest extends DontStoreNotRenderedPageTestCase +class DontStoreNotRenderedPageRedirectToRenderTest extends DontStoreNotRenderedPageTestCase { @Override protected WebApplication newApplication() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java index fe1875b..ceac5e3 100644 --- a/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java +++ b/wicket-core/src/test/java/org/apache/wicket/dontstoreunrendered/DontStoreNotRenderedPageTestCase.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.dontstoreunrendered; +import static org.junit.jupiter.api.Assertions.assertFalse; + import org.apache.wicket.Component; import org.apache.wicket.IPageManagerProvider; import org.apache.wicket.application.IComponentInstantiationListener; @@ -27,13 +29,12 @@ import org.apache.wicket.page.IPageManagerContext; 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; /** * https://issues.apache.org/jira/browse/WICKET-5415 */ -public abstract class DontStoreNotRenderedPageTestCase extends WicketTestCase +abstract class DontStoreNotRenderedPageTestCase extends WicketTestCase { @Override protected WicketTester newWicketTester(WebApplication app) @@ -65,7 +66,7 @@ public abstract class DontStoreNotRenderedPageTestCase extends WicketTestCase @Override public void touchPage(IManageablePage page) { - Assert.assertFalse("PageB should not be touched!", page instanceof PageB); + assertFalse(page instanceof PageB, "PageB should not be touched!"); super.touchPage(page); } }; @@ -76,16 +77,14 @@ public abstract class DontStoreNotRenderedPageTestCase extends WicketTestCase } /** - * Start with PageA. - * Then click a link to go to PageB. - * PageB throws a RestartResponseException(PageC) in its constructor, so - * it shouldn't be neither initialized nor rendered. - * PageC is rendered. + * Start with PageA. Then click a link to go to PageB. PageB throws a + * RestartResponseException(PageC) in its constructor, so it shouldn't be neither initialized + * nor rendered. PageC is rendered. * * Verifies that PageB is not initialized, rendered and stored by PageManager */ @Test - public void dontStoreNotRenderedPage() + void dontStoreNotRenderedPage() { tester.startPage(PageA.class); tester.clickLink("goToB"); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java b/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java index c12fb2a..714dfd9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/feedback/FeedbackRenderTest.java @@ -16,21 +16,23 @@ */ package org.apache.wicket.feedback; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.Component; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test calling of {@link Component#beforeRender()} for {@link IFeedback} components. */ -public class FeedbackRenderTest extends WicketTestCase +class FeedbackRenderTest extends WicketTestCase { /** * @throws Exception */ @Test - public void test() throws Exception + void test() throws Exception { final FeedbacksPage page = new FeedbacksPage(); @@ -44,7 +46,7 @@ public class FeedbackRenderTest extends WicketTestCase * @throws Exception */ @Test - public void testAjax() throws Exception + void testAjax() throws Exception { final FeedbacksPage page = new FeedbacksPage(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java b/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java index f6ac2ee..a2354d4 100644 --- a/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/intercept/InterceptDataCleanedAfterReadTest.java @@ -19,12 +19,12 @@ package org.apache.wicket.intercept; import org.apache.wicket.protocol.http.WebApplication; import org.apache.wicket.util.tester.FormTester; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * https://issues.apache.org/jira/browse/WICKET-4066 */ -public class InterceptDataCleanedAfterReadTest extends WicketTestCase +class InterceptDataCleanedAfterReadTest extends WicketTestCase { @Override protected WebApplication newApplication() @@ -38,7 +38,7 @@ public class InterceptDataCleanedAfterReadTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-4066 */ @Test - public void wicket4066() + void wicket4066() { // go to a secured page (a redirect to LoginPage with interception will be done) tester.startPage(SecurePage.class); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/intercept/Wicket4066Application.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/intercept/Wicket4066Application.java b/wicket-core/src/test/java/org/apache/wicket/intercept/Wicket4066Application.java index cbee61e..ae134b1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/intercept/Wicket4066Application.java +++ b/wicket-core/src/test/java/org/apache/wicket/intercept/Wicket4066Application.java @@ -24,7 +24,7 @@ import org.apache.wicket.request.Response; * Application object for your web application. If you want to run this application without * deploying, run the Start class. */ -public class Wicket4066Application extends WebApplication +class Wicket4066Application extends WebApplication { @Override public Class<HomePage> getHomePage() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java index 222244e..4509edc 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/ComponentTagAttributeEscapingTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.markup; +import static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.html.WebPage; import org.apache.wicket.markup.html.form.Button; @@ -23,35 +25,36 @@ import org.apache.wicket.markup.html.link.Link; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * @author Pedro Santos */ -public class ComponentTagAttributeEscapingTest extends WicketTestCase +class ComponentTagAttributeEscapingTest extends WicketTestCase { /** * @throws Exception */ @Test - public void componentAttributesNotDoubleEscaped() throws Exception + void componentAttributesNotDoubleEscaped() throws Exception { tester.startPage(ButtonValuePage.class); String response = tester.getLastResponseAsString(); -// System.out.println(response); - assertTrue("One of the pound entity representations is missing: £ or £", - response.contains("\u00a3\u00a3")); - assertTrue("must not be double escaped", response.contains("Watch escaped value: >>")); - assertTrue("following the last assert logic, this one would true", - response.contains("alerting: &")); - assertTrue("escape manually added attributes", - response.contains("some_attribute=\"a & b\"")); +// System.out.println(response); + assertTrue(response.contains("\u00a3\u00a3"), + "One of the pound entity representations is missing: £ or £"); + assertTrue(response.contains("Watch escaped value: >>"), + "must not be double escaped"); + assertTrue(response.contains("alerting: &"), + "following the last assert logic, this one would true"); + assertTrue(response.contains("some_attribute=\"a & b\""), + "escape manually added attributes"); } /** * Just two distinct components with escaped characters in markup attribute. - * */ + */ public static class ButtonValuePage extends WebPage implements IMarkupResourceStreamProvider { /** */ @@ -60,7 +63,7 @@ public class ComponentTagAttributeEscapingTest extends WicketTestCase /** * Construct. */ - public ButtonValuePage() + public ButtonValuePage() { add(new Button("button")); add(new Link<Void>("link") @@ -86,13 +89,14 @@ public class ComponentTagAttributeEscapingTest extends WicketTestCase public IResourceStream getMarkupResourceStream(MarkupContainer container, Class<?> containerClass) { - return new StringResourceStream( - "<html>"// - + "<body>"// - + "<a wicket:id=\"link\" onclick=\"alert('alerting: & ££ ')\">link</a>"// - + "<input type=\"submit\" wicket:id=\"button\" value=\"Watch escaped value: >>\"/>"// - + "</body>" + // - "</html>"); + return new StringResourceStream("<html>"// + + "<body>"// + + + "<a wicket:id=\"link\" onclick=\"alert('alerting: & ££ ')\">link</a>"// + + + "<input type=\"submit\" wicket:id=\"button\" value=\"Watch escaped value: >>\"/>"// + + "</body>" + // + "</html>"); } } } \ No newline at end of file http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java index 909a2ec..c369d2a 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/DefaultMarkupCacheKeyProviderTest.java @@ -16,22 +16,24 @@ */ package org.apache.wicket.markup; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Locale; import org.apache.wicket.markup.html.WebMarkupContainer; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Test for {@link DefaultMarkupCacheKeyProvider}. */ -public class DefaultMarkupCacheKeyProviderTest extends WicketTestCase +class DefaultMarkupCacheKeyProviderTest extends WicketTestCase { /** */ @Test - public void localeLanguageCountryVariant() + void localeLanguageCountryVariant() { DefaultMarkupCacheKeyProvider provider = new DefaultMarkupCacheKeyProvider(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java index c9215ea..9a19359 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/HtmlProblemFinderTest.java @@ -16,31 +16,31 @@ */ package org.apache.wicket.markup; +import static org.junit.jupiter.api.Assertions.assertThrows; import org.apache.wicket.markup.parser.filter.HtmlProblemFinder; import org.apache.wicket.markup.parser.filter.RelativePathPrefixHandler; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; - +import org.junit.jupiter.api.Test; /** * @author Juergen Donnerstag */ -public class HtmlProblemFinderTest extends WicketTestCase +class HtmlProblemFinderTest extends WicketTestCase { /** * @throws Exception */ - @Test(expected = MarkupException.class) - public void problemFinder() throws Exception + @Test + void problemFinder() throws Exception { final MarkupParser parser = new MarkupParser("<img src=\"\"/>"); parser.add(new HtmlProblemFinder(HtmlProblemFinder.ERR_THROW_EXCEPTION), RelativePathPrefixHandler.class); - parser.parse(); - assertTrue("Should have thrown an exception", false); - + assertThrows(MarkupException.class, () -> { + parser.parse(); + }); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java index 8a8b9d2..1d84cf6 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupCacheTest.java @@ -16,19 +16,23 @@ */ package org.apache.wicket.markup; +import static org.junit.jupiter.api.Assertions.assertNotNull; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.fail; + import org.apache.wicket.Application; import org.apache.wicket.MarkupContainer; import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.StringResourceStream; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Before; -import org.junit.Test; +import org.junit.jupiter.api.BeforeEach; +import org.junit.jupiter.api.Test; /** * @author Timo Rantalaiho */ -public class MarkupCacheTest extends WicketTestCase +class MarkupCacheTest extends WicketTestCase { private MarkupCache cache; private MarkupCachingAssumingComponent component; @@ -36,8 +40,8 @@ public class MarkupCacheTest extends WicketTestCase /** * */ - @Before - public void before() + @BeforeEach + void before() { cache = new MarkupCache(); @@ -58,7 +62,7 @@ public class MarkupCacheTest extends WicketTestCase * testMarkupNotFoundInformationIsCachedInDeploymentMode() */ @Test - public void markupNotFoundInformationIsCachedInDeploymentMode() + void markupNotFoundInformationIsCachedInDeploymentMode() { IMarkupFragment markup = cache.getMarkup(component, null, false); assertNotNull(markup); @@ -71,7 +75,7 @@ public class MarkupCacheTest extends WicketTestCase * testRemoveMarkupWhereBaseMarkupIsNoLongerInTheCache() */ @Test - public void removeMarkupWhereBaseMarkupIsNoLongerInTheCache() + void removeMarkupWhereBaseMarkupIsNoLongerInTheCache() { tester.startPage(MarkupInheritanceExtension_1.class); tester.assertRenderedPage(MarkupInheritanceExtension_1.class); @@ -94,7 +98,7 @@ public class MarkupCacheTest extends WicketTestCase private static final long serialVersionUID = -6743937191677599322L; private boolean firstCall = true; - public MarkupCachingAssumingComponent(final String id) + MarkupCachingAssumingComponent(final String id) { super(id); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java index e65a866..12b767d 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupFragmentTest.java @@ -16,27 +16,26 @@ */ package org.apache.wicket.markup; -import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; +import static org.junit.jupiter.api.Assertions.assertEquals; import java.util.ArrayList; import java.util.List; -import static org.hamcrest.Matchers.equalTo; -import static org.hamcrest.Matchers.is; +import org.apache.wicket.util.tester.WicketTestCase; +import org.junit.jupiter.api.Test; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; /** * Tests for {@link MarkupFragment} */ -public class MarkupFragmentTest extends WicketTestCase +class MarkupFragmentTest extends WicketTestCase { private static final Logger LOG = LoggerFactory.getLogger(MarkupFragmentTest.class); /** */ @Test - public void iteratorSameAsSizeForMarkup() + void iteratorSameAsSizeForMarkup() { Markup markup = Markup.of("<body wicket:id='body'><div wicket:id='label'> text </div></body>"); @@ -65,7 +64,7 @@ public class MarkupFragmentTest extends WicketTestCase /** */ @Test - public void iteratorSameAsSizeForMarkupFragment() + void iteratorSameAsSizeForMarkupFragment() { Markup markup = Markup.of("<body wicket:id='body'><div wicket:id='label'> text </div></body>"); MarkupFragment fragment = new MarkupFragment(markup, 1); @@ -97,7 +96,7 @@ public class MarkupFragmentTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-4136 */ @Test - public void createMarkupFragmentOnOpenTag() + void createMarkupFragmentOnOpenTag() { Markup markup = Markup.of("<body><img wicket:id='photo'><span wicket:id='label'/></body>"); MarkupFragment fragment = new MarkupFragment(markup, 1); @@ -109,7 +108,7 @@ public class MarkupFragmentTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-6339 */ @Test - public void iteratorMustBeSameAsGetByIndex() { + void iteratorMustBeSameAsGetByIndex() { // test markup Markup markup = Markup.of("<html><body><wicket:panel><wicket:container wicket:id='content'><a wicket:id='link' href='https://www.google.de'>Test</a></wicket:container></wicket:panel></body></html>"); @@ -130,6 +129,6 @@ public class MarkupFragmentTest extends WicketTestCase } // elements from iterator should match the ones from the get(i) method - assertThat(getElements, is(equalTo(iteratorElements))); + assertEquals(iteratorElements, getElements); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java index 9ef2dd6..8aaf523 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_11.java @@ -31,7 +31,7 @@ public class MarkupInheritanceBaseBase_11 extends WebPage /** * Construct. */ - public MarkupInheritanceBaseBase_11() + MarkupInheritanceBaseBase_11() { WebMarkupContainer css = new WebMarkupContainer("css"); css.add(AttributeModifier.replace("src", Model.of("myStyle.css"))); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_13.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_13.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_13.java index 3af7927..6a41819 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_13.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_13.java @@ -29,7 +29,7 @@ public class MarkupInheritanceBaseBase_13 extends WebPage * Construct. * */ - public MarkupInheritanceBaseBase_13() + MarkupInheritanceBaseBase_13() { } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_3.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_3.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_3.java index 79149dd..b050ae8 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_3.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBaseBase_3.java @@ -29,7 +29,7 @@ public class MarkupInheritanceBaseBase_3 extends WebPage * Construct. * */ - public MarkupInheritanceBaseBase_3() + MarkupInheritanceBaseBase_3() { // add(new Label("label1", "baseBase label 1")); // add(new Label("label2", "baseBase label 2")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_6.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_6.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_6.java index 344c86f..13fc672 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_6.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_6.java @@ -31,7 +31,7 @@ public class MarkupInheritanceBasePanel_6 extends Panel * * @param id */ - public MarkupInheritanceBasePanel_6(final String id) + MarkupInheritanceBasePanel_6(final String id) { super(id); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_9.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_9.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_9.java index 37f37e3..2e024ad 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_9.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBasePanel_9.java @@ -31,7 +31,7 @@ public class MarkupInheritanceBasePanel_9 extends Panel * * @param id */ - public MarkupInheritanceBasePanel_9(final String id) + MarkupInheritanceBasePanel_9(final String id) { super(id); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_1.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_1.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_1.java index 8756c15..05663e2 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_1.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_1.java @@ -28,7 +28,7 @@ public class MarkupInheritanceBase_1 extends WebPage /** * Construct. */ - public MarkupInheritanceBase_1() + MarkupInheritanceBase_1() { } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java index 8ccb555..eba0585 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_10.java @@ -31,7 +31,7 @@ public class MarkupInheritanceBase_10 extends WebPage /** * Construct. */ - public MarkupInheritanceBase_10() + MarkupInheritanceBase_10() { WebMarkupContainer css = new WebMarkupContainer("css"); css.add(AttributeModifier.replace("src", Model.of("myStyle.css"))); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_11.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_11.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_11.java index 2b27341..6b210b7 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_11.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_11.java @@ -28,7 +28,7 @@ public class MarkupInheritanceBase_11 extends MarkupInheritanceBaseBase_11 * Construct. * */ - public MarkupInheritanceBase_11() + MarkupInheritanceBase_11() { super(); add(new Label("label3", "base label 3")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_12.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_12.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_12.java index e58acdd..b389134 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_12.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_12.java @@ -34,7 +34,7 @@ public class MarkupInheritanceBase_12 extends WebPage * Construct. * */ - public MarkupInheritanceBase_12() + MarkupInheritanceBase_12() { add(new Label("label1", new PropertyModel<Integer>(this, "counter"))); add(new Link<Void>("link") http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_13.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_13.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_13.java index 583551c..19a07fa 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_13.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_13.java @@ -27,7 +27,7 @@ public class MarkupInheritanceBase_13 extends MarkupInheritanceBaseBase_13 * Construct. * */ - public MarkupInheritanceBase_13() + MarkupInheritanceBase_13() { super(); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_2.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_2.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_2.java index d9aaf7f..bdbb679 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_2.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_2.java @@ -30,7 +30,7 @@ public class MarkupInheritanceBase_2 extends WebPage * Construct. * */ - public MarkupInheritanceBase_2() + MarkupInheritanceBase_2() { add(new Label("label1", "base label 1")); add(new Label("label2", "base label 2")); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_3.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_3.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_3.java index 414ca76..517e4af 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_3.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_3.java @@ -27,7 +27,7 @@ public class MarkupInheritanceBase_3 extends MarkupInheritanceBaseBase_3 * Construct. * */ - public MarkupInheritanceBase_3() + MarkupInheritanceBase_3() { super(); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_4.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_4.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_4.java index 7d0e3d4..d09b995 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_4.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_4.java @@ -34,7 +34,7 @@ public class MarkupInheritanceBase_4 extends WebPage * Construct. * */ - public MarkupInheritanceBase_4() + MarkupInheritanceBase_4() { add(new Label("label1", new PropertyModel<Integer>(this, "counter"))); add(new Link<Void>("link") http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_5.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_5.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_5.java index 292be5a..1734944 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_5.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_5.java @@ -34,7 +34,7 @@ public class MarkupInheritanceBase_5 extends WebPage * Construct. * */ - public MarkupInheritanceBase_5() + MarkupInheritanceBase_5() { add(new Label("label1", new PropertyModel<Integer>(this, "counter"))); add(new Link<Void>("link") http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_7.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_7.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_7.java index 02c669c..889872e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_7.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_7.java @@ -34,7 +34,7 @@ public class MarkupInheritanceBase_7 extends WebPage * Construct. * */ - public MarkupInheritanceBase_7() + MarkupInheritanceBase_7() { add(new Label("label1", new PropertyModel<Integer>(this, "counter"))); add(new Link<Void>("link") http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_8.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_8.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_8.java index f98b4a6..4c7a570 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_8.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceBase_8.java @@ -29,7 +29,7 @@ public class MarkupInheritanceBase_8 extends WebPage * Construct. * */ - public MarkupInheritanceBase_8() + MarkupInheritanceBase_8() { } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java index edc4c4b..4bc494e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupInheritanceTest.java @@ -16,17 +16,18 @@ */ package org.apache.wicket.markup; +import static org.junit.jupiter.api.Assertions.assertEquals; + 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; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** */ -public class MarkupInheritanceTest extends WicketTestCase +class MarkupInheritanceTest extends WicketTestCase { private static final Logger log = LoggerFactory.getLogger(MarkupInheritanceTest.class); @@ -36,7 +37,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderChildPageWithStyleVariation() throws Exception + void renderChildPageWithStyleVariation() throws Exception { // first, render page with no style executeTest(MarkupInheritanceExtension_1.class, "MarkupInheritanceExpectedResult_1.html"); @@ -58,7 +59,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_1() throws Exception + void renderHomePage_1() throws Exception { executeTest(MarkupInheritanceExtension_1.class, "MarkupInheritanceExpectedResult_1.html"); } @@ -67,7 +68,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_2() throws Exception + void renderHomePage_2() throws Exception { executeTest(MarkupInheritanceExtension_2.class, "MarkupInheritanceExpectedResult_2.html"); } @@ -76,7 +77,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_3() throws Exception + void renderHomePage_3() throws Exception { executeTest(MarkupInheritanceExtension_3.class, "MarkupInheritanceExpectedResult_3.html"); } @@ -85,7 +86,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_4() throws Exception + void renderHomePage_4() throws Exception { System.out.println("=== " + MarkupInheritanceExtension_4.class.getName() + " ==="); @@ -112,7 +113,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_5() throws Exception + void renderHomePage_5() throws Exception { executeTest(MarkupInheritanceExtension_5.class, "MarkupInheritanceExpectedResult_5.html"); } @@ -121,7 +122,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_6() throws Exception + void renderHomePage_6() throws Exception { executeTest(MarkupInheritancePage_6.class, "MarkupInheritanceExpectedResult_6.html"); } @@ -130,7 +131,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_7() throws Exception + void renderHomePage_7() throws Exception { executeTest(MarkupInheritanceExtension_7.class, "MarkupInheritanceExpectedResult_7.html"); } @@ -139,7 +140,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_8() throws Exception + void renderHomePage_8() throws Exception { tester.getApplication().getMarkupSettings().setStripWicketTags(true); executeTest(MarkupInheritanceExtension_8.class, "MarkupInheritanceExpectedResult_8.html"); @@ -149,7 +150,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_9() throws Exception + void renderHomePage_9() throws Exception { executeTest(MarkupInheritancePage_9.class, "MarkupInheritanceExpectedResult_9.html"); } @@ -158,7 +159,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_10() throws Exception + void renderHomePage_10() throws Exception { executeTest(MarkupInheritanceExtension_10.class, "MarkupInheritanceExpectedResult_10.html"); } @@ -167,7 +168,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_11() throws Exception + void renderHomePage_11() throws Exception { executeTest(MarkupInheritanceExtension_11.class, "MarkupInheritanceExpectedResult_11.html"); } @@ -176,7 +177,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_12() throws Exception + void renderHomePage_12() throws Exception { executeTest(MarkupInheritanceExtension_12.class, "MarkupInheritanceExpectedResult_12.html"); } @@ -185,7 +186,7 @@ public class MarkupInheritanceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_13() throws Exception + void renderHomePage_13() throws Exception { executeTest(MarkupInheritanceExtension_13.class, "MarkupInheritanceExpectedResult_13.html"); } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java index 30d9268..5f6651b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupParserTest.java @@ -16,6 +16,11 @@ */ package org.apache.wicket.markup; +import static org.junit.jupiter.api.Assertions.assertEquals; +import static org.junit.jupiter.api.Assertions.assertFalse; +import static org.junit.jupiter.api.Assertions.assertNull; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.io.IOException; import java.text.ParseException; import java.util.Locale; @@ -31,18 +36,16 @@ import org.apache.wicket.util.resource.IResourceStream; import org.apache.wicket.util.resource.ResourceStreamNotFoundException; import org.apache.wicket.util.string.StringValueConversionException; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Assert; -import org.junit.Test; +import org.junit.jupiter.api.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; - /** * Test cases for markup parser. * * @author Jonathan Locke */ -public final class MarkupParserTest extends WicketTestCase +final class MarkupParserTest extends WicketTestCase { private static final Logger log = LoggerFactory.getLogger(MarkupParserTest.class); @@ -52,7 +55,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws Exception */ @Test - public void tagParsing() throws Exception + void tagParsing() throws Exception { final MarkupParser parser = new MarkupParser( "This is a test <a componentName:id=\"a\" href=\"foo.html\"> <b componentName:id=\"b\">Bold!</b> " @@ -64,51 +67,51 @@ public final class MarkupParserTest extends WicketTestCase final ComponentTag aOpen = (ComponentTag)markupStream.next(); log.info("", aOpen); - Assert.assertTrue(aOpen.getName().equals("a")); - Assert.assertEquals("foo.html", aOpen.getAttributes().getString("href")); + assertTrue(aOpen.getName().equals("a")); + assertEquals("foo.html", aOpen.getAttributes().getString("href")); markupStream.next(); final ComponentTag boldOpen = (ComponentTag)markupStream.next(); log.info("", boldOpen); - Assert.assertTrue(boldOpen.getName().equals("b")); - Assert.assertEquals(TagType.OPEN, boldOpen.getType()); + assertTrue(boldOpen.getName().equals("b")); + assertEquals(TagType.OPEN, boldOpen.getType()); markupStream.next(); final ComponentTag boldClose = (ComponentTag)markupStream.next(); log.info("", boldClose); - Assert.assertTrue(boldClose.getName().equals("b")); - Assert.assertEquals(TagType.CLOSE, boldClose.getType()); + assertTrue(boldClose.getName().equals("b")); + assertEquals(TagType.CLOSE, boldClose.getType()); markupStream.next(); final ComponentTag img = (ComponentTag)markupStream.next(); log.info("", img); - Assert.assertTrue(img.getName().equals("img")); - Assert.assertEquals(9, img.getAttributes().getInt("width")); - Assert.assertEquals(10, img.getAttributes().getInt("height")); - Assert.assertEquals(TagType.OPEN, img.getType()); + assertTrue(img.getName().equals("img")); + assertEquals(9, img.getAttributes().getInt("width")); + assertEquals(10, img.getAttributes().getInt("height")); + assertEquals(TagType.OPEN, img.getType()); markupStream.next(); final ComponentTag marker = (ComponentTag)markupStream.next(); log.info("", marker); - Assert.assertTrue(marker.getName().equals("marker")); - Assert.assertEquals(TagType.OPEN_CLOSE, marker.getType()); + assertTrue(marker.getName().equals("marker")); + assertEquals(TagType.OPEN_CLOSE, marker.getType()); markupStream.next(); final ComponentTag aClose = (ComponentTag)markupStream.next(); log.info("", aClose); - Assert.assertTrue(aClose.getName().equals("a")); + assertTrue(aClose.getName().equals("a")); - Assert.assertNull(markupStream.next()); + assertNull(markupStream.next()); } /** @@ -116,7 +119,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws Exception */ @Test - public final void test1() throws Exception + final void test1() throws Exception { final MarkupParser parser = new MarkupParser( "This is a test <a componentName:id=9> <b>bold</b> <b componentName:id=10></b></a> of the emergency broadcasting system"); @@ -130,21 +133,21 @@ public final class MarkupParserTest extends WicketTestCase log.info("tok(4)=" + tokens.get(4)); log.info("tok(5)=" + tokens.get(5)); - Assert.assertTrue(tokens.get(0).equals("This is a test ")); + assertTrue(tokens.get(0).equals("This is a test ")); final ComponentTag a = (ComponentTag)tokens.get(1); - Assert.assertEquals(9, a.getAttributes().getInt("componentName:id")); - Assert.assertTrue(tokens.get(2).equals(" <b>bold</b> ")); + assertEquals(9, a.getAttributes().getInt("componentName:id")); + assertTrue(tokens.get(2).equals(" <b>bold</b> ")); final ComponentTag b = (ComponentTag)tokens.get(3); - Assert.assertEquals(10, b.getAttributes().getInt("componentName:id")); + assertEquals(10, b.getAttributes().getInt("componentName:id")); final ComponentTag closeA = (ComponentTag)tokens.get(5); - Assert.assertEquals("a", closeA.getName()); - Assert.assertTrue(tokens.get(6).equals(" of the emergency broadcasting system")); + assertEquals("a", closeA.getName()); + assertTrue(tokens.get(6).equals(" of the emergency broadcasting system")); } /** @@ -152,7 +155,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws Exception */ @Test - public void xhtmlDocument() throws Exception + void xhtmlDocument() throws Exception { final String docText = "" + "<?xml version='1.0' encoding='iso-8859-1' ?>" @@ -166,9 +169,9 @@ public final class MarkupParserTest extends WicketTestCase log.info("tok(0)=" + tokens.get(0)); // without HtmlHeaderSectionHandler - Assert.assertEquals(docText.substring(44), tokens.get(0).toString()); + assertEquals(docText.substring(44), tokens.get(0).toString()); // with HtmlHeaderSectionHandler - // Assert.assertEquals(docText.substring(44, 147), + // assertEquals(docText.substring(44, 147), // tokens.get(0).toString()); } @@ -190,7 +193,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws IOException */ @Test - public void fileDocument() throws ParseException, ResourceStreamNotFoundException, IOException + void fileDocument() throws ParseException, ResourceStreamNotFoundException, IOException { IResourceStreamLocator locator = new ResourceStreamLocator(); MarkupResourceStream resource = newMarkupResourceStream(locator, getClass(), "1", null, @@ -201,28 +204,28 @@ public final class MarkupParserTest extends WicketTestCase IMarkupFragment tokens = parser.parse(); log.info("tok(0)=" + tokens.get(0)); - // Assert.assertEquals(docText, tokens.get(0).toString()); + // assertEquals(docText, tokens.get(0).toString()); resource = newMarkupResourceStream(locator, getClass(), "2", null, null, "html"); parser = new MarkupParser(resource); parser.setWicketNamespace("wcn"); tokens = parser.parse(); log.info("tok(0)=" + tokens.get(0)); - // Assert.assertEquals(docText, tokens.get(0).toString()); + // assertEquals(docText, tokens.get(0).toString()); resource = newMarkupResourceStream(locator, getClass(), "3", null, null, "html"); parser = new MarkupParser(resource); parser.setWicketNamespace("wcn"); tokens = parser.parse(); log.info("tok(0)=" + tokens.get(0)); - // Assert.assertEquals(docText, tokens.get(0).toString()); + // assertEquals(docText, tokens.get(0).toString()); resource = newMarkupResourceStream(locator, getClass(), "4", null, null, "html"); parser = new MarkupParser(resource); parser.setWicketNamespace("wcn"); tokens = parser.parse(); log.info("tok(0)=" + tokens.get(0)); - // Assert.assertEquals(docText, tokens.get(0).toString()); + // assertEquals(docText, tokens.get(0).toString()); // File from jar (URL resource) resource = newMarkupResourceStream(locator, PageExpiredErrorPage.class, null, null, null, @@ -231,42 +234,42 @@ public final class MarkupParserTest extends WicketTestCase parser.setWicketNamespace("wcn"); tokens = parser.parse(); log.info("tok(0)=" + tokens.get(0)); - // Assert.assertEquals(docText, tokens.get(0).toString()); + // assertEquals(docText, tokens.get(0).toString()); resource = newMarkupResourceStream(locator, getClass(), "5", null, null, "html"); parser = new MarkupParser(resource); parser.setWicketNamespace("wcn"); tokens = parser.parse(); log.info("tok(0)=" + tokens.get(0)); - // Assert.assertEquals(docText, tokens.get(0).toString()); + // assertEquals(docText, tokens.get(0).toString()); resource = newMarkupResourceStream(locator, getClass(), "6", null, null, "html"); parser = new MarkupParser(resource); parser.setWicketNamespace("wcn"); tokens = parser.parse(); log.info("tok(0)=" + tokens.get(0)); - // Assert.assertEquals(docText, tokens.get(0).toString()); + // assertEquals(docText, tokens.get(0).toString()); resource = newMarkupResourceStream(locator, getClass(), "7", null, null, "html"); parser = new MarkupParser(resource); parser.setWicketNamespace("wcn"); tokens = parser.parse(); log.info("tok(0)=" + tokens.get(0)); - // Assert.assertEquals(docText, tokens.get(0).toString()); + // assertEquals(docText, tokens.get(0).toString()); resource = newMarkupResourceStream(locator, getClass(), "8", null, null, "html"); parser = new MarkupParser(resource); parser.setWicketNamespace("wcn"); tokens = parser.parse(); log.info("tok(0)=" + tokens.get(0)); - // Assert.assertEquals(docText, tokens.get(0).toString()); + // assertEquals(docText, tokens.get(0).toString()); resource = newMarkupResourceStream(locator, getClass(), "9", null, null, "html"); parser = new MarkupParser(resource); parser.setWicketNamespace("wcn"); tokens = parser.parse(); log.info("tok(0)=" + tokens.get(0)); - // Assert.assertEquals(docText, tokens.get(0).toString()); + // assertEquals(docText, tokens.get(0).toString()); } /** @@ -277,7 +280,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws IOException */ @Test - public void wicketTag() throws ParseException, ResourceStreamNotFoundException, IOException + void wicketTag() throws ParseException, ResourceStreamNotFoundException, IOException { new MarkupParser("<span wicket:id=\"test\"/>").parse(); new MarkupParser("<span wicket:id=\"test\">Body</span>").parse(); @@ -292,7 +295,7 @@ public final class MarkupParserTest extends WicketTestCase try { new MarkupParser("<wicket:remove/>").parse(); - assertTrue("Should have thrown an exception", false); + assertTrue(false, "Should have thrown an exception"); } catch (MarkupException ex) { @@ -315,9 +318,7 @@ public final class MarkupParserTest extends WicketTestCase try { new MarkupParser("<wicket:remove> <wicket:remove> </wicket:remove> </wicket:remove>").parse(); - assertTrue( - "Should have thrown an exception: remove regions must not contain wicket-components", - false); + assertTrue(false, "Should have thrown an exception: remove regions must not contain wicket-components"); } catch (MarkupException ex) { @@ -338,7 +339,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws IOException */ @Test - public void defaultWicketTag() throws ParseException, ResourceStreamNotFoundException, + void defaultWicketTag() throws ParseException, ResourceStreamNotFoundException, IOException { MarkupParser parser = new MarkupParser("<image wcn:id=\"test\"/>"); @@ -365,7 +366,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws IOException */ @Test - public void script() throws ParseException, ResourceStreamNotFoundException, IOException + void script() throws ParseException, ResourceStreamNotFoundException, IOException { final MarkupParser parser = new MarkupParser( "<html wicket:id=\"test\"><script language=\"JavaScript\">... <x a> ...</script></html>"); @@ -386,7 +387,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws IOException */ @Test - public void scriptWithTemplate() throws ParseException, ResourceStreamNotFoundException, IOException + void scriptWithTemplate() throws ParseException, ResourceStreamNotFoundException, IOException { final MarkupParser parser = new MarkupParser( "<html wicket:id=\"test\"><script type=\"text/x-jquery-tmpl\" language=\"JavaScript\">... <x a/> ...</script></html>"); @@ -407,7 +408,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws IOException */ @Test - public void scriptWithTemplateSingleQuotes() throws ParseException, ResourceStreamNotFoundException, IOException + void scriptWithTemplateSingleQuotes() throws ParseException, ResourceStreamNotFoundException, IOException { final MarkupParser parser = new MarkupParser( "<html wicket:id=\"test\"><script type='text/x-jquery-tmpl' language=\"JavaScript\">... <x a/> ...</script></html>"); @@ -425,7 +426,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws ResourceStreamNotFoundException */ @Test - public void balancing() throws IOException, ResourceStreamNotFoundException + void balancing() throws IOException, ResourceStreamNotFoundException { final MarkupParser parser = new MarkupParser( "<span wicket:id=\"span\"><img wicket:id=\"img\"><span wicket:id=\"span2\"></span></span>"); @@ -449,7 +450,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws ResourceStreamNotFoundException */ @Test - public void comments() throws IOException, ResourceStreamNotFoundException + void comments() throws IOException, ResourceStreamNotFoundException { tester.getApplication().getMarkupSettings().setStripComments(true); final MarkupParser parser = new MarkupParser( @@ -467,7 +468,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws ResourceStreamNotFoundException */ @Test - public void commentsWithNestedElements() throws IOException, ResourceStreamNotFoundException + void commentsWithNestedElements() throws IOException, ResourceStreamNotFoundException { tester.getApplication().getMarkupSettings().setStripComments(true); final MarkupParser parser = new MarkupParser( @@ -490,7 +491,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws ResourceStreamNotFoundException */ @Test - public void script1() throws IOException, ResourceStreamNotFoundException + void script1() throws IOException, ResourceStreamNotFoundException { IMarkupFragment markup = new MarkupParser("<script/>").parse(); assertEquals(1, markup.size()); @@ -566,7 +567,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws ParseException */ @Test - public void parseConditionalComment() throws IOException, ResourceStreamNotFoundException, + void parseConditionalComment() throws IOException, ResourceStreamNotFoundException, ParseException { String x = " <!--[if IE]>\r\n" + // @@ -582,7 +583,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws ResourceStreamNotFoundException */ @Test - public void parseTagToBeExpanded() throws IOException, ResourceStreamNotFoundException + void parseTagToBeExpanded() throws IOException, ResourceStreamNotFoundException { String x = "<html xmlns:wicket>\r\n<body>\r\n <span wicket:id=\"myPanel\"/>\r\n</body>\r\n</html>\r\n"; MarkupParser parser = new MarkupParser(x); @@ -597,7 +598,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws ResourceStreamNotFoundException */ @Test - public void parseBorderSintax() throws IOException, ResourceStreamNotFoundException + void parseBorderSintax() throws IOException, ResourceStreamNotFoundException { tester.getApplication().getPageSettings().addComponentResolver(new Border("test_resolver") { @@ -619,7 +620,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws ResourceStreamNotFoundException */ @Test - public void rawMakupParsingWithStripCommentsSetTrue() throws IOException, + void rawMakupParsingWithStripCommentsSetTrue() throws IOException, ResourceStreamNotFoundException { tester.getApplication().getMarkupSettings().setStripComments(true); @@ -633,7 +634,7 @@ public final class MarkupParserTest extends WicketTestCase * @see <a href="https://issues.apache.org/jira/browse/WICKET-3500";>WICKET-3500</a> */ @Test - public void ppenConditionalCommentPattern() + void ppenConditionalCommentPattern() { assertFalse(AbstractMarkupParser.CONDITIONAL_COMMENT_OPENING.matcher( "<!--x--> <!--[if IE]>").find()); @@ -673,7 +674,7 @@ public final class MarkupParserTest extends WicketTestCase * @throws Exception */ @Test - public void IEConditionalComments() throws Exception + void IEConditionalComments() throws Exception { boolean stripComments = tester.getApplication().getMarkupSettings().getStripComments(); try http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java index d5e6368..89a0fe9 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest.java @@ -16,16 +16,21 @@ */ package org.apache.wicket.markup; +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 static org.junit.jupiter.api.Assertions.assertTrue; + import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests {@link Markup} class. */ -public class MarkupTest extends WicketTestCase +class MarkupTest extends WicketTestCase { @Test - public void testFind() + void testFind() { MarkupFactory markupFactory = tester.getApplication().getMarkupSettings().getMarkupFactory(); Markup markup = markupFactory.getMarkup(new MarkupTest_Find_3(), false); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_1.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_1.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_1.java index f215512..71b0b71 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_1.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_1.java @@ -18,7 +18,7 @@ package org.apache.wicket.markup; import org.apache.wicket.markup.html.WebPage; -public class MarkupTest_Find_1 extends WebPage +class MarkupTest_Find_1 extends WebPage { } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_2.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_2.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_2.java index 26d54bc..53d3c1e 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_2.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_2.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.markup; -public class MarkupTest_Find_2 extends MarkupTest_Find_1 +class MarkupTest_Find_2 extends MarkupTest_Find_1 { } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_3.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_3.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_3.java index 9b71872..a13bace 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_3.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupTest_Find_3.java @@ -16,7 +16,7 @@ */ package org.apache.wicket.markup; -public class MarkupTest_Find_3 extends MarkupTest_Find_2 +class MarkupTest_Find_3 extends MarkupTest_Find_2 { } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java index 705e075..bf239ad 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/MarkupVariationTest.java @@ -27,19 +27,19 @@ 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.Test; +import org.junit.jupiter.api.Test; /** * Tests that changing component's variation will use the correct markup */ -public class MarkupVariationTest extends WicketTestCase +class MarkupVariationTest extends WicketTestCase { /** * https://issues.apache.org/jira/browse/WICKET-3931 */ @Test - public void changeVariation() + void changeVariation() { tester.startPage(new VariationPage()); tester.assertContainsNot("Two"); @@ -67,7 +67,7 @@ public class MarkupVariationTest extends WicketTestCase * https://issues.apache.org/jira/browse/WICKET-6231 */ @Test - public void changeVariationBeforeRendering() throws Exception + void changeVariationBeforeRendering() throws Exception { tester.startPage(new VariationPage()); FormTester formTester = tester.newFormTester("p:a_form"); @@ -97,7 +97,7 @@ public class MarkupVariationTest extends WicketTestCase { private String variation; - public VariationPanel(String id) + VariationPanel(String id) { super(id); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java index 57f2c08..441f886 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/RefreshingViewOnRemoveTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.markup; +import static org.junit.jupiter.api.Assertions.assertTrue; + import java.util.ArrayList; import java.util.Arrays; import java.util.Iterator; @@ -33,14 +35,14 @@ import org.apache.wicket.model.Model; 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 child's {@link Component#onRemove} is on refresh * * @author igor */ -public class RefreshingViewOnRemoveTest extends WicketTestCase +class RefreshingViewOnRemoveTest extends WicketTestCase { private final List<TestComponent> components = new ArrayList<TestComponent>(); private int round = 1; @@ -49,14 +51,14 @@ public class RefreshingViewOnRemoveTest extends WicketTestCase * test() */ @Test - public void test() + void test() { tester.startPage(new TestPage()); // check everything was detached for (TestComponent c : components) { - assertTrue("Component " + c + " is not detached.", c.detached); + assertTrue(c.detached, "Component " + c + " is not detached."); } round++; @@ -90,7 +92,7 @@ public class RefreshingViewOnRemoveTest extends WicketTestCase } - protected Component newComponent(String id) + private Component newComponent(String id) { TestComponent c = new TestComponent(id, round); components.add(c); @@ -100,11 +102,11 @@ public class RefreshingViewOnRemoveTest extends WicketTestCase static class TestComponent extends Label { private static final long serialVersionUID = 1L; - public boolean detached = false; - public boolean removed = false; - public final int round; + boolean detached = false; + boolean removed = false; + final int round; - public TestComponent(String id, int round) + TestComponent(String id, int round) { super(id, id); this.round = round; @@ -129,7 +131,7 @@ public class RefreshingViewOnRemoveTest extends WicketTestCase { private static final long serialVersionUID = 1L; - public TestPage() + TestPage() { add(new RefreshingView<Integer>("repeater") { http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java index 35bf4f2..632c494 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/WicketNamespaceTest.java @@ -16,19 +16,21 @@ */ package org.apache.wicket.markup; +import static org.junit.jupiter.api.Assertions.assertEquals; + import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** */ -public class WicketNamespaceTest extends WicketTestCase +class WicketNamespaceTest extends WicketTestCase { /** * @throws Exception */ @Test - public void renderHomePage_1() throws Exception + void renderHomePage_1() throws Exception { executeTest(WicketNamespace_1.class, "WicketNamespaceExpectedResult_1.html"); } @@ -37,7 +39,7 @@ public class WicketNamespaceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_2() throws Exception + void renderHomePage_2() throws Exception { executeTest(WicketNamespace_2.class, "WicketNamespaceExpectedResult_2.html"); } @@ -46,7 +48,7 @@ public class WicketNamespaceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_3() throws Exception + void renderHomePage_3() throws Exception { executeTest(WicketNamespace_3.class, "WicketNamespaceExpectedResult_3.html"); } @@ -55,7 +57,7 @@ public class WicketNamespaceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_4() throws Exception + void renderHomePage_4() throws Exception { executeTest(WicketNamespace_4.class, "WicketNamespaceExpectedResult_4.html"); } @@ -64,7 +66,7 @@ public class WicketNamespaceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_5() throws Exception + void renderHomePage_5() throws Exception { executeTest(WicketNamespace_5.class, "WicketNamespaceExpectedResult_5.html"); } @@ -73,7 +75,7 @@ public class WicketNamespaceTest extends WicketTestCase * @throws Exception */ @Test - public void renderHomePage_6() throws Exception + void renderHomePage_6() throws Exception { executeTest(WicketNamespace_6.class, "WicketNamespaceExpectedResult_6.html"); } @@ -82,7 +84,7 @@ public class WicketNamespaceTest extends WicketTestCase * @throws Exception */ @Test - public void doctype_1() throws Exception + void doctype_1() throws Exception { executeTest(Doctype_1.class, "DoctypeExpectedResult_1.html"); MarkupResourceStream rs = MarkupFactory.get() @@ -96,7 +98,7 @@ public class WicketNamespaceTest extends WicketTestCase * @throws Exception */ @Test - public void doctype_InheritedPage() throws Exception + void doctype_InheritedPage() throws Exception { executeTest(Doctype_1_InheritedPage.class, "DoctypeExpectedResult_1_Inherited.html"); MarkupResourceStream rs = MarkupFactory.get() @@ -110,7 +112,7 @@ public class WicketNamespaceTest extends WicketTestCase * @throws Exception */ @Test - public void doctype_2() throws Exception + void doctype_2() throws Exception { executeTest(Doctype_2.class, "DoctypeExpectedResult_2.html"); MarkupResourceStream rs = MarkupFactory.get() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java index ab86f6a..a98d3b1 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/HeaderResponseTest.java @@ -18,14 +18,14 @@ package org.apache.wicket.markup.head; import org.apache.wicket.markup.html.header.response.ConcretePage; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * This test verifies the ordering of header items. * * @author papegaaij */ -public class HeaderResponseTest extends WicketTestCase +class HeaderResponseTest extends WicketTestCase { /** * Renders items in child-first order and priority items and parent-first order. The expected @@ -40,7 +40,7 @@ public class HeaderResponseTest extends WicketTestCase * @throws Exception */ @Test - public void testAllMarkup() throws Exception + void testAllMarkup() throws Exception { executeTest(ConcretePage.class, "ExpectedResult.html"); } @@ -50,7 +50,7 @@ public class HeaderResponseTest extends WicketTestCase * @throws Exception */ @Test - public void testAllMarkupPageFirst() throws Exception + void testAllMarkupPageFirst() throws Exception { tester.getApplication() .getResourceSettings() http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/head/HtmlImportHeaderItemTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/HtmlImportHeaderItemTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/HtmlImportHeaderItemTest.java index 79244b6..7d5eebf 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/head/HtmlImportHeaderItemTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/HtmlImportHeaderItemTest.java @@ -16,44 +16,45 @@ */ package org.apache.wicket.markup.head; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.wicket.markup.html.basic.SimplePage; import org.apache.wicket.request.mapper.parameter.PageParameters; import org.apache.wicket.util.tester.WicketTester; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class HtmlImportHeaderItemTest +class HtmlImportHeaderItemTest { @Test - public void basicUsage() throws Exception + void basicUsage() throws Exception { String url = "/path/to/page.html"; - + MetaDataHeaderItem result = HtmlImportHeaderItem.forImportLinkTag(url); - + assertEquals("<link rel=\"import\" href=\"" + url + "\" />\n", result.generateString()); - + result = HtmlImportHeaderItem.forImportLinkTag(url, true); - - assertEquals("<link rel=\"import\" href=\"" + url + "\" async />\n", result.generateString()); + + assertEquals("<link rel=\"import\" href=\"" + url + "\" async />\n", + result.generateString()); } - + @Test - public void wicketPageUrl() throws Exception + void wicketPageUrl() throws Exception { - WicketTester tester = new WicketTester(); + WicketTester tester = new WicketTester(); PageParameters parameters = new PageParameters(); parameters.add("foo", "foo"); parameters.add("bar", "bar"); - + CharSequence pageUrl = tester.getRequestCycle().urlFor(SimplePage.class, parameters); - - MetaDataHeaderItem importLink = HtmlImportHeaderItem - .forImportLinkTag(SimplePage.class, parameters, "monitor", true); - - assertEquals("<link rel=\"import\" href=\"" + pageUrl + "\" media=\"monitor\" async />\n", + + MetaDataHeaderItem importLink = HtmlImportHeaderItem.forImportLinkTag(SimplePage.class, + parameters, "monitor", true); + + assertEquals("<link rel=\"import\" href=\"" + pageUrl + "\" media=\"monitor\" async />\n", importLink.generateString()); } } http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/head/MetaDataHeaderItemTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/MetaDataHeaderItemTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/MetaDataHeaderItemTest.java index 6cff0a5..fc2c93b 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/head/MetaDataHeaderItemTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/MetaDataHeaderItemTest.java @@ -16,16 +16,16 @@ */ package org.apache.wicket.markup.head; -import static org.junit.Assert.assertEquals; +import static org.junit.jupiter.api.Assertions.assertEquals; import org.apache.wicket.model.Model; -import org.junit.Test; +import org.junit.jupiter.api.Test; -public class MetaDataHeaderItemTest +class MetaDataHeaderItemTest { @Test - public void testMetaTag() throws Exception + void testMetaTag() throws Exception { String expectedString = "<meta name=\"robots\" content=\"index,nofollow\" />\n"; MetaDataHeaderItem metaTag = MetaDataHeaderItem.forMetaTag("robots", "index,nofollow"); @@ -34,7 +34,7 @@ public class MetaDataHeaderItemTest } @Test - public void testLinkTag() throws Exception + void testLinkTag() throws Exception { String expectedString = "<link rel=\"shortcut icon\" href=\"http://www.mysite.com/favicon.ico\"; type=\"image/x-icon\" />\n"; MetaDataHeaderItem metaTag = MetaDataHeaderItem.forLinkTag("shortcut icon", "http://www.mysite.com/favicon.ico";); @@ -44,7 +44,7 @@ public class MetaDataHeaderItemTest } @Test - public void testEscapeOnlyDoubleQuotes() throws Exception + void testEscapeOnlyDoubleQuotes() throws Exception { String expectedString = "<link rel=\"single quote \' double quotes\\\"\" href=\"\" />\n"; MetaDataHeaderItem metaTag = MetaDataHeaderItem.forLinkTag("single quote \' double quotes\"", ""); http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java index 88e9c64..152dfaf 100644 --- a/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/markup/head/filter/FilteringHeaderResponseTest.java @@ -16,6 +16,8 @@ */ package org.apache.wicket.markup.head.filter; +import static org.junit.jupiter.api.Assertions.assertEquals; + import java.util.Collections; import org.apache.wicket.markup.head.IHeaderResponse; @@ -26,18 +28,18 @@ import org.apache.wicket.markup.html.IHeaderResponseDecorator; import org.apache.wicket.request.Response; import org.apache.wicket.response.StringResponse; import org.apache.wicket.util.tester.WicketTestCase; -import org.junit.Test; +import org.junit.jupiter.api.Test; /** * Tests for FilteringHeaderResponse * * @since 6.0 */ -public class FilteringHeaderResponseTest extends WicketTestCase +class FilteringHeaderResponseTest extends WicketTestCase { @Test - public void footerDependsOnHeadItem() throws Exception + void footerDependsOnHeadItem() throws Exception { tester.getApplication().setHeaderResponseDecorator(new IHeaderResponseDecorator() { @@ -46,7 +48,8 @@ public class FilteringHeaderResponseTest extends WicketTestCase { // use this header resource decorator to load all JavaScript resources in the page // footer (after </body>) - return new ResourceAggregator(new JavaScriptFilteredIntoFooterHeaderResponse(response, "footerJS")); + return new ResourceAggregator( + new JavaScriptFilteredIntoFooterHeaderResponse(response, "footerJS")); } }); executeTest(FilteredHeaderPage.class, "FilteredHeaderPageExpected.html"); @@ -54,23 +57,26 @@ public class FilteringHeaderResponseTest extends WicketTestCase /** * https://issues.apache.org/jira/browse/WICKET-5057 + * * @throws Exception */ @Test - public void createBucketOnTheFlyForFilteredHeaderItem() throws Exception + void createBucketOnTheFlyForFilteredHeaderItem() throws Exception { - try (FilteringHeaderResponse headerResponse = new FilteringHeaderResponse(new HeaderResponse() - { - @Override - protected Response getRealResponse() + try (FilteringHeaderResponse headerResponse = new FilteringHeaderResponse( + new HeaderResponse() { - return new StringResponse(); - } - }, "headerBucketName", Collections.emptyList())) + @Override + protected Response getRealResponse() + { + return new StringResponse(); + } + }, "headerBucketName", Collections.emptyList())) { String filterName = "filterName"; String headerContent = "content"; - FilteredHeaderItem item = new FilteredHeaderItem(StringHeaderItem.forString(headerContent), filterName); + FilteredHeaderItem item = new FilteredHeaderItem( + StringHeaderItem.forString(headerContent), filterName); headerResponse.render(item); CharSequence realContent = headerResponse.getContent(filterName); assertEquals(headerContent, realContent.toString()); @@ -82,9 +88,10 @@ public class FilteringHeaderResponseTest extends WicketTestCase * inside a {@code document.addEventListener('DOMContentLoaded', function() {}; } hook. */ @Test - public void deferred() throws Exception + void deferred() throws Exception { - tester.getApplication().setHeaderResponseDecorator(response -> new ResourceAggregator(new JavaScriptDeferHeaderResponse(response))); + tester.getApplication().setHeaderResponseDecorator( + response -> new ResourceAggregator(new JavaScriptDeferHeaderResponse(response))); executeTest(DeferredPage.class, "DeferredPageExpected.html"); } }
