This is an automated email from the ASF dual-hosted git repository.
markt pushed a commit to branch 8.5.x
in repository https://gitbox.apache.org/repos/asf/tomcat.git
commit 024ddaff2cfff88e8fdf06f0db75f45bd3f8dcb1
Author: Mark Thomas <ma...@apache.org>
AuthorDate: Tue Jan 18 11:37:13 2022 +0000
Get tests building with --release=7 and newer test libraries
---
.../valves/TestCrawlerSessionManagerValve.java | 20 ++++++++++----------
test/org/apache/catalina/valves/TestSSLValve.java | 2 +-
2 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
b/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
index 631c979..75c5d49 100644
--- a/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
+++ b/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
@@ -58,13 +58,13 @@ public class TestCrawlerSessionManagerValve {
CrawlerSessionManagerValve valve = new CrawlerSessionManagerValve();
valve.setCrawlerIps("216\\.58\\.206\\.174");
valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
- valve.setNext(EasyMock.createMock(Valve.class));
+ valve.setNext((Valve) EasyMock.createMock(Valve.class));
HttpSession session = createSessionExpectations(valve, true);
Request request = createRequestExpectations("216.58.206.174", session,
true);
EasyMock.replay(request, session);
- valve.invoke(request, EasyMock.createMock(Response.class));
+ valve.invoke(request, (Response) EasyMock.createMock(Response.class));
EasyMock.verify(request, session);
}
@@ -74,13 +74,13 @@ public class TestCrawlerSessionManagerValve {
CrawlerSessionManagerValve valve = new CrawlerSessionManagerValve();
valve.setCrawlerIps("216\\.58\\.206\\.174");
valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
- valve.setNext(EasyMock.createMock(Valve.class));
+ valve.setNext((Valve) EasyMock.createMock(Valve.class));
HttpSession session = createSessionExpectations(valve, false);
Request request = createRequestExpectations("127.0.0.1", session,
false);
EasyMock.replay(request, session);
- valve.invoke(request, EasyMock.createMock(Response.class));
+ valve.invoke(request, (Response) EasyMock.createMock(Response.class));
EasyMock.verify(request, session);
}
@@ -91,7 +91,7 @@ public class TestCrawlerSessionManagerValve {
valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
valve.setHostAware(true);
valve.setContextAware(true);
- valve.setNext(EasyMock.createMock(Valve.class));
+ valve.setNext((Valve) EasyMock.createMock(Valve.class));
verifyCrawlingLocalhost(valve, "localhost");
verifyCrawlingLocalhost(valve, "example.invalid");
@@ -103,7 +103,7 @@ public class TestCrawlerSessionManagerValve {
valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
valve.setHostAware(true);
valve.setContextAware(true);
- valve.setNext(EasyMock.createMock(Valve.class));
+ valve.setNext((Valve) EasyMock.createMock(Valve.class));
verifyCrawlingContext(valve, "/examples");
verifyCrawlingContext(valve, null);
@@ -114,7 +114,7 @@ public class TestCrawlerSessionManagerValve {
CrawlerSessionManagerValve valve = new CrawlerSessionManagerValve();
valve.setCrawlerIps("216\\.58\\.206\\.174");
valve.setCrawlerUserAgents(valve.getCrawlerUserAgents());
- valve.setNext(EasyMock.createMock(Valve.class));
+ valve.setNext((Valve) EasyMock.createMock(Valve.class));
valve.setSessionInactiveInterval(0);
StandardSession session = new StandardSession(TEST_MANAGER);
session.setId("id");
@@ -124,7 +124,7 @@ public class TestCrawlerSessionManagerValve {
EasyMock.replay(request);
- valve.invoke(request, EasyMock.createMock(Response.class));
+ valve.invoke(request, (Response) EasyMock.createMock(Response.class));
EasyMock.verify(request);
@@ -143,7 +143,7 @@ public class TestCrawlerSessionManagerValve {
EasyMock.replay(request, session);
- valve.invoke(request, EasyMock.createMock(Response.class));
+ valve.invoke(request, (Response) EasyMock.createMock(Response.class));
EasyMock.verify(request, session);
}
@@ -156,7 +156,7 @@ public class TestCrawlerSessionManagerValve {
EasyMock.replay(request, session);
- valve.invoke(request, EasyMock.createMock(Response.class));
+ valve.invoke(request, (Response) EasyMock.createMock(Response.class));
EasyMock.verify(request, session);
}
diff --git a/test/org/apache/catalina/valves/TestSSLValve.java
b/test/org/apache/catalina/valves/TestSSLValve.java
index d3c3373..0d7bc53 100644
--- a/test/org/apache/catalina/valves/TestSSLValve.java
+++ b/test/org/apache/catalina/valves/TestSSLValve.java
@@ -37,7 +37,7 @@ public class TestSSLValve {
public static class MockRequest extends Request {
public MockRequest() {
- setConnector(EasyMock.createMock(Connector.class));
+ setConnector((Connector) EasyMock.createMock(Connector.class));
setCoyoteRequest(new org.apache.coyote.Request());
}
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org
For additional commands, e-mail: dev-h...@tomcat.apache.org
