This is an automated email from the ASF dual-hosted git repository.
reta pushed a commit to branch 3.6.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit c7ca14461fc59953b147cc9238dbacb996750e12
Author: Andriy Redko <drr...@gmail.com>
AuthorDate: Sun Aug 20 11:18:48 2023 -0400
CXF-8864: Get rid of EasyMock in cxf-rt-transports-jms (#1382)
(cherry picked from commit e2538a8919311c3fe7e4e9ec634a8d9d4cb62cbb)
---
rt/transports/jms/pom.xml | 12 ++++++------
.../continuations/JMSContinuationProviderTest.java | 8 ++++----
.../jms/continuations/JMSContinuationTest.java | 22 ++++++++--------------
3 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/rt/transports/jms/pom.xml b/rt/transports/jms/pom.xml
index fd42f26f0b..740b224e91 100644
--- a/rt/transports/jms/pom.xml
+++ b/rt/transports/jms/pom.xml
@@ -69,15 +69,15 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>org.easymock</groupId>
- <artifactId>easymock</artifactId>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>${cxf.mockito.version}</version>
<scope>test</scope>
</dependency>
-
<dependency>
- <groupId>org.awaitility</groupId>
- <artifactId>awaitility</artifactId>
- <scope>test</scope>
+ <groupId>org.awaitility</groupId>
+ <artifactId>awaitility</artifactId>
+ <scope>test</scope>
</dependency>
<dependency>
<groupId>org.apache.cxf</groupId>
diff --git
a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
index 800d9fa883..faeb2ddbf4 100644
---
a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
+++
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationProviderTest.java
@@ -27,13 +27,13 @@ import org.apache.cxf.message.ExchangeImpl;
import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
-import org.easymock.EasyMock;
import org.junit.AfterClass;
import org.junit.Test;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
public class JMSContinuationProviderTest {
@@ -50,7 +50,7 @@ public class JMSContinuationProviderTest {
exchange.setOneWay(true);
Message m = new MessageImpl();
m.setExchange(exchange);
- Counter counter = EasyMock.createMock(Counter.class);
+ Counter counter = mock(Counter.class);
JMSContinuationProvider provider =
new JMSContinuationProvider(null, m, null, counter);
assertNull(provider.getContinuation());
@@ -60,7 +60,7 @@ public class JMSContinuationProviderTest {
public void testGetNewContinuation() {
Message m = new MessageImpl();
m.setExchange(new ExchangeImpl());
- Counter counter = EasyMock.createMock(Counter.class);
+ Counter counter = mock(Counter.class);
JMSContinuationProvider provider =
new JMSContinuationProvider(bus, m, null, counter);
Continuation cw = provider.getContinuation();
@@ -72,7 +72,7 @@ public class JMSContinuationProviderTest {
public void testGetExistingContinuation() {
Message m = new MessageImpl();
m.setExchange(new ExchangeImpl());
- Counter counter = EasyMock.createMock(Counter.class);
+ Counter counter = mock(Counter.class);
JMSContinuation cw = new JMSContinuation(bus, m, null, counter);
m.put(JMSContinuation.class, cw);
JMSContinuationProvider provider = new JMSContinuationProvider(null,
m, null, counter);
diff --git
a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
index 36f42d9484..2ced2880ee 100644
---
a/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
+++
b/rt/transports/jms/src/test/java/org/apache/cxf/transport/jms/continuations/JMSContinuationTest.java
@@ -30,7 +30,6 @@ import org.apache.cxf.message.Message;
import org.apache.cxf.message.MessageImpl;
import org.apache.cxf.transport.MessageObserver;
-import org.easymock.EasyMock;
import org.junit.Assert;
import org.junit.Before;
import org.junit.Test;
@@ -39,6 +38,9 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.times;
+import static org.mockito.Mockito.verify;
public class JMSContinuationTest {
@@ -51,16 +53,16 @@ public class JMSContinuationTest {
m = new MessageImpl();
Exchange exchange = new ExchangeImpl();
m.setExchange(exchange);
- m.setInterceptorChain(EasyMock.createMock(InterceptorChain.class));
+ m.setInterceptorChain(mock(InterceptorChain.class));
exchange.setInMessage(m);
b = BusFactory.getDefaultBus();
- observer = EasyMock.createMock(MessageObserver.class);
+ observer = mock(MessageObserver.class);
}
@Test
public void testInitialStatus() {
- Counter continuations = EasyMock.createMock(Counter.class);
+ Counter continuations = mock(Counter.class);
JMSContinuation cw = new JMSContinuation(b, m, observer,
continuations);
assertTrue(cw.isNew());
assertFalse(cw.isPending());
@@ -83,17 +85,13 @@ public class JMSContinuationTest {
assertFalse(cw.suspend(1000));
Assert.assertEquals(1, continuations.counter.get());
- observer.onMessage(m);
- EasyMock.expectLastCall();
- EasyMock.replay(observer);
-
cw.resume();
Assert.assertEquals(0, continuations.counter.get());
assertFalse(cw.isNew());
assertFalse(cw.isPending());
assertTrue(cw.isResumed());
- EasyMock.verify(observer);
+ verify(observer, times(1)).onMessage(m);
}
@Test
@@ -104,13 +102,9 @@ public class JMSContinuationTest {
cw.suspend(5000);
assertFalse(cw.suspend(1000));
- observer.onMessage(m);
- EasyMock.expectLastCall();
- EasyMock.replay(observer);
-
cw.resume();
- EasyMock.verify(observer);
+ verify(observer, times(1)).onMessage(m);
}
@Test
