Skip to content

Commit 27035f3

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 18536e8 commit 27035f3

File tree

9 files changed

+39
-32
lines changed

9 files changed

+39
-32
lines changed

‎app/src/test/java/org/lfenergy/compas/scl/validator/rest/CompasSclValidatorConfigurationTest.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@
1212
import java.nio.file.Path;
1313

1414
import static org.junit.jupiter.api.Assertions.assertNotNull;
15-
import static org.mockito.Mockito.*;
15+
import static org.mockito.Mockito.verify;
16+
import static org.mockito.Mockito.when;
1617

1718
@ExtendWith(MockitoExtension.class)
1819
class CompasSclValidatorConfigurationTest {
@@ -32,7 +33,7 @@ void createOclFileCollector_WhenCalled_ThenObjectReturned() {
3233

3334
assertNotNull(new CompasSclValidatorConfiguration().createOclFileCollector(validatorProperties));
3435

35-
verify(validatorProperties, times(1)).oclCustomDirectory();
36+
verify(validatorProperties).oclCustomDirectory();
3637
}
3738

3839
@Test
@@ -43,7 +44,7 @@ void createSclRiseClipseValidator_WhenCalled_ThenObjectReturned() {
4344
oclFileCollector,
4445
validatorProperties));
4546

46-
verify(validatorProperties, times(1)).tempDirectory();
47+
verify(validatorProperties).tempDirectory();
4748
}
4849

4950
@Test
@@ -58,6 +59,6 @@ void createNsdocFinder_WhenCalled_ThenObjectReturned() {
5859
assertNotNull(new CompasSclValidatorConfiguration().createNsdocFinder(
5960
validatorProperties));
6061

61-
verify(validatorProperties, times(1)).nsdocDirectory();
62+
verify(validatorProperties).nsdocDirectory();
6263
}
6364
}

‎app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/NsdocResourceTest.java

+5-4
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
import static org.lfenergy.compas.core.commons.CommonConstants.COMPAS_COMMONS_V1_NS_URI;
2525
import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI;
2626
import static org.lfenergy.compas.scl.validator.rest.SclResourceConstants.ID_PARAM;
27-
import static org.mockito.Mockito.*;
27+
import static org.mockito.Mockito.verify;
28+
import static org.mockito.Mockito.when;
2829

2930
@QuarkusTest
3031
@TestHTTPEndpoint(NsdocResource.class)
@@ -52,7 +53,7 @@ void list_WhenCalled_ThenListReturned() {
5253
var files = xmlPath.getList("svs:NsdocListResponse.svs:NsdocFile");
5354
assertNotNull(files);
5455
assertEquals(1, files.size());
55-
verify(nsdocService, times(1)).list();
56+
verify(nsdocService).list();
5657
}
5758

5859
@Test
@@ -78,7 +79,7 @@ void get_WhenCalled_ThenContentReturned() {
7879
var nsdocFile = xmlPath.getString("svs:NsdocResponse.svs:NsdocFile");
7980
assertNotNull(nsdocFile);
8081
assertEquals(result, nsdocFile);
81-
verify(nsdocService, times(1)).get(id);
82+
verify(nsdocService).get(id);
8283
}
8384

8485
@Test
@@ -107,6 +108,6 @@ void get_WhenCalledWithUnknownFile_Then404Returned() {
107108
var code = xmlPath.getString("commons:ErrorResponse.commons:ErrorMessage.commons:Code");
108109
assertEquals(SclValidatorErrorCode.NSDOC_FILE_NOT_FOUND, code);
109110

110-
verify(nsdocService, times(1)).get(id);
111+
verify(nsdocService).get(id);
111112
}
112113
}

‎app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorResourceTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
import static org.junit.jupiter.api.Assertions.assertNotNull;
2525
import static org.lfenergy.compas.scl.validator.SclValidatorConstants.SCL_VALIDATOR_SERVICE_V1_NS_URI;
2626
import static org.lfenergy.compas.scl.validator.rest.SclResourceConstants.TYPE_PATH_PARAM;
27-
import static org.mockito.Mockito.*;
27+
import static org.mockito.Mockito.verify;
28+
import static org.mockito.Mockito.when;
2829

2930
@QuarkusTest
3031
@TestHTTPEndpoint(SclValidatorResource.class)
@@ -58,6 +59,6 @@ void validate_WhenCalled_ThenExpectedResponseIsRetrieved() throws IOException {
5859
var errors = xmlPath.getList("svs:SclValidateResponse.svs:ValidationErrors");
5960
assertNotNull(errors);
6061
assertEquals(1, errors.size());
61-
verify(sclValidatorService, times(1)).validate(sclFileTye, request.getSclData());
62+
verify(sclValidatorService).validate(sclFileTye, request.getSclData());
6263
}
6364
}

