@@ -55,9 +55,9 @@ class AWSCognitoAuthPluginConfigTests: XCTestCase {
5555 let categoryConfig = AuthCategoryConfiguration ( plugins: [
5656 " awsCognitoAuthPlugin " : [
5757 " CredentialsProvider " : [ " CognitoIdentity " : [ " Default " :
58- [ " PoolId " : " xx " ,
59- " Region " : " us-east-1 " ]
60- ] ] ,
58+ [ " PoolId " : " xx " ,
59+ " Region " : " us-east-1 " ]
60+ ] ] ,
6161 " CognitoUserPool " : [ " Default " : [
6262 " PoolId " : " xx " ,
6363 " Region " : " us-east-1 " ,
@@ -89,9 +89,9 @@ class AWSCognitoAuthPluginConfigTests: XCTestCase {
8989 let categoryConfig = AuthCategoryConfiguration ( plugins: [
9090 " awsCognitoAuthPlugin " : [
9191 " CredentialsProvider " : [ " CognitoIdentity " : [ " Default " :
92- [ " PoolId " : " cc " ,
93- " Region " : " us-east-1 " ]
94- ] ]
92+ [ " PoolId " : " cc " ,
93+ " Region " : " us-east-1 " ]
94+ ] ]
9595 ]
9696 ] )
9797 let amplifyConfig = AmplifyConfiguration ( auth: categoryConfig)
@@ -147,13 +147,13 @@ class AWSCognitoAuthPluginConfigTests: XCTestCase {
147147 let categoryConfig = AuthCategoryConfiguration ( plugins: [
148148 " awsCognitoAuthPlugin " : [
149149 " CredentialsProvider " : [ " CognitoIdentity " : [ " Default " :
150- [ " xx " : " xx " ,
151- " xx2 " : " us-east-1 " ]
152- ] ] ,
150+ [ " xx " : " xx " ,
151+ " xx2 " : " us-east-1 " ]
152+ ] ] ,
153153 " CognitoUserPool " : [ " Default " : [
154154 " xx " : " xx " ,
155155 " xx2 " : " us-east-1 "
156- ] ]
156+ ] ]
157157 ]
158158 ] )
159159 let amplifyConfig = AmplifyConfiguration ( auth: categoryConfig)
@@ -253,9 +253,9 @@ class AWSCognitoAuthPluginConfigTests: XCTestCase {
253253 XCTFail ( " Auth configuration should not succeed " )
254254 } catch {
255255 guard let pluginError = error as? PluginError ,
256- case . pluginConfigurationError = pluginError else {
257- XCTFail ( " Should throw invalidConfiguration exception. But received \( error) " )
258- return
256+ case . pluginConfigurationError = pluginError else {
257+ XCTFail ( " Should throw invalidConfiguration exception. But received \( error) " )
258+ return
259259 }
260260 }
261261 }
@@ -274,10 +274,11 @@ class AWSCognitoAuthPluginConfigTests: XCTestCase {
274274
275275 let categoryConfig = AuthCategoryConfiguration ( plugins: [
276276 " awsCognitoAuthPlugin " : [
277- " CredentialsProvider " : [ " CognitoIdentity " : [ " Default " :
278- [ " PoolId " : " xx " ,
279- " Region " : " us-east-1 " ]
280- ] ] ,
277+ " CredentialsProvider " : [ " CognitoIdentity " :
278+ [ " Default " :
279+ [ " PoolId " : " xx " ,
280+ " Region " : " us-east-1 " ]
281+ ] ] ,
281282 " CognitoUserPool " : [ " Default " : [
282283 " PoolId " : " xx " ,
283284 " Region " : " us-east-1 " ,
@@ -293,65 +294,69 @@ class AWSCognitoAuthPluginConfigTests: XCTestCase {
293294 XCTFail ( " Should not throw error. \( error) " )
294295 }
295296
296- let signUpExpectation = expectation ( description: " Should receive a result " )
297+ let signUpExpectation = expectation ( description: " Should receive a signUp result " )
297298 _ = plugin. signUp ( username: " mockUsername " , password: " " , options: nil ) { _ in
298299 signUpExpectation. fulfill ( )
299300 }
300301
301302 var expectationList = [ signUpExpectation]
302303
303- for _ in 1 ... 50 {
304- let fetchSessionExpectation = expectation ( description: " Should receive a result " )
304+ for index in 1 ... 50 {
305+ let fetchSessionExpectation = expectation (
306+ description: " Should receive fetch Authsession result for \( index) " )
305307 _ = plugin. fetchAuthSession ( options: nil ) { _ in
306308 fetchSessionExpectation. fulfill ( )
307309 }
308310 expectationList. append ( fetchSessionExpectation)
309311 }
310312
311- let signUpExpectation2 = expectation ( description: " Should receive a result " )
313+ let signUpExpectation2 = expectation ( description: " Should receive a second signUp result " )
312314 DispatchQueue . global ( ) . async {
313315
314316 _ = plugin. signUp ( username: " mockUsername " , password: " " , options: nil ) { _ in
315317 signUpExpectation2. fulfill ( )
316318 }
317319 }
318320 expectationList. append ( signUpExpectation2)
319- wait ( for: expectationList, timeout: 10 , enforceOrder: true )
321+ wait ( for: expectationList, timeout: 20 , enforceOrder: true )
320322 }
321-
323+
322324 func testUserNetworkPreferencesForIdentityPoolService( ) throws {
323325 let networkPreferences = AWSCognitoNetworkPreferences ( maxRetryCount: 0 ,
324326 timeoutIntervalForRequest: 30 ,
325327 timeoutIntervalForResource: 30 )
326328 let plugin = AWSCognitoAuthPlugin ( networkPreferences: networkPreferences)
327329
328- let json = JSONValue ( dictionaryLiteral: ( " CredentialsProvider " ,
329- . init( dictionaryLiteral: ( " CognitoIdentity " ,
330- . init( dictionaryLiteral: ( " Default " ,
331- . init( dictionaryLiteral: ( " Region " , " us-east-1 " ) ) ) ) ) ) ) )
330+ let json : JSONValue = [ " CredentialsProvider " :
331+ [ " CognitoIdentity " :
332+ [ " Default " :
333+ [ " Region " : " us-east1 " ]
334+ ]
335+ ] ]
332336 let identityPoolConfig = plugin. identityPoolServiceConfiguration ( from: json)
333337
334338 XCTAssertEqual ( identityPoolConfig? . maxRetryCount, networkPreferences. maxRetryCount)
335339 XCTAssertEqual ( identityPoolConfig? . timeoutIntervalForResource, networkPreferences. timeoutIntervalForResource)
336340 XCTAssertEqual ( identityPoolConfig? . timeoutIntervalForRequest, networkPreferences. timeoutIntervalForRequest)
337341 }
338-
342+
339343 func testUserNetworkPreferencesForUserPoolService( ) throws {
340344 let networkPreferences = AWSCognitoNetworkPreferences ( maxRetryCount: 0 ,
341345 timeoutIntervalForRequest: 30 ,
342346 timeoutIntervalForResource: 30 )
343347 let plugin = AWSCognitoAuthPlugin ( networkPreferences: networkPreferences)
344-
345- let json = JSONValue ( dictionaryLiteral: ( " CognitoUserPool " ,
346- . init( dictionaryLiteral: ( " Default " ,
347- . init( dictionaryLiteral: ( " Region " , " us-east-1 " ) ) ) ) ) )
348+ let json : JSONValue = [ " CognitoUserPool " :
349+ [ " Default " :
350+ [ " Region " : " us-east1 " ]
351+ ]
352+ ]
348353 let identityPoolConfig = try . userPoolServiceConfiguration ( from: json)
349354
350355 XCTAssertEqual ( identityPoolConfig? . maxRetryCount, networkPreferences. maxRetryCount)
351356 XCTAssertEqual ( identityPoolConfig? . timeoutIntervalForResource, networkPreferences. timeoutIntervalForResource)
352357 XCTAssertEqual ( identityPoolConfig? . timeoutIntervalForRequest, networkPreferences. timeoutIntervalForRequest)
353358 }
354-
359+
355360 func testNoUserPreferences( ) throws {
356361 let plugin = AWSCognitoAuthPlugin ( )
357362 XCTAssertNil ( plugin. networkPreferences)
0 commit comments