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 2013/11/11 10:39:01 UTC
[1/3] git commit: Refactor Testcases to make failing tests more
informative: Refactor assertTrue(factory.getFieldValue(field, obj) instanceof
ILazyInitProxy); to assertThat(factory.getFieldValue(field, obj),
instanceOf(ILazyInitProxy.class));
Updated Branches:
refs/heads/master 171f01703 -> 8f4ec56d5
Refactor Testcases to make failing tests more informative:
Refactor
assertTrue(factory.getFieldValue(field, obj) instanceof ILazyInitProxy);
to
assertThat(factory.getFieldValue(field, obj),
instanceOf(ILazyInitProxy.class));
Now when the assertion fails the value of the first argument is printed
in the test output.
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/3744d5be
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/3744d5be
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/3744d5be
Branch: refs/heads/master
Commit: 3744d5bee81753f3623497dd39e4529d2be5ee84
Parents: 2ab4c7c
Author: Martin Funk <ma...@gmail.com>
Authored: Wed Nov 6 17:44:21 2013 +0100
Committer: Martin Funk <ma...@gmail.com>
Committed: Wed Nov 6 17:44:21 2013 +0100
----------------------------------------------------------------------
.../BasicResourceReferenceMapperTest.java | 28 ++++++++-------
.../request/mapper/BookmarkableMapperTest.java | 18 +++++-----
.../core/request/mapper/CryptoMapperTest.java | 36 ++++++++++---------
.../core/request/mapper/MountedMapperTest.java | 38 ++++++++++----------
.../core/request/mapper/PackageMapperTest.java | 22 ++++++------
.../request/mapper/PageInstanceMapperTest.java | 12 ++++---
.../apache/wicket/markup/html/WebPageTest.java | 9 ++---
.../html/basic/SimpleResponsePageClassTest.java | 4 ++-
.../parser/filter/OpenCloseTagExpanderTest.java | 4 ++-
.../apache/wicket/model/PropertyModelTest.java | 7 ++--
.../protocol/http/ResponseIOExceptionTest.java | 5 ++-
.../http/servlet/ServletWebRequestTest.java | 4 ++-
.../ContextRelativeResourceCachingTest.java | 9 ++---
.../ajax/markup/html/AjaxEditableTest.java | 6 ++--
.../wicket/proxy/LazyInitProxyFactoryTest.java | 8 +++--
.../annot/AnnotProxyFieldValueFactoryTest.java | 6 ++--
16 files changed, 119 insertions(+), 97 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java
index 7dcf36e..bb01176 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import java.io.Serializable;
import java.util.Locale;
@@ -65,7 +67,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource1, h.getResource());
assertEquals(0, h.getPageParameters().getIndexedCount());
@@ -80,7 +82,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?en");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource1, h.getResource());
assertEquals(Locale.ENGLISH, h.getLocale());
@@ -98,7 +100,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource1, h.getResource());
assertEquals(null, h.getLocale());
@@ -117,7 +119,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference1?-style&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource1, h.getResource());
assertEquals(null, h.getLocale());
@@ -136,7 +138,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource2, h.getResource());
assertEquals(new Locale("en", "en"), h.getLocale());
@@ -154,7 +156,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN-style");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource2, h.getResource());
assertEquals(new Locale("en", "en"), h.getLocale());
@@ -183,7 +185,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource2, h.getResource());
assertEquals(new Locale("en", "en"), h.getLocale());
@@ -201,7 +203,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference3?-style");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource3, h.getResource());
assertEquals(null, h.getLocale());
@@ -219,7 +221,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference3?-style&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource3, h.getResource());
assertEquals(null, h.getLocale());
@@ -239,7 +241,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?en-style");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource4, h.getResource());
assertEquals(Locale.ENGLISH, h.getLocale());
@@ -268,7 +270,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
{
Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference4?en-style&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource4, h.getResource());
assertEquals(Locale.ENGLISH, h.getLocale());
@@ -288,7 +290,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference5?en--variation&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource5, h.getResource());
assertEquals(Locale.ENGLISH, h.getLocale());
@@ -308,7 +310,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
Url url = Url.parse("wicket/resource/" + CLASS_NAME +
"/reference6?en-style-variation&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
assertEquals(resource6, h.getResource());
assertEquals(Locale.ENGLISH, h.getLocale());
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
index 07850a3..3d58907 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
@@ -18,7 +18,7 @@ package org.apache.wicket.core.request.mapper;
import java.nio.charset.Charset;
import java.util.Locale;
-
+import static org.hamcrest.CoreMatchers.instanceOf;
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler;
import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
@@ -69,7 +69,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -85,7 +85,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/indexed1?a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getName());
@@ -107,7 +107,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
}
@@ -121,7 +121,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
@@ -140,7 +140,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME + "?15-ILinkListener-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
@@ -162,7 +162,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
"/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -187,7 +187,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
"?15-ILinkListener.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
@@ -212,7 +212,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
IRequestablePage page = h.getPage();
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
index 1a9129b..5bef307 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/CryptoMapperTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.ListenerInterfaceRequestHandler;
import org.apache.wicket.core.request.handler.PageAndComponentProvider;
@@ -105,9 +107,9 @@ public class CryptoMapperTest extends AbstractMapperTest
{
Request request = getRequest(Url.parse(ENCRYPTED_URL));
IRequestHandler requestHandler = mapper.mapRequest(request);
- assertTrue(requestHandler instanceof RequestSettingRequestHandler);
+ assertThat(requestHandler, instanceOf(RequestSettingRequestHandler.class));
requestHandler = ((RequestSettingRequestHandler)requestHandler).getDelegateHandler();
- assertTrue(requestHandler instanceof RenderPageRequestHandler);
+ assertThat(requestHandler, instanceOf(RenderPageRequestHandler.class));
RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertEquals(DummyHomePage.class, handler.getPageClass());
@@ -122,9 +124,9 @@ public class CryptoMapperTest extends AbstractMapperTest
{
Request request = getRequest(Url.parse("?named1=value1"));
IRequestHandler requestHandler = mapper.mapRequest(request);
- assertTrue(requestHandler instanceof RequestSettingRequestHandler);
+ assertThat(requestHandler, instanceOf(RequestSettingRequestHandler.class));
requestHandler = ((RequestSettingRequestHandler)requestHandler).getDelegateHandler();
- assertTrue(requestHandler instanceof RenderPageRequestHandler);
+ assertThat(requestHandler, instanceOf(RenderPageRequestHandler.class));
RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertEquals(tester.getApplication().getHomePage(), handler.getPageClass());
@@ -166,9 +168,9 @@ public class CryptoMapperTest extends AbstractMapperTest
Request request = getRequest(url);
IRequestHandler requestHandler = mapper.mapRequest(request);
- assertTrue(requestHandler instanceof RequestSettingRequestHandler);
+ assertThat(requestHandler, instanceOf(RequestSettingRequestHandler.class));
requestHandler = ((RequestSettingRequestHandler)requestHandler).getDelegateHandler();
- assertTrue(requestHandler instanceof RenderPageRequestHandler);
+ assertThat(requestHandler, instanceOf(RenderPageRequestHandler.class));
RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertEquals(DummyHomePage.class, handler.getPageClass());
@@ -194,9 +196,9 @@ public class CryptoMapperTest extends AbstractMapperTest
Request request = getRequest(url);
IRequestHandler requestHandler = mapper.mapRequest(request);
- assertTrue(requestHandler instanceof RequestSettingRequestHandler);
+ assertThat(requestHandler, instanceOf(RequestSettingRequestHandler.class));
requestHandler = ((RequestSettingRequestHandler)requestHandler).getDelegateHandler();
- assertTrue(requestHandler instanceof RenderPageRequestHandler);
+ assertThat(requestHandler, instanceOf(RenderPageRequestHandler.class));
RenderPageRequestHandler handler = (RenderPageRequestHandler)requestHandler;
assertEquals(tester.getApplication().getHomePage(), handler.getPageClass());
@@ -231,9 +233,9 @@ public class CryptoMapperTest extends AbstractMapperTest
IRequestHandler requestHandler = mapper.mapRequest(request);
- assertTrue(requestHandler instanceof RequestSettingRequestHandler);
+ assertThat(requestHandler, instanceOf(RequestSettingRequestHandler.class));
requestHandler = ((RequestSettingRequestHandler)requestHandler).getDelegateHandler();
- assertTrue(requestHandler instanceof ResourceReferenceRequestHandler);
+ assertThat(requestHandler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler)requestHandler;
assertEquals(getClass(), handler.getResourceReference().getScope());
@@ -256,9 +258,9 @@ public class CryptoMapperTest extends AbstractMapperTest
IRequestHandler requestHandler = mapper.mapRequest(request);
- assertTrue(requestHandler instanceof RequestSettingRequestHandler);
+ assertThat(requestHandler, instanceOf(RequestSettingRequestHandler.class));
requestHandler = ((RequestSettingRequestHandler)requestHandler).getDelegateHandler();
- assertTrue(requestHandler instanceof ResourceReferenceRequestHandler);
+ assertThat(requestHandler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler)requestHandler;
assertEquals(getClass(), handler.getResourceReference().getScope());
@@ -282,9 +284,9 @@ public class CryptoMapperTest extends AbstractMapperTest
IRequestHandler requestHandler = mapper.mapRequest(request);
- assertTrue(requestHandler instanceof RequestSettingRequestHandler);
+ assertThat(requestHandler, instanceOf(RequestSettingRequestHandler.class));
requestHandler = ((RequestSettingRequestHandler)requestHandler).getDelegateHandler();
- assertTrue(requestHandler instanceof ResourceReferenceRequestHandler);
+ assertThat(requestHandler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler)requestHandler;
assertEquals(getClass(), handler.getResourceReference().getScope());
@@ -308,9 +310,9 @@ public class CryptoMapperTest extends AbstractMapperTest
IRequestHandler requestHandler = mapper.mapRequest(request);
- assertTrue(requestHandler instanceof RequestSettingRequestHandler);
+ assertThat(requestHandler, instanceOf(RequestSettingRequestHandler.class));
requestHandler = ((RequestSettingRequestHandler)requestHandler).getDelegateHandler();
- assertTrue(requestHandler instanceof ResourceReferenceRequestHandler);
+ assertThat(requestHandler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler handler = (ResourceReferenceRequestHandler)requestHandler;
assertEquals(getClass(), handler.getResourceReference().getScope());
@@ -336,7 +338,7 @@ public class CryptoMapperTest extends AbstractMapperTest
IRequestHandler requestHandler = mapper.mapRequest(request);
- assertTrue(requestHandler instanceof RequestSettingRequestHandler);
+ assertThat(requestHandler, instanceOf(RequestSettingRequestHandler.class));
assertEquals("foo", ((RequestSettingRequestHandler)requestHandler).getRequest().getUrl()
.getQueryParameterValue("q").toString());
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/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 555bf33..76535ad 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,6 +16,8 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler;
import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
@@ -105,7 +107,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/mount/path");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -121,7 +123,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/mount/path/indexed1?a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParameters p = page.getPageParameters();
@@ -142,7 +144,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/mount/path?15");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
}
@@ -156,7 +158,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/mount/path/i1/i2?15&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
@@ -175,7 +177,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/mount/path?15-ILinkListener-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
@@ -196,7 +198,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/mount/path/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -220,7 +222,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/mount/path?param1=value1&15-ILinkListener.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
@@ -253,7 +255,7 @@ public class MountedMapperTest extends AbstractMapperTest
// capture the home page
Url url = Url.parse("");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
}
/**
@@ -266,7 +268,7 @@ public class MountedMapperTest extends AbstractMapperTest
context.setNextPageRenderCount(5);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
@@ -297,7 +299,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/mount/path/i1/i2?-1.ILinkListener-foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -579,7 +581,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/p1/path/p2");
IRequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -597,7 +599,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/p1/path/p2/indexed1?a=b&b=c");
IRequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
PageParameters p = page.getPageParameters();
@@ -618,7 +620,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/p1/path/p2/p3/p4");
IRequestHandler handler = placeholderEncoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(2, page.getPageParameters().getIndexedCount());
@@ -707,7 +709,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/p1/path/p2/p3");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -724,7 +726,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/path/path/path");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -742,7 +744,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/p1/path/p2");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -760,7 +762,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/path/p2");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -779,7 +781,7 @@ public class MountedMapperTest extends AbstractMapperTest
Url url = Url.parse("some/path/p2/p3/p4");
IRequestHandler handler = optionPlaceholderEncoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(1, page.getPageParameters().getIndexedCount());
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/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 5ee7c0c..625d30f 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,6 +16,8 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import org.apache.wicket.MockPage;
import org.apache.wicket.core.request.handler.BookmarkableListenerInterfaceRequestHandler;
import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler;
@@ -109,7 +111,7 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = Url.parse(PAGE_CLASS_NAME);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -125,7 +127,7 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = Url.parse(PAGE_CLASS_NAME + "/indexed1?a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
@@ -147,7 +149,7 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = Url.parse(PAGE_CLASS_NAME + "?15");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
}
@@ -161,7 +163,7 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = Url.parse(PAGE_CLASS_NAME + "/i1/i2?15&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
@@ -180,7 +182,7 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = Url.parse(PAGE_CLASS_NAME + "?15-ILinkListener-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
@@ -201,7 +203,7 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = Url.parse(PAGE_CLASS_NAME + "/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -225,7 +227,7 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = Url.parse(PAGE_CLASS_NAME + "?15-ILinkListener.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
@@ -249,7 +251,7 @@ public class PackageMapperTest extends AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
IRequestablePage page = h.getPage();
@@ -499,7 +501,7 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = Url.parse("PackageMapperTest$OuterPage$InnerPage");
IRequestHandler handler = innerClassEncoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
assertEquals("InnerPage", page.getClass().getSimpleName());
assertEquals(0, page.getPageParameters().getIndexedCount());
@@ -534,7 +536,7 @@ public class PackageMapperTest extends AbstractMapperTest
Url url = Url.parse(ALIAS + "?15");
IRequestHandler handler = aliasEncoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
IRequestablePage page = ((RenderPageRequestHandler)handler).getPage();
checkPage(page, 15);
assertEquals(PAGE_CLASS_NAME, page.getClass().getSimpleName());
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/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 d1fa307..e9141b2 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,6 +16,8 @@
*/
package org.apache.wicket.core.request.mapper;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import java.nio.charset.Charset;
import java.util.Locale;
@@ -59,7 +61,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
Url url = Url.parse("wicket/page?4");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
checkPage(h.getPage(), 4);
@@ -74,7 +76,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
Url url = Url.parse("wicket/page/ingore/me?4&a=3&b=3");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof RenderPageRequestHandler);
+ assertThat(handler, instanceOf(RenderPageRequestHandler.class));
RenderPageRequestHandler h = (RenderPageRequestHandler)handler;
checkPage(h.getPage(), 4);
@@ -89,7 +91,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
Url url = Url.parse("wicket/page?4-ILinkListener-a-b-c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
checkPage(h.getPage(), 4);
@@ -131,7 +133,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
Url url = Url.parse("wicket/page?4-ILinkListener.5-a-b-c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
checkPage(h.getPage(), 4);
@@ -151,7 +153,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
context.setNextPageRenderCount(6);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
- assertTrue(handler instanceof ListenerInterfaceRequestHandler);
+ assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
ListenerInterfaceRequestHandler h = (ListenerInterfaceRequestHandler)handler;
assertEquals(6, h.getPage().getRenderCount());
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java
index 24df587..b03669d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/WebPageTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import org.apache.wicket.MarkupContainer;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.ajax.AjaxRequestTarget;
@@ -24,7 +26,6 @@ import org.apache.wicket.markup.IMarkupResourceStreamProvider;
import org.apache.wicket.page.IManageablePage;
import org.apache.wicket.util.resource.IResourceStream;
import org.apache.wicket.util.resource.StringResourceStream;
-import org.junit.Assert;
import org.junit.Test;
/**
@@ -48,13 +49,13 @@ public class WebPageTest extends WicketTestCase
tester.assertRenderedPage(TargetPage.class);
int targetPageId = tester.getLastRenderedPage().getPageId();
- Assert.assertTrue(mainPageId != targetPageId);
+ assertTrue(mainPageId != targetPageId);
IManageablePage mainPage = tester.getSession().getPageManager().getPage(mainPageId);
IManageablePage targetPage = tester.getSession().getPageManager().getPage(targetPageId);
- Assert.assertTrue(mainPage instanceof MainPage);
- Assert.assertTrue(targetPage instanceof TargetPage);
+ assertThat(mainPage, instanceOf(MainPage.class));
+ assertThat(targetPage, instanceOf(TargetPage.class));
}
/** */
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
index 04b20f0..3a7700d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/basic/SimpleResponsePageClassTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.html.basic;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.markup.html.form.Form;
import org.junit.Test;
@@ -40,6 +42,6 @@ public class SimpleResponsePageClassTest extends WicketTestCase
tester.submitForm(form);
// assertion failed, getLastRenderedPage() return null.
- assertTrue(tester.getLastRenderedPage() instanceof SimplePage);
+ assertThat(tester.getLastRenderedPage(), instanceOf(SimplePage.class));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
index 574f8e1..e1b9838 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.markup.parser.filter;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import java.text.ParseException;
import org.apache.wicket.WicketTestCase;
@@ -84,7 +86,7 @@ public class OpenCloseTagExpanderTest extends WicketTestCase
MarkupElement markupElement = expander.nextElement();
// assert the next element is returned by the parent
- assertTrue(markupElement instanceof TestMarkupElement);
+ assertThat(markupElement, instanceOf(TestMarkupElement.class));
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java b/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
index cb35f0c..e2c753b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/model/PropertyModelTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.model;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import org.apache.wicket.WicketRuntimeException;
import org.apache.wicket.WicketTestCase;
import org.junit.Ignore;
@@ -114,7 +116,7 @@ public class PropertyModelTest extends WicketTestCase
PropertyModel<String> model = new PropertyModel<String>(person, "concreteAddress.street");
model.setObject("foo");
assertNotNull("concreteAddress", person.concreteAddress);
- assertTrue(person.concreteAddress instanceof ConcreteAddress);
+ assertThat(person.concreteAddress, instanceOf(ConcreteAddress.class));
assertEquals("foo", person.concreteAddress.street);
}
@@ -147,8 +149,7 @@ public class PropertyModelTest extends WicketTestCase
PropertyModel<String> model = new PropertyModel<String>(person, "finalAddress.street");
model.setObject("foo");
- assertNotNull("finalAddress", person.finalAddress);
- assertTrue(person.finalAddress instanceof ConcreteAddress);
+ assertThat(person.finalAddress, instanceOf(ConcreteAddress.class));
assertEquals("foo", person.finalAddress.street);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
index f8b5cf1..5f2ef5a 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.protocol.http;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import java.net.SocketException;
import javax.servlet.http.HttpServletResponse;
@@ -79,7 +81,8 @@ public class ResponseIOExceptionTest extends Assert
TestRequestCycleListener testRequestCycleListener = new TestRequestCycleListener();
tester.getApplication().getRequestCycleListeners().add(testRequestCycleListener);
tester.startResource(new ResourceStreamResource(new StringResourceStream("asdf")));
- assertTrue(testRequestCycleListener.lastExceptionRquestHandlerResolved instanceof EmptyRequestHandler);
+ assertThat(testRequestCycleListener.lastExceptionRquestHandlerResolved,
+ instanceOf(EmptyRequestHandler.class));
}
class TestRequestCycleListener extends AbstractRequestCycleListener
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
index 965dcd8..cf78440 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.protocol.http.servlet;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -212,7 +214,7 @@ public class ServletWebRequestTest extends Assert
private CustomRequestPage()
{
- assertTrue(getRequest() instanceof CustomServletWebRequest);
+ assertThat(getRequest(), instanceOf(CustomServletWebRequest.class));
}
@Override
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java
index 12edc1d..ea34c9d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java
@@ -16,12 +16,13 @@
*/
package org.apache.wicket.request.resource.caching;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import java.nio.charset.Charset;
import java.util.Locale;
import org.apache.wicket.WicketTestCase;
import org.apache.wicket.request.IRequestHandler;
-import org.apache.wicket.request.IRequestMapper;
import org.apache.wicket.request.Request;
import org.apache.wicket.request.Url;
import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler;
@@ -40,9 +41,6 @@ public class ContextRelativeResourceCachingTest extends WicketTestCase
private static final Charset CHARSET = Charset.forName("UTF-8");
private static final String SHARED_NAME = "contextresource";
- private IRequestMapper mapper;
- private IRequestMapper mapperWithPlaceholder;
-
private Request createRequest(final String url)
{
return new Request()
@@ -104,8 +102,7 @@ public class ContextRelativeResourceCachingTest extends WicketTestCase
final IRequestHandler handler = tester.getApplication()
.getRootRequestMapper()
.mapRequest(request);
- assertNotNull(handler);
- assertTrue(handler instanceof ResourceReferenceRequestHandler);
+ assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
assertEquals(((ResourceReferenceRequestHandler)handler).getResource(), resource);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
index 1ad587c..c18524c 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.extensions.ajax.markup.html;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import java.util.Arrays;
import org.apache.wicket.Page;
@@ -123,7 +125,6 @@ public class AjaxEditableTest extends WicketTestCase
{
Page page = tester.getLastRenderedPage();
AjaxEditableLabel<String> ajaxLabel = (AjaxEditableLabel<String>)page.get("ajaxLabel");
- AjaxLink<Void> toggle = (AjaxLink<Void>)page.get("toggle");
tester.assertInvisible("ajaxLabel:editor");
tester.assertVisible("ajaxLabel:label");
@@ -173,7 +174,6 @@ public class AjaxEditableTest extends WicketTestCase
Arrays.asList(new StringValue[] { StringValue.valueOf("5") }));
editableLabel.getEditor().processInput();
- assertNotNull(integerModel.getObject());
- assertTrue(integerModel.getObject() instanceof Integer);
+ assertThat(integerModel.getObject(), instanceOf(Integer.class));
}
}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java b/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
index 5be0b6f..8231d49 100644
--- a/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
+++ b/wicket-ioc/src/test/java/org/apache/wicket/proxy/LazyInitProxyFactoryTest.java
@@ -16,15 +16,17 @@
*/
package org.apache.wicket.proxy;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import java.lang.reflect.Proxy;
+import org.apache.wicket.core.util.lang.WicketObjects;
import org.apache.wicket.proxy.LazyInitProxyFactory.ProxyReplacement;
import org.apache.wicket.proxy.util.ConcreteObject;
import org.apache.wicket.proxy.util.IInterface;
import org.apache.wicket.proxy.util.IObjectMethodTester;
import org.apache.wicket.proxy.util.InterfaceObject;
import org.apache.wicket.proxy.util.ObjectMethodTester;
-import org.apache.wicket.core.util.lang.WicketObjects;
import org.junit.Assert;
import org.junit.Test;
@@ -87,7 +89,7 @@ public class LazyInitProxyFactoryTest extends Assert
assertTrue(Proxy.isProxyClass(proxy.getClass()));
// test proxy implements ILazyInitProxy
- assertTrue(proxy instanceof ILazyInitProxy);
+ assertThat(proxy, instanceOf(ILazyInitProxy.class));
assertTrue(((ILazyInitProxy)proxy).getObjectLocator() == interfaceObjectLocator);
// test method invocation
@@ -131,7 +133,7 @@ public class LazyInitProxyFactoryTest extends Assert
ConcreteObject.class, concreteObjectLocator);
// test proxy implements ILazyInitProxy
- assertTrue(proxy instanceof ILazyInitProxy);
+ assertThat(proxy, instanceOf(ILazyInitProxy.class));
assertTrue(((ILazyInitProxy)proxy).getObjectLocator() == concreteObjectLocator);
// test we do not have a jdk dynamic proxy
http://git-wip-us.apache.org/repos/asf/wicket/blob/3744d5be/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
----------------------------------------------------------------------
diff --git a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
index a8b9122..892c8a8 100644
--- a/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
+++ b/wicket-spring/src/test/java/org/apache/wicket/spring/injection/annot/AnnotProxyFieldValueFactoryTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.wicket.spring.injection.annot;
+import static org.hamcrest.CoreMatchers.instanceOf;
+
import java.lang.reflect.Field;
import org.apache.wicket.proxy.ILazyInitProxy;
@@ -89,7 +91,7 @@ public class AnnotProxyFieldValueFactoryTest extends Assert
locator = (SpringBeanLocator)((ILazyInitProxy)proxy).getObjectLocator();
assertTrue(locator.getBeanType().equals(Bean.class));
assertTrue(locator.getSpringContextLocator() == mockCtxLocator);
- assertTrue(factory.getFieldValue(field, obj) instanceof ILazyInitProxy);
+ assertThat(factory.getFieldValue(field, obj), instanceOf(ILazyInitProxy.class));
field = obj.getClass().getDeclaredField("beanByName");
proxy = factory.getFieldValue(field, obj);
@@ -97,7 +99,7 @@ public class AnnotProxyFieldValueFactoryTest extends Assert
assertTrue(locator.getBeanName().equals("somebean"));
assertTrue(locator.getBeanType().equals(Bean2.class));
assertTrue(locator.getSpringContextLocator() == mockCtxLocator);
- assertTrue(factory.getFieldValue(field, obj) instanceof ILazyInitProxy);
+ assertThat(factory.getFieldValue(field, obj), instanceOf(ILazyInitProxy.class));
}
/**
[3/3] git commit: Merge branch 'assertThatInstanceOfCherryPicked' of
https://github.com/mafulafunk/wicket into mafula-assertThatInstanceOf
Posted by mg...@apache.org.
Merge branch 'assertThatInstanceOfCherryPicked' of https://github.com/mafulafunk/wicket into mafula-assertThatInstanceOf
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/8f4ec56d
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/8f4ec56d
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/8f4ec56d
Branch: refs/heads/master
Commit: 8f4ec56d535bdab00e506b04a40151bf36f06b3d
Parents: 171f017 ad98b7c
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Mon Nov 11 11:34:28 2013 +0200
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Mon Nov 11 11:34:28 2013 +0200
----------------------------------------------------------------------
.../BasicResourceReferenceMapperTest.java | 51 +++++++------
.../request/mapper/BookmarkableMapperTest.java | 67 ++++++++---------
.../core/request/mapper/CryptoMapperTest.java | 36 ++++-----
.../core/request/mapper/MountedMapperTest.java | 79 +++++++++++---------
.../core/request/mapper/PackageMapperTest.java | 31 ++++----
.../request/mapper/PageInstanceMapperTest.java | 18 +++--
.../apache/wicket/markup/html/WebPageTest.java | 9 ++-
.../html/basic/SimpleResponsePageClassTest.java | 4 +-
.../parser/filter/OpenCloseTagExpanderTest.java | 26 ++++---
.../apache/wicket/model/PropertyModelTest.java | 7 +-
.../protocol/http/ResponseIOExceptionTest.java | 5 +-
.../http/servlet/ServletWebRequestTest.java | 17 +++--
.../ContextRelativeResourceCachingTest.java | 12 +--
.../ajax/markup/html/AjaxEditableTest.java | 21 +++---
.../wicket/proxy/LazyInitProxyFactoryTest.java | 8 +-
.../annot/AnnotProxyFieldValueFactoryTest.java | 6 +-
16 files changed, 215 insertions(+), 182 deletions(-)
----------------------------------------------------------------------
[2/3] git commit: Code formatted version of the previous commit,
as suggested by Eclipse using: wicket-core/EclipseCodeFormat.xml
Posted by mg...@apache.org.
Code formatted version of the previous commit, as suggested by Eclipse using:
wicket-core/EclipseCodeFormat.xml
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ad98b7ca
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ad98b7ca
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ad98b7ca
Branch: refs/heads/master
Commit: ad98b7ca75afb0617c04e1885a5aec7dac447734
Parents: 3744d5b
Author: Martin Funk <ma...@gmail.com>
Authored: Wed Nov 6 18:09:13 2013 +0100
Committer: Martin Funk <ma...@gmail.com>
Committed: Wed Nov 6 18:09:13 2013 +0100
----------------------------------------------------------------------
.../BasicResourceReferenceMapperTest.java | 23 +++++----
.../request/mapper/BookmarkableMapperTest.java | 49 ++++++++++----------
.../core/request/mapper/MountedMapperTest.java | 41 +++++++++-------
.../core/request/mapper/PackageMapperTest.java | 9 ++--
.../request/mapper/PageInstanceMapperTest.java | 6 +--
.../parser/filter/OpenCloseTagExpanderTest.java | 22 +++++----
.../protocol/http/ResponseIOExceptionTest.java | 2 +-
.../http/servlet/ServletWebRequestTest.java | 13 +++---
.../ContextRelativeResourceCachingTest.java | 3 +-
.../ajax/markup/html/AjaxEditableTest.java | 15 +++---
10 files changed, 97 insertions(+), 86 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad98b7ca/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java
index bb01176..3e075e0 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BasicResourceReferenceMapperTest.java
@@ -183,7 +183,8 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
@Test
public void decode4()
{
- Url url = Url.parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN&p1=v1&p2=v2");
+ Url url = Url
+ .parse("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
@@ -287,8 +288,8 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
@Test
public void decode9()
{
- Url url = Url.parse("wicket/resource/" + CLASS_NAME +
- "/reference5?en--variation&p1=v1&p2=v2");
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME
+ + "/reference5?en--variation&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
@@ -307,8 +308,8 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
@Test
public void decode10()
{
- Url url = Url.parse("wicket/resource/" + CLASS_NAME +
- "/reference6?en-style-variation&p1=v1&p2=v2");
+ Url url = Url.parse("wicket/resource/" + CLASS_NAME
+ + "/reference6?en-style-variation&p1=v1&p2=v2");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
ResourceReferenceRequestHandler h = (ResourceReferenceRequestHandler)handler;
@@ -377,7 +378,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME + "/reference2/name2?en_EN&p1=v1&p2=v2",
- url.toString());
+ url.toString());
}
/**
@@ -407,7 +408,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME + "/reference3?-style&p1=v1&p2=v2",
- url.toString());
+ url.toString());
}
/**
@@ -437,7 +438,7 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
Url url = encoder.mapHandler(handler);
assertEquals("wicket/resource/" + CLASS_NAME + "/reference4?en-style&p1=v1&p2=v2",
- url.toString());
+ url.toString());
}
/**
@@ -539,7 +540,8 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
strategy.undecorateUrl(url);
assertEquals("test.txt", url.getFileName());
- // check a version that contains a dot which also marks the filename extension
+ // check a version that contains a dot which also marks the filename
+ // extension
strategy = new FilenameWithVersionResourceCachingStrategy("-version-",
new StaticResourceVersion("1.0.4-beta"));
url = new ResourceUrl("test.txt", params);
@@ -564,7 +566,8 @@ public class BasicResourceReferenceMapperTest extends AbstractResourceReferenceM
@Test
public void wicket3918()
{
- Url url = Url.parse("wicket/resource/org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow/res/");
+ Url url = Url
+ .parse("wicket/resource/org.apache.wicket.extensions.ajax.markup.html.modal.ModalWindow/res/");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertNull(handler);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad98b7ca/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
index 3d58907..f1db41b 100644
--- a/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/core/request/mapper/BookmarkableMapperTest.java
@@ -158,8 +158,8 @@ public class BookmarkableMapperTest extends AbstractMapperTest
@Test
public void decode6()
{
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME
+ + "/i1/i2?15-ILinkListener-foo-bar&a=b&b=c");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -183,8 +183,8 @@ public class BookmarkableMapperTest extends AbstractMapperTest
@Test
public void decode7()
{
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "?15-ILinkListener.4-foo-bar");
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME
+ + "?15-ILinkListener.4-foo-bar");
IRequestHandler handler = encoder.mapRequest(getRequest(url));
assertThat(handler, instanceOf(ListenerInterfaceRequestHandler.class));
@@ -205,8 +205,8 @@ public class BookmarkableMapperTest extends AbstractMapperTest
@Test
public void decode8()
{
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME
+ + "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
context.setNextPageRenderCount(5);
@@ -225,8 +225,8 @@ public class BookmarkableMapperTest extends AbstractMapperTest
@Test(expected = StalePageException.class)
public void decode9()
{
- Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
+ Url url = Url.parse("wicket/bookmarkable/" + PAGE_CLASS_NAME
+ + "/i1/i2?15-5.ILinkListener-foo-bar&a=b&b=c");
context.setNextPageRenderCount(6);
IRequestHandler handler = encoder.mapRequest(getRequest(url));
@@ -253,7 +253,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
* Decodes a request to
* {@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}
* /com.example.MyPage when the current base url is
- * {@link org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/
+ * {@link org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()} /
* {@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}
*/
@Test
@@ -285,10 +285,8 @@ public class BookmarkableMapperTest extends AbstractMapperTest
public Url getClientUrl()
{
StringBuilder url = new StringBuilder();
- url.append(context.getNamespace())
- .append('/')
- .append(context.getBookmarkableIdentifier())
- .append('/')
+ url.append(context.getNamespace()).append('/')
+ .append(context.getBookmarkableIdentifier()).append('/')
.append("com.example.MyPage");
return Url.parse(url.toString());
}
@@ -314,7 +312,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
* Decodes a request to
* {@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}
* /com.example.MyPage when the current base url is
- * {@link org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/
+ * {@link org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()} /
* {@link org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
*/
@Test
@@ -346,9 +344,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
public Url getClientUrl()
{
StringBuilder url = new StringBuilder();
- url.append(context.getNamespace())
- .append('/')
- .append(context.getPageIdentifier())
+ url.append(context.getNamespace()).append('/').append(context.getPageIdentifier())
.append("?3");
return Url.parse(url.toString());
}
@@ -374,7 +370,7 @@ public class BookmarkableMapperTest extends AbstractMapperTest
* Decodes a request to
* {@link org.apache.wicket.core.request.mapper.IMapperContext#getBookmarkableIdentifier()}
* /com.example.MyPage when the current base url is
- * {@link org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()}/
+ * {@link org.apache.wicket.core.request.mapper.IMapperContext#getNamespace()} /
* {@link org.apache.wicket.core.request.mapper.IMapperContext#getPageIdentifier()}
*/
@Test
@@ -514,7 +510,8 @@ public class BookmarkableMapperTest extends AbstractMapperTest
IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
- // never allow bookmarkable render url for page that has not been created by bookmarkable
+ // never allow bookmarkable render url for page that has not been
+ // created by bookmarkable
// URL
assertNull(url);
@@ -532,7 +529,8 @@ public class BookmarkableMapperTest extends AbstractMapperTest
page.getPageParameters().set("a", "b");
page.getPageParameters().set("b", "c");
- // shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
+ // shouldn't make any difference for
+ // BookmarkableListenerInterfaceRequestHandler,
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
@@ -544,8 +542,8 @@ public class BookmarkableMapperTest extends AbstractMapperTest
Url url = encoder.mapHandler(handler);
- assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?15-0.ILinkListener-foo-bar&a=b&b=c", url.toString());
+ assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME
+ + "/i1/i2?15-0.ILinkListener-foo-bar&a=b&b=c", url.toString());
}
/**
@@ -560,7 +558,8 @@ public class BookmarkableMapperTest extends AbstractMapperTest
page.getPageParameters().set("a", "b");
page.getPageParameters().set("b", "c");
- // shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
+ // shouldn't make any difference for
+ // BookmarkableListenerInterfaceRequestHandler,
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
@@ -572,8 +571,8 @@ public class BookmarkableMapperTest extends AbstractMapperTest
Url url = encoder.mapHandler(handler);
- assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME +
- "/i1/i2?15-0.ILinkListener.4-foo-bar&a=b&b=c", url.toString());
+ assertEquals("wicket/bookmarkable/" + PAGE_CLASS_NAME
+ + "/i1/i2?15-0.ILinkListener.4-foo-bar&a=b&b=c", url.toString());
}
/**
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad98b7ca/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 76535ad..9538ac6 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
@@ -404,7 +404,8 @@ public class MountedMapperTest extends AbstractMapperTest
IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
- // mounted pages must render mounted url even for page that has not been created by
+ // mounted pages must render mounted url even for page that has not been
+ // created by
// bookmarkable
// URL
@@ -424,7 +425,8 @@ public class MountedMapperTest extends AbstractMapperTest
page.getPageParameters().set("b", "c");
page.setRenderCount(4);
- // shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
+ // shouldn't make any difference for
+ // BookmarkableListenerInterfaceRequestHandler,
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
@@ -488,7 +490,8 @@ public class MountedMapperTest extends AbstractMapperTest
page.getPageParameters().set("b", "c");
page.setRenderCount(5);
- // shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
+ // shouldn't make any difference for
+ // BookmarkableListenerInterfaceRequestHandler,
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
@@ -833,7 +836,7 @@ public class MountedMapperTest extends AbstractMapperTest
assertEquals("some/path/p2/p3/i1/i2?a=b&b=c", url.toString());
}
- /* WICKET-5056 **/
+ /* WICKET-5056 * */
@Test
public void optionalParameterGetsLowerScore_ThanExactOne() throws Exception
{
@@ -843,8 +846,8 @@ 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,
+ assertTrue("exactCompatScore should have greater compatibility score than optional one"
+ + " got exact = " + exactCompatScore + " and optional = " + optCompatScore,
exactCompatScore > optCompatScore);
}
@@ -857,8 +860,8 @@ 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,
+ assertTrue("exactCompatScore should have greater compatibility score than required one"
+ + " got exact = " + exactCompatScore + " and required= " + requiredParamScore,
exactCompatScore > requiredParamScore);
}
@@ -869,7 +872,8 @@ public class MountedMapperTest extends AbstractMapperTest
final MountedMapper exactMount = new MountedMapper("/all/sindex", MockPage.class);
final MountedMapper requiredParam = new MountedMapper("/all/${exp}", MockPage.class);
final MountedMapper optionalParameter = new MountedMapper("/all/#{exp}", MockPage.class);
- final MountedMapper requiredOptionalParam = new MountedMapper("/all/${exp}/#{opt}", MockPage.class);
+ final MountedMapper requiredOptionalParam = new MountedMapper("/all/${exp}/#{opt}",
+ MockPage.class);
Request request = getRequest(url);
final int exactCompatScore = exactMount.getCompatibilityScore(request);
@@ -877,16 +881,17 @@ public class MountedMapperTest extends AbstractMapperTest
final int optCompatScore = optionalParameter.getCompatibilityScore(request);
final int requiredOptCompatScore = requiredOptionalParam.getCompatibilityScore(request);
- 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 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 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);
+ assertTrue("exactCompatScore should have greater compatibility score than optional one"
+ + " got exact = " + exactCompatScore + " and optional = " + optCompatScore,
+ requiredParamScore > optCompatScore);
}
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad98b7ca/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 625d30f..74fcaa9 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
@@ -376,7 +376,8 @@ public class PackageMapperTest extends AbstractMapperTest
IRequestHandler handler = new RenderPageRequestHandler(provider);
Url url = encoder.mapHandler(handler);
- // never allow bookmarkable render url for page that has not been created by bookmarkable
+ // never allow bookmarkable render url for page that has not been
+ // created by bookmarkable
// URL
assertNull(url);
@@ -394,7 +395,8 @@ public class PackageMapperTest extends AbstractMapperTest
page.getPageParameters().set("a", "b");
page.getPageParameters().set("b", "c");
- // shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
+ // shouldn't make any difference for
+ // BookmarkableListenerInterfaceRequestHandler,
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
@@ -421,7 +423,8 @@ public class PackageMapperTest extends AbstractMapperTest
page.getPageParameters().set("a", "b");
page.getPageParameters().set("b", "c");
- // shouldn't make any difference for BookmarkableListenerInterfaceRequestHandler,
+ // shouldn't make any difference for
+ // BookmarkableListenerInterfaceRequestHandler,
// as this explicitely says the url must be bookmarkable
page.setCreatedBookmarkable(false);
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad98b7ca/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 e9141b2..fefd8c7 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
@@ -37,7 +37,7 @@ import org.apache.wicket.request.component.IRequestablePage;
import org.junit.Test;
/**
- *
+ *
* @author Matej Knopp
*/
public class PageInstanceMapperTest extends AbstractMapperTest
@@ -214,7 +214,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(request);
- IRequestablePage page = ((IPageRequestHandler) handler).getPage();
+ IRequestablePage page = ((IPageRequestHandler)handler).getPage();
checkPage(page, 4);
}
@@ -259,7 +259,7 @@ public class PageInstanceMapperTest extends AbstractMapperTest
IRequestHandler handler = encoder.mapRequest(request);
- IRequestablePage page = ((IPageRequestHandler) handler).getPage();
+ IRequestablePage page = ((IPageRequestHandler)handler).getPage();
checkPage(page, 4);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad98b7ca/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
index e1b9838..366cf6d 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/parser/filter/OpenCloseTagExpanderTest.java
@@ -46,27 +46,28 @@ public class OpenCloseTagExpanderTest extends WicketTestCase
/**
* https://issues.apache.org/jira/browse/WICKET-5237
+ *
* @throws ParseException
*/
@Test
public void doNotExpandVoidElements() throws ParseException
{
- String[] htmlVoidElements = new String[] {
- "area", "base", "br", "col", "command", "embed", "hr", "img", "input",
- "keygen", "link", "meta", "param", "source", "track", "wbr"
- };
+ String[] htmlVoidElements = new String[] { "area", "base", "br", "col", "command", "embed",
+ "hr", "img", "input", "keygen", "link", "meta", "param", "source", "track", "wbr" };
for (String htmlVoidElement : htmlVoidElements)
{
- OpenCloseTagExpander expander = new OpenCloseTagExpander() {
+ OpenCloseTagExpander expander = new OpenCloseTagExpander()
+ {
@Override
public IMarkupFilter getNextFilter()
{
return new AbstractMarkupFilter()
{
@Override
- protected MarkupElement onComponentTag(ComponentTag tag) throws ParseException
+ protected MarkupElement onComponentTag(ComponentTag tag)
+ throws ParseException
{
return null;
}
@@ -92,6 +93,7 @@ public class OpenCloseTagExpanderTest extends WicketTestCase
/**
* https://issues.apache.org/jira/browse/WICKET-5237
+ *
* @throws ParseException
*/
@Test
@@ -99,14 +101,16 @@ public class OpenCloseTagExpanderTest extends WicketTestCase
{
for (String htmlNonVoidElement : OpenCloseTagExpander.REPLACE_FOR_TAGS)
{
- OpenCloseTagExpander expander = new OpenCloseTagExpander() {
+ OpenCloseTagExpander expander = new OpenCloseTagExpander()
+ {
@Override
public IMarkupFilter getNextFilter()
{
return new AbstractMarkupFilter()
{
@Override
- protected MarkupElement onComponentTag(ComponentTag tag) throws ParseException
+ protected MarkupElement onComponentTag(ComponentTag tag)
+ throws ParseException
{
return null;
}
@@ -123,7 +127,7 @@ public class OpenCloseTagExpanderTest extends WicketTestCase
ComponentTag tag = new ComponentTag(htmlNonVoidElement, XmlTag.TagType.OPEN_CLOSE);
expander.onComponentTag(tag);
- ComponentTag markupElement = (ComponentTag) expander.nextElement();
+ ComponentTag markupElement = (ComponentTag)expander.nextElement();
// assert the next element is returned by the parent
assertEquals(htmlNonVoidElement, markupElement.getName());
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad98b7ca/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
index 5f2ef5a..56ed65e 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/ResponseIOExceptionTest.java
@@ -82,7 +82,7 @@ public class ResponseIOExceptionTest extends Assert
tester.getApplication().getRequestCycleListeners().add(testRequestCycleListener);
tester.startResource(new ResourceStreamResource(new StringResourceStream("asdf")));
assertThat(testRequestCycleListener.lastExceptionRquestHandlerResolved,
- instanceOf(EmptyRequestHandler.class));
+ instanceOf(EmptyRequestHandler.class));
}
class TestRequestCycleListener extends AbstractRequestCycleListener
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad98b7ca/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
index cf78440..33d9914 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebRequestTest.java
@@ -59,8 +59,8 @@ public class ServletWebRequestTest extends Assert
assertEquals("request/Uri?some=parameter", clientUrl.toString());
// simulates a request that has errors metadata
- httpRequest.setAttribute("javax.servlet.error.request_uri",
- httpRequest.getContextPath() + "/any/source/of/error");
+ httpRequest.setAttribute("javax.servlet.error.request_uri", httpRequest.getContextPath()
+ + "/any/source/of/error");
ServletWebRequest errorWebRequest = new ServletWebRequest(httpRequest, "");
Url errorClientUrl = errorWebRequest.getClientUrl();
@@ -146,7 +146,7 @@ public class ServletWebRequestTest extends Assert
/**
* Assert that ServletWebRequest#getClientUrl() will throw an AbortWithHttpErrorCodeException
* with error code 400 (Bad Request) when an Ajax request doesn't provide the base url.
- *
+ *
* https://issues.apache.org/jira/browse/WICKET-4841
*/
@Test
@@ -185,8 +185,8 @@ public class ServletWebRequestTest extends Assert
assertEquals("request/Path?some=parameter", clientUrl.toString());
// simulates a request that has errors metadata
- httpRequest.setAttribute("javax.servlet.error.request_uri",
- httpRequest.getContextPath() + '/' + filterPath + "/any/source/of/error");
+ httpRequest.setAttribute("javax.servlet.error.request_uri", httpRequest.getContextPath()
+ + '/' + filterPath + "/any/source/of/error");
ServletWebRequest errorWebRequest = new ServletWebRequest(httpRequest, filterPath);
Url errorClientUrl = errorWebRequest.getClientUrl();
@@ -202,7 +202,8 @@ public class ServletWebRequestTest extends Assert
String filterPath = "filterPath";
MockHttpServletRequest httpRequest = new MockHttpServletRequest(null, null, null);
String looksLikeFullUrl = "/foo://:/";
- httpRequest.setURL("http://localhost" + '/' + httpRequest.getContextPath() + '/' + filterPath + looksLikeFullUrl);
+ httpRequest.setURL("http://localhost" + '/' + httpRequest.getContextPath() + '/'
+ + filterPath + looksLikeFullUrl);
ServletWebRequest webRequest = new ServletWebRequest(httpRequest, filterPath);
assertEquals(looksLikeFullUrl, webRequest.getClientUrl().toString());
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad98b7ca/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java
index ea34c9d..0821a38 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/caching/ContextRelativeResourceCachingTest.java
@@ -99,8 +99,7 @@ public class ContextRelativeResourceCachingTest extends WicketTestCase
init(resource, "/test/resource");
Request request = createRequest("test/resource-version-4711?bla=123");
- final IRequestHandler handler = tester.getApplication()
- .getRootRequestMapper()
+ final IRequestHandler handler = tester.getApplication().getRootRequestMapper()
.mapRequest(request);
assertThat(handler, instanceOf(ResourceReferenceRequestHandler.class));
assertEquals(((ResourceReferenceRequestHandler)handler).getResource(), resource);
http://git-wip-us.apache.org/repos/asf/wicket/blob/ad98b7ca/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
----------------------------------------------------------------------
diff --git a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
index c18524c..b2a5914 100644
--- a/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
+++ b/wicket-extensions/src/test/java/org/apache/wicket/extensions/ajax/markup/html/AjaxEditableTest.java
@@ -64,11 +64,9 @@ public class AjaxEditableTest extends WicketTestCase
AjaxEditableLabel<String> ajaxLabel = (AjaxEditableLabel<String>)page.get("ajaxLabel");
AbstractAjaxBehavior labelBehavior = (AbstractAjaxBehavior)ajaxLabel.get("label")
- .getBehaviors()
- .get(0);
+ .getBehaviors().get(0);
AbstractAjaxBehavior editorBehavior = (AbstractAjaxBehavior)ajaxLabel.get("editor")
- .getBehaviors()
- .get(0);
+ .getBehaviors().get(0);
// "click" on the label and check for valid visibility
tester.executeBehavior(labelBehavior);
@@ -112,8 +110,8 @@ public class AjaxEditableTest extends WicketTestCase
// check for the *presence* of the ajax onclick call
// TODO Wicket.next - re-enable
-// markup = tester.getTagById(ajaxLabel.getMarkupId()).getMarkup();
-// assertTrue(markup.matches(".*onclick=\"var wcall=Wicket.Ajax.get.*"));
+ // markup = tester.getTagById(ajaxLabel.getMarkupId()).getMarkup();
+ // assertTrue(markup.matches(".*onclick=\"var wcall=Wicket.Ajax.get.*"));
}
/**
@@ -167,9 +165,8 @@ public class AjaxEditableTest extends WicketTestCase
integerModel);
editableLabel.getEditor().setVisible(true);
- IWritableRequestParameters postParameters = (IWritableRequestParameters)tester.getRequestCycle()
- .getRequest()
- .getPostParameters();
+ IWritableRequestParameters postParameters = (IWritableRequestParameters)tester
+ .getRequestCycle().getRequest().getPostParameters();
postParameters.setParameterValues(editableLabel.getEditor().getInputName(),
Arrays.asList(new StringValue[] { StringValue.valueOf("5") }));
editableLabel.getEditor().processInput();