Skip to content

Commit eb58ce2

Browse files
Yuki-YuXinYuki-YuXin
committed
Update account result param
1 parent b197ef3 commit eb58ce2

File tree

1 file changed

+61
-31
lines changed

1 file changed

+61
-31
lines changed

‎MSAL/test/unit/native_auth/public/MSALNativeAuthUserAccountResultTests.swift

Lines changed: 61 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,10 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
137137
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedResult: expectedResult)
138138
delegate.expectedAccessToken = accessToken.accessToken
139139
delegate.expectedScopes = accessToken.scopes?.array as? [String] ?? []
140-
sut.getAccessToken(correlationId: contextCorrelationId, delegate: delegate)
140+
141+
let getParams = MSALNativeAuthGetAccessTokenParameters()
142+
getParams.correlationId = contextCorrelationId
143+
sut.getAccessToken(parameters: getParams, delegate: delegate)
141144

142145
await fulfillment(of: [delegateExp])
143146

@@ -176,10 +179,12 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
176179
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedResult: expectedResult)
177180
delegate.expectedAccessToken = accessToken.accessToken
178181
delegate.expectedScopes = accessToken.scopes?.array as? [String] ?? []
179-
sut.getAccessToken(scopes: accessToken.scopes?.array as? [String] ?? [],
180-
forceRefresh: true,
181-
correlationId: contextCorrelationId,
182-
delegate: delegate)
182+
183+
let getParams = MSALNativeAuthGetAccessTokenParameters()
184+
getParams.scopes = accessToken.scopes?.array as? [String] ?? []
185+
getParams.forceRefresh = true
186+
getParams.correlationId = contextCorrelationId
187+
sut.getAccessToken(parameters: getParams, delegate: delegate)
183188

184189
await fulfillment(of: [delegateExp])
185190

@@ -211,10 +216,12 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
211216
factory.silentTokenProvider.error = expectedError
212217
let delegateExp = expectation(description: "delegateDispatcher delegate exp")
213218
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedError: expectedError)
214-
sut.getAccessToken(scopes: ["scope"],
215-
forceRefresh: true,
216-
correlationId: correlationId,
217-
delegate: delegate)
219+
220+
let getParams = MSALNativeAuthGetAccessTokenParameters()
221+
getParams.scopes = ["scope"]
222+
getParams.forceRefresh = true
223+
getParams.correlationId = correlationId
224+
sut.getAccessToken(parameters: getParams, delegate: delegate)
218225

219226
await fulfillment(of: [delegateExp])
220227
}
@@ -243,10 +250,12 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
243250
factory.silentTokenProvider.error = expectedError
244251
let delegateExp = expectation(description: "delegateDispatcher delegate exp")
245252
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedError: expectedError)
246-
sut.getAccessToken(scopes: ["scope"],
247-
forceRefresh: true,
248-
correlationId: correlationId,
249-
delegate: delegate)
253+
254+
let getParams = MSALNativeAuthGetAccessTokenParameters()
255+
getParams.scopes = ["scope"]
256+
getParams.forceRefresh = true
257+
getParams.correlationId = correlationId
258+
sut.getAccessToken(parameters: getParams, delegate: delegate)
250259

251260
await fulfillment(of: [delegateExp])
252261
}
@@ -424,7 +433,9 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
424433
let delegateExp = expectation(description: "delegateDispatcher delegate exp")
425434
let expectedError = RetrieveAccessTokenError(type: .generalError, message: "inner_user_info_error_description", correlationId: innerCorrelationId, errorCodes: [], errorUri: nil)
426435
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedError: expectedError)
427-
sut.getAccessToken(delegate: delegate)
436+
437+
let getParams = MSALNativeAuthGetAccessTokenParameters()
438+
sut.getAccessToken(parameters: getParams, delegate: delegate)
428439

429440
await fulfillment(of: [delegateExp])
430441
}
@@ -434,7 +445,9 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
434445
let delegateExp = expectation(description: "delegateDispatcher delegate exp")
435446
let expectedError = RetrieveAccessTokenError(type: .generalError, message: "user_info_error_description", correlationId: withoutInnerCorrelationId, errorCodes: [], errorUri: nil)
436447
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedError: expectedError)
437-
sut.getAccessToken(delegate: delegate)
448+
449+
let getParams = MSALNativeAuthGetAccessTokenParameters()
450+
sut.getAccessToken(parameters: getParams, delegate: delegate)
438451

439452
await fulfillment(of: [delegateExp])
440453
}
@@ -445,7 +458,10 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
445458
let delegateExp = expectation(description: "delegateDispatcher delegate exp")
446459
let expectedError = RetrieveAccessTokenError(type: .generalError, message: errorWithoutInnerErrorWithoutDescriptionMock.localizedDescription, correlationId: correlationId, errorCodes: [], errorUri: nil)
447460
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedError: expectedError)
448-
sut.getAccessToken(correlationId: correlationId, delegate: delegate)
461+
462+
let getParams = MSALNativeAuthGetAccessTokenParameters()
463+
getParams.correlationId = correlationId
464+
sut.getAccessToken(parameters: getParams, delegate: delegate)
449465

