Skip to content

Commit 7738a72

Browse files
Avery-DunnAvery-Dunn
committed
PR feedback
1 parent a0023af commit 7738a72

File tree

5 files changed

+21
-21
lines changed

5 files changed

+21
-21
lines changed

‎msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AcquireTokenInteractiveIT.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -145,7 +145,7 @@ void acquireTokenInteractive_Ciam() {
145145
throw new RuntimeException("Error acquiring token with authCode: " + e.getMessage());
146146
}
147147

148-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
148+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
149149
assertEquals(user.getUpn(), result.account().username());
150150
}
151151

@@ -157,7 +157,7 @@ private void assertAcquireTokenCommon(User user, String authority, String scope)
157157
pca,
158158
scope);
159159

160-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
160+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
161161
assertEquals(user.getUpn(), result.account().username());
162162
}
163163

@@ -174,15 +174,15 @@ private void assertAcquireTokenB2C(User user, String authority) {
174174
}
175175

176176
IAuthenticationResult result = acquireTokenInteractive(user, pca, user.getAppId());
177-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
177+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
178178
}
179179

180180
private void assertAcquireTokenInstanceAware(User user) {
181181
PublicClientApplication pca = IntegrationTestHelper.createPublicApp(user.getAppId(), TestConstants.MICROSOFT_AUTHORITY_HOST + user.getTenantID());
182182

183183
IAuthenticationResult result = acquireTokenInteractive_instanceAware(user, pca, cfg.graphDefaultScope());
184184

185-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
185+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
186186
assertEquals(user.getUpn(), result.account().username());
187187

188188
//This test is using a client app with the login.microsoftonline.com config to get tokens for a login.microsoftonline.us user,
@@ -236,7 +236,7 @@ public void afterCacheAccess(ITokenCacheAccessContext iTokenCacheAccessContext)
236236
build();
237237

238238
IAuthenticationResult result = acquireTokenInteractive(user, publicCloudPca, TestConstants.USER_READ_SCOPE);
239-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
239+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
240240
assertEquals(user.getHomeUPN(), result.account().username());
241241

242242
publicCloudPca.removeAccount(publicCloudPca.getAccounts().join().iterator().next()).join();

‎msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/AuthorizationCodeIT.java

+5-5
Original file line numberDiff line numberDiff line change
@@ -113,15 +113,15 @@ public void acquireTokenWithAuthorizationCode_CiamCud() throws Exception {
113113
.build())
114114
.get();
115115

116-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
116+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
117117
assertEquals(user.getUpn(), result.account().username());
118118

119119
IAuthenticationResult resultSilent = pca.acquireTokenSilently(SilentParameters
120120
.builder(Collections.singleton("user.read"), result.account())
121121
.build())
122122
.get();
123123

124-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
124+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
125125
assertEquals(resultSilent.accessToken(), result.accessToken());
126126
assertEquals(resultSilent.account().username(), result.account().username());
127127
}
@@ -143,7 +143,7 @@ private void assertAcquireTokenADFS2019(User user) {
143143
authCode,
144144
Collections.singleton(TestConstants.ADFS_SCOPE));
145145

146-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
146+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
147147
assertEquals(user.getUpn(), result.account().username());
148148
}
149149

@@ -157,7 +157,7 @@ private void assertAcquireTokenAAD(User user, Map<String, Set<String>> parameter
157157
authCode,
158158
Collections.singleton(cfg.graphDefaultScope()));
159159

160-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
160+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
161161
assertEquals(user.getUpn(), result.account().username());
162162
}
163163

@@ -180,7 +180,7 @@ private void assertAcquireTokenB2C(User user) {
180180
String authCode = acquireAuthorizationCodeAutomated(user, cca, null);
181181
IAuthenticationResult result = acquireTokenInteractiveB2C(cca, authCode);
182182

183-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
183+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
184184
}
185185

186186
private IAuthenticationResult acquireTokenAuthorizationCodeFlow(

‎msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/DeviceCodeIT.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ void DeviceCodeFlowADTest(String environment) throws Exception {
5050
.build())
5151
.get();
5252

53-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
53+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
5454
}
5555

5656
@Test()
@@ -73,7 +73,7 @@ void DeviceCodeFlowADFSv2019Test() throws Exception {
7373
.build())
7474
.get();
7575

76-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
76+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
7777
}
7878

7979
@Test()

‎msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/IntegrationTestHelper.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,9 +20,9 @@ static PublicClientApplication createPublicApp(String appID, String authority) {
2020
}
2121
}
2222

23-
static void assertTokenResultNotNull(IAuthenticationResult result, boolean checkAccessToken, boolean checkIDToken) {
23+
static void assertAccessAndIdTokensNotNull(IAuthenticationResult result) {
2424
assertNotNull(result);
25-
if (checkAccessToken) assertNotNull(result.accessToken());
26-
if (checkIDToken) assertNotNull(result.idToken());
25+
assertNotNull(result.accessToken());
26+
assertNotNull(result.idToken());
2727
}
2828
}

‎msal4j-sdk/src/integrationtest/java/com.microsoft.aad.msal4j/UsernamePasswordIT.java

+6-6
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ void acquireTokenWithUsernamePassword_Ciam() throws Exception {
106106
.build())
107107
.get();
108108

109-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
109+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
110110
}
111111

112112
private void assertAcquireTokenCommon(User user, String authority, String scope, String appId)
@@ -125,7 +125,7 @@ private void assertAcquireTokenCommon(User user, String authority, String scope,
125125

126126
.get();
127127

128-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
128+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
129129
assertEquals(user.getUpn(), result.account().username());
130130
}
131131

@@ -148,7 +148,7 @@ void acquireTokenWithUsernamePassword_B2C_CustomAuthority() throws Exception {
148148
.build())
149149
.get();
150150

151-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
151+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
152152

153153
IAccount account = pca.getAccounts().join().iterator().next();
154154
SilentParameters.builder(Collections.singleton(TestConstants.B2C_READ_SCOPE), account);
@@ -158,7 +158,7 @@ void acquireTokenWithUsernamePassword_B2C_CustomAuthority() throws Exception {
158158
.build())
159159
.get();
160160

161-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
161+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
162162
}
163163

164164
@Test
@@ -180,7 +180,7 @@ void acquireTokenWithUsernamePassword_B2C_LoginMicrosoftOnline() throws Exceptio
180180
.build())
181181
.get();
182182

183-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
183+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
184184

185185
IAccount account = pca.getAccounts().join().iterator().next();
186186
SilentParameters.builder(Collections.singleton(TestConstants.B2C_READ_SCOPE), account);
@@ -190,6 +190,6 @@ void acquireTokenWithUsernamePassword_B2C_LoginMicrosoftOnline() throws Exceptio
190190
.build())
191191
.get();
192192

193-
IntegrationTestHelper.assertTokenResultNotNull(result, true, true);
193+
IntegrationTestHelper.assertAccessAndIdTokensNotNull(result);
194194
}
195195
}

0 commit comments

Comments
 (0)