Skip to content

Commit 0d014bc

Browse files
slachiewiczslachiewicz
committed
Revert not necessary for Mockito code cleanups
1 parent 4f12030 commit 0d014bc

25 files changed

+74
-74
lines changed

‎ocpp-common/src/test/java/eu/chargetime/ocpp/test/ClientTest.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ public void connect_connects() {
7777
client.connect(someUrl, events);
7878

7979
// Then
80-
verify(session).open(eq(someUrl), any());
80+
verify(session, times(1)).open(eq(someUrl), any());
8181
}
8282

8383
@Test
@@ -89,7 +89,7 @@ public void connect_connectionOpenedEvent() {
8989
this.eventHandler.handleConnectionOpened();
9090

9191
// Then
92-
verify(events).connectionOpened();
92+
verify(events, times(1)).connectionOpened();
9393
verify(events, never()).connectionClosed();
9494
}
9595

@@ -102,7 +102,7 @@ public void connect_connectionClosedEvent() {
102102
this.eventHandler.handleConnectionClosed();
103103

104104
// Then
105-
verify(events).connectionClosed();
105+
verify(events, times(1)).connectionClosed();
106106
verify(events, never()).connectionOpened();
107107
}
108108

@@ -113,7 +113,7 @@ public void send_aMessage_isCommunicated() throws Exception {
113113

114114
// Then
115115
// TODO action and uuid should not be nullable
116-
verify(session).sendRequest(nullable(String.class), eq(request), nullable(String.class));
116+
verify(session, times(1)).sendRequest(nullable(String.class), eq(request), nullable(String.class));
117117
}
118118

119119
@Test
@@ -153,7 +153,7 @@ public void handleRequest_callsFeatureHandleRequest() throws UnsupportedFeatureE
153153
eventHandler.handleRequest(request);
154154

155155
// Then
156-
verify(feature).handleRequest(any(), eq(request));
156+
verify(feature, times(1)).handleRequest(any(), eq(request));
157157
}
158158

159159
@Test
@@ -162,6 +162,6 @@ public void send_aMessage_validatesMessage() throws Exception {
162162
client.send(request);
163163

164164
// Then
165-
verify(request).validate();
165+
verify(request, times(1)).validate();
166166
}
167167
}

‎ocpp-common/src/test/java/eu/chargetime/ocpp/test/CommunicatorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ public void sendCall_aNormalRequestAndRadioThrowsNotConnectedException_onErrorIs
126126
communicator.sendCall(uniqueId, action, normalRequest);
127127

128128
// Then
129-
verify(events).onError(eq(uniqueId), any(), any(), any());
129+
verify(events, times(1)).onError(eq(uniqueId), any(), any(), any());
130130
}
131131

132132
@Test
@@ -164,7 +164,7 @@ public void sendCall_queueNotEmpty_messagesAreProcessInSequence() throws Excepti
164164

165165
// Then
166166
verify(receiver, times(2)).send(eq(firstId));
167-
verify(receiver).send(eq(secondId));
167+
verify(receiver, times(1)).send(eq(secondId));
168168
}
169169

170170
@Test
@@ -222,7 +222,7 @@ public boolean validate() {
222222
communicator.sendCallResult(uniqueId, action, conf);
223223

224224
// Then
225-
verify(handler).onConfirmationCompleted();
225+
verify(handler, times(1)).onConfirmationCompleted();
226226
}
227227

228228
@Test