‎app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/SclValidatorServerEndpointTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,8 @@
3232
import static org.junit.jupiter.api.Assertions.assertEquals;
3333
import static org.junit.jupiter.api.Assertions.assertNotNull;
3434
import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.WEBSOCKET_DECODER_ERROR_CODE;
35-
import static org.mockito.Mockito.*;
35+
import static org.mockito.Mockito.verify;
36+
import static org.mockito.Mockito.when;
3637

3738
@QuarkusTest
3839
@TestSecurity(user = "test-user")
@@ -61,7 +62,7 @@ void validate_WhenCalled_ThenExpectedResponseIsRetrieved() throws Exception {
6162

6263
assertNotNull(validationErrors.poll(10, TimeUnit.SECONDS));
6364
assertEquals(0, validationErrors.size());
64-
verify(sclValidatorService, times(1)).validate(sclFileTye, request.getSclData());
65+
verify(sclValidatorService).validate(sclFileTye, request.getSclData());
6566
}
6667
}
6768

‎app/src/test/java/org/lfenergy/compas/scl/validator/rest/v1/event/SclValidatorEventHandlerTest.java

+11-10
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,8 @@
2424
import static org.junit.jupiter.api.Assertions.assertEquals;
2525
import static org.lfenergy.compas.core.commons.exception.CompasErrorCode.WEBSOCKET_GENERAL_ERROR_CODE;
2626
import static org.lfenergy.compas.scl.validator.exception.SclValidatorErrorCode.LOADING_OCL_FILES_FAILED;
27-
import static org.mockito.Mockito.*;
27+
import static org.mockito.Mockito.verify;
28+
import static org.mockito.Mockito.when;
2829

2930
@ExtendWith(MockitoExtension.class)
3031
class SclValidatorEventHandlerTest {
@@ -49,13 +50,13 @@ void validateWebsocketsEvent_WhenCalled_ThenExpectedCallsAreMade() {
4950

5051
eventHandler.validateWebsocketsEvent(request);
5152

52-
verify(session, times(1)).getAsyncRemote();
53+
verify(session).getAsyncRemote();
5354
ArgumentCaptor<SclValidateResponse> captor = ArgumentCaptor.forClass(SclValidateResponse.class);
54-
verify(async, times(1)).sendObject(captor.capture());
55+
verify(async).sendObject(captor.capture());
5556
var response = captor.getValue();
5657
assertEquals(veList, response.getValidationErrorList());
5758

58-
verify(service, times(1)).validate(type, sclData);
59+
verify(service).validate(type, sclData);
5960
}
6061

6162
@Test
@@ -74,16 +75,16 @@ void validateWebsocketsEvent_WhenCalledAndCompasExceptionThrownByService_ThenErr
7475

7576
eventHandler.validateWebsocketsEvent(request);
7677

77-
verify(session, times(1)).getAsyncRemote();
78+
verify(session).getAsyncRemote();
7879
ArgumentCaptor<ErrorResponse> captor = ArgumentCaptor.forClass(ErrorResponse.class);
79-
verify(async, times(1)).sendObject(captor.capture());
80+
verify(async).sendObject(captor.capture());
8081
var response = captor.getValue();
8182
assertEquals(1, response.getErrorMessages().size());
8283
var message = response.getErrorMessages().get(0);
8384
assertEquals(LOADING_OCL_FILES_FAILED, message.getCode());
8485
assertEquals(errorMessage, message.getMessage());
8586

86-
verify(service, times(1)).validate(type, sclData);
87+
verify(service).validate(type, sclData);
8788
}
8889

8990
@Test
@@ -101,15 +102,15 @@ void validateWebsocketsEvent_WhenCalledAndRuntimeExceptionThrownByService_ThenEr
101102

102103
eventHandler.validateWebsocketsEvent(request);
103104

104-
verify(session, times(1)).getAsyncRemote();
105+
verify(session).getAsyncRemote();
105106
ArgumentCaptor<ErrorResponse> captor = ArgumentCaptor.forClass(ErrorResponse.class);
106-
verify(async, times(1)).sendObject(captor.capture());
107+
verify(async).sendObject(captor.capture());
107108
var response = captor.getValue();
108109
assertEquals(1, response.getErrorMessages().size());
109110
var message = response.getErrorMessages().get(0);
110111
assertEquals(WEBSOCKET_GENERAL_ERROR_CODE, message.getCode());
111112
assertEquals(errorMessage, message.getMessage());
112113

113-
verify(service, times(1)).validate(type, sclData);
114+
verify(service).validate(type, sclData);
114115
}
115116
}

