Skip to content

Commit 3e83d94

Browse files
author
Dennis Labordus
committed
Remove code (times(1)) that is not needed in test files.
Signed-off-by: Dennis Labordus <[email protected]>
1 parent 9a4053f commit 3e83d94

10 files changed

+69
-62
lines changed

‎app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResourceAsEditorTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ void list_WhenCalled_ThenItemResponseRetrieved() {
6969
assertEquals(name, xmlPath.get("ListResponse.Item[0].Name"));
7070
assertEquals(version, xmlPath.get("ListResponse.Item[0].Version"));
7171
assertEquals(labels.get(0), xmlPath.get("ListResponse.Item[0].Label"));
72-
verify(compasSclDataService, times(1)).list(type);
72+
verify(compasSclDataService).list(type);
7373
}
7474

7575
@Test
@@ -95,7 +95,7 @@ void listVersionsByUUID_WhenCalled_ThenItemResponseRetrieved() {
9595
assertEquals(uuid.toString(), xmlPath.get("VersionsResponse.HistoryItem[0].Id"));
9696
assertEquals(name, xmlPath.get("VersionsResponse.HistoryItem[0].Name"));
9797
assertEquals(version, xmlPath.get("VersionsResponse.HistoryItem[0].Version"));
98-
verify(compasSclDataService, times(1)).listVersionsByUUID(type, uuid);
98+
verify(compasSclDataService).listVersionsByUUID(type, uuid);
9999
}
100100

101101
@Test
@@ -118,7 +118,7 @@ void findByUUID_WhenCalled_ThenSCLResponseRetrieved() throws IOException {
118118
var xmlPath = response.xmlPath()
119119
.using(xmlPathConfig().declaredNamespace("scl", SCL_NS_URI));
120120
assertEquals(scl, xmlPath.get("GetWsResponse.SclData"));
121-
verify(compasSclDataService, times(1)).findByUUID(type, uuid);
121+
verify(compasSclDataService).findByUUID(type, uuid);
122122
}
123123

124124
@Test
@@ -143,7 +143,7 @@ void findByUUIDAndVersion_WhenCalled_ThenSCLResponseRetrieved() throws IOExcepti
143143
var xmlPath = response.xmlPath()
144144
.using(xmlPathConfig().declaredNamespace("scl", SCL_NS_URI));
145145
assertEquals(scl, xmlPath.get("GetWsResponse.SclData"));
146-
verify(compasSclDataService, times(1)).findByUUID(type, uuid, version);
146+
verify(compasSclDataService).findByUUID(type, uuid, version);
147147
}
148148

149149
@Test
@@ -171,7 +171,7 @@ void create_WhenCalled_ThenServiceCalledAndUUIDRetrieved() throws IOException {
171171
.response();
172172

173173
assertEquals(scl, response.xmlPath().getString("CreateWsResponse.SclData"));
174-
verify(compasSclDataService, times(1)).create(type, name, USERNAME, comment, scl);
174+
verify(compasSclDataService).create(type, name, USERNAME, comment, scl);
175175
}
176176

177177
@Test
@@ -228,7 +228,7 @@ void update_WhenCalled_ThenServiceCalledAndNewUUIDRetrieved() throws IOException
228228
.response();
229229

230230
assertEquals(scl, response.xmlPath().getString("CreateWsResponse.SclData"));
231-
verify(compasSclDataService, times(1)).update(type, uuid, changeSetType, USERNAME, comment, scl);
231+
verify(compasSclDataService).update(type, uuid, changeSetType, USERNAME, comment, scl);
232232
}
233233

234234
@Test
@@ -245,7 +245,7 @@ void deleteAll_WhenCalled_ThenServiceCalled() {
245245
.then()
246246
.statusCode(204);
247247

248-
verify(compasSclDataService, times(1)).delete(type, uuid);
248+
verify(compasSclDataService).delete(type, uuid);
249249
}
250250

