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:54 UTC
[24/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/core/request/mapper/LocaleAwarePageParametersTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/LocaleAwarePageParametersTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/LocaleAwarePageParametersTest.java
index 6a4bc88..b833fac 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/LocaleAwarePageParametersTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/LocaleAwarePageParametersTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.core.request.mapper;
-import static org.hamcrest.Matchers.is;
+import static org.junit.jupiter.api.Assertions.assertEquals;
import java.util.Locale;
@@ -33,26 +33,26 @@ import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.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;
/**
* https://issues.apache.org/jira/browse/WICKET-6419
*/
-public class LocaleAwarePageParametersTest extends WicketTestCase
+class LocaleAwarePageParametersTest extends WicketTestCase
{
private Locale defaultLocale = null;
- @Before
- public void before()
+ @BeforeEach
+ void before()
{
defaultLocale = Locale.getDefault(Locale.Category.DISPLAY);
Locale.setDefault(Locale.Category.DISPLAY, Locale.ENGLISH);
}
- @After
- public void after()
+ @AfterEach
+ void after()
{
if (defaultLocale != null)
{
@@ -93,26 +93,26 @@ public class LocaleAwarePageParametersTest extends WicketTestCase
}
@Test
- public void localeUnaware()
+ void localeUnaware()
{
tester.executeUrl("unaware?number=1.234,0");
final Page page = tester.getLastRenderedPage();
- assertThat(page.getPageParameters().get("number").toDouble(), is(1.234));
+ assertEquals(1.234, page.getPageParameters().get("number").toDouble());
}
@Test
- public void localeAware()
+ void localeAware()
{
tester.executeUrl("aware?number=1.234,0");
final Page page = tester.getLastRenderedPage();
- assertThat(page.getPageParameters().get("number").toDouble(), is(1234d));
+ assertEquals(1234d, page.getPageParameters().get("number").toDouble());
}
private static class BasePage extends WebPage implements IMarkupResourceStreamProvider
{
- protected BasePage(PageParameters parameters)
+ BasePage(PageParameters parameters)
{
super(parameters);
}
@@ -124,17 +124,17 @@ public class LocaleAwarePageParametersTest extends WicketTestCase
}
}
- public static class LocaleUnawarePageParametersPage extends BasePage
+ public static class LocaleUnawarePageParametersPage extends BasePage
{
- public LocaleUnawarePageParametersPage(PageParameters parameters)
+ public LocaleUnawarePageParametersPage(PageParameters parameters)
{
super(parameters);
}
}
- public static class LocaleAwarePageParametersPage extends BasePage
+ public static class LocaleAwarePageParametersPage extends BasePage
{
- public LocaleAwarePageParametersPage(PageParameters parameters)
+ public LocaleAwarePageParametersPage(PageParameters parameters)
{
super(parameters);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MoreSpecificResourceMountPathTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MoreSpecificResourceMountPathTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MoreSpecificResourceMountPathTest.java
index 9d5f582..c815172 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MoreSpecificResourceMountPathTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MoreSpecificResourceMountPathTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.net.URL;
+
import org.apache.wicket.Application;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.protocol.http.WebApplication;
@@ -27,95 +31,62 @@ import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.util.string.StringValue;
import org.apache.wicket.util.tester.DummyHomePage;
import org.apache.wicket.util.tester.WicketTester;
-import org.junit.Assert;
-import org.junit.Test;
-
-import java.net.URL;
-
-import static org.hamcrest.CoreMatchers.equalTo;
-import static org.hamcrest.CoreMatchers.is;
+import org.junit.jupiter.api.Test;
/**
* https://issues.apache.org/jira/browse/WICKET-6094
*/
-public class MoreSpecificResourceMountPathTest
+class MoreSpecificResourceMountPathTest
{
@Test
- public void can_use_resource_mounted_without_parameter()
+ void can_use_resource_mounted_without_parameter()
{
WicketTester browser = new WicketTester(new WicketApplication());
browser.executeUrl(WicketApplication.urlFor("howdy"));
- Assert.assertThat(browser.getLastResponseAsString(), is(equalTo("howdy")));
+ assertEquals("howdy", browser.getLastResponseAsString());
}
@Test
- public void can_use_resource_mounted_with_parameter()
+ void can_use_resource_mounted_with_parameter()
{
WicketTester browser = new WicketTester(new WicketApplication());
browser.executeUrl(WicketApplication.urlFor(1L));
- Assert.assertThat(browser.getLastResponseAsString(), is(equalTo("1")));
+ assertEquals("1", browser.getLastResponseAsString());
}
- public static class WicketApplication extends WebApplication
+ static class WicketApplication extends WebApplication
{
+ static final String PARAM_ID = "id";
+ static final String PARAM_NAME = "name";
private static final String OWNER_BY_ID_LOADER = "owner-by-id-loader";
private static final String OWNERS_LISTER = "owners-lister";
- public static final String PARAM_ID = "id";
- public static final String PARAM_NAME = "name";
- @Override
- public Class<? extends WebPage> getHomePage()
- {
- return DummyHomePage.class;
- }
-
- @Override
- public void init()
- {
- super.init();
-
- String path = "/ajax/owners"; // shared by both references
-
- mountResource(path, new ResourceReference(OWNERS_LISTER)
- {
- @Override
- public IResource getResource()
- {
- return new DummyResource(PARAM_NAME);
- }
- });
-
- mountResource(path + "/${" + PARAM_ID + "}", new ResourceReference(OWNER_BY_ID_LOADER)
- {
- @Override
- public IResource getResource()
- {
- return new DummyResource(PARAM_ID);
- }
- });
- }
-
- public static String urlFor(String name)
+ static String urlFor(String name)
{
return urlFor(name, PARAM_NAME, OWNERS_LISTER);
}
- public static String urlFor(Long id)
+ static String urlFor(Long id)
{
return urlFor(id, PARAM_ID, OWNER_BY_ID_LOADER);
}
- /** <Test-Helper>
- * Generate an {@link URL} to access the mounted resource reference.
- * @param value of dummy attribute used to have some testable response output.
- * @param parameterName of dummy attribute
- * @param resourceReferenceName used to mount instance
+ /**
+ * <Test-Helper> Generate an {@link URL} to access the mounted resource reference.
+ *
+ * @param value
+ * of dummy attribute used to have some testable response output.
+ * @param parameterName
+ * of dummy attribute
+ * @param resourceReferenceName
+ * used to mount instance
* @return {@link CharSequence} url for resource reference
*/
- private static String urlFor(Object value, String parameterName, String resourceReferenceName)
+ private static String urlFor(Object value, String parameterName,
+ String resourceReferenceName)
{
PageParameters parameters = new PageParameters();
- if (value != null)
+ if (value != null)
{
parameters.set(parameterName, value);
}
@@ -124,46 +95,70 @@ public class MoreSpecificResourceMountPathTest
return string;
}
- /** <Test-Helper>
- * Find resource reference mounted in application.
- * @param name of resource reference used to mount instance
+ /**
+ * <Test-Helper> Find resource reference mounted in application.
+ *
+ * @param name
+ * of resource reference used to mount instance
* @return {@link ResourceReference} found
*/
- private static ResourceReference findResourceReference(String name)
+ private static ResourceReference findResourceReference(String name)
+ {
+ return Application.get().getResourceReferenceRegistry().getResourceReference(
+ new ResourceReference.Key(Application.class.getName(), name, null, null, null),
+ false, false);
+ }
+
+ @Override
+ public Class<? extends WebPage> getHomePage()
+ {
+ return DummyHomePage.class;
+ }
+
+ @Override
+ public void init()
{
- return Application.get()
- .getResourceReferenceRegistry()
- .getResourceReference(
- new ResourceReference.Key(
- Application.class.getName(),
- name,
- null,
- null,
- null
- ),
- false,
- false
- );
+ super.init();
+
+ String path = "/ajax/owners"; // shared by both references
+
+ mountResource(path, new ResourceReference(OWNERS_LISTER)
+ {
+ @Override
+ public IResource getResource()
+ {
+ return new DummyResource(PARAM_NAME);
+ }
+ });
+
+ mountResource(path + "/${" + PARAM_ID + "}", new ResourceReference(OWNER_BY_ID_LOADER)
+ {
+ @Override
+ public IResource getResource()
+ {
+ return new DummyResource(PARAM_ID);
+ }
+ });
}
- /** <Test-Helper>
- * This is only a dummy to be referenced. It is possible to
- * exchange this by a mock or whatever.
+ /**
+ * <Test-Helper> This is only a dummy to be referenced. It is possible to exchange this by a
+ * mock or whatever.
*
* @author rene.dieckmann@menoto.de
*/
- private static class DummyResource extends ByteArrayResource
+ private static class DummyResource extends ByteArrayResource
{
private final String parameterName;
- public DummyResource(String parameterName)
+ DummyResource(String parameterName)
{
super("application/text");
this.parameterName = parameterName;
}
@Override
- protected byte[] getData(Attributes attributes)
+ protected byte[] getData(Attributes attributes)
{
StringValue value = attributes.getParameters().get(parameterName);
return value == null ? new byte[0] : value.toString().getBytes();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
index 5b809a7..1b91f8a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/MountedMapperTest.java
@@ -16,7 +16,13 @@
*/
package org.apache.wicket.core.request.mapper;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler;
@@ -36,21 +42,14 @@ import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.mapper.parameter.INamedParameters;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* @author Matej Knopp
*/
-public class MountedMapperTest extends AbstractMapperTest
+class MountedMapperTest extends AbstractMapperTest
{
- /**
- * Construct.
- */
- public MountedMapperTest()
- {
- }
-
private final MountedMapper encoder = new MountedMapper("/some/mount/path", MockPage.class)
{
@Override
@@ -65,7 +64,6 @@ public class MountedMapperTest extends AbstractMapperTest
return true;
}
};
-
private final MountedMapper placeholderEncoder = new MountedMapper(
"/some/${param1}/path/${param2}", MockPage.class)
{
@@ -81,7 +79,6 @@ public class MountedMapperTest extends AbstractMapperTest
return true;
}
};
-
private final MountedMapper optionPlaceholderEncoder = new MountedMapper(
"/some/#{param1}/path/${param2}/#{param3}", MockPage.class)
{
@@ -99,15 +96,22 @@ public class MountedMapperTest extends AbstractMapperTest
};
/**
+ * Construct.
+ */
+ MountedMapperTest()
+ {
+ }
+
+ /**
*
*/
@Test
- public void decode1()
+ void decode1()
{
Url url = Url.parse("some/mount/path");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -118,12 +122,12 @@ public class MountedMapperTest extends AbstractMapperTest
* https://issues.apache.org/jira/browse/WICKET-4994
*/
@Test
- public void decode1CaseInsensitively()
+ void decode1CaseInsensitively()
{
Url url = Url.parse("somE/moUnt/paTh");
IRequestHandler handler = encoder.setCaseSensitiveMatch(false).mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -134,12 +138,12 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode2()
+ void decode2()
{
Url url = Url.parse("some/mount/path/indexed1?a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParameters p = page.getPageParameters();
@@ -152,46 +156,42 @@ public class MountedMapperTest extends AbstractMapperTest
}
/**
- * The tests resolves pages by id as if they were existed in the page store.
- * These pages have no page parameters (i.e. page.getPageParameters() == null).
+ * The tests resolves pages by id as if they were existed in the page store. These pages have no
+ * page parameters (i.e. page.getPageParameters() == null).
*
- * The request that the encoder does also has no parameters (neither in the path
- * nor in the query string) so the resolved page is assumed to be valid.
+ * The request that the encoder does also has no parameters (neither in the path nor in the
+ * query string) so the resolved page is assumed to be valid.
*/
@Test
- public void decode3()
+ void decode3()
{
Url url = Url.parse("some/mount/path?15");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
}
/**
- * The tests resolves pages by id as if they were existed in the page store.
- * These pages have no page parameters (i.e. page.getPageParameters() == null).
+ * The tests resolves pages by id as if they were existed in the page store. These pages have no
+ * page parameters (i.e. page.getPageParameters() == null).
*
- * Since Wicket 7.0.0 (WICKET-4441) if a new request to hybrid url
- * (a url with both mount path and pageId) has different page parameters
- * than the resolved page then a new page instance with the new parameters
- * is created.
- * This way if a user manipulates manually the product id in url like:
- * /products/23?3
- * to
- * /products/24?3
- * then Wicket will create a new page that will show product=24
+ * Since Wicket 7.0.0 (WICKET-4441) if a new request to hybrid url (a url with both mount path
+ * and pageId) has different page parameters than the resolved page then a new page instance
+ * with the new parameters is created. This way if a user manipulates manually the product id in
+ * url like: /products/23?3 to /products/24?3 then Wicket will create a new page that will show
+ * product=24
*/
@Test
- public void decode4()
+ void decode4()
{
Url url = Url.parse("some/mount/path/i1/i2?15&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
- RenderPageRequestHandler h = (RenderPageRequestHandler) handler;
- ((PageProvider) h.getPageProvider()).setPageSource(context);
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
+ RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
+ ((PageProvider)h.getPageProvider()).setPageSource(context);
IRequestablePage page = h.getPage();
checkPage(page, 1);
@@ -205,12 +205,12 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode5()
+ void decode5()
{
Url url = Url.parse("some/mount/path?15--foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
@@ -225,12 +225,12 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode6()
+ void decode6()
{
Url url = Url.parse("some/mount/path/i1/i2?15--foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -248,12 +248,12 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode7()
+ void decode7()
{
Url url = Url.parse("some/mount/path?param1=value1&15-.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
@@ -268,7 +268,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode8()
+ void decode8()
{
Url url = Url.parse("some/mmount/path?15-.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
@@ -280,25 +280,25 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode9()
+ void decode9()
{
// capture the home page
Url url = Url.parse("");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
}
/**
*
*/
@Test
- public void decode10()
+ void decode10()
{
Url url = Url.parse("some/mount/path?15-5.4-foo-bar");
context.setNextPageRenderCount(5);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
@@ -309,27 +309,29 @@ public class MountedMapperTest extends AbstractMapperTest
/**
*
*/
- @Test(expected = StalePageException.class)
- public void decode11()
+ @Test
+ void decode11()
{
- Url url = Url.parse("some/mount/path?15-5.4-foo-bar");
- context.setNextPageRenderCount(7);
+ assertThrows(StalePageException.class, () -> {
+ Url url = Url.parse("some/mount/path?15-5.4-foo-bar");
+ context.setNextPageRenderCount(7);
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
- ((IPageRequestHandler)handler).getPage();
+ ((IPageRequestHandler)handler).getPage();
+ });
}
/**
*
*/
@Test
- public void decode12()
+ void decode12()
{
Url url = Url.parse("some/mount/path/i1/i2?-1.-foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -348,7 +350,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode1()
+ void encode1()
{
PageProvider provider = new PageProvider(MockPage.class, new PageParameters());
provider.setPageSource(context);
@@ -361,7 +363,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode2()
+ void encode2()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -379,7 +381,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode3()
+ void encode3()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -399,7 +401,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode4()
+ void encode4()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -419,7 +421,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode5()
+ void encode5()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -445,7 +447,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode6()
+ void encode6()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -471,11 +473,11 @@ public class MountedMapperTest extends AbstractMapperTest
/**
* https://issues.apache.org/jira/browse/WICKET-4014
*
- * The difference with testEncode7 is that here ListenerRequestHandler is used instead
- * of BookmarkableListenerRequestHandler
+ * The difference with testEncode7 is that here ListenerRequestHandler is used instead of
+ * BookmarkableListenerRequestHandler
*/
@Test
- public void encode6_1()
+ void encode6_1()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -484,8 +486,10 @@ public class MountedMapperTest extends AbstractMapperTest
page.getPageParameters().set("b", "c", INamedParameters.Type.QUERY_STRING);
// WICKET-4038
- page.getPageParameters().add(WebRequest.PARAM_AJAX, "true", INamedParameters.Type.QUERY_STRING);
- page.getPageParameters().add(WebRequest.PARAM_AJAX_BASE_URL, "some/base/url", INamedParameters.Type.QUERY_STRING);
+ page.getPageParameters().add(WebRequest.PARAM_AJAX, "true",
+ INamedParameters.Type.QUERY_STRING);
+ page.getPageParameters().add(WebRequest.PARAM_AJAX_BASE_URL, "some/base/url",
+ INamedParameters.Type.QUERY_STRING);
page.setRenderCount(4);
@@ -507,7 +511,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode7()
+ void encode7()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -533,11 +537,11 @@ public class MountedMapperTest extends AbstractMapperTest
/**
* https://issues.apache.org/jira/browse/WICKET-4014
*
- * The difference with testEncode7 is that here ListenerRequestHandler is used instead
- * of BookmarkableListenerRequestHandler
+ * The difference with testEncode7 is that here ListenerRequestHandler is used instead of
+ * BookmarkableListenerRequestHandler
*/
@Test
- public void encode7_1()
+ void encode7_1()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -564,7 +568,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode8()
+ void encode8()
{
MockPage page = new MockPage(15);
page.setBookmarkable(true);
@@ -582,17 +586,19 @@ public class MountedMapperTest extends AbstractMapperTest
/**
*
*/
- @Test(expected = IllegalArgumentException.class)
- public void construct1()
+ @Test
+ void construct1()
{
- IRequestMapper e = new MountedMapper("", MockPage.class);
+ assertThrows(IllegalArgumentException.class, () -> {
+ IRequestMapper e = new MountedMapper("", MockPage.class);
+ });
}
/**
* Overriding mounting on '/' (see HomePageMapper) should be possible
*/
@Test
- public void construct2()
+ void construct2()
{
IRequestMapper homePageMapper = new MountedMapper("/", MockPage.class);
assertNotNull(homePageMapper);
@@ -602,12 +608,12 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void placeholderDecode1()
+ void placeholderDecode1()
{
Url url = Url.parse("some/p1/path/p2");
IRequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -620,12 +626,12 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void placeholderDecode2()
+ void placeholderDecode2()
{
Url url = Url.parse("some/p1/path/p2/indexed1?a=b&b=c");
IRequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParameters p = page.getPageParameters();
@@ -641,12 +647,12 @@ public class MountedMapperTest extends AbstractMapperTest
/** */
@Test
- public void placeholderDecodeWithIndexedParameters()
+ void placeholderDecodeWithIndexedParameters()
{
Url url = Url.parse("some/p1/path/p2/p3/p4");
IRequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(2, page.getPageParameters().getIndexedCount());
@@ -661,7 +667,7 @@ public class MountedMapperTest extends AbstractMapperTest
*
*/
@Test
- public void placeholderEncode2()
+ void placeholderEncode2()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -684,7 +690,7 @@ public class MountedMapperTest extends AbstractMapperTest
* new, this way the produced Url has version '1' in the page info parameter
*/
@Test
- public void placeholderEncode3()
+ void placeholderEncode3()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -712,7 +718,7 @@ public class MountedMapperTest extends AbstractMapperTest
* WICKET-5247 page instantiated without required parameters won't be mapped
*/
@Test
- public void placeholderEncode4()
+ void placeholderEncode4()
{
PageProvider provider = new PageProvider(MockPage.class)
{
@@ -730,12 +736,12 @@ public class MountedMapperTest extends AbstractMapperTest
/** */
@Test
- public void optionPlaceholderDecode1()
+ void optionPlaceholderDecode1()
{
Url url = Url.parse("some/p1/path/p2/p3");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -747,73 +753,72 @@ public class MountedMapperTest extends AbstractMapperTest
/** */
@Test
- public void optionPlaceholderDecodeEagerMatchParameters()
+ void optionPlaceholderDecodeEagerMatchParameters()
{
Url url = Url.parse("some/path/path/path");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
assertTrue(page.getPageParameters().getNamedKeys().size() == 2);
assertEquals("path", page.getPageParameters().get("param1").toString());
assertEquals("path", page.getPageParameters().get("param2").toString());
- assertFalse("param3 should not be set",
- page.getPageParameters().getNamedKeys().contains("param3"));
+ assertFalse(page.getPageParameters().getNamedKeys().contains("param3"),
+ "param3 should not be set");
}
/** */
@Test
- public void optionPlaceholderDecode2()
+ void optionPlaceholderDecode2()
{
Url url = Url.parse("some/p1/path/p2");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
assertTrue(page.getPageParameters().getNamedKeys().size() == 2);
assertEquals("p1", page.getPageParameters().get("param1").toString());
assertEquals("p2", page.getPageParameters().get("param2").toString());
- assertFalse("param3 should not be set",
- page.getPageParameters().getNamedKeys().contains("param3"));
+ assertFalse(page.getPageParameters().getNamedKeys().contains("param3"));
}
/** */
@Test
- public void optionPlaceholderDecode3()
+ void optionPlaceholderDecode3()
{
Url url = Url.parse("some/path/p2");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
assertTrue(page.getPageParameters().getNamedKeys().size() == 1);
- assertFalse("param1 should not be set",
- page.getPageParameters().getNamedKeys().contains("param1"));
+ assertFalse(page.getPageParameters().getNamedKeys().contains("param1"),
+ "param1 should not be set");
assertEquals("p2", page.getPageParameters().get("param2").toString());
- assertFalse("param3 should not be set",
- page.getPageParameters().getNamedKeys().contains("param3"));
+ assertFalse(page.getPageParameters().getNamedKeys().contains("param3"),
+ "param3 should not be set");
}
/** */
@Test
- public void optionPlaceholderDecodeWithIndexParams()
+ void optionPlaceholderDecodeWithIndexParams()
{
Url url = Url.parse("some/path/p2/p3/p4");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(1, page.getPageParameters().getIndexedCount());
assertEquals(2, page.getPageParameters().getNamedKeys().size());
- assertFalse("param1 should not be set",
- page.getPageParameters().getNamedKeys().contains("param1"));
+ assertFalse(page.getPageParameters().getNamedKeys().contains("param1"),
+ "param1 should not be set");
assertEquals("p2", page.getPageParameters().get("param2").toString());
assertEquals("p3", page.getPageParameters().get("param3").toString());
assertEquals("p4", page.getPageParameters().get(0).toString());
@@ -821,7 +826,7 @@ public class MountedMapperTest extends AbstractMapperTest
/** */
@Test
- public void optionPlaceholderEncode1()
+ void optionPlaceholderEncode1()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -841,7 +846,7 @@ public class MountedMapperTest extends AbstractMapperTest
/** */
@Test
- public void optionPlaceholderEncode2()
+ void optionPlaceholderEncode2()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -863,9 +868,11 @@ public class MountedMapperTest extends AbstractMapperTest
* WICKET-6461
*/
@Test
- public void optionalPlaceholdersBeforeRequiredPlaceholder() throws Exception
+ void optionalPlaceholdersBeforeRequiredPlaceholder() throws Exception
{
- final MountedMapper mapper = new MountedMapper("/params/#{optional1}/#{optional2}/${required}", MockPage.class) {
+ final MountedMapper mapper = new MountedMapper(
+ "/params/#{optional1}/#{optional2}/${required}", MockPage.class)
+ {
@Override
protected IMapperContext getContext()
{
@@ -878,24 +885,24 @@ public class MountedMapperTest extends AbstractMapperTest
return true;
}
};
-
+
IRequestHandler handler = mapper.mapRequest(getRequest(Url.parse("params/required")));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParameters p = page.getPageParameters();
assertEquals(1, p.getNamedKeys().size());
assertEquals("required", p.get("required").toString());
-
+
handler = mapper.mapRequest(getRequest(Url.parse("params/optional1/required")));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
page = ((RenderPageRequestHandler)handler).getPage();
p = page.getPageParameters();
assertEquals(2, p.getNamedKeys().size());
assertEquals("required", p.get("required").toString());
assertEquals("optional1", p.get("optional1").toString());
-
+
handler = mapper.mapRequest(getRequest(Url.parse("params/optional1/optional2/required")));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
page = ((RenderPageRequestHandler)handler).getPage();
p = page.getPageParameters();
assertEquals(3, p.getNamedKeys().size());
@@ -908,7 +915,7 @@ public class MountedMapperTest extends AbstractMapperTest
* WICKET-5056
*/
@Test
- public void optionalParameterGetsLowerScore_ThanExactOne() throws Exception
+ void optionalParameterGetsLowerScore_ThanExactOne() throws Exception
{
final Url url = Url.parse("all/sindex");
final MountedMapper exactMount = new MountedMapper("/all/sindex", MockPage.class);
@@ -916,13 +923,13 @@ public class MountedMapperTest extends AbstractMapperTest
Request request = getRequest(url);
final int exactCompatScore = exactMount.getCompatibilityScore(request);
final int optCompatScore = optionalParameter.getCompatibilityScore(request);
- assertTrue("exactCompatScore should have greater compatibility score than optional one"
- + " got exact = " + exactCompatScore + " and optional = " + optCompatScore,
- exactCompatScore > optCompatScore);
+ assertTrue(exactCompatScore > optCompatScore,
+ "exactCompatScore should have greater compatibility score than optional one" +
+ " got exact = " + exactCompatScore + " and optional = " + optCompatScore);
}
@Test
- public void exactMountGetsBetterScore_ThanParameterOne() throws Exception
+ void exactMountGetsBetterScore_ThanParameterOne() throws Exception
{
final Url url = Url.parse("all/sindex");
final MountedMapper exactMount = new MountedMapper("/all/sindex", MockPage.class);
@@ -930,13 +937,13 @@ public class MountedMapperTest extends AbstractMapperTest
Request request = getRequest(url);
final int exactCompatScore = exactMount.getCompatibilityScore(request);
final int requiredParamScore = requiredParam.getCompatibilityScore(request);
- assertTrue("exactCompatScore should have greater compatibility score than required one"
- + " got exact = " + exactCompatScore + " and required= " + requiredParamScore,
- exactCompatScore > requiredParamScore);
+ assertTrue(exactCompatScore > requiredParamScore,
+ "exactCompatScore should have greater compatibility score than required one" +
+ " got exact = " + exactCompatScore + " and required= " + requiredParamScore);
}
@Test
- public void exactMountGetsBetterScore_ThanParameterOne_ThenOptionalOne() throws Exception
+ void exactMountGetsBetterScore_ThanParameterOne_ThenOptionalOne() throws Exception
{
final Url url = Url.parse("all/sindex");
final MountedMapper exactMount = new MountedMapper("/all/sindex", MockPage.class);
@@ -950,24 +957,28 @@ public class MountedMapperTest extends AbstractMapperTest
final int requiredParamScore = requiredParam.getCompatibilityScore(request);
final int optCompatScore = optionalParameter.getCompatibilityScore(request);
final int requiredOptCompatScore = requiredOptionalParam.getCompatibilityScore(request);
-
- //all the mappers above must be eligible for the give URL (i.e. their score must be > 0)
- assertTrue("exactMount mapper must be eligible to handle the request", exactCompatScore > 0);
- assertTrue("requiredParam mapper must be eligible to handle the request", requiredParamScore > 0);
- assertTrue("optionalParameter mapper must be eligible to handle the request", optCompatScore > 0);
- assertTrue("requiredOptionalParam mapper must be eligible to handle the request", requiredOptCompatScore > 0);
-
- assertTrue("exactCompatScore should have greater compatibility score than required one"
- + " got exact = " + exactCompatScore + " and required= " + requiredParamScore,
- exactCompatScore > requiredParamScore);
-
- assertTrue(
- "exactCompatScore should have greater compatibility score than required+optional one"
- + " got exact = " + exactCompatScore + " and requiredOptional= "
- + requiredOptCompatScore, exactCompatScore > requiredOptCompatScore);
-
- assertTrue("exactCompatScore should have greater compatibility score than optional one"
- + " got exact = " + exactCompatScore + " and optional = " + optCompatScore,
- requiredParamScore > optCompatScore);
+
+ // all the mappers above must be eligible for the give URL (i.e. their score must be > 0)
+ assertTrue(exactCompatScore > 0,
+ "exactMount mapper must be eligible to handle the request");
+ assertTrue(requiredParamScore > 0,
+ "requiredParam mapper must be eligible to handle the request");
+ assertTrue(optCompatScore > 0,
+ "optionalParameter mapper must be eligible to handle the request");
+ assertTrue(requiredOptCompatScore > 0,
+ "requiredOptionalParam mapper must be eligible to handle the request");
+
+ assertTrue(exactCompatScore > requiredParamScore,
+ "exactCompatScore should have greater compatibility score than required one" +
+ " got exact = " + exactCompatScore + " and required= " + requiredParamScore);
+
+ assertTrue(exactCompatScore > requiredOptCompatScore,
+ "exactCompatScore should have greater compatibility score than required+optional one" +
+ " got exact = " + exactCompatScore + " and requiredOptional= " +
+ requiredOptCompatScore);
+
+ assertTrue(requiredParamScore > optCompatScore,
+ "exactCompatScore should have greater compatibility score than optional one" +
+ " got exact = " + exactCompatScore + " and optional = " + optCompatScore);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
index b75f70b..72ab8a1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PackageMapperTest.java
@@ -16,9 +16,11 @@
*/
package org.apache.wicket.core.request.mapper;
-import static org.hamcrest.Matchers.instanceOf;
-import static org.hamcrest.Matchers.is;
-import static org.hamcrest.Matchers.nullValue;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.BookmarkableListenerRequestHandler;
@@ -38,18 +40,19 @@ import org.apache.wicket.request.component.IRequestablePage;
import org.apache.wicket.request.mapper.parameter.INamedParameters;
import org.apache.wicket.request.mapper.parameter.PageParameters;
import org.apache.wicket.util.lang.PackageName;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link PackageMapper}
*/
-public class PackageMapperTest extends AbstractMapperTest
+class PackageMapperTest extends AbstractMapperTest
{
private static final String MOUNT_PATH = "mount/path";
private static final String ALIAS = "alias";
-
- private final PackageMapper encoder = new PackageMapper(MOUNT_PATH, PackageName.forClass(MockPage.class))
+ private static final String PAGE_CLASS_NAME = MockPage.class.getSimpleName();
+ private final PackageMapper encoder = new PackageMapper(MOUNT_PATH,
+ PackageName.forClass(MockPage.class))
{
@Override
protected IMapperContext getContext()
@@ -63,9 +66,6 @@ public class PackageMapperTest extends AbstractMapperTest
return true;
}
};
-
- private static final String PAGE_CLASS_NAME = MockPage.class.getSimpleName();
-
private final PackageMapper aliasEncoder = new PackageMapper(MOUNT_PATH,
PackageName.forClass(MockPage.class))
{
@@ -106,7 +106,17 @@ public class PackageMapperTest extends AbstractMapperTest
}
};
- private final PackageMapper namedParametersEncoder = new PackageMapper(MOUNT_PATH + "/${foo}/${bar}", PackageName.forClass(MockPage.class))
+ private final PackageMapper namedParametersEncoder = new PackageMapper(
+ MOUNT_PATH + "/${foo}/${bar}", PackageName.forClass(MockPage.class))
+ {
+ @Override
+ protected IMapperContext getContext()
+ {
+ return context;
+ }
+ };
+ private final PackageMapper innerClassEncoder = new PackageMapper(MOUNT_PATH,
+ PackageName.forClass(OuterPage.class))
{
@Override
protected IMapperContext getContext()
@@ -119,12 +129,12 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode1()
+ void decode1()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -135,22 +145,23 @@ public class PackageMapperTest extends AbstractMapperTest
* https://issues.apache.org/jira/browse/WICKET-4994
*/
@Test
- public void decode1CaseInsensitively()
+ void decode1CaseInsensitively()
{
Url url = Url.parse(MOUNT_PATH.replace('o', 'O').replace('p', 'P') + '/' + PAGE_CLASS_NAME);
IRequestHandler handler = encoder.setCaseSensitiveMatch(false).mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
assertEquals(0, page.getPageParameters().getIndexedCount());
assertTrue(page.getPageParameters().getNamedKeys().isEmpty());
}
+
/**
* https://issues.apache.org/jira/browse/WICKET-5500
*/
@Test
- public void decodePageClassWithPathParameters()
+ void decodePageClassWithPathParameters()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + ";something=else");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
@@ -166,12 +177,12 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode2()
+ void decode2()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/indexed1?a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
@@ -185,46 +196,42 @@ public class PackageMapperTest extends AbstractMapperTest
}
/**
- * The tests resolves pages by id as if they were existed in the page store.
- * These pages have no page parameters (i.e. page.getPageParameters() == null).
+ * The tests resolves pages by id as if they were existed in the page store. These pages have no
+ * page parameters (i.e. page.getPageParameters() == null).
*
- * The request that the encoder does also has no parameters (neither in the path
- * nor in the query string) so the resolved page is assumed to be valid.
+ * The request that the encoder does also has no parameters (neither in the path nor in the
+ * query string) so the resolved page is assumed to be valid.
*/
@Test
- public void decode3()
+ void decode3()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
}
/**
- * The tests resolves pages by id as if they were existed in the page store.
- * These pages have no page parameters (i.e. page.getPageParameters() == null).
+ * The tests resolves pages by id as if they were existed in the page store. These pages have no
+ * page parameters (i.e. page.getPageParameters() == null).
*
- * Since Wicket 7.0.0 (WICKET-4441) if a new request to hybrid url
- * (a url with both mount path and pageId) has different page parameters
- * than the resolved page then a new page instance with the new parameters
- * is created.
- * This way if a user manipulates manually the product id in url like:
- * /mount/path/Products/23?3
- * to
- * /mount/path/Products/24?3
- * then Wicket will create a new page that will show product=24
+ * Since Wicket 7.0.0 (WICKET-4441) if a new request to hybrid url (a url with both mount path
+ * and pageId) has different page parameters than the resolved page then a new page instance
+ * with the new parameters is created. This way if a user manipulates manually the product id in
+ * url like: /mount/path/Products/23?3 to /mount/path/Products/24?3 then Wicket will create a
+ * new page that will show product=24
*/
@Test
- public void decode4()
+ void decode4()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
- RenderPageRequestHandler h = (RenderPageRequestHandler) handler;
- ((PageProvider) h.getPageProvider()).setPageSource(context);
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
+ RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
+ ((PageProvider)h.getPageProvider()).setPageSource(context);
IRequestablePage page = h.getPage();
checkPage(page, 1);
@@ -238,12 +245,12 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode5()
+ void decode5()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15--foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
@@ -258,12 +265,12 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode6()
+ void decode6()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15--foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -281,12 +288,12 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode7()
+ void decode7()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "?15-.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
@@ -301,7 +308,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode8()
+ void decode8()
{
Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-5.-foo-bar&a=b&b=c");
@@ -309,7 +316,7 @@ public class PackageMapperTest extends AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -319,26 +326,27 @@ public class PackageMapperTest extends AbstractMapperTest
/**
*
*/
- @Test(expected = StalePageException.class)
- public void decode9()
+ @Test
+ void decode9()
{
- Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-5.-foo-bar&a=b&b=c");
+ assertThrows(StalePageException.class, () -> {
+ Url url = Url.parse(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-5.-foo-bar&a=b&b=c");
- context.setNextPageRenderCount(6);
-
- IRequestHandler handler = encoder.mapRequest(getRequest(url));
-
- ((IPageRequestHandler)handler).getPage();
+ context.setNextPageRenderCount(6);
+ IRequestHandler handler = encoder.mapRequest(getRequest(url));
+ ((IPageRequestHandler)handler).getPage();
+ });
}
/**
*
*/
@Test
- public void decodeNamedParameters()
+ void decodeNamedParameters()
{
- Url url = Url.parse(MOUNT_PATH + "/fooValue/barValue/" + PAGE_CLASS_NAME + "/i1/i2?a=b&b=c");
+ Url url = Url
+ .parse(MOUNT_PATH + "/fooValue/barValue/" + PAGE_CLASS_NAME + "/i1/i2?a=b&b=c");
IRequestHandler handler = namedParametersEncoder.mapRequest(getRequest(url));
assertTrue(handler instanceof RenderPageRequestHandler);
@@ -360,44 +368,44 @@ public class PackageMapperTest extends AbstractMapperTest
* WICKET-2993
*/
@Test
- public void decode10()
+ void decode10()
{
// use String.class but any other non-Page will do the job as well
Url url = Url.parse(String.class.getSimpleName());
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertNull("A non-page class should not create a request handler!", handler);
+ assertNull(handler, "A non-page class should not create a request handler!");
}
/**
* https://issues.apache.org/jira/browse/WICKET-5996
*/
@Test
- public void decode11()
+ void decode11()
{
Url url = Url.parse(MOUNT_PATH);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, is(nullValue()));
+ assertNull(handler);
}
/**
* https://issues.apache.org/jira/browse/WICKET-5996
*/
@Test
- public void decode12()
+ void decode12()
{
Url url = Url.parse(MOUNT_PATH + '/');
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, is(nullValue()));
+ assertNull(handler);
}
/**
*
*/
@Test
- public void encode1()
+ void encode1()
{
PageProvider provider = new PageProvider(MockPage.class, new PageParameters());
provider.setPageSource(context);
@@ -410,7 +418,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode2()
+ void encode2()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -428,7 +436,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode3()
+ void encode3()
{
PageParameters parameters = new PageParameters();
parameters.set(0, "i1");
@@ -448,7 +456,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode4()
+ void encode4()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -468,7 +476,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode5()
+ void encode5()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -489,7 +497,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode6()
+ void encode6()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -508,14 +516,15 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = encoder.mapHandler(handler);
- assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-0.-foo-bar&a=b&b=c", url.toString());
+ assertEquals(MOUNT_PATH + '/' + PAGE_CLASS_NAME + "/i1/i2?15-0.-foo-bar&a=b&b=c",
+ url.toString());
}
/**
*
*/
@Test
- public void encode7()
+ void encode7()
{
MockPage page = new MockPage(15);
page.getPageParameters().set(0, "i1");
@@ -542,7 +551,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode8()
+ void encode8()
{
MockPage page = new MockPage(15);
page.setBookmarkable(true);
@@ -561,7 +570,7 @@ public class PackageMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encodeNamedPageParameters()
+ void encodeNamedPageParameters()
{
MockPage page = new MockPage(15);
page.setBookmarkable(true);
@@ -578,32 +587,11 @@ public class PackageMapperTest extends AbstractMapperTest
assertEquals(MOUNT_PATH + "/fooValue/barValue/" + PAGE_CLASS_NAME, url.toString());
}
-
- private final PackageMapper innerClassEncoder = new PackageMapper(MOUNT_PATH,
- PackageName.forClass(OuterPage.class))
- {
- @Override
- protected IMapperContext getContext()
- {
- return context;
- }
- };
-
- public static class OuterPage extends MockPage
- {
- private static final long serialVersionUID = 1L;
-
- public static class InnerPage extends MockPage
- {
- private static final long serialVersionUID = 1L;
- }
- }
-
/**
* https://issues.apache.org/jira/browse/WICKET-3838
*/
@Test
- public void encodeInnerClass()
+ void encodeInnerClass()
{
InnerPage page = new OuterPage.InnerPage();
IPageProvider provider = new PageProvider(page);
@@ -618,12 +606,12 @@ public class PackageMapperTest extends AbstractMapperTest
* https://issues.apache.org/jira/browse/WICKET-3838
*/
@Test
- public void decodeInnerClass()
+ void decodeInnerClass()
{
Url url = Url.parse(MOUNT_PATH + '/' + "PackageMapperTest$OuterPage$InnerPage");
IRequestHandler handler = innerClassEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals("InnerPage", page.getClass().getSimpleName());
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -634,7 +622,7 @@ public class PackageMapperTest extends AbstractMapperTest
* https://issues.apache.org/jira/browse/WICKET-3941
*/
@Test
- public void encodeAlias()
+ void encodeAlias()
{
MockPage page = new MockPage(15);
page.setBookmarkable(true);
@@ -653,33 +641,43 @@ public class PackageMapperTest extends AbstractMapperTest
* https://issues.apache.org/jira/browse/WICKET-3941
*/
@Test
- public void decodeAlias()
+ void decodeAlias()
{
Url url = Url.parse(MOUNT_PATH + '/' + ALIAS + "?15");
IRequestHandler handler = aliasEncoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
}
-
+
/**
* https://issues.apache.org/jira/browse/WICKET-5565
*/
@Test
- public void testGetCompatibilityScore()
- {
- Url url = Url.parse(MOUNT_PATH + '/' + "MyPage");
- MockWebRequest request = new MockWebRequest(url);
- int score = encoder.getCompatibilityScore(request);
-
- assertEquals(4, score);
-
- url = Url.parse(MOUNT_PATH + "/foo/bar/" + "MyPage");
- request = new MockWebRequest(url);
- score = namedParametersEncoder.getCompatibilityScore(request);
-
- assertEquals(6, score);
+ void testGetCompatibilityScore()
+ {
+ Url url = Url.parse(MOUNT_PATH + '/' + "MyPage");
+ MockWebRequest request = new MockWebRequest(url);
+ int score = encoder.getCompatibilityScore(request);
+
+ assertEquals(4, score);
+
+ url = Url.parse(MOUNT_PATH + "/foo/bar/" + "MyPage");
+ request = new MockWebRequest(url);
+ score = namedParametersEncoder.getCompatibilityScore(request);
+
+ assertEquals(6, score);
+ }
+
+ public static class OuterPage extends MockPage
+ {
+ private static final long serialVersionUID = 1L;
+
+ public static class InnerPage extends MockPage
+ {
+ private static final long serialVersionUID = 1L;
+ }
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
index 2c99a7b..e2281c8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/PageInstanceMapperTest.java
@@ -16,10 +16,14 @@
*/
package org.apache.wicket.core.request.mapper;
-import static org.hamcrest.CoreMatchers.instanceOf;
+import static org.assertj.core.api.Assertions.assertThat;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNull;
+import static org.junit.jupiter.api.Assertions.assertThrows;
import java.nio.charset.Charset;
import java.util.Locale;
+
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.IPageProvider;
import org.apache.wicket.core.request.handler.IPageRequestHandler;
@@ -32,13 +36,13 @@ import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.component.IRequestableComponent;
import org.apache.wicket.request.component.IRequestablePage;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
*
* @author Matej Knopp
*/
-public class PageInstanceMapperTest extends AbstractMapperTest
+class PageInstanceMapperTest extends AbstractMapperTest
{
private final PageInstanceMapper encoder = new PageInstanceMapper()
@@ -54,12 +58,12 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode1()
+ void decode1()
{
Url url = Url.parse("wicket/page?4");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
checkPage(h.getPage(), 4);
@@ -69,12 +73,12 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode2()
+ void decode2()
{
Url url = Url.parse("wicket/page?4&a=3&b=3");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(RenderPageRequestHandler.class));
+ assertThat(handler).isInstanceOf(RenderPageRequestHandler.class);
RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
checkPage(h.getPage(), 4);
@@ -84,7 +88,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void ignoreIfPageIdentifierHasSegmentsAfterIt()
+ void ignoreIfPageIdentifierHasSegmentsAfterIt()
{
Url url = Url.parse("wicket/page/ingore/me?4&a=3&b=3");
@@ -96,12 +100,12 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode3()
+ void decode3()
{
Url url = Url.parse("wicket/page?4--a-b-c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
checkPage(h.getPage(), 4);
@@ -113,7 +117,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode4()
+ void decode4()
{
Url url = Url.parse("wickett/pagee?4--a:b-c");
@@ -125,7 +129,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode5()
+ void decode5()
{
Url url = Url.parse("wicket/page?abc");
@@ -137,12 +141,12 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode6()
+ void decode6()
{
Url url = Url.parse("wicket/page?4-ILinkListener.5-a-b-c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
checkPage(h.getPage(), 4);
@@ -154,14 +158,14 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void decode7()
+ void decode7()
{
Url url = Url.parse("wicket/page?4-6.5-a-b-c");
context.setNextPageRenderCount(6);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertThat(handler, instanceOf(ListenerRequestHandler.class));
+ assertThat(handler).isInstanceOf(ListenerRequestHandler.class);
ListenerRequestHandler h = (ListenerRequestHandler)handler;
assertEquals(6, h.getPage().getRenderCount());
@@ -170,8 +174,8 @@ public class PageInstanceMapperTest extends AbstractMapperTest
/**
*
*/
- @Test(expected = StalePageException.class)
- public void decode8()
+ @Test
+ void decode8()
{
Url url = Url.parse("wicket/page?4-6.5-a-b-c");
@@ -179,11 +183,13 @@ public class PageInstanceMapperTest extends AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- ((IPageRequestHandler)handler).getPage();
+ assertThrows(StalePageException.class, () -> {
+ ((IPageRequestHandler)handler).getPage();
+ });
}
@Test
- public void decode9()
+ void decode9()
{
final Url url = Url.parse("page?4");
@@ -228,7 +234,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
@Test
- public void decode10()
+ void decode10()
{
final Url url = Url.parse("page?4");
@@ -275,7 +281,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode1()
+ void encode1()
{
MockPage page = new MockPage(15);
IPageProvider provider = new PageProvider(page);
@@ -290,7 +296,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
*
*/
@Test
- public void encode2()
+ void encode2()
{
MockPage page = new MockPage(15);
page.setRenderCount(5);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
index cc00db8..a31c508 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperTest.java
@@ -16,6 +16,10 @@
*/
package org.apache.wicket.core.request.mapper;
+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 java.nio.charset.Charset;
import java.util.List;
import java.util.Locale;
@@ -31,10 +35,10 @@ import org.apache.wicket.request.resource.ResourceReference;
import org.apache.wicket.request.resource.SharedResourceReference;
import org.apache.wicket.util.string.StringValue;
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;
-public class ResourceMapperTest extends WicketTestCase
+class ResourceMapperTest extends WicketTestCase
{
private static final Charset CHARSET = Charset.forName("UTF-8");
private static final String SHARED_NAME = "test-resource";
@@ -46,8 +50,8 @@ public class ResourceMapperTest extends WicketTestCase
/**
* @throws Exception
*/
- @Before
- public void before() throws Exception
+ @BeforeEach
+ void before() throws Exception
{
resource = new TestResource();
tester.getApplication().getSharedResources().add(SHARED_NAME, resource);
@@ -97,7 +101,7 @@ public class ResourceMapperTest extends WicketTestCase
* testInvalidPathIsEmpty()
*/
@Test
- public void invalidPathIsEmpty()
+ void invalidPathIsEmpty()
{
IRequestHandler requestHandler = mapper.mapRequest(createRequest(""));
assertNull(requestHandler);
@@ -107,7 +111,7 @@ public class ResourceMapperTest extends WicketTestCase
* testInvalidPathIsMismatch()
*/
@Test
- public void invalidPathIsMismatch()
+ void invalidPathIsMismatch()
{
IRequestHandler requestHandler = mapper.mapRequest(createRequest("test/resourcex"));
assertNull(requestHandler);
@@ -117,7 +121,7 @@ public class ResourceMapperTest extends WicketTestCase
* testInvalidPathIsTooShort()
*/
@Test
- public void invalidPathIsTooShort()
+ void invalidPathIsTooShort()
{
IRequestHandler requestHandler = mapper.mapRequest(createRequest("test"));
assertNull(requestHandler);
@@ -127,7 +131,7 @@ public class ResourceMapperTest extends WicketTestCase
* testValidPathWithParams()
*/
@Test
- public void validPathWithParams()
+ void validPathWithParams()
{
Request request = createRequest("test/resource/1/fred");
IRequestHandler requestHandler = mapper.mapRequest(request);
@@ -154,7 +158,7 @@ public class ResourceMapperTest extends WicketTestCase
* testValidPathWithParamsAndQueryPath()
*/
@Test
- public void validPathWithParamsAndQueryPath()
+ void validPathWithParamsAndQueryPath()
{
Request request = createRequest("test/resource/1/fred?foo=bar&foo=baz&value=12");
IRequestHandler requestHandler = mapper.mapRequest(request);
@@ -189,7 +193,7 @@ public class ResourceMapperTest extends WicketTestCase
* testPlaceholders()
*/
@Test
- public void placeholders()
+ void placeholders()
{
Request request = createRequest("test2/image/resource/foo/bar?a=abc&b=123");
IRequestHandler requestHandler = mapperWithPlaceholder.mapRequest(request);
@@ -215,7 +219,7 @@ public class ResourceMapperTest extends WicketTestCase
* testPlaceholdersWithQueryParamDuplicate()
*/
@Test
- public void placeholdersWithQueryParamDuplicate()
+ void placeholdersWithQueryParamDuplicate()
{
// we have one named parameter that exists twice
Request request = createRequest("test2/image/resource/foo/bar?name=name-2&val=123");
@@ -251,7 +255,7 @@ public class ResourceMapperTest extends WicketTestCase
*
*/
@Test
- public void requestWithEmptyFilename()
+ void requestWithEmptyFilename()
{
// request invalid path with empty filename
// this must not return a handler
@@ -264,7 +268,7 @@ public class ResourceMapperTest extends WicketTestCase
{
private static final long serialVersionUID = -3130204487473856574L;
- public PageParameters pageParameters;
+ PageParameters pageParameters;
@Override
public void respond(Attributes attributes)
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperWithDecoratedResourcesTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperWithDecoratedResourcesTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperWithDecoratedResourcesTest.java
index 6cacfbb..72b73e8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperWithDecoratedResourcesTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/ResourceMapperWithDecoratedResourcesTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.mock.MockApplication;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.protocol.http.request.HomePage;
@@ -24,38 +26,44 @@ import org.apache.wicket.request.resource.caching.FilenameWithVersionResourceCac
import org.apache.wicket.request.resource.caching.version.CachingResourceVersion;
import org.apache.wicket.request.resource.caching.version.MessageDigestResourceVersion;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Assert;
-import org.junit.Test;
-
+import org.junit.jupiter.api.Test;
/**
* Simple test using the WicketTester
*/
-public class ResourceMapperWithDecoratedResourcesTest extends WicketTestCase {
+class ResourceMapperWithDecoratedResourcesTest extends WicketTestCase
+{
@Override
- protected WebApplication newApplication() {
- return new MockApplication() {
+ protected WebApplication newApplication()
+ {
+ return new MockApplication()
+ {
@Override
- public void init() {
+ public void init()
+ {
super.init();
- getResourceSettings().setCachingStrategy(new FilenameWithVersionResourceCachingStrategy(
+ getResourceSettings()
+ .setCachingStrategy(new FilenameWithVersionResourceCachingStrategy(
new CachingResourceVersion(new MessageDigestResourceVersion())));
- mountResource("stylesheet.css", new CssResourceReference(ResourceMapperWithDecoratedResourcesTest.class, "decorated-resource.css"));
+ mountResource("stylesheet.css", new CssResourceReference(
+ ResourceMapperWithDecoratedResourcesTest.class, "decorated-resource.css"));
mountPage("/", HomePage.class);
}
};
}
@Test
- public void resourceNoCacheDecorationSuccessfully() {
+ void resourceNoCacheDecorationSuccessfully()
+ {
tester.executeUrl("stylesheet.css");
- Assert.assertEquals("body { background-color: lightblue; }", tester.getLastResponseAsString());
+ assertEquals("body { background-color: lightblue; }", tester.getLastResponseAsString());
}
-
+
@Test
- public void resourceWithCacheDecorationSuccessfully() {
+ void resourceWithCacheDecorationSuccessfully()
+ {
tester.executeUrl("stylesheet-ver-9876543210.css");
- Assert.assertEquals("body { background-color: lightblue; }", tester.getLastResponseAsString());
+ assertEquals("body { background-color: lightblue; }", tester.getLastResponseAsString());
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
index 15518c6..2fff6cc 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/TestMapperContext.java
@@ -43,10 +43,10 @@ public class TestMapperContext implements IMapperContext
{
private static final String APP_NAME = "test_app";
private static int count;
- IDataStore dataStore;
- IPageStore pageStore;
- IPageManagerContext pageManagerContext;
- PageStoreManager pageManager;
+ private IDataStore dataStore;
+ private IPageStore pageStore;
+ private IPageManagerContext pageManagerContext;
+ private PageStoreManager pageManager;
private String appName;
private boolean createMockPageIfInstanceNotFound = true;
@@ -175,7 +175,7 @@ public class TestMapperContext implements IMapperContext
}
- int idCounter = 0;
+ private int idCounter = 0;
@Override
public IRequestablePage newPageInstance(Class<? extends IRequestablePage> pageClass,
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/UrlInfoTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/UrlInfoTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/UrlInfoTest.java
index 1014f52..5e2fc1f 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/UrlInfoTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/UrlInfoTest.java
@@ -16,24 +16,25 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.mapper.AbstractBookmarkableMapper.UrlInfo;
import org.apache.wicket.request.http.WebRequest;
import org.apache.wicket.request.mapper.parameter.PageParameters;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for {@link UrlInfo}
*/
-public class UrlInfoTest extends Assert
+class UrlInfoTest
{
/**
* WICKET-4038 & WICKET-4054
*/
@Test
- public void wicket4038()
+ void wicket4038()
{
PageParameters parameters = new PageParameters();
parameters.add(WebRequest.PARAM_AJAX, "true");
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java
index b627374..96e6633 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/license/ApacheLicenceHeaderTest.java
@@ -25,12 +25,12 @@ import org.apache.wicket.util.license.ApacheLicenseHeaderTestCase;
*
* @author Frank Bille Jensen (frankbille)
*/
-public class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
+class ApacheLicenceHeaderTest extends ApacheLicenseHeaderTestCase
{
/**
* Construct.
*/
- public ApacheLicenceHeaderTest()
+ ApacheLicenceHeaderTest()
{
// addHeaders = true;
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/AbstractObjectCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/AbstractObjectCheckerTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/AbstractObjectCheckerTest.java
index 20cd873..468a885 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/AbstractObjectCheckerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/AbstractObjectCheckerTest.java
@@ -16,19 +16,20 @@
*/
package org.apache.wicket.core.util.objects.checker;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import java.util.Collections;
import java.util.List;
-import org.junit.Assert;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for AbstractObjectChecker
*/
-public class AbstractObjectCheckerTest extends Assert
+class AbstractObjectCheckerTest
{
@Test
- public void doCheckIsNotCalledForExcludedTypes()
+ void doCheckIsNotCalledForExcludedTypes()
{
List<Class<?>> exclusions = Collections.singletonList(CharSequence.class);
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
index 8752d2d..f31e6f1 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/DifferentPageCheckerTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.core.util.objects.checker;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
@@ -27,9 +29,9 @@ import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.form.login.MockHomePage;
import org.apache.wicket.serialize.java.JavaSerializer;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class DifferentPageCheckerTest extends WicketTestCase
+class DifferentPageCheckerTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-5634
@@ -39,7 +41,7 @@ public class DifferentPageCheckerTest extends WicketTestCase
* keeps a reference to a page which is not component.getPage()..
*/
@Test
- public void serializingAnotherPage()
+ void serializingAnotherPage()
{
JavaSerializer serializer = new JavaSerializer("JavaSerializerTest")
{
@@ -55,7 +57,7 @@ public class DifferentPageCheckerTest extends WicketTestCase
MockPageWithLink rootPage = new MockPageWithLink();
rootPage.add(component);
byte[] serialized = serializer.serialize(rootPage);
- assertNull("The produced byte[] must be null if there was an error", serialized);
+ assertNull(serialized, "The produced byte[] must be null if there was an error");
}
private static class ComponentThatKeepsAReferenceToAnotherPage extends WebComponent
@@ -64,7 +66,7 @@ public class DifferentPageCheckerTest extends WicketTestCase
private final Page anotherPage = new MockHomePage();
};
- public ComponentThatKeepsAReferenceToAnotherPage(final String id)
+ ComponentThatKeepsAReferenceToAnotherPage(final String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
index 96c9df7..89a9566 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/OrphanComponentCheckerTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.core.util.objects.checker;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
import org.apache.wicket.TestPage_1;
import org.apache.wicket.markup.html.WebComponent;
import org.apache.wicket.markup.html.WebPage;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
/**
* Tests for OrphanComponentChecker
*/
-public class OrphanComponentCheckerTest extends WicketTestCase
+class OrphanComponentCheckerTest extends WicketTestCase
{
@Test
- public void checkOrphanComponent()
+ void checkOrphanComponent()
{
WebComponent component = new WebComponent("a");
IObjectChecker checker = new OrphanComponentChecker();
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
index 94e8ea7..2b6eb5d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/objects/checker/SessionCheckerTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.core.util.objects.checker;
+import static org.junit.jupiter.api.Assertions.assertNull;
+
import java.io.IOException;
import java.io.ObjectOutputStream;
import java.io.OutputStream;
@@ -29,9 +31,9 @@ import org.apache.wicket.protocol.http.WebSession;
import org.apache.wicket.request.Url;
import org.apache.wicket.serialize.java.JavaSerializer;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class SessionCheckerTest extends WicketTestCase
+class SessionCheckerTest extends WicketTestCase
{
/**
* https://issues.apache.org/jira/browse/WICKET-5634
@@ -41,7 +43,7 @@ public class SessionCheckerTest extends WicketTestCase
* keeps a reference to the Wicket Session.
*/
@Test
- public void serializingTheSession()
+ void serializingTheSession()
{
JavaSerializer serializer = new JavaSerializer("JavaSerializerTest")
{
@@ -59,14 +61,14 @@ public class SessionCheckerTest extends WicketTestCase
container.add(new ComponentWithAReferenceToTheSession("id2"));
byte[] serialized = serializer.serialize(container);
- assertNull("The produced byte[] must be null if there was an error", serialized);
+ assertNull(serialized, "The produced byte[] must be null if there was an error");
}
private static class ComponentWithAReferenceToTheSession extends WebComponent
{
private final Session member = new WebSession(new MockWebRequest(Url.parse("")));
- public ComponentWithAReferenceToTheSession(final String id)
+ ComponentWithAReferenceToTheSession(final String id)
{
super(id);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
index 3167209..74044f8 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/resource/ClassPathResourceFinderTest.java
@@ -16,19 +16,21 @@
*/
package org.apache.wicket.core.util.resource;
-import static org.apache.wicket.util.resource.ResourceStreamLocatorTest.*;
+import static org.apache.wicket.util.resource.ResourceStreamLocatorTest.getFilename;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertNotNull;
import java.io.File;
import org.apache.wicket.protocol.http.WebApplication;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.tester.WicketTestCase;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
-public class ClassPathResourceFinderTest extends WicketTestCase
+class ClassPathResourceFinderTest extends WicketTestCase
{
@Test
- public void loadStartingFromClasspathRoot() throws Exception
+ void loadStartingFromClasspathRoot() throws Exception
{
ClassPathResourceFinder finder = new ClassPathResourceFinder("");
String filename = ClassPathResourceFinderTest.class.getName().replace('.',
@@ -40,7 +42,7 @@ public class ClassPathResourceFinderTest extends WicketTestCase
}
@Test
- public void loadStartingFromPrefix() throws Exception
+ void loadStartingFromPrefix() throws Exception
{
ClassPathResourceFinder finder = new ClassPathResourceFinder(
ClassPathResourceFinderTest.class.getPackage()
http://git-wip-us.apache.org/repos/asf/wicket/blob/645f239c/wicket-core/src/test/java/org/apache/wicket/core/util/string/CssUtilsTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/util/string/CssUtilsTest.java b/wicket-core/src/test/java/org/apache/wicket/core/util/string/CssUtilsTest.java
index 696953b..4598d66 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/util/string/CssUtilsTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/util/string/CssUtilsTest.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 CssUtilsTest extends Assert
+class CssUtilsTest
{
/**
* https://issues.apache.org/jira/browse/WICKET-4546
@@ -31,7 +32,7 @@ public class CssUtilsTest extends Assert
* @throws Exception
*/
@Test
- public void writeLinkUrl() throws Exception
+ void writeLinkUrl() throws Exception
{
StringResponse response = new StringResponse();
String url = "some/url;jsessionid=1234?with=parameters&p1=v1";