1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
|
From: Emmanuel Bourg <ebourg@apache.org>
Date: Mon, 16 Jan 2023 23:22:18 +0100
Subject: Fixes the compatibility with the version of Easymock in Debian
Forwarded: no
---
.../valves/TestCrawlerSessionManagerValve.java | 28 +++++++++++-----------
test/org/apache/catalina/valves/TestSSLValve.java | 4 ++--
2 files changed, 16 insertions(+), 16 deletions(-)
--- a/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
+++ b/test/org/apache/catalina/valves/TestCrawlerSessionManagerValve.java
@@ -57,13 +57,13 @@
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);
}
@@ -73,13 +73,13 @@
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);
}
@@ -90,7 +90,7 @@
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");
@@ -102,7 +102,7 @@
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);
@@ -113,7 +113,7 @@
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");
@@ -123,7 +123,7 @@
EasyMock.replay(request);
- valve.invoke(request, EasyMock.createMock(Response.class));
+ valve.invoke(request, (Response) EasyMock.createMock(Response.class));
EasyMock.verify(request);
@@ -142,7 +142,7 @@
EasyMock.replay(request, session);
- valve.invoke(request, EasyMock.createMock(Response.class));
+ valve.invoke(request, (Response) EasyMock.createMock(Response.class));
EasyMock.verify(request, session);
}
@@ -156,14 +156,14 @@
EasyMock.replay(request, session);
- valve.invoke(request, EasyMock.createMock(Response.class));
+ valve.invoke(request, (Response) EasyMock.createMock(Response.class));
EasyMock.verify(request, session);
}
private HttpSession createSessionExpectations(CrawlerSessionManagerValve valve, boolean isBot) {
- HttpSession session = EasyMock.createMock(HttpSession.class);
+ HttpSession session = (HttpSession) EasyMock.createMock(HttpSession.class);
if (isBot) {
EasyMock.expect(session.getId()).andReturn("id").times(1);
session.setAttribute(EasyMock.eq(valve.getClass().getName()),
@@ -182,7 +182,7 @@
private Request createRequestExpectations(String ip, HttpSession session, boolean isBot, String hostname,
String contextPath, String userAgent) {
- Request request = EasyMock.createMock(Request.class);
+ Request request = (Request) EasyMock.createMock(Request.class);
EasyMock.expect(request.getRemoteAddr()).andReturn(ip);
EasyMock.expect(request.getHost()).andReturn(simpleHostWithName(hostname));
EasyMock.expect(request.getContext()).andReturn(simpleContextWithName(contextPath));
@@ -196,7 +196,7 @@
}
private Host simpleHostWithName(String hostname) {
- Host host = EasyMock.createMock(Host.class);
+ Host host = (Host) EasyMock.createMock(Host.class);
EasyMock.expect(host.getName()).andReturn(hostname);
EasyMock.replay(host);
return host;
@@ -206,7 +206,7 @@
if (contextPath == null) {
return null;
}
- Context context = EasyMock.createMock(Context.class);
+ Context context = (Context) EasyMock.createMock(Context.class);
EasyMock.expect(context.getName()).andReturn(contextPath);
EasyMock.replay(context);
return context;
|