251251
@Test
@@ -264,7 +264,7 @@ void deleteVersion_WhenCalled_ThenServiceCalled() {
264264
.then()
265265
.statusCode(204);
266266

267-
verify(compasSclDataService, times(1)).delete(type, uuid, version);
267+
verify(compasSclDataService).delete(type, uuid, version);
268268
}
269269

270270
private String readSCL() throws IOException {

‎app/src/test/java/org/lfenergy/compas/scl/data/rest/v1/CompasSclDataResourceAsReaderTest.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ void list_WhenCalled_ThenItemResponseRetrieved() {
6161
assertEquals(name, xmlPath.get("ListResponse.Item[0].Name"));
6262
assertEquals(version, xmlPath.get("ListResponse.Item[0].Version"));
6363
assertEquals(labels.get(0), xmlPath.get("ListResponse.Item[0].Label"));
64-
verify(compasSclDataService, times(1)).list(type);
64+
verify(compasSclDataService).list(type);
6565
}
6666

6767
@Test
@@ -87,7 +87,7 @@ void listVersionsByUUID_WhenCalled_ThenItemResponseRetrieved() {
8787
assertEquals(uuid.toString(), xmlPath.get("VersionsResponse.HistoryItem[0].Id"));
8888
assertEquals(name, xmlPath.get("VersionsResponse.HistoryItem[0].Name"));
8989
assertEquals(version, xmlPath.get("VersionsResponse.HistoryItem[0].Version"));
90-
verify(compasSclDataService, times(1)).listVersionsByUUID(type, uuid);
90+
verify(compasSclDataService).listVersionsByUUID(type, uuid);
9191
}
9292

9393
@Test
@@ -110,7 +110,7 @@ void findByUUID_WhenCalled_ThenSCLResponseRetrieved() throws IOException {
110110
var xmlPath = response.xmlPath()
111111
.using(xmlPathConfig().declaredNamespace("scl", SCL_NS_URI));
112112
assertEquals(scl, xmlPath.get("GetWsResponse.SclData"));
113-
verify(compasSclDataService, times(1)).findByUUID(type, uuid);
113+
verify(compasSclDataService).findByUUID(type, uuid);
114114
}
115115

116116
@Test
@@ -135,7 +135,7 @@ void findByUUIDAndVersion_WhenCalled_ThenSCLResponseRetrieved() throws IOExcepti
135135
var xmlPath = response.xmlPath()
136136
.using(xmlPathConfig().declaredNamespace("scl", SCL_NS_URI));
137137
assertEquals(scl, xmlPath.get("GetWsResponse.SclData"));
138-
verify(compasSclDataService, times(1)).findByUUID(type, uuid, version);
138+
verify(compasSclDataService).findByUUID(type, uuid, version);
139139
}
140140

141141
@Test

‎app/src/test/java/org/lfenergy/compas/scl/data/websocket/event/CompasSclDataEventHandlerTest.java‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@
3131
import static org.junit.jupiter.api.Assertions.assertEquals;
3232
import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.WEBSOCKET_GENERAL_ERROR_CODE;
3333
import static org.lfenergy.compas.scl.data.exception.CompasSclDataServiceErrorCode.DUPLICATE_SCL_NAME_ERROR_CODE;
34-
import static org.mockito.Mockito.*;
34+
import static org.mockito.Mockito.verify;
35+
import static org.mockito.Mockito.when;
3536

3637
@ExtendWith(MockitoExtension.class)
3738
class CompasSclDataEventHandlerTest {
@@ -57,7 +58,7 @@ void createWebsocketsEvent_WhenCalled_ThenCreateResponseReturned() {
5758

5859
var response = verifyResponse(session, CreateWsResponse.class);
5960
assertEquals(sclData, response.getSclData());
60-
verify(service, times(1)).create(type, name, who, comment, sclData);
61+
verify(service).create(type, name, who, comment, sclData);
6162
}
6263

6364
@Test
@@ -77,7 +78,7 @@ void createWebsocketsEvent_WhenCalledAndCompasExceptionThrownByService_ThenError
7778
eventHandler.createWebsocketsEvent(request);
7879

7980
verifyErrorResponse(session, DUPLICATE_SCL_NAME_ERROR_CODE, errorMessage);
80-
verify(service, times(1)).create(type, name, who, comment, sclData);
81+
verify(service).create(type, name, who, comment, sclData);
8182
}
8283

