Skip to content

Commit 686f162

Browse files
bucky-boybucky-boy
committed
SDK-2771: [MB] Tidy up DigitalIdentityServiceTest
1 parent c4a66b5 commit 686f162

File tree

1 file changed

+25
-39
lines changed

1 file changed

+25
-39
lines changed

‎yoti-sdk-api/src/test/java/com/yoti/api/client/spi/remote/call/identity/DigitalIdentityServiceTest.java‎

Lines changed: 25 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -38,19 +38,15 @@
3838
@RunWith(MockitoJUnitRunner.class)
3939
public class DigitalIdentityServiceTest {
4040

41-
private static final String SDK_ID = "anSdkId";
42-
private static final String SESSION_ID = "aSessionId";
43-
private static final String QR_CODE_ID = "aQrCodeId";
4441
private static final String SESSION_CREATION_PATH = "aSessionCreationPath";
4542
private static final String DIGITAL_ID_MATCH_PATH = "aDigitalIdMatchPath";
4643
private static final String POST = "POST";
4744
private static final byte[] A_BODY_BYTES = "aBody".getBytes(StandardCharsets.UTF_8);
4845

49-
@InjectMocks DigitalIdentityService identityService;
46+
@InjectMocks DigitalIdentityService testObj;
5047

5148
@Mock UnsignedPathFactory unsignedPathFactoryMock;
5249
@Mock YotiHttpRequestBuilderFactory requestBuilderFactoryMock;
53-
@Mock DigitalIdentitySignedRequestStrategy authStrategyMock;
5450

5551
@Mock(answer = RETURNS_DEEP_STUBS) YotiHttpRequestBuilder yotiHttpRequestBuilder;
5652

@@ -72,7 +68,7 @@ public void setUp() {
7268
public void createShareSession_NullShareSessionRequest_Exception() {
7369
IllegalArgumentException ex = assertThrows(
7470
IllegalArgumentException.class,
75-
() -> identityService.createShareSession(null)
71+
() -> testObj.createShareSession(null)
7672
);
7773

7874
assertThat(ex.getMessage(), containsString("Share Session request"));
@@ -87,7 +83,7 @@ public void createShareSession_SerializingWrongPayload_Exception() {
8783

8884
DigitalIdentityException ex = assertThrows(
8985
DigitalIdentityException.class,
90-
() -> identityService.createShareSession(shareSessionRequest)
86+
() -> testObj.createShareSession(shareSessionRequest)
9187
);
9288

9389
Throwable cause = ex.getCause();
@@ -103,11 +99,11 @@ public void createShareSession_BuildingRequestWithWrongUri_Exception() throws Ex
10399

104100
String exMessage = "URI wrong format";
105101
URISyntaxException causeEx = new URISyntaxException("", exMessage);
106-
when(identityService.createSignedRequest(SESSION_CREATION_PATH, POST, A_BODY_BYTES)).thenThrow(causeEx);
102+
when(testObj.createSignedRequest(SESSION_CREATION_PATH, POST, A_BODY_BYTES)).thenThrow(causeEx);
107103

108104
DigitalIdentityException ex = assertThrows(
109105
DigitalIdentityException.class,
110-
() -> identityService.createShareSession(shareSessionRequest)
106+
() -> testObj.createShareSession(shareSessionRequest)
111107
);
112108

113109
Throwable cause = ex.getCause();
@@ -121,15 +117,13 @@ public void createShareSession_BuildingRequestWithWrongQueryParams_Exception() t
121117
try (MockedStatic<ResourceMapper> mapper = Mockito.mockStatic(ResourceMapper.class)) {
122118
mapper.when(() -> ResourceMapper.writeValueAsString(shareSessionRequest)).thenReturn(A_BODY_BYTES);
123119

124-
125-
126120
String exMessage = "Wrong query params format";
127121
UnsupportedEncodingException causeEx = new UnsupportedEncodingException(exMessage);
128-
when(identityService.createSignedRequest(SESSION_CREATION_PATH, POST, A_BODY_BYTES)).thenThrow(causeEx);
122+
when(testObj.createSignedRequest(SESSION_CREATION_PATH, POST, A_BODY_BYTES)).thenThrow(causeEx);
129123

130124
DigitalIdentityException ex = assertThrows(
131125
DigitalIdentityException.class,
132-
() -> identityService.createShareSession(shareSessionRequest)
126+
() -> testObj.createShareSession(shareSessionRequest)
133127
);
134128

135129
Throwable cause = ex.getCause();
@@ -143,15 +137,13 @@ public void createShareSession_BuildingRequestWithWrongDigest_Exception() throws
143137
try (MockedStatic<ResourceMapper> mapper = Mockito.mockStatic(ResourceMapper.class)) {
144138
mapper.when(() -> ResourceMapper.writeValueAsString(shareSessionRequest)).thenReturn(A_BODY_BYTES);
145139

146-
147-
148140
String exMessage = "Wrong digest";
149141
GeneralSecurityException causeEx = new GeneralSecurityException(exMessage);
150-
when(identityService.createSignedRequest(SESSION_CREATION_PATH, POST, A_BODY_BYTES)).thenThrow(causeEx);
142+
when(testObj.createSignedRequest(SESSION_CREATION_PATH, POST, A_BODY_BYTES)).thenThrow(causeEx);
151143

152144
DigitalIdentityException ex = assertThrows(
153145
DigitalIdentityException.class,
154-
() -> identityService.createShareSession(shareSessionRequest)
146+
() -> testObj.createShareSession(shareSessionRequest)
155147
);
156148

157149
Throwable cause = ex.getCause();
@@ -164,11 +156,11 @@ public void createShareSession_BuildingRequestWithWrongDigest_Exception() throws
164156
public void createShareSession_SessionRequest_exception() throws Exception {
165157
try (MockedStatic<ResourceMapper> mapper = Mockito.mockStatic(ResourceMapper.class)) {
166158
mapper.when(() -> ResourceMapper.writeValueAsString(shareSessionRequest)).thenReturn(A_BODY_BYTES);
167-
168-
when(identityService.createSignedRequest(SESSION_CREATION_PATH, POST, A_BODY_BYTES)).thenReturn(yotiHttpRequest);
159+
160+
when(testObj.createSignedRequest(SESSION_CREATION_PATH, POST, A_BODY_BYTES)).thenReturn(yotiHttpRequest);
169161
when(yotiHttpRequest.execute(ShareSession.class)).thenReturn(shareSession);
170162

171-
ShareSession result = identityService.createShareSession(shareSessionRequest);
163+
ShareSession result = testObj.createShareSession(shareSessionRequest);
172164

173165
assertSame(shareSession, result);
174166
}
@@ -178,7 +170,7 @@ public void createShareSession_SessionRequest_exception() throws Exception {
178170
public void createShareQrCode_NullSessionId_Exception() {
179171
IllegalArgumentException ex = assertThrows(
180172
IllegalArgumentException.class,
181-
() -> identityService.createShareQrCode(null)
173+
() -> testObj.createShareQrCode(null)
182174
);
183175

184176
assertThat(ex.getMessage(), containsString("Session ID"));
@@ -188,7 +180,7 @@ public void createShareQrCode_NullSessionId_Exception() {
188180
public void fetchShareQrCode_NullSessionId_Exception() {
189181
IllegalArgumentException ex = assertThrows(
190182
IllegalArgumentException.class,
191-
() -> identityService.fetchShareQrCode(null)
183+
() -> testObj.fetchShareQrCode(null)
192184
);
193185

194186
assertThat(ex.getMessage(), containsString("QR Code ID"));
@@ -198,7 +190,7 @@ public void fetchShareQrCode_NullSessionId_Exception() {
198190
public void fetchMatch_NullMatchRequest_Exception() {
199191
IllegalArgumentException ex = assertThrows(
200192
IllegalArgumentException.class,
201-
() -> identityService.fetchMatch(null)
193+
() -> testObj.fetchMatch(null)
202194
);
203195

204196
assertThat(ex.getMessage(), notNullValue());
@@ -213,7 +205,7 @@ public void fetchMatch_SerializingWrongPayload_Exception() {
213205

214206
DigitalIdentityException ex = assertThrows(
215207
DigitalIdentityException.class,
216-
() -> identityService.fetchMatch(matchRequest)
208+
() -> testObj.fetchMatch(matchRequest)
217209
);
218210

219211
Throwable cause = ex.getCause();
@@ -226,15 +218,14 @@ public void fetchMatch_SerializingWrongPayload_Exception() {
226218
public void fetchMatch_BuildingRequestWithWrongEndpoint_Exception() throws Exception {
227219
try (MockedStatic<ResourceMapper> mapper = Mockito.mockStatic(ResourceMapper.class)) {
228220
mapper.when(() -> ResourceMapper.writeValueAsString(matchRequest)).thenReturn(A_BODY_BYTES);
229-
230221

231222
String exMessage = "URI wrong format";
232223
URISyntaxException causeEx = new URISyntaxException("", exMessage);
233-
when(identityService.createSignedRequest(DIGITAL_ID_MATCH_PATH, POST, A_BODY_BYTES)).thenThrow(causeEx);
224+
when(testObj.createSignedRequest(DIGITAL_ID_MATCH_PATH, POST, A_BODY_BYTES)).thenThrow(causeEx);
234225

235226
DigitalIdentityException ex = assertThrows(
236227
DigitalIdentityException.class,
237-
() -> identityService.fetchMatch(matchRequest)
228+
() -> testObj.fetchMatch(matchRequest)
238229
);
239230

240231
Throwable cause = ex.getCause();
@@ -248,16 +239,14 @@ public void fetchMatch_BuildingRequestWithWrongQueryParams_Exception() throws Ex
248239
try (MockedStatic<ResourceMapper> mapper = Mockito.mockStatic(ResourceMapper.class)) {
249240
mapper.when(() -> ResourceMapper.writeValueAsString(matchRequest)).thenReturn(A_BODY_BYTES);
250241

251-
252-
253242
String exMessage = "Wrong query params format";
254243
UnsupportedEncodingException causeEx = new UnsupportedEncodingException(exMessage);
255-
when(identityService.createSignedRequest(DIGITAL_ID_MATCH_PATH, POST, A_BODY_BYTES))
244+
when(testObj.createSignedRequest(DIGITAL_ID_MATCH_PATH, POST, A_BODY_BYTES))
256245
.thenThrow(causeEx);
257246

258247
DigitalIdentityException ex = assertThrows(
259248
DigitalIdentityException.class,
260-
() -> identityService.fetchMatch(matchRequest)
249+
() -> testObj.fetchMatch(matchRequest)
261250
);
262251

263252
Throwable cause = ex.getCause();
@@ -271,16 +260,14 @@ public void fetchMatch_BuildingRequestWithWrongDigest_Exception() throws Excepti
271260
try (MockedStatic<ResourceMapper> mapper = Mockito.mockStatic(ResourceMapper.class)) {
272261
mapper.when(() -> ResourceMapper.writeValueAsString(matchRequest)).thenReturn(A_BODY_BYTES);
273262

274-
275-
276263
String exMessage = "Wrong digest";
277264
GeneralSecurityException causeEx = new GeneralSecurityException(exMessage);
278-
when(identityService.createSignedRequest(DIGITAL_ID_MATCH_PATH, POST, A_BODY_BYTES))
265+
when(testObj.createSignedRequest(DIGITAL_ID_MATCH_PATH, POST, A_BODY_BYTES))
279266
.thenThrow(causeEx);
280267

281268
DigitalIdentityException ex = assertThrows(
282269
DigitalIdentityException.class,
283-
() -> identityService.fetchMatch(matchRequest)
270+
() -> testObj.fetchMatch(matchRequest)
284271
);
285272

286273
Throwable cause = ex.getCause();
@@ -294,13 +281,12 @@ public void fetchMatch_SessionRequest_exception() throws Exception {
294281
try (MockedStatic<ResourceMapper> mapper = Mockito.mockStatic(ResourceMapper.class)) {
295282
mapper.when(() -> ResourceMapper.writeValueAsString(matchRequest)).thenReturn(A_BODY_BYTES);
296283

297-
298-
when(identityService.createSignedRequest(DIGITAL_ID_MATCH_PATH, POST, A_BODY_BYTES))
284+
when(testObj.createSignedRequest(DIGITAL_ID_MATCH_PATH, POST, A_BODY_BYTES))
299285
.thenReturn(yotiHttpRequest);
300-
301286
when(yotiHttpRequest.execute(MatchResult.class)).thenReturn(matchResult);
302287

303-
MatchResult result = identityService.fetchMatch(matchRequest);
288+
MatchResult result = testObj.fetchMatch(matchRequest);
289+
304290
assertSame(matchResult, result);
305291
}
306292
}

0 commit comments

Comments
 (0)