Skip to content

Commit 85a276d

Browse files
slachiewiczslachiewicz
committed
Refactor tests to use Mockito for mocking and assertions
1 parent 19161d6 commit 85a276d

File tree

5 files changed

+39
-72
lines changed

5 files changed

+39
-72
lines changed

‎pom.xml‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -227,11 +227,6 @@ under the License.
227227
<artifactId>commons-io</artifactId>
228228
<version>2.21.0</version>
229229
</dependency>
230-
<dependency>
231-
<groupId>org.easymock</groupId>
232-
<artifactId>easymock</artifactId>
233-
<version>5.6.0</version>
234-
</dependency>
235230

236231
<dependency>
237232
<groupId>org.eclipse.jetty.aggregate</groupId>

‎wagon-provider-api/src/test/java/org/apache/maven/wagon/StreamWagonTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ public void fillInputData(InputData inputData) {
9696
} finally {
9797
wagon.disconnect();
9898
}
99-
verify(listener, times(1)).transferInitiated(any(TransferEvent.class));
99+
verify(listener).transferInitiated(any(TransferEvent.class));
100100
verify(listener, never()).transferStarted(any(TransferEvent.class));
101101
verify(listener, never()).transferCompleted(any(TransferEvent.class));
102102
}
@@ -127,7 +127,7 @@ public void fillOutputData(OutputData inputData) {
127127
} finally {
128128
wagon.disconnect();
129129
}
130-
verify(listener, times(1)).transferInitiated(any(TransferEvent.class));
130+
verify(listener).transferInitiated(any(TransferEvent.class));
131131
verify(listener, never()).transferStarted(any(TransferEvent.class));
132132
verify(listener, never()).transferCompleted(any(TransferEvent.class));
133133
}
@@ -212,7 +212,7 @@ public void fillInputData(InputData inputData)
212212
} finally {
213213
wagon.disconnect();
214214
}
215-
verify(listener, times(1)).transferInitiated(any(TransferEvent.class));
215+
verify(listener).transferInitiated(any(TransferEvent.class));
216216
}
217217

218218
@Test

‎wagon-provider-test/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,8 +45,8 @@ under the License.
4545
<artifactId>plexus-utils</artifactId>
4646
</dependency>
4747
<dependency>
48-
<groupId>org.easymock</groupId>
49-
<artifactId>easymock</artifactId>
48+
<groupId>org.mockito</groupId>
49+
<artifactId>mockito-core</artifactId>
5050
<scope>compile</scope>
5151
</dependency>
5252
<dependency>

‎wagon-provider-test/src/main/java/org/apache/maven/wagon/StreamingWagonTestCase.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ private int putStream() throws Exception {
230230

231231
disconnectWagon(wagon);
232232

233-
verifyMock(progressAnswer, content.length());
233+
assertEquals(content.length(), progressAnswer.getSize());
234234
return content.length();
235235
}
236236

@@ -261,6 +261,6 @@ private void getStream(int expectedSize) throws Exception {
261261

262262
disconnectWagon(wagon);
263263

264-
verifyMock(progressAnswer, expectedSize);
264+
assertEquals(expectedSize, progressAnswer.getSize());
265265
}
266266
}

‎wagon-provider-test/src/main/java/org/apache/maven/wagon/WagonTestCase.java‎

Lines changed: 32 additions & 60 deletions
Original file line numberDiff line numberDiff line change
@@ -39,33 +39,29 @@
3939
import org.apache.maven.wagon.resource.Resource;
4040
import org.codehaus.plexus.PlexusTestCase;
4141
import org.codehaus.plexus.util.FileUtils;
42-
import org.easymock.IAnswer;
4342
import org.junit.Assume;
43+
import org.mockito.invocation.InvocationOnMock;
44+
import org.mockito.stubbing.Answer;
4445
import org.slf4j.Logger;
4546
import org.slf4j.LoggerFactory;
4647