‎ocpp-common/src/test/java/eu/chargetime/ocpp/test/ServerTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,6 @@ public void setup() {
6565
UUID sessionId = UUID.randomUUID();
6666
when(request.validate()).thenReturn(true);
6767
when(session.getSessionId()).thenReturn(sessionId);
68-
// when(session.storeRequest(any())).thenReturn(UUID.randomUUID().toString());
6968
doAnswer(invocation -> listenerEvents = invocation.getArgument(2, ListenerEvents.class))
7069
.when(listener)
7170
.open(anyString(), anyInt(), any());
@@ -90,7 +89,7 @@ public void newSession_serverIsListening_sessionIsAccepted() {
9089
listenerEvents.newSession(session, information);
9190

9291
// Then
93-
verify(session).accept(any());
92+
verify(session, times(1)).accept(any());
9493
}
9594

9695
@Test
@@ -102,7 +101,7 @@ public void newSession_serverIsListening_callbackWithIndex0() {
102101
listenerEvents.newSession(session, information);
103102

104103
// Then
105-
verify(serverEvents).newSession(any(UUID.class), eq(information));
104+
verify(serverEvents, times(1)).newSession(any(UUID.class), eq(information));
106105
}
107106

108107
@Test
@@ -116,7 +115,7 @@ public void send_aMessage_isCommunicated() throws Exception {
116115

117116
// Then
118117
// TODO action and uuid should not be nullable
119-
verify(session).sendRequest(nullable(String.class), eq(request), nullable(String.class));
118+
verify(session, times(1)).sendRequest(nullable(String.class), eq(request), nullable(String.class));
120119
}
121120

122121
@Test
@@ -129,7 +128,7 @@ public void handleRequest_callsFeatureHandleRequest() throws UnsupportedFeatureE
129128
sessionEvents.handleRequest(request);
130129

131130
// Then
132-
verify(feature).handleRequest(any(UUID.class), eq(request));
131+
verify(feature, times(1)).handleRequest(any(UUID.class), eq(request));
133132
}
134133

135134
@Test
@@ -142,6 +141,6 @@ public void send_aMessage_validatesMessage() throws Exception {
142141
server.send(sessionIndex, request);
143142

144143
// Then
145-
verify(request).validate();
144+
verify(request, times(1)).validate();
146145
}
147146
}

‎ocpp-common/src/test/java/eu/chargetime/ocpp/test/SessionTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ public boolean validate() {
104104

105105
// Then
106106
// TODO uniqueid should not be nullable
107-
verify(communicator).sendCall(nullable(String.class), eq(someAction), eq(someRequest));
107+
verify(communicator, times(1)).sendCall(nullable(String.class), eq(someAction), eq(someRequest));
108108
}
109109

110110
@Test
@@ -117,7 +117,7 @@ public void sendRequest_someUniqueId_sendsUniqueIdToCommunicator() {
117117

118118
// Then
119119
// TODO uuid and request should not be nullable
120-
verify(communicator).sendCall(eq(someUniqueId), nullable(String.class), nullable(Request.class));
120+
verify(communicator, times(1)).sendCall(eq(someUniqueId), nullable(String.class), nullable(Request.class));
121121
}
122122

123123
@Test
@@ -136,7 +136,7 @@ public boolean validate() {
136136
session.sendConfirmation(someUniqueId, action, conf);
137137

138138
// Then
139-
verify(communicator).sendCallResult(eq(someUniqueId), eq(action), eq(conf));
139+
verify(communicator, times(1)).sendCallResult(eq(someUniqueId), eq(action), eq(conf));
140140
}
141141

142142
@Test
@@ -148,7 +148,7 @@ public void open_connectsViaCommunicator() {
148148
session.open(someUri, null);
149149

150150
// Then
151-
verify(communicator).connect(eq(someUri), any());
151+
verify(communicator, times(1)).connect(eq(someUri), any());
152152
}
153153

154154
@Test
@@ -165,7 +165,7 @@ public void onCall_unhandledCallback_callSendCallError() throws Exception {
165165

166166
// then
167167
// TODO action should not be nullable
168-
verify(communicator).sendCallError(eq(someId), nullable(String.class), anyString(), anyString());
168+
verify(communicator, times(1)).sendCallError(eq(someId), nullable(String.class), anyString(), anyString());
169169
}
170170

171171
@Test
@@ -191,7 +191,7 @@ public boolean validate() {
191191

192192
// then
193193
// TODO action should not be nullable
194-
verify(communicator).sendCallResult(anyString(), nullable(String.class), eq(aConfirmation));
194+
verify(communicator, times(1)).sendCallResult(anyString(), nullable(String.class), eq(aConfirmation));
195195
}
196196

197197
@Test
@@ -212,7 +212,7 @@ public void onCall_callbackThrowsException_callSendCallResult() throws Exception
212212

213213
// then
214214
// TODO uniqueid should not be nullable
215-
verify(communicator).sendCallError(eq(someId), nullable(String.class), anyString(), anyString());
215+
verify(communicator, times(1)).sendCallError(eq(someId), nullable(String.class), anyString(), anyString());
216216
}
217217