‎riseclipse/validator-riseclipse/src/test/java/org/lfenergy/compas/scl/validator/impl/OclFileLoaderTest.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ void prepareValidator_whenCalledWithValidator_ThenValidatorIsAdded() {
116116
var validator = mock(ComposedEValidator.class);
117117
loader.prepareValidator(validator);
118118

119-
verify(validator, times(1)).addChild(any(CompleteOCLEObjectValidator.class));
119+
verify(validator).addChild(any(CompleteOCLEObjectValidator.class));
120120
}
121121

122122
@AfterEach

‎service/src/test/java/org/lfenergy/compas/scl/validator/service/NsdocServiceTest.java

+4-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,8 @@
1616

1717
import static org.junit.jupiter.api.Assertions.assertEquals;
1818
import static org.junit.jupiter.api.Assertions.assertNotNull;
19-
import static org.mockito.Mockito.*;
19+
import static org.mockito.Mockito.verify;
20+
import static org.mockito.Mockito.when;
2021

2122
@ExtendWith(MockitoExtension.class)
2223
class NsdocServiceTest {
@@ -40,7 +41,7 @@ void list_WhenCalled_ThenEmptyListReturned() {
4041
assertNotNull(result);
4142
assertEquals(1, result.size());
4243

43-
verify(nsdocFinder, times(1)).getNsdocFiles();
44+
verify(nsdocFinder).getNsdocFiles();
4445
}
4546

4647
@Test
@@ -55,6 +56,6 @@ void get_WhenCalled_ThenContentReturned() {
5556
assertNotNull(result);
5657
assertEquals(content, result);
5758

58-
verify(nsdocFinder, times(1)).getNsdocFile(id);
59+
verify(nsdocFinder).getNsdocFile(id);
5960
}
6061
}

‎service/src/test/java/org/lfenergy/compas/scl/validator/service/SclValidatorServiceTest.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
import org.junit.jupiter.api.extension.ExtendWith;
88
import org.lfenergy.compas.scl.extensions.model.SclFileType;
99
import org.lfenergy.compas.scl.validator.SclValidator;
10-
import org.lfenergy.compas.scl.validator.xsd.SclXsdValidator;
1110
import org.lfenergy.compas.scl.validator.model.ValidationError;
11+
import org.lfenergy.compas.scl.validator.xsd.SclXsdValidator;
1212
import org.mockito.InjectMocks;
1313
import org.mockito.Mock;
1414
import org.mockito.junit.jupiter.MockitoExtension;
@@ -45,8 +45,8 @@ void validate_WhenCalled_ThenExpectedListReturned() {
4545
assertNotNull(result);
4646
assertEquals(1, result.size());
4747

48-
verify(sclValidator, times(1)).validate(type, sclData);
49-
verify(xsdValidator, times(1)).validate(sclData);
48+
verify(sclValidator).validate(type, sclData);
49+
verify(xsdValidator).validate(sclData);
5050
}
5151

5252
@Test
@@ -61,7 +61,7 @@ void validate_WhenXsdErrorsAreReturned_ThenSclValidatorIsNeverCalled() {
6161
assertNotNull(result);
6262
assertEquals(1, result.size());
6363

64-
verify(xsdValidator, times(1)).validate(sclData);
64+
verify(xsdValidator).validate(sclData);
6565
verify(sclValidator, never()).validate(type, sclData);
6666
}
6767
}

‎validator/src/test/java/org/lfenergy/compas/scl/validator/xsd/XSDErrorHandlerTest.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,8 @@
2727
import static org.lfenergy.compas.scl.validator.exception.SclValidatorErrorCode.CREATE_XPATH_ELEMENT_ERROR_CODE;
2828
import static org.lfenergy.compas.scl.validator.xsd.XSDErrorHandler.DEFAULT_PREFIX;
2929
import static org.lfenergy.compas.scl.validator.xsd.XSDErrorHandler.DEFAULT_RULE_NAME;
30-
import static org.mockito.Mockito.*;
30+
import static org.mockito.Mockito.verify;
31+
import static org.mockito.Mockito.when;
3132

3233
@ExtendWith(MockitoExtension.class)
3334
class XSDErrorHandlerTest {
@@ -95,7 +96,7 @@ private void assertValidationError(List<ValidationError> errorList, String messa
9596
assertNull(errorList.get(0).getLineNumber());
9697
assertNull(errorList.get(0).getColumnNumber());
9798

98-
verify(validator, times(1)).getProperty(Constants.XERCES_PROPERTY_PREFIX + Constants.CURRENT_ELEMENT_NODE_PROPERTY);
99+
verify(validator).getProperty(Constants.XERCES_PROPERTY_PREFIX + Constants.CURRENT_ELEMENT_NODE_PROPERTY);
99100
}
100101

101102
@Test

0 commit comments

Comments
 (0)