8384
@Test
@@ -96,7 +97,7 @@ void createWebsocketsEvent_WhenCalledAndRuntimeExceptionThrownByService_ThenErro
9697
eventHandler.createWebsocketsEvent(request);
9798

9899
verifyErrorResponse(session, WEBSOCKET_GENERAL_ERROR_CODE, errorMessage);
99-
verify(service, times(1)).create(type, name, who, comment, sclData);
100+
verify(service).create(type, name, who, comment, sclData);
100101
}
101102

102103
@Test
@@ -113,7 +114,7 @@ void getWebsocketsEvent_WhenCalled_ThenGetResponseReturned() {
113114

114115
var response = verifyResponse(session, GetWsResponse.class);
115116
assertEquals(sclData, response.getSclData());
116-
verify(service, times(1)).findByUUID(type, id);
117+
verify(service).findByUUID(type, id);
117118
}
118119

119120
@Test
@@ -130,7 +131,7 @@ void getWebsocketsEvent_WhenCalledAndCompasExceptionThrownByService_ThenErrorRes
130131
eventHandler.getWebsocketsEvent(request);
131132

132133
verifyErrorResponse(session, DUPLICATE_SCL_NAME_ERROR_CODE, errorMessage);
133-
verify(service, times(1)).findByUUID(type, id);
134+
verify(service).findByUUID(type, id);
134135
}
135136

136137
@Test
@@ -146,7 +147,7 @@ void getWebsocketsEvent_WhenCalledAndRuntimeExceptionThrownByService_ThenErrorRe
146147
eventHandler.getWebsocketsEvent(request);
147148

148149
verifyErrorResponse(session, WEBSOCKET_GENERAL_ERROR_CODE, errorMessage);
149-
verify(service, times(1)).findByUUID(type, id);
150+
verify(service).findByUUID(type, id);
150151
}
151152

152153
@Test
@@ -164,7 +165,7 @@ void getVersionWebsocketsEvent_WhenCalled_ThenGetResponseReturned() {
164165

165166
var response = verifyResponse(session, GetWsResponse.class);
166167
assertEquals(sclData, response.getSclData());
167-
verify(service, times(1)).findByUUID(type, id, version);
168+
verify(service).findByUUID(type, id, version);
168169
}
169170

170171
@Test
@@ -182,7 +183,7 @@ void getVersionWebsocketsEvent_WhenCalledAndCompasExceptionThrownByService_ThenE
182183
eventHandler.getVersionWebsocketsEvent(request);
183184

184185
verifyErrorResponse(session, DUPLICATE_SCL_NAME_ERROR_CODE, errorMessage);
185-
verify(service, times(1)).findByUUID(type, id, version);
186+
verify(service).findByUUID(type, id, version);
186187
}
187188

188189
@Test
@@ -199,7 +200,7 @@ void getVersionWebsocketsEvent_WhenCalledAndRuntimeExceptionThrownByService_Then
199200
eventHandler.getVersionWebsocketsEvent(request);
200201

201202
verifyErrorResponse(session, WEBSOCKET_GENERAL_ERROR_CODE, errorMessage);
202-
verify(service, times(1)).findByUUID(type, id, version);
203+
verify(service).findByUUID(type, id, version);
203204
}
204205