218218
@Test
@@ -221,7 +221,7 @@ public void close_disconnects() {
221221
session.close();
222222

223223
// Then
224-
verify(communicator).disconnect();
224+
verify(communicator, times(1)).disconnect();
225225
}
226226

227227
@Test
@@ -235,6 +235,6 @@ public void onCall_unknownAction_callSendCallError() {
235235

236236
// Then
237237
// TODO uniqueid should not be nullable
238-
verify(communicator).sendCallError(eq(someId), nullable(String.class), anyString(), anyString());
238+
verify(communicator, times(1)).sendCallError(eq(someId), nullable(String.class), anyString(), anyString());
239239
}
240240
}

‎ocpp-common/src/test/java/eu/chargetime/ocpp/test/SimpleRequestDispatcherTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,8 @@ of this software and associated documentation files (the "Software"), to deal
2525
SOFTWARE.
2626
*/
2727

28-
import static org.junit.Assert.assertEquals;
28+
import static org.hamcrest.CoreMatchers.is;
29+
import static org.junit.Assert.assertThat;
2930
import static org.mockito.ArgumentMatchers.any;
3031
import static org.mockito.Mockito.when;
3132

@@ -34,7 +35,6 @@ of this software and associated documentation files (the "Software"), to deal
3435
import eu.chargetime.ocpp.UnsupportedFeatureException;
3536
import eu.chargetime.ocpp.model.Confirmation;
3637
import java.util.concurrent.CompletableFuture;
37-
3838
import org.junit.Test;
3939
import org.junit.runner.RunWith;
4040
import org.mockito.Mock;
@@ -65,6 +65,6 @@ public void fulfill_throwsException_completesWithException() throws UnsupportedF
6565
sut.fulfill(promise, eventsMock, null);
6666

6767
// Then
68-
assertEquals(result[0], expectedException);
68+
assertThat(result[0], is(expectedException));
6969
}
7070
}

‎ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientCoreProfileTest.java‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -303,7 +303,7 @@ public void handleRequest_aChangeAvailabilityRequest_callsHandleChangeAvailabili
303303
core.handleRequest(SESSION_NULL, request);
304304

305305
// Then
306-
verify(handler).handleChangeAvailabilityRequest(eq(request));
306+
verify(handler, times(1)).handleChangeAvailabilityRequest(eq(request));
307307
}
308308

309309
@Test
@@ -316,7 +316,7 @@ public void handleRequest_aChangeAvailabilityRequest_callsHandleChangeAvailabili
316316
core.handleRequest(SESSION_NULL, request);
317317

318318
// Then
319-
verify(handler).handleRemoteStartTransactionRequest(eq(request));
319+
verify(handler, times(1)).handleRemoteStartTransactionRequest(eq(request));
320320
}
321321

322322
@Test
@@ -329,7 +329,7 @@ public void handleRequest_aChangeAvailabilityRequest_callsHandleChangeAvailabili
329329
core.handleRequest(SESSION_NULL, request);
330330

331331
// Then
332-
verify(handler).handleRemoteStopTransactionRequest(eq(request));
332+
verify(handler, times(1)).handleRemoteStopTransactionRequest(eq(request));
333333
}
334334

335335
@Test
@@ -341,7 +341,7 @@ public void handleRequest_aResetRequest_callsHandleResetRequest() {
341341
core.handleRequest(SESSION_NULL, request);
342342

343343
// Then
344-
verify(handler).handleResetRequest(eq(request));
344+
verify(handler, times(1)).handleResetRequest(eq(request));
345345
}
346346

347347
@Test
@@ -353,7 +353,7 @@ public void handleRequest_anUnlockConnectorRequest_callsHandleUnlockConnectorReq
353353
core.handleRequest(SESSION_NULL, request);
354354

355355
// Then
356-
verify(handler).handleUnlockConnectorRequest(eq(request));
356+
verify(handler, times(1)).handleUnlockConnectorRequest(eq(request));
357357
}
358358

359359
@Test
@@ -380,7 +380,7 @@ public void handleRequest_aGetConfigurationRequest_callsHandleGetConfigurationRe
380380
core.handleRequest(SESSION_NULL, request);
381381