450466
await fulfillment(of: [delegateExp])
451467
}
@@ -456,9 +472,11 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
456472
let delegateExp = expectation(description: "delegateDispatcher delegate exp")
457473
let expectedError = RetrieveAccessTokenError(type: .generalError, message: "user_info_error_description", correlationId: correlationId, errorCodes: [], errorUri: nil)
458474
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedError: expectedError)
459-
sut.getAccessToken(correlationId: correlationId,
460-
delegate: delegate)
461-
475+
476+
let getParams = MSALNativeAuthGetAccessTokenParameters()
477+
getParams.correlationId = correlationId
478+
sut.getAccessToken(parameters: getParams, delegate: delegate)
479+
462480
await fulfillment(of: [delegateExp])
463481
}
464482

@@ -474,8 +492,10 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
474492
let delegateExp = expectation(description: "delegateDispatcher delegate exp")
475493
let expectedError = RetrieveAccessTokenError(type: .generalError, message: "The operation couldn’t be completed. ( error 1.)", correlationId: correlationId, errorCodes: errorCodes, errorUri: nil)
476494
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedError: expectedError)
477-
sut.getAccessToken(correlationId: correlationId,
478-
delegate: delegate)
495+
496+
let getParams = MSALNativeAuthGetAccessTokenParameters()
497+
getParams.correlationId = correlationId
498+
sut.getAccessToken(parameters: getParams, delegate: delegate)
479499

480500
await fulfillment(of: [delegateExp])
481501
}
@@ -492,8 +512,10 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
492512
let delegateExp = expectation(description: "delegateDispatcher delegate exp")
493513
let expectedError = RetrieveAccessTokenError(type: .generalError, message: "The operation couldn’t be completed. ( error 1.)", correlationId: correlationId, errorCodes: [], errorUri: nil)
494514
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedError: expectedError)
495-
sut.getAccessToken(correlationId: correlationId,
496-
delegate: delegate)
515+
516+
let getParams = MSALNativeAuthGetAccessTokenParameters()
517+
getParams.correlationId = correlationId
518+
sut.getAccessToken(parameters: getParams, delegate: delegate)
497519

498520
await fulfillment(of: [delegateExp])
499521
}
@@ -511,8 +533,10 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
511533
let delegateExp = expectation(description: "delegateDispatcher delegate exp")
512534
let expectedError = RetrieveAccessTokenError(type: .generalError, message: "The operation couldn’t be completed. ( error 1.)", correlationId: correlationId, errorCodes: [1, 2, 3], errorUri: nil)
513535
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedError: expectedError)
514-
sut.getAccessToken(correlationId: correlationId,
515-
delegate: delegate)
536+
537+
let getParams = MSALNativeAuthGetAccessTokenParameters()
538+
getParams.correlationId = correlationId
539+
sut.getAccessToken(parameters: getParams, delegate: delegate)
516540

517541
await fulfillment(of: [delegateExp])
518542
}
@@ -530,8 +554,10 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
530554
let delegateExp = expectation(description: "delegateDispatcher delegate exp")
531555
let expectedError = RetrieveAccessTokenError(type: .generalError, message: "The operation couldn’t be completed. ( error 1.)", correlationId: correlationId, errorCodes: [], errorUri: nil)
532556
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedError: expectedError)
533-
sut.getAccessToken(correlationId: correlationId,
534-
delegate: delegate)
557+
558+
let getParams = MSALNativeAuthGetAccessTokenParameters()
559+
getParams.correlationId = correlationId
560+
sut.getAccessToken(parameters: getParams, delegate: delegate)
535561

536562
await fulfillment(of: [delegateExp])
537563
}
@@ -549,8 +575,10 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
549575
let delegateExp = expectation(description: "delegateDispatcher delegate exp")
550576
let expectedError = RetrieveAccessTokenError(type: .generalError, message: MSALNativeAuthErrorMessage.refreshTokenMFARequiredError + message, correlationId: correlationId, errorCodes: errorCodes, errorUri: nil)
551577
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedError: expectedError)
552-
sut.getAccessToken(correlationId: correlationId,
553-
delegate: delegate)
578+
579+
let getParams = MSALNativeAuthGetAccessTokenParameters()
580+
getParams.correlationId = correlationId
581+
sut.getAccessToken(parameters: getParams, delegate: delegate)
554582

555583
await fulfillment(of: [delegateExp])
556584
}
@@ -568,8 +596,10 @@ class MSALNativeAuthUserAccountResultTests: XCTestCase {
568596
let delegateExp = expectation(description: "delegateDispatcher delegate exp")
569597
let expectedError = RetrieveAccessTokenError(type: .generalError, message: MSALNativeAuthErrorMessage.passwordResetRequired + message, correlationId: correlationId, errorCodes: errorCodes, errorUri: nil)
570598
let delegate = CredentialsDelegateSpy(expectation: delegateExp, expectedError: expectedError)
571-
sut.getAccessToken(correlationId: correlationId,
572-
delegate: delegate)
599+
600+
let getParams = MSALNativeAuthGetAccessTokenParameters()
601+
getParams.correlationId = correlationId
602+
sut.getAccessToken(parameters: getParams, delegate: delegate)
573603

574604
await fulfillment(of: [delegateExp])
575605
}

0 commit comments

Comments
 (0)