205206
@Test
@@ -219,7 +220,7 @@ void updateWebsocketsEvent_WhenCalled_ThenUpdateResponseReturned() {
219220

220221
var response = verifyResponse(session, UpdateWsResponse.class);
221222
assertEquals(sclData, response.getSclData());
222-
verify(service, times(1)).update(type, id, cst, who, comment, sclData);
223+
verify(service).update(type, id, cst, who, comment, sclData);
223224
}
224225

225226
@Test
@@ -240,7 +241,7 @@ void updateWebsocketsEvent_WhenCalledAndCompasExceptionThrownByService_ThenError
240241
eventHandler.updateWebsocketsEvent(request);
241242

242243
verifyErrorResponse(session, DUPLICATE_SCL_NAME_ERROR_CODE, errorMessage);
243-
verify(service, times(1)).update(type, id, cst, who, comment, sclData);
244+
verify(service).update(type, id, cst, who, comment, sclData);
244245
}
245246

246247
@Test
@@ -260,7 +261,7 @@ void updateWebsocketsEvent_WhenCalledAndRuntimeExceptionThrownByService_ThenErro
260261
eventHandler.updateWebsocketsEvent(request);
261262

262263
verifyErrorResponse(session, WEBSOCKET_GENERAL_ERROR_CODE, errorMessage);
263-
verify(service, times(1)).update(type, id, cst, who, comment, sclData);
264+
verify(service).update(type, id, cst, who, comment, sclData);
264265
}
265266