47-
import static org.easymock.EasyMock.anyInt;
48-
import static org.easymock.EasyMock.anyObject;
49-
import static org.easymock.EasyMock.anyString;
50-
import static org.easymock.EasyMock.createMock;
51-
import static org.easymock.EasyMock.eq;
52-
import static org.easymock.EasyMock.expectLastCall;
53-
import static org.easymock.EasyMock.getCurrentArguments;
54-
import static org.easymock.EasyMock.replay;
55-
import static org.easymock.EasyMock.reset;
56-
import static org.easymock.EasyMock.verify;
48+
import static org.mockito.ArgumentMatchers.any;
49+
import static org.mockito.ArgumentMatchers.anyInt;
50+
import static org.mockito.ArgumentMatchers.eq;
51+
import static org.mockito.Mockito.doAnswer;
52+
import static org.mockito.Mockito.mock;
5753

5854
/**
5955
* @author <a href="mailto:[email protected]">Jason van Zyl</a>
6056
*/
6157
public abstract class WagonTestCase extends PlexusTestCase {
6258
protected static Logger logger = LoggerFactory.getLogger(WagonTestCase.class);
6359

64-
static final class ProgressAnswer implements IAnswer {
60+
static final class ProgressAnswer implements Answer<Object> {
6561
private int size;
6662

67-
public Object answer() throws Throwable {
68-
int length = (Integer) getCurrentArguments()[2];
63+
public Object answer(InvocationOnMock invocation) {
64+
int length = invocation.getArgument(2);
6965
size += length;
7066
return null;
7167
}
@@ -110,7 +106,7 @@ public int getSize() {
110106
protected void setUp() throws Exception {
111107
checksumObserver = new ChecksumObserver();
112108

113-
mockTransferListener = createMock(TransferListener.class);
109+
mockTransferListener = mock(TransferListener.class);
114110

115111
super.setUp();
116112
}
@@ -315,7 +311,7 @@ protected ProgressAnswer setupGetIfNewerTest(Wagon wagon, boolean expectedResult
315311
protected void assertGetIfNewerTest(ProgressAnswer progressAnswer, boolean expectedResult, int expectedSize)
316312
throws IOException {
317313
if (expectedResult) {
318-
verifyMock(progressAnswer, expectedSize);
314+
assertEquals(expectedSize, progressAnswer.getSize());
319315

320316
assertNotNull("check checksum is not null", checksumObserver.getActualChecksum());
321317

@@ -329,10 +325,6 @@ protected void assertGetIfNewerTest(ProgressAnswer progressAnswer, boolean expec
329325
String destContent = FileUtils.fileRead(destFile);
330326
assertEquals(sourceContent, destContent);
331327
} else {
332-
verify(mockTransferListener);
333-
334-
reset(mockTransferListener);
335-
336328
assertNull("check checksum is null", checksumObserver.getActualChecksum());
337329

338330
assertFalse(destFile.exists());
@@ -349,11 +341,6 @@ private void replaceMockForSkippedGetIfNewer(Wagon wagon, int expectedSize) {
349341
// TODO: transfer skipped event?
350342
// mockTransferListener.transferSkipped( createTransferEvent( wagon, resource, TransferEvent.TRANSFER_STARTED,
351343
// TransferEvent.REQUEST_GET, destFile ) );
352-
353-
mockTransferListener.debug(anyString());
354-
expectLastCall().anyTimes();
355-
356-
replay(mockTransferListener);
357344
}
358345

359346
public void testWagonPutDirectory() throws Exception {
@@ -802,7 +789,7 @@ protected void putFile(String resourceName, String testFileName, String content)
802789

803790
disconnectWagon(wagon);
804791

805-
verifyMock(progressAnswer, content.length());
792+
assertEquals(content.length(), progressAnswer.getSize());
806793
}
807794

808795
protected ProgressAnswer replayMockForPut(String resourceName, String content, Wagon wagon) {
@@ -814,21 +801,22 @@ protected ProgressAnswer replayMockForPut(String resourceName, String content, W
814801
resource.setLastModified(sourceFile.lastModified());
815802
mockTransferListener.transferStarted(createTransferEvent(
816803
wagon, resource, TransferEvent.TRANSFER_STARTED, TransferEvent.REQUEST_PUT, sourceFile));
817-
mockTransferListener.transferProgress(
818-
eq(createTransferEvent(
819-
wagon, resource, TransferEvent.TRANSFER_PROGRESS, TransferEvent.REQUEST_PUT, sourceFile)),
820-
anyObject(byte[].class),
821-
anyInt());
822804
ProgressAnswer progressAnswer = new ProgressAnswer();
823-
expectLastCall().andStubAnswer(progressAnswer);
824-
825-
mockTransferListener.debug(anyString());
826-
expectLastCall().anyTimes();
805+
doAnswer(progressAnswer)
806+
.when(mockTransferListener)
807+
.transferProgress(
808+
eq(createTransferEvent(
809+
wagon,
810+
resource,
811+
TransferEvent.TRANSFER_PROGRESS,
812+
TransferEvent.REQUEST_PUT,
813+
sourceFile)),
814+
any(byte[].class),
815+
anyInt());
827816

828817
mockTransferListener.transferCompleted(createTransferEvent(
829818
wagon, resource, TransferEvent.TRANSFER_COMPLETED, TransferEvent.REQUEST_PUT, sourceFile));
830819

831-
replay(mockTransferListener);
832820
return progressAnswer;
833821
}
834822

@@ -861,15 +849,7 @@ protected void getFile(int expectedSize) throws Exception {
861849

862850
disconnectWagon(wagon);
863851

864-
verifyMock(progressAnswer, expectedSize);
865-
}
866-
867-
protected void verifyMock(ProgressAnswer progressAnswer, int length) {
868-
verify(mockTransferListener);
869-
870-
assertEquals(length, progressAnswer.getSize());
871-
872-
reset(mockTransferListener);
852+
assertEquals(expectedSize, progressAnswer.getSize());
873853
}
874854

875855
protected void disconnectWagon(Wagon wagon) throws ConnectionException {
@@ -907,26 +887,18 @@ protected ProgressAnswer replaceMockForGet(Wagon wagon, int expectedSize) {
907887
TransferEvent te =
908888
createTransferEvent(wagon, resource, TransferEvent.TRANSFER_STARTED, TransferEvent.REQUEST_GET, null);
909889
mockTransferListener.transferStarted(te);
910-
mockTransferListener.transferProgress(
911-
eq(new TransferEvent(wagon, resource, TransferEvent.TRANSFER_PROGRESS, TransferEvent.REQUEST_GET)),
912-
anyObject(byte[].class),
913-
anyInt());
914-
915890
ProgressAnswer progressAnswer = new ProgressAnswer();
916-
917-
if (assertOnTransferProgress()) {
918-
expectLastCall().andAnswer(progressAnswer);
919-
} else {
920-
expectLastCall().andAnswer(progressAnswer);
921-
expectLastCall().anyTimes();
922-
}
923-
mockTransferListener.debug(anyString());
924-
expectLastCall().anyTimes();
891+
doAnswer(progressAnswer)
892+
.when(mockTransferListener)
893+
.transferProgress(
894+
eq(new TransferEvent(
895+
wagon, resource, TransferEvent.TRANSFER_PROGRESS, TransferEvent.REQUEST_GET)),
896+
any(byte[].class),
897+
anyInt());
925898

926899
mockTransferListener.transferCompleted(createTransferEvent(
927900
wagon, resource, TransferEvent.TRANSFER_COMPLETED, TransferEvent.REQUEST_GET, destFile));
928901

929-
replay(mockTransferListener);
930902
return progressAnswer;
931903
}
932904

0 commit comments

Comments
 (0)