382382
// Then
383-
verify(handler).handleGetConfigurationRequest(eq(request));
383+
verify(handler, times(1)).handleGetConfigurationRequest(eq(request));
384384
}
385385

386386
@Test
@@ -406,7 +406,7 @@ public void handleRequest_aDataTransferRequest_callsHandleDataTransferRequest()
406406
core.handleRequest(SESSION_NULL, request);
407407

408408
// Then
409-
verify(handler).handleDataTransferRequest(eq(request));
409+
verify(handler, times(1)).handleDataTransferRequest(eq(request));
410410
}
411411

412412
@Test
@@ -431,7 +431,7 @@ public void handleRequest_aChangeConfigurationRequest_callsHandleChangeConfigura
431431
core.handleRequest(SESSION_NULL, request);
432432

433433
// Then
434-
verify(handler).handleChangeConfigurationRequest(eq(request));
434+
verify(handler, times(1)).handleChangeConfigurationRequest(eq(request));
435435
}
436436

437437
@Test
@@ -457,7 +457,7 @@ public void handleRequest_aClearCacheRequest_callsHandleClearCacheRequest() {
457457
core.handleRequest(SESSION_NULL, request);
458458

459459
// Then
460-
verify(handler).handleClearCacheRequest(request);
460+
verify(handler, times(1)).handleClearCacheRequest(request);
461461
}
462462

463463
@Test

‎ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientFirmwareManagementProfileTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ public void handleRequest_aGetDiagnosticsRequest_callsHandleGetDiagnosticsReques
8686
profile.handleRequest(SESSION_NULL, request);
8787

8888
// Then
89-
verify(handler).handleGetDiagnosticsRequest(eq(request));
89+
verify(handler, times(1)).handleGetDiagnosticsRequest(eq(request));
9090
}
9191

9292
@Test
@@ -98,7 +98,7 @@ public void handleRequest_aUpdateFirmwareRequest_callsHandleUpdateFirmwareReques
9898
profile.handleRequest(SESSION_NULL, request);
9999

100100
// Then
101-
verify(handler).handleUpdateFirmwareRequest(eq(request));
101+
verify(handler, times(1)).handleUpdateFirmwareRequest(eq(request));
102102
}
103103

104104
@Test

‎ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientLocalAuthListProfileTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void handleRequest_GetLocalListVersion_callsHandleGetLocalListVersionRequ
8989
profile.handleRequest(SESSION_NULL, request);
9090

9191
// Then
92-
verify(handler).handleGetLocalListVersionRequest(eq(request));
92+
verify(handler, times(1)).handleGetLocalListVersionRequest(eq(request));
9393
}
9494

9595
public void handleRequest_SendLocalList_callsHandleSendLocalListRequest() {
@@ -100,6 +100,6 @@ public void handleRequest_SendLocalList_callsHandleSendLocalListRequest() {
100100
profile.handleRequest(SESSION_NULL, request);
101101

102102
// Then
103-
verify(handler).handleSendLocalListRequest(eq(request));
103+
verify(handler, times(1)).handleSendLocalListRequest(eq(request));
104104
}
105105
}

‎ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientRemoteTriggerProfileTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ public void handleRequest_TriggerMessageReqest_callsHandleTriggerMessageReqestRe
6868
profile.handleRequest(SESSION_NULL, request);
6969

7070
// Then
71-
verify(handler).handleTriggerMessageRequest(request);
71+
verify(handler, times(1)).handleTriggerMessageRequest(request);
7272
}
7373

7474
@Test

‎ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientReservationProfileTest.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public void handleRequest_aReserveNowRequest_callsHandleReserveNowRequest() {
8989
profile.handleRequest(SESSION_NULL, request);
9090

9191
// Then
92-
verify(handler).handleReserveNowRequest(eq(request));
92+
verify(handler, times(1)).handleReserveNowRequest(eq(request));
9393
}
9494

9595
@Test
@@ -101,6 +101,6 @@ public void handleRequest_aCancelReservationRequest_callsHandleCancelReservation
101101
profile.handleRequest(SESSION_NULL, request);
102102

103103
// Then
104-
verify(handler).handleCancelReservationRequest(eq(request));
104+
verify(handler, times(1)).handleCancelReservationRequest(eq(request));
105105
}
106106
}

0 commit comments

Comments
 (0)