266267
private Session mockSession() {
@@ -271,16 +272,16 @@ private Session mockSession() {
271272
}
272273

273274
private <T> T verifyResponse(Session session, Class<T> responseClass) {
274-
verify(session, times(1)).getAsyncRemote();
275+
verify(session).getAsyncRemote();
275276
ArgumentCaptor<T> captor = ArgumentCaptor.forClass(responseClass);
276-
verify(session.getAsyncRemote(), times(1)).sendObject(captor.capture());
277+
verify(session.getAsyncRemote()).sendObject(captor.capture());
277278
return captor.getValue();
278279
}
279280

280281
private void verifyErrorResponse(Session session, String errorCode, String errorMessage) {
281-
verify(session, times(1)).getAsyncRemote();
282+
verify(session).getAsyncRemote();
282283
ArgumentCaptor<ErrorResponse> captor = ArgumentCaptor.forClass(ErrorResponse.class);
283-
verify(session.getAsyncRemote(), times(1)).sendObject(captor.capture());
284+
verify(session.getAsyncRemote()).sendObject(captor.capture());
284285
var response = captor.getValue();
285286
assertEquals(1, response.getErrorMessages().size());
286287
var message = response.getErrorMessages().get(0);

‎app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclCreateServerEndpointAsEditorTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,8 @@
2020
import javax.websocket.Session;
2121
import java.net.URI;
2222

23-
import static org.mockito.Mockito.*;
23+
import static org.mockito.Mockito.verify;
24+
import static org.mockito.Mockito.when;
2425

2526
@QuarkusTest
2627
class CompasSclCreateServerEndpointAsEditorTest extends AbstractServerEndpointAsEditorTestSupport {
@@ -50,7 +51,7 @@ void createSCL_WhenCalled_ThenExpectedResponseIsRetrieved() throws Exception {
5051
session.getAsyncRemote().sendText(encoder.encode(request));
5152

5253
assertSclData(sclData);
53-
verify(service, times(1)).create(sclFileTye, name, USERNAME, comment, sclData);
54+
verify(service).create(sclFileTye, name, USERNAME, comment, sclData);
5455
}
5556
}
5657

‎app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpointAsEditorTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
import java.net.URI;
2222
import java.util.UUID;
2323

24-
import static org.mockito.Mockito.*;
24+
import static org.mockito.Mockito.verify;
25+
import static org.mockito.Mockito.when;
2526

2627
@QuarkusTest
2728
class CompasSclGetServerEndpointAsEditorTest extends AbstractServerEndpointAsEditorTestSupport {
@@ -47,7 +48,7 @@ void getSCL_WhenCalled_ThenExpectedResponseIsRetrieved() throws Exception {
4748
session.getAsyncRemote().sendText(encoder.encode(request));
4849

4950
assertSclData(sclData);
50-
verify(service, times(1)).findByUUID(sclFileTye, id);
51+
verify(service).findByUUID(sclFileTye, id);
5152
}
5253
}
5354

‎app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetServerEndpointAsReaderTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,8 @@
2121
import java.net.URI;
2222
import java.util.UUID;
2323

24-
import static org.mockito.Mockito.*;
24+
import static org.mockito.Mockito.verify;
25+
import static org.mockito.Mockito.when;
2526

2627
@QuarkusTest
2728
class CompasSclGetServerEndpointAsReaderTest extends AbstractServerEndpointAsReaderTestSupport {
@@ -47,7 +48,7 @@ void getSCL_WhenCalled_ThenExpectedResponseIsRetrieved() throws Exception {
4748
session.getAsyncRemote().sendText(encoder.encode(request));
4849

4950
assertSclData(sclData);
50-
verify(service, times(1)).findByUUID(sclFileTye, id);
51+
verify(service).findByUUID(sclFileTye, id);
5152
}
5253
}
5354

‎app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpointAsEditorTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
import java.net.URI;
2323
import java.util.UUID;
2424

25-
import static org.mockito.Mockito.*;
25+
import static org.mockito.Mockito.verify;
26+
import static org.mockito.Mockito.when;
2627

2728
@QuarkusTest
2829
class CompasSclGetVersionServerEndpointAsEditorTest extends AbstractServerEndpointAsEditorTestSupport {
@@ -50,7 +51,7 @@ void getVersionSCL_WhenCalled_ThenExpectedResponseIsRetrieved() throws Exception
5051
session.getAsyncRemote().sendText(encoder.encode(request));
5152

5253
assertSclData(sclData);
53-
verify(service, times(1)).findByUUID(sclFileTye, id, version);
54+
verify(service).findByUUID(sclFileTye, id, version);
5455
}
5556
}
5657

‎app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclGetVersionServerEndpointAsReaderTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
import java.net.URI;
2323
import java.util.UUID;
2424

25-
import static org.mockito.Mockito.*;
25+
import static org.mockito.Mockito.verify;
26+
import static org.mockito.Mockito.when;
2627

2728
@QuarkusTest
2829
class CompasSclGetVersionServerEndpointAsReaderTest extends AbstractServerEndpointAsReaderTestSupport {
@@ -50,7 +51,7 @@ void getVersionSCL_WhenCalled_ThenExpectedResponseIsRetrieved() throws Exception
5051
session.getAsyncRemote().sendText(encoder.encode(request));
5152

5253
assertSclData(sclData);
53-
verify(service, times(1)).findByUUID(sclFileTye, id, version);
54+
verify(service).findByUUID(sclFileTye, id, version);
5455
}
5556
}
5657

‎app/src/test/java/org/lfenergy/compas/scl/data/websocket/v1/CompasSclUpdateServerEndpointAsEditorTest.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,8 @@
2222
import java.net.URI;
2323
import java.util.UUID;
2424

25-
import static org.mockito.Mockito.*;
25+
import static org.mockito.Mockito.verify;
26+
import static org.mockito.Mockito.when;
2627

2728
@QuarkusTest
2829
class CompasSclUpdateServerEndpointAsEditorTest extends AbstractServerEndpointAsEditorTestSupport {
@@ -54,7 +55,7 @@ void updateSCL_WhenCalled_ThenExpectedResponseIsRetrieved() throws Exception {
5455
session.getAsyncRemote().sendText(encoder.encode(request));
5556

5657
assertSclData(sclData);
57-
verify(service, times(1)).update(sclFileTye, id, cst, USERNAME, comment, sclData);
58+
verify(service).update(sclFileTye, id, cst, USERNAME, comment, sclData);
5859
}
5960
}
6061

0 commit comments

Comments
 (0)