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
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
|
Description: Fixes the compatibility with Easymock 4
Author: Emmanuel Bourg <ebourg@apache.org>
Forwarded: no
--- a/src/test/java/org/apache/commons/lang3/event/EventListenerSupportTest.java
+++ b/src/test/java/org/apache/commons/lang3/event/EventListenerSupportTest.java
@@ -52,7 +52,7 @@
//for fun, show that the same empty instance is used
assertSame(empty, listenerSupport.getListeners());
- final VetoableChangeListener listener1 = EasyMock.createNiceMock(VetoableChangeListener.class);
+ final VetoableChangeListener listener1 = (VetoableChangeListener) EasyMock.createNiceMock(VetoableChangeListener.class);
listenerSupport.addListener(listener1);
assertEquals(1, listenerSupport.getListeners().length);
listenerSupport.addListener(listener1, false);
@@ -120,10 +120,10 @@
//for fun, show that the same empty instance is used
assertSame(empty, listenerSupport.getListeners());
- final VetoableChangeListener listener1 = EasyMock.createNiceMock(VetoableChangeListener.class);
+ final VetoableChangeListener listener1 = (VetoableChangeListener) EasyMock.createNiceMock(VetoableChangeListener.class);
listenerSupport.addListener(listener1);
assertEquals(1, listenerSupport.getListeners().length);
- final VetoableChangeListener listener2 = EasyMock.createNiceMock(VetoableChangeListener.class);
+ final VetoableChangeListener listener2 = (VetoableChangeListener) EasyMock.createNiceMock(VetoableChangeListener.class);
listenerSupport.addListener(listener2);
assertEquals(2, listenerSupport.getListeners().length);
listenerSupport.removeListener(listener1);
@@ -141,7 +141,7 @@
public void vetoableChange(final PropertyChangeEvent e) {
}
});
- listenerSupport.addListener(EasyMock.createNiceMock(VetoableChangeListener.class));
+ listenerSupport.addListener((VetoableChangeListener) EasyMock.createNiceMock(VetoableChangeListener.class));
//serialize:
final ByteArrayOutputStream outputStream = new ByteArrayOutputStream();
@@ -199,7 +199,7 @@
}
};
- final VetoableChangeListener listener = EasyMock.createNiceMock(VetoableChangeListener.class);
+ final VetoableChangeListener listener = (VetoableChangeListener) EasyMock.createNiceMock(VetoableChangeListener.class);
eventListenerSupport.addListener(listener);
final Object source = new Date();
final PropertyChangeEvent ignore = new PropertyChangeEvent(source, "Hour", 5, 6);
--- a/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java
+++ b/src/test/java/org/apache/commons/lang3/concurrent/BasicThreadFactoryTest.java
@@ -97,7 +97,7 @@
*/
@Test
public void testBuilderReset() {
- final ThreadFactory wrappedFactory = EasyMock.createMock(ThreadFactory.class);
+ final ThreadFactory wrappedFactory = (ThreadFactory) EasyMock.createMock(ThreadFactory.class);
final Thread.UncaughtExceptionHandler exHandler = EasyMock
.createMock(Thread.UncaughtExceptionHandler.class);
EasyMock.replay(wrappedFactory, exHandler);
@@ -117,7 +117,7 @@
*/
@Test
public void testBuilderResetAfterBuild() {
- builder.wrappedFactory(EasyMock.createNiceMock(ThreadFactory.class))
+ builder.wrappedFactory((ThreadFactory) EasyMock.createNiceMock(ThreadFactory.class))
.namingPattern(PATTERN).daemon(true).build();
checkFactoryDefaults(builder.build());
}
@@ -127,8 +127,8 @@
*/
@Test
public void testNewThreadNamingPattern() {
- final ThreadFactory wrapped = EasyMock.createMock(ThreadFactory.class);
- final Runnable r = EasyMock.createMock(Runnable.class);
+ final ThreadFactory wrapped = (ThreadFactory) EasyMock.createMock(ThreadFactory.class);
+ final Runnable r = (Runnable) EasyMock.createMock(Runnable.class);
final int count = 12;
for (int i = 0; i < count; i++) {
EasyMock.expect(wrapped.newThread(r)).andReturn(new Thread());
@@ -151,8 +151,8 @@
*/
@Test
public void testNewThreadNoNamingPattern() {
- final ThreadFactory wrapped = EasyMock.createMock(ThreadFactory.class);
- final Runnable r = EasyMock.createMock(Runnable.class);
+ final ThreadFactory wrapped = (ThreadFactory) EasyMock.createMock(ThreadFactory.class);
+ final Runnable r = (Runnable) EasyMock.createMock(Runnable.class);
final String name = "unchangedThreadName";
final Thread t = new Thread(name);
EasyMock.expect(wrapped.newThread(r)).andReturn(t);
@@ -169,8 +169,8 @@
* @param flag the value of the flag
*/
private void checkDaemonFlag(final boolean flag) {
- final ThreadFactory wrapped = EasyMock.createMock(ThreadFactory.class);
- final Runnable r = EasyMock.createMock(Runnable.class);
+ final ThreadFactory wrapped = (ThreadFactory) EasyMock.createMock(ThreadFactory.class);
+ final Runnable r = (Runnable) EasyMock.createMock(Runnable.class);
final Thread t = new Thread();
EasyMock.expect(wrapped.newThread(r)).andReturn(t);
EasyMock.replay(wrapped, r);
@@ -203,9 +203,9 @@
*/
@Test
public void testNewThreadNoDaemonFlag() {
- final ThreadFactory wrapped = EasyMock.createMock(ThreadFactory.class);
- final Runnable r1 = EasyMock.createMock(Runnable.class);
- final Runnable r2 = EasyMock.createMock(Runnable.class);
+ final ThreadFactory wrapped = (ThreadFactory) EasyMock.createMock(ThreadFactory.class);
+ final Runnable r1 = (Runnable) EasyMock.createMock(Runnable.class);
+ final Runnable r2 = (Runnable) EasyMock.createMock(Runnable.class);
final Thread t1 = new Thread();
final Thread t2 = new Thread();
t1.setDaemon(true);
@@ -225,8 +225,8 @@
*/
@Test
public void testNewThreadPriority() {
- final ThreadFactory wrapped = EasyMock.createMock(ThreadFactory.class);
- final Runnable r = EasyMock.createMock(Runnable.class);
+ final ThreadFactory wrapped = (ThreadFactory) EasyMock.createMock(ThreadFactory.class);
+ final Runnable r = (Runnable) EasyMock.createMock(Runnable.class);
final Thread t = new Thread();
EasyMock.expect(wrapped.newThread(r)).andReturn(t);
EasyMock.replay(wrapped, r);
@@ -244,8 +244,8 @@
*/
@Test
public void testNewThreadNoPriority() {
- final ThreadFactory wrapped = EasyMock.createMock(ThreadFactory.class);
- final Runnable r = EasyMock.createMock(Runnable.class);
+ final ThreadFactory wrapped = (ThreadFactory) EasyMock.createMock(ThreadFactory.class);
+ final Runnable r = (Runnable) EasyMock.createMock(Runnable.class);
final int orgPriority = Thread.NORM_PRIORITY + 1;
final Thread t = new Thread();
t.setPriority(orgPriority);
@@ -262,8 +262,8 @@
*/
@Test
public void testNewThreadExHandler() {
- final ThreadFactory wrapped = EasyMock.createMock(ThreadFactory.class);
- final Runnable r = EasyMock.createMock(Runnable.class);
+ final ThreadFactory wrapped = (ThreadFactory) EasyMock.createMock(ThreadFactory.class);
+ final Runnable r = (Runnable) EasyMock.createMock(Runnable.class);
final Thread.UncaughtExceptionHandler handler = EasyMock
.createMock(Thread.UncaughtExceptionHandler.class);
final Thread t = new Thread();
@@ -283,8 +283,8 @@
*/
@Test
public void testNewThreadNoExHandler() {
- final ThreadFactory wrapped = EasyMock.createMock(ThreadFactory.class);
- final Runnable r = EasyMock.createMock(Runnable.class);
+ final ThreadFactory wrapped = (ThreadFactory) EasyMock.createMock(ThreadFactory.class);
+ final Runnable r = (Runnable) EasyMock.createMock(Runnable.class);
final Thread.UncaughtExceptionHandler handler = EasyMock
.createMock(Thread.UncaughtExceptionHandler.class);
final Thread t = new Thread();
|
