Repository: wicket Updated Branches: refs/heads/master 247619ab1 -> f2a3a3db1
Upgrade Mockito to 2.1.0-RC1 Project: http://git-wip-us.apache.org/repos/asf/wicket/repo Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/f2a3a3db Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/f2a3a3db Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/f2a3a3db Branch: refs/heads/master Commit: f2a3a3db10f86db0632bd41d9f67b80a67236851 Parents: 247619a Author: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Authored: Thu Sep 22 21:47:03 2016 +0200 Committer: Martin Tzvetanov Grigorov <mgrigo...@apache.org> Committed: Thu Sep 22 21:47:03 2016 +0200 ---------------------------------------------------------------------- pom.xml | 2 +- .../request/cycle/RequestCycleUrlForTest.java | 11 ++++---- .../handler/render/WebPageRendererTest.java | 29 ++++++++++---------- .../apache/wicket/request/http/WebResponse.java | 2 +- 4 files changed, 22 insertions(+), 22 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/wicket/blob/f2a3a3db/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 9470419..4762208 100644 --- a/pom.xml +++ b/pom.xml @@ -135,7 +135,7 @@ <servlet-api.version>3.1.0</servlet-api.version> <maven.javadoc.version>2.10.4</maven.javadoc.version> <maven.surefire.version>2.19.1</maven.surefire.version> - <mockito.version>1.10.19</mockito.version> + <mockito.version>2.1.0-RC.1</mockito.version> <slf4j.version>1.7.21</slf4j.version> <hamcrest.version>2.0.0.0</hamcrest.version> <objenesis.version>2.4</objenesis.version> http://git-wip-us.apache.org/repos/asf/wicket/blob/f2a3a3db/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java index 2ec1c7c..214cc36 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/cycle/RequestCycleUrlForTest.java @@ -20,13 +20,13 @@ import static org.mockito.Matchers.argThat; import static org.mockito.Mockito.mock; import static org.mockito.Mockito.when; +import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler; import org.apache.wicket.mock.MockHomePage; import org.apache.wicket.request.IExceptionMapper; import org.apache.wicket.request.IRequestMapper; import org.apache.wicket.request.Request; import org.apache.wicket.request.Response; import org.apache.wicket.request.Url; -import org.apache.wicket.core.request.handler.BookmarkablePageRequestHandler; import org.apache.wicket.request.handler.resource.ResourceReferenceRequestHandler; import org.apache.wicket.request.handler.resource.ResourceRequestHandler; import org.apache.wicket.request.mapper.parameter.PageParameters; @@ -35,11 +35,10 @@ import org.apache.wicket.request.resource.IResource; import org.apache.wicket.request.resource.ResourceReference; import org.apache.wicket.request.resource.caching.IStaticCacheableResource; import org.apache.wicket.response.StringResponse; -import org.hamcrest.BaseMatcher; -import org.hamcrest.Description; import org.junit.Assert; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatcher; /** * Tests that RequestCycle#urlFor() does not encode the jsessionid for static resources. @@ -177,7 +176,7 @@ public class RequestCycleUrlForTest extends Assert * @param <T> * the type of the expected class */ - private static class ExactClassMatcher<T> extends BaseMatcher<T> + private static class ExactClassMatcher<T> implements ArgumentMatcher<T> { private final Class<T> targetClass; @@ -198,9 +197,9 @@ public class RequestCycleUrlForTest extends Assert } @Override - public void describeTo(Description desc) + public String toString() { - desc.appendText("Matches a class or subclass"); + return "Matches a class or subclass"; } } } http://git-wip-us.apache.org/repos/asf/wicket/blob/f2a3a3db/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java ---------------------------------------------------------------------- diff --git a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java index b33514e..595b5a3 100644 --- a/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java +++ b/wicket-core/src/test/java/org/apache/wicket/request/handler/render/WebPageRendererTest.java @@ -16,6 +16,7 @@ */ package org.apache.wicket.request.handler.render; +import static org.mockito.ArgumentMatchers.isNull; import static org.mockito.Matchers.any; import static org.mockito.Matchers.anyString; import static org.mockito.Matchers.eq; @@ -141,7 +142,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); verify(response, never()).write(any(byte[].class)); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); assertTrue(responseBuffered.get()); } @@ -177,7 +178,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); verify(response, never()).write(any(byte[].class)); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); } /** @@ -200,7 +201,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); verify(response, never()).write(any(byte[].class)); } @@ -337,7 +338,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); verify(response, never()).write(any(byte[].class)); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); } /** @@ -359,7 +360,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); verify(response, never()).write(any(byte[].class)); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); } /** @@ -380,7 +381,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); verify(response, never()).write(any(byte[].class)); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); } /** @@ -404,7 +405,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); verify(response, never()).write(any(byte[].class)); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); } /** @@ -427,7 +428,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); verify(response, never()).write(any(byte[].class)); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); } /** @@ -448,7 +449,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); verify(response, never()).write(any(byte[].class)); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); } /** @@ -558,7 +559,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); verify(response, never()).write(any(byte[].class)); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); Assert.assertTrue(stored.get()); } @@ -593,7 +594,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); verify(response, never()).write(any(byte[].class)); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); Assert.assertTrue(stored.get()); } @@ -983,7 +984,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); verify(response, never()).write(any(byte[].class)); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); Assert.assertTrue(stored.get()); } @@ -1006,7 +1007,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); verify(response, never()).write(any(byte[].class)); } @@ -1029,7 +1030,7 @@ public class WebPageRendererTest extends Assert renderer.respond(requestCycle); - verify(response).sendRedirect(anyString()); + verify(response).sendRedirect(isNull()); verify(response, never()).write(any(byte[].class)); } http://git-wip-us.apache.org/repos/asf/wicket/blob/f2a3a3db/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java ---------------------------------------------------------------------- diff --git a/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java b/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java index 4183940..5b508f7 100644 --- a/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java +++ b/wicket-request/src/main/java/org/apache/wicket/request/http/WebResponse.java @@ -208,7 +208,7 @@ public abstract class WebResponse extends Response /** * Redirects the response to specified URL. The implementation is responsible for properly * encoding the URL. Implementations of this method should run passed in {@code url} parameters - * throu the {@link #encodeRedirectURL(CharSequence)} method. + * through the {@link #encodeRedirectURL(CharSequence)} method. * * @param url */
