You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by mg...@apache.org on 2018/07/25 07:09:25 UTC
[2/2] wicket git commit: Fix compilation warnings.
Fix compilation warnings.
Replace usega of deprecated Mockito Matchers class with ArgumentMatchers
Project: http://git-wip-us.apache.org/repos/asf/wicket/repo
Commit: http://git-wip-us.apache.org/repos/asf/wicket/commit/ed2e2cd8
Tree: http://git-wip-us.apache.org/repos/asf/wicket/tree/ed2e2cd8
Diff: http://git-wip-us.apache.org/repos/asf/wicket/diff/ed2e2cd8
Branch: refs/heads/master
Commit: ed2e2cd825150af4f6a4221a9ab9f2a8abf7a14a
Parents: dbe4357
Author: Martin Tzvetanov Grigorov <mg...@apache.org>
Authored: Wed Jul 25 10:08:36 2018 +0300
Committer: Martin Tzvetanov Grigorov <mg...@apache.org>
Committed: Wed Jul 25 10:08:36 2018 +0300
----------------------------------------------------------------------
.../markup/html/internal/HeaderResponseTest.java | 2 +-
.../wicket/protocol/http/WicketFilterTest.java | 15 ++++++++-------
.../http/servlet/ServletWebResponseTest.java | 9 +++++----
.../wicket/request/cycle/RequestCycleUrlForTest.java | 2 +-
.../request/handler/render/WebPageRendererTest.java | 6 +++---
.../request/resource/ByteArrayResourceTest.java | 4 ++--
.../wicket/util/file/WebApplicationPathTest.java | 3 ++-
7 files changed, 22 insertions(+), 19 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed2e2cd8/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
index 8495e7c..6bab883 100644
--- a/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/markup/html/internal/HeaderResponseTest.java
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.markup.html.internal;
-import static org.mockito.Matchers.any;
+import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed2e2cd8/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
index f0560b0..54141c4 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/WicketFilterTest.java
@@ -63,6 +63,7 @@ import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
import org.junit.experimental.categories.Category;
+import org.mockito.ArgumentMatchers;
import org.mockito.Matchers;
import org.mockito.Mockito;
import org.mockito.invocation.InvocationOnMock;
@@ -480,7 +481,7 @@ public class WicketFilterTest extends Assert
when(request.getContextPath()).thenReturn("/contextPath");
when(request.getMethod()).thenReturn("POST");
HttpServletResponse response = mock(HttpServletResponse.class);
- when(response.encodeRedirectURL(Matchers.anyString())).thenAnswer(new Answer<String>()
+ when(response.encodeRedirectURL(ArgumentMatchers.anyString())).thenAnswer(new Answer<String>()
{
@Override
public String answer(InvocationOnMock invocation) throws Throwable
@@ -495,18 +496,18 @@ public class WicketFilterTest extends Assert
{
boolean isProcessed = filter.processRequest(request, response, chain);
assertFalse(isProcessed);
- verify(application, Mockito.never()).newWebRequest(Matchers.eq(request),
- Matchers.anyString());
- verify(application, Mockito.never()).newWebResponse(Matchers.any(WebRequest.class),
- Matchers.eq(response));
+ verify(application, Mockito.never()).newWebRequest(ArgumentMatchers.eq(request),
+ ArgumentMatchers.anyString());
+ verify(application, Mockito.never()).newWebResponse(ArgumentMatchers.any(WebRequest.class),
+ ArgumentMatchers.eq(response));
verify(chain, Mockito.times(i + 1)).doFilter(request, response);
}
// execute the request to /something/real
boolean isProcessed = filter.processRequest(request, response, chain);
assertTrue(isProcessed);
- verify(application).newWebRequest(Matchers.eq(request), Matchers.anyString());
- verify(application).newWebResponse(Matchers.any(WebRequest.class), Matchers.eq(response));
+ verify(application).newWebRequest(ArgumentMatchers.eq(request), ArgumentMatchers.anyString());
+ verify(application).newWebResponse(ArgumentMatchers.any(WebRequest.class), ArgumentMatchers.eq(response));
// the request is processed so the chain is not executed
verify(chain, Mockito.times(3)).doFilter(request, response);
}
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed2e2cd8/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java
index 0af28f9..71626da 100644
--- a/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/protocol/http/servlet/ServletWebResponseTest.java
@@ -35,6 +35,7 @@ import org.apache.wicket.request.UrlRenderer;
import org.apache.wicket.request.cycle.RequestCycle;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.ArgumentMatchers;
import org.mockito.Matchers;
/**
@@ -68,7 +69,7 @@ public class ServletWebResponseTest extends Assert
when(httpServletRequest.getCharacterEncoding()).thenReturn("UTF-8");
HttpServletResponse httpServletResponse = mock(HttpServletResponse.class);
- when(httpServletResponse.encodeRedirectURL(Matchers.anyString())).thenReturn(url);
+ when(httpServletResponse.encodeRedirectURL(ArgumentMatchers.anyString())).thenReturn(url);
StringWriter writer = new StringWriter();
when(httpServletResponse.getWriter()).thenReturn(new PrintWriter(writer));
@@ -110,7 +111,7 @@ public class ServletWebResponseTest extends Assert
when(webRequest.getClientUrl()).thenReturn(baseUrl);
HttpServletResponse httpServletResponse = mock(HttpServletResponse.class);
- when(httpServletResponse.encodeRedirectURL(Matchers.anyString())).thenReturn(url);
+ when(httpServletResponse.encodeRedirectURL(ArgumentMatchers.anyString())).thenReturn(url);
ServletWebResponse webResponse = new ServletWebResponse(webRequest, httpServletResponse);
webResponse.sendRedirect(url);
@@ -180,7 +181,7 @@ public class ServletWebResponseTest extends Assert
when(requestCycle.getUrlRenderer()).thenReturn(renderer);
HttpServletResponse httpServletResponse = mock(HttpServletResponse.class);
- when(httpServletResponse.encodeURL(Matchers.eq(url))).thenReturn(url + ";foo");
+ when(httpServletResponse.encodeURL(ArgumentMatchers.eq(url))).thenReturn(url + ";foo");
ServletWebResponse webResponse = new ServletWebResponse(webRequest, httpServletResponse);
assertEquals(url + ";foo", webResponse.encodeURL(url));
@@ -209,7 +210,7 @@ public class ServletWebResponseTest extends Assert
when(requestCycle.getUrlRenderer()).thenReturn(renderer);
HttpServletResponse httpServletResponse = mock(HttpServletResponse.class);
- when(httpServletResponse.encodeRedirectURL(Matchers.eq(url))).thenReturn(url + ";foo");
+ when(httpServletResponse.encodeRedirectURL(ArgumentMatchers.eq(url))).thenReturn(url + ";foo");
ServletWebResponse webResponse = new ServletWebResponse(webRequest, httpServletResponse);
assertEquals(url + ";foo", webResponse.encodeRedirectURL(url));
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed2e2cd8/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 214cc36..6c99eef 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
@@ -16,7 +16,7 @@
*/
package org.apache.wicket.request.cycle;
-import static org.mockito.Matchers.argThat;
+import static org.mockito.ArgumentMatchers.argThat;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.when;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed2e2cd8/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 595b5a3..c2094fa 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
@@ -17,9 +17,9 @@
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;
+import static org.mockito.ArgumentMatchers.any;
+import static org.mockito.ArgumentMatchers.anyString;
+import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.never;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed2e2cd8/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java b/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java
index 0e79915..73b1295 100644
--- a/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/request/resource/ByteArrayResourceTest.java
@@ -16,8 +16,8 @@
*/
package org.apache.wicket.request.resource;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Matchers.same;
+import static org.mockito.ArgumentMatchers.eq;
+import static org.mockito.ArgumentMatchers.same;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.verify;
http://git-wip-us.apache.org/repos/asf/wicket/blob/ed2e2cd8/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java
----------------------------------------------------------------------
diff --git a/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java b/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java
index fc71fe4..9532d99 100644
--- a/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java
+++ b/wicket-core/src/test/java/org/apache/wicket/util/file/WebApplicationPathTest.java
@@ -24,6 +24,7 @@ import org.apache.wicket.core.util.file.WebApplicationPath;
import org.apache.wicket.util.resource.IResourceStream;
import org.junit.Assert;
import org.junit.Test;
+import org.mockito.ArgumentMatchers;
import org.mockito.Matchers;
import org.mockito.Mockito;
@@ -38,7 +39,7 @@ public class WebApplicationPathTest extends Assert
URL webUrl = new URL("file://dummyFile");
ServletContext context = Mockito.mock(ServletContext.class);
- Mockito.when(context.getResource(Matchers.any(String.class))).thenReturn(webUrl);
+ Mockito.when(context.getResource(ArgumentMatchers.any(String.class))).thenReturn(webUrl);
WebApplicationPath path = new WebApplicationPath(context, "");
IResourceStream resourceStream = path.find(String.class, "WEB-INF/web.xml");