Skip to content

Commit e10b2cd

Browse files
jalaurosjalauros
committed
test to use new public verify method
1 parent 6e3f6e6 commit e10b2cd

4 files changed

Lines changed: 30 additions & 19 deletions

File tree

‎src/test/java/org/oidc/msg/AbstractMessageTest.java‎

Lines changed: 22 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ public void failureMissingRequiredParam() throws InvalidClaimException {
8383
new HashMap<String, ParameterVerificationDefinition>();
8484
parVerDef.put("parameter2", ParameterVerification.SINGLE_REQUIRED_STRING.getValue());
8585
MockMessage mockMessage = new MockMessage(claims, parVerDef);
86-
Assert.assertEquals(mockMessage.getClaims().get("parameter1"),"value");
86+
mockMessage.verify();
8787
}
8888

8989
@Test
@@ -97,6 +97,7 @@ public void successMissingOptionalParams() throws InvalidClaimException {
9797
parVerDef.put("parameter4", ParameterVerification.OPTIONAL_LIST_OF_SP_SEP_STRINGS.getValue());
9898
parVerDef.put("parameter5", ParameterVerification.OPTIONAL_LIST_OF_STRINGS.getValue());
9999
MockMessage mockMessage = new MockMessage(claims, parVerDef);
100+
mockMessage.verify();
100101
Assert.assertEquals(mockMessage.getClaims().get("parameter1"),"value");
101102
}
102103

@@ -109,6 +110,7 @@ public void successTestStringType() throws InvalidClaimException,
109110
new HashMap<String, ParameterVerificationDefinition>();
110111
parVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_STRING.getValue());
111112
MockMessage mockMessage = new MockMessage(claims, parVerDef);
113+
mockMessage.verify();
112114
Assert.assertEquals(mockMessage.getClaims().get("parameter1"),"value");
113115
Assert.assertEquals(mockMessage.toJson(), "{\"parameter1\":\"value\"}");
114116
}
@@ -121,8 +123,7 @@ public void failTestStringType() throws InvalidClaimException {
121123
new HashMap<String, ParameterVerificationDefinition>();
122124
parVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_STRING.getValue());
123125
MockMessage mockMessage = new MockMessage(claims, parVerDef);
124-
mockMessage.triggerVerify();
125-
Assert.assertEquals(mockMessage.getClaims().get("parameter1"),1);
126+
mockMessage.verify();
126127
}
127128

128129
@Test
@@ -134,6 +135,7 @@ public void successTestIntType() throws InvalidClaimException,
134135
new HashMap<String, ParameterVerificationDefinition>();
135136
parVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_INT.getValue());
136137
MockMessage mockMessage = new MockMessage(claims, parVerDef);
138+
mockMessage.verify();
137139
Assert.assertEquals(mockMessage.getClaims().get("parameter1"), 5L);
138140
Assert.assertEquals(mockMessage.toJson(), "{\"parameter1\":5}");
139141
}
@@ -147,6 +149,7 @@ public void successIntTypeConversion()
147149
new HashMap<String, ParameterVerificationDefinition>();
148150
parVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_INT.getValue());
149151
MockMessage mockMessage = new MockMessage(claims, parVerDef);
152+
mockMessage.verify();
150153
Assert.assertEquals(mockMessage.getClaims().get("parameter1"), 5L);
151154
Assert.assertEquals(mockMessage.toJson(), "{\"parameter1\":5}");
152155
}
@@ -160,6 +163,7 @@ public void successIntTypeConversion2()
160163
new HashMap<String, ParameterVerificationDefinition>();
161164
parVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_INT.getValue());
162165
MockMessage mockMessage = new MockMessage(claims, parVerDef);
166+
mockMessage.verify();
163167
Assert.assertEquals(mockMessage.getClaims().get("parameter1"), 57L);
164168
Assert.assertEquals(mockMessage.toJson(), "{\"parameter1\":57}");
165169
}
@@ -172,7 +176,7 @@ public void failTestIntType() throws InvalidClaimException {
172176
new HashMap<String, ParameterVerificationDefinition>();
173177
parVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_INT.getValue());
174178
MockMessage mockMessage = new MockMessage(claims, parVerDef);
175-
Assert.assertEquals(mockMessage.getClaims().get("parameter1"),"fail");
179+
mockMessage.verify();
176180
}
177181

178182
@SuppressWarnings("unchecked")
@@ -188,6 +192,7 @@ public void successTestListType()
188192
new HashMap<String, ParameterVerificationDefinition>();
189193
parVerDef.put("parameter1", ParameterVerification.OPTIONAL_LIST_OF_STRINGS.getValue());
190194
MockMessage mockMessage = new MockMessage(claims, parVerDef);
195+
mockMessage.verify();
191196
Assert.assertEquals(((List<String>) mockMessage.getClaims().get("parameter1")).get(0), "value");
192197
Assert.assertEquals(((List<String>) mockMessage.getClaims().get("parameter1")).get(1),
193198
"value2");
@@ -209,6 +214,7 @@ public void successTestListTypeAllowed()
209214
Map<String, List<?>> allowedValues = new HashMap<String, List<?>>();
210215
allowedValues.put("parameter1", Arrays.asList("value", "value2", "evenMore"));
211216
MockMessage mockMessage = new MockMessage(claims, parVerDef, allowedValues);
217+
mockMessage.verify();
212218
Assert.assertEquals(((List<String>) mockMessage.getClaims().get("parameter1")).get(0), "value");
213219
Assert.assertEquals(((List<String>) mockMessage.getClaims().get("parameter1")).get(1),
214220
"value2");
@@ -229,7 +235,7 @@ public void failedTestListTypeNotAllAllowed()
229235
Map<String, List<?>> allowedValues = new HashMap<String, List<?>>();
230236
allowedValues.put("parameter1", Arrays.asList("value", "evenMore"));
231237
MockMessage mockMessage = new MockMessage(claims, parVerDef, allowedValues);
232-
mockMessage.triggerVerify();
238+
mockMessage.verify();
233239
}
234240

235241
@SuppressWarnings("unchecked")
@@ -242,6 +248,7 @@ public void successTestListTypeConversion()
242248
new HashMap<String, ParameterVerificationDefinition>();
243249
parVerDef.put("parameter1", ParameterVerification.OPTIONAL_LIST_OF_STRINGS.getValue());
244250
MockMessage mockMessage = new MockMessage(claims, parVerDef);
251+
mockMessage.verify();
245252
Assert.assertEquals(((List<String>) mockMessage.getClaims().get("parameter1")).get(0),
246253
"values");
247254
Assert.assertThat(mockMessage.toJson(), is("{\"parameter1\":[\"values\"]}"));
@@ -259,6 +266,7 @@ public void successTestListTypeConversionAllowed()
259266
Map<String, List<?>> allowedValues = new HashMap<String, List<?>>();
260267
allowedValues.put("parameter1", Arrays.asList("values"));
261268
MockMessage mockMessage = new MockMessage(claims, parVerDef, allowedValues);
269+
mockMessage.verify();
262270
Assert.assertEquals(((List<String>) mockMessage.getClaims().get("parameter1")).get(0),
263271
"values");
264272
Assert.assertThat(mockMessage.toJson(), is("{\"parameter1\":[\"values\"]}"));
@@ -275,7 +283,7 @@ public void failedTestListTypeConversionNotAllowed()
275283
Map<String, List<?>> allowedValues = new HashMap<String, List<?>>();
276284
allowedValues.put("parameter1", Arrays.asList("notValues"));
277285
MockMessage mockMessage = new MockMessage(claims, parVerDef, allowedValues);
278-
mockMessage.triggerVerify();
286+
mockMessage.verify();
279287
}
280288

281289
@SuppressWarnings("unchecked")
@@ -289,6 +297,7 @@ public void failTestListType() throws InvalidClaimException {
289297
new HashMap<String, ParameterVerificationDefinition>();
290298
parVerDef.put("parameter1", ParameterVerification.OPTIONAL_LIST_OF_STRINGS.getValue());
291299
MockMessage mockMessage = new MockMessage(claims, parVerDef);
300+
mockMessage.verify();
292301
Assert.assertEquals(((List<String>) mockMessage.getClaims().get("parameter1")).get(0),"values");
293302
}
294303

@@ -304,6 +313,7 @@ public void successTestArrayType()
304313
new HashMap<String, ParameterVerificationDefinition>();
305314
parVerDef.put("parameter1", ParameterVerification.REQUIRED_LIST_OF_SP_SEP_STRINGS.getValue());
306315
MockMessage mockMessage = new MockMessage(claims, parVerDef);
316+
mockMessage.verify();
307317
Assert.assertEquals(mockMessage.getClaims().get("parameter1"), "value value2");
308318
Assert.assertThat(mockMessage.toJson(), is("{\"parameter1\":\"value value2\"}"));
309319
}
@@ -316,7 +326,7 @@ public void failTestArrayType() throws InvalidClaimException {
316326
new HashMap<String, ParameterVerificationDefinition>();
317327
parVerDef.put("parameter1", ParameterVerification.REQUIRED_LIST_OF_SP_SEP_STRINGS.getValue());
318328
MockMessage mockMessage = new MockMessage(claims, parVerDef);
319-
Assert.assertEquals(((String[])mockMessage.getClaims().get("parameter1"))[0],"value");
329+
mockMessage.verify();
320330
}
321331

322332
@Test
@@ -327,6 +337,7 @@ public void successTestBooleanType() throws InvalidClaimException {
327337
new HashMap<String, ParameterVerificationDefinition>();
328338
parVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_BOOLEAN.getValue());
329339
MockMessage mockMessage = new MockMessage(claims, parVerDef);
340+
mockMessage.verify();
330341
Assert.assertEquals(mockMessage.getClaims().get("parameter1"),true);
331342
}
332343

@@ -338,7 +349,7 @@ public void failTestBooleanType() throws InvalidClaimException {
338349
new HashMap<String, ParameterVerificationDefinition>();
339350
parVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_BOOLEAN.getValue());
340351
MockMessage mockMessage = new MockMessage(claims, parVerDef);
341-
Assert.assertEquals(mockMessage.getClaims().get("parameter1"),"value");
352+
mockMessage.verify();
342353
}
343354

344355
@Test
@@ -350,6 +361,7 @@ public void successTestDateType() throws InvalidClaimException {
350361
new HashMap<String, ParameterVerificationDefinition>();
351362
parVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_DATE.getValue());
352363
MockMessage mockMessage = new MockMessage(claims, parVerDef);
364+
mockMessage.verify();
353365
Assert.assertEquals(((Date)mockMessage.getClaims().get("parameter1")).getTime(),
354366
date.getTime());
355367
}
@@ -363,6 +375,7 @@ public void successTestDateTypeConversion() throws InvalidClaimException {
363375
new HashMap<String, ParameterVerificationDefinition>();
364376
parVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_DATE.getValue());
365377
MockMessage mockMessage = new MockMessage(claims, parVerDef);
378+
mockMessage.verify();
366379
Assert.assertEquals(((Date)mockMessage.getClaims().get("parameter1")).getTime(),
367380
date.getTime());
368381
}
@@ -375,8 +388,7 @@ public void failTestDateType() throws InvalidClaimException {
375388
new HashMap<String, ParameterVerificationDefinition>();
376389
parVerDef.put("parameter1", ParameterVerification.SINGLE_OPTIONAL_DATE.getValue());
377390
MockMessage mockMessage = new MockMessage(claims, parVerDef);
378-
mockMessage.triggerVerify();
379-
Assert.assertEquals(mockMessage.getClaims().get("parameter1"),"value");
391+
mockMessage.verify();
380392
}
381393

382394
class MockMessage extends AbstractMessage {
@@ -401,10 +413,6 @@ class MockMessage extends AbstractMessage {
401413
this.allowedValues.put(key, allowedValues.get(key));
402414
}
403415
}
404-
405416

406-
public void triggerVerify() throws InvalidClaimException {
407-
verify();
408-
}
409417
}
410418
}

‎src/test/java/org/oidc/msg/AuthenticationRequestTest.java‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ public void testSuccessMandatoryParameters() throws InvalidClaimException {
1515
claims.put("redirect_uri", "value");
1616
claims.put("scope", "openid");
1717
AuthenticationRequest req = new AuthenticationRequest(claims);
18+
req.verify();
1819
Assert.assertEquals("code", req.getClaims().get("response_type"));
1920
Assert.assertEquals("value", req.getClaims().get("client_id"));
2021
Assert.assertEquals("value", req.getClaims().get("redirect_uri"));
@@ -27,7 +28,7 @@ public void testFailureMissingResponseTypeMandatoryParameters() throws InvalidCl
2728
Map<String, Object> claims = new HashMap<String, Object>();
2829
claims.put("client_id", "value");
2930
AuthenticationRequest req = new AuthenticationRequest(claims);
30-
Assert.assertEquals("value", req.getClaims().get("client_id"));
31+
req.verify();
3132
}
3233

3334
}

‎src/test/java/org/oidc/msg/AuthorizationRequestTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ public void testSuccessMandatoryParameters() throws InvalidClaimException {
1919
claims.put("response_type", responseType);
2020
claims.put("client_id", "value");
2121
AuthorizationRequest req = new AuthorizationRequest(claims);
22+
req.verify();
2223
Assert.assertEquals("id_token token", req.getClaims().get("response_type"));
2324
Assert.assertEquals("value", req.getClaims().get("client_id"));
2425
}
@@ -28,18 +29,17 @@ public void testFailureMissingResponseTypeMandatoryParameter() throws InvalidCla
2829
Map<String, Object> claims = new HashMap<String, Object>();
2930
claims.put("client_id", "value");
3031
AuthorizationRequest req = new AuthorizationRequest(claims);
31-
Assert.assertEquals("value", req.getClaims().get("client_id"));
32+
req.verify();
3233
}
3334

34-
@SuppressWarnings("unchecked")
3535
@Test(expected = InvalidClaimException.class)
3636
public void testFailureMissingClientIdMandatoryParameter() throws InvalidClaimException {
3737
Map<String, Object> claims = new HashMap<String, Object>();
3838
List<String> responseType = new ArrayList<String>();
3939
responseType.add("code");
4040
claims.put("response_type", responseType);
4141
AuthorizationRequest req = new AuthorizationRequest(claims);
42-
Assert.assertEquals("code", ((List<String>) req.getClaims().get("response_type")).get(0));
42+
req.verify();
4343
}
4444

4545
}

‎src/test/java/org/oidc/msg/WebfingerRequestTest.java‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ public void testDefaultRelParameter() throws InvalidClaimException {
1717
claims.put("resource", "value");
1818
WebfingerRequest req = new WebfingerRequest();
1919
req.addClaim("resource", "value");
20+
req.verify();
2021
Map<String, Object> msgClaims = req.getClaims();
2122
Assert.assertEquals("value", msgClaims.get("resource"));
2223
Assert.assertEquals("http://openid.net/specs/connect/1.0/issuer", msgClaims.get("rel"));
@@ -28,6 +29,7 @@ public void testSuccessMandatoryParameters() throws InvalidClaimException {
2829
claims.put("resource", "value");
2930
claims.put("rel", "relValue");
3031
WebfingerRequest req = new WebfingerRequest(claims);
32+
req.verify();
3133
Map<String, Object> msgClaims = req.getClaims();
3234
Assert.assertEquals("value", msgClaims.get("resource"));
3335
Assert.assertEquals("relValue", msgClaims.get("rel"));
@@ -38,7 +40,7 @@ public void testFailureMissingResponseTypeMandatoryParameters() throws InvalidCl
3840
Map<String, Object> claims = new HashMap<String, Object>();
3941
claims.put("custom", "value");
4042
WebfingerRequest req = new WebfingerRequest(claims);
41-
req.getClaims(); // triggers verify()
43+
req.verify();
4244
}
4345

4446
}

0 commit comments

Comments
 (0)