chore(auth): Ensure AWSAuthBaseTest subclasses setup fail if initializeAmplify fails

jcjimenez · jcjimenez · commit 876b3e9b1c0b · 2023-01-26T09:26:53.000-06:00
diff --git a/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AWSAuthBaseTest.swift b/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AWSAuthBaseTest.swift
@@ -18,21 +18,11 @@ class AWSAuthBaseTest: XCTestCase {
 
     let amplifyConfigurationFile = "testconfiguration/AWSCognitoAuthPluginIntegrationTests-amplifyconfiguration"
 
-    func initializeAmplifyWithError() throws {
+    func initializeAmplify() throws {
         let configuration = try TestConfigHelper.retrieveAmplifyConfiguration(
             forResource: amplifyConfigurationFile)
         let authPlugin = AWSCognitoAuthPlugin()
         try Amplify.add(plugin: authPlugin)
         try Amplify.configure(configuration)
     }
-
-    func initializeAmplify() {
-        do {
-            try initializeAmplifyWithError()
-            print("Amplify configured with auth plugin")
-        } catch {
-            print(error)
-            XCTFail("Failed to initialize Amplify with \(error)")
-        }
-    }
 }
diff --git a/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthDeleteUserTests/AuthDeleteUserTests.swift b/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthDeleteUserTests/AuthDeleteUserTests.swift
@@ -14,13 +14,11 @@ import AmplifyTestCommon
 
 class AuthDeleteUserTests: AWSAuthBaseTest {
 
-    override func setUp() {
-        super.setUp()
-        initializeAmplify()
+    override func setUpWithError() throws {
+        try initializeAmplify()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDownWithError() throws {
         Amplify.reset()
         sleep(2)
     }
diff --git a/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthDeviceTests/AuthDeviceOperationTests.swift b/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthDeviceTests/AuthDeviceOperationTests.swift
@@ -17,13 +17,11 @@ import AWSMobileClientXCF
 
 class AuthDeviceOperationTests: AWSAuthBaseTest {
 
-    override func setUp() {
-        super.setUp()
-        initializeAmplify()
+    override func setUpWithError() throws {
+        try initializeAmplify()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDownWithError() throws {
         Amplify.reset()
         sleep(2)
     }
diff --git a/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSessionTests/SignedInAuthSessionTests.swift b/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSessionTests/SignedInAuthSessionTests.swift
@@ -15,7 +15,7 @@ import AmplifyTestCommon
 class SignedInAuthSessionTests: AWSAuthBaseTest {
 
     override func setUpWithError() throws {
-        try initializeAmplifyWithError()
+        try initializeAmplify()
         AuthSessionHelper.clearKeychain()
     }
 
diff --git a/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSessionTests/SignedOutAuthSessionTests.swift b/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSessionTests/SignedOutAuthSessionTests.swift
@@ -12,13 +12,11 @@ import AWSPluginsCore
 
 class SignedOutAuthSessionTests: AWSAuthBaseTest {
 
-    override func setUp() {
-        super.setUp()
-        initializeAmplify()
+    override func setUpWithError() throws {
+        try initializeAmplify()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDownWithError() throws {
         Amplify.reset()
         sleep(2)
     }
diff --git a/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSignInTests/AuthUsernamePasswordSignInTests.swift b/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSignInTests/AuthUsernamePasswordSignInTests.swift
@@ -12,13 +12,11 @@ import AmplifyTestCommon
 
 class AuthUsernamePasswordSignInTests: AWSAuthBaseTest {
 
-    override func setUp() {
-        super.setUp()
-        initializeAmplify()
+    override func setUpWithError() throws {
+        try initializeAmplify()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDownWithError() throws {
         Amplify.reset()
         sleep(2)
     }
diff --git a/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSignOutTests/AuthSignOutTests.swift b/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSignOutTests/AuthSignOutTests.swift
@@ -14,13 +14,11 @@ import AmplifyTestCommon
 
 class AuthSignedOutTests: AWSAuthBaseTest {
 
-    override func setUp() {
-        super.setUp()
-        initializeAmplify()
+    override func setUpWithError() throws {
+        try initializeAmplify()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDownWithError() throws {
         Amplify.reset()
         sleep(2)
     }
diff --git a/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSignUpTests/AuthConfirmSignUpTests.swift b/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSignUpTests/AuthConfirmSignUpTests.swift
@@ -11,13 +11,11 @@ import AWSCognitoAuthPlugin
 
 class AuthConfirmSignUpTests: AWSAuthBaseTest {
 
-    override func setUp() {
-        super.setUp()
-        initializeAmplify()
+    override func setUpWithError() throws {
+        try initializeAmplify()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDownWithError() throws {
         Amplify.reset()
         sleep(2)
     }
diff --git a/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSignUpTests/AuthResendSignUpCodeTests.swift b/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSignUpTests/AuthResendSignUpCodeTests.swift
@@ -11,13 +11,11 @@ import AWSCognitoAuthPlugin
 
 class AuthResendSignUpCodeTests: AWSAuthBaseTest {
 
-    override func setUp() {
-        super.setUp()
-        initializeAmplify()
+    override func setUpWithError() throws {
+        try initializeAmplify()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDownWithError() throws {
         Amplify.reset()
         sleep(2)
     }
diff --git a/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSignUpTests/AuthSignUpTests.swift b/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthSignUpTests/AuthSignUpTests.swift
@@ -12,13 +12,11 @@ import AmplifyTestCommon
 
 class AuthSignUpTests: AWSAuthBaseTest {
 
-    override func setUp() {
-        super.setUp()
-        initializeAmplify()
+    override func setUpWithError() throws {
+        try initializeAmplify()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDownWithError() throws {
         Amplify.reset()
         sleep(2)
     }
diff --git a/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthUserAttributesTests/AuthUserAttributesTests.swift b/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthUserAttributesTests/AuthUserAttributesTests.swift
@@ -12,13 +12,11 @@ import AmplifyTestCommon
 
 class AuthUserAttributesTests: AWSAuthBaseTest {
 
-    override func setUp() {
-        super.setUp()
-        initializeAmplify()
+    override func setUpWithError() throws {
+        try initializeAmplify()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDownWithError() throws {
         Amplify.reset()
         sleep(2)
     }
diff --git a/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthUserTests/AuthUserTests.swift b/AmplifyPlugins/Auth/AWSCognitoAuthPluginIntegrationTests/AuthUserTests/AuthUserTests.swift
@@ -12,13 +12,11 @@ import AmplifyTestCommon
 
 class AuthUserTests: AWSAuthBaseTest {
 
-    override func setUp() {
-        super.setUp()
-        initializeAmplify()
+    override func setUpWithError() throws {
+        try initializeAmplify()
     }
 
-    override func tearDown() {
-        super.tearDown()
+    override func tearDownWithError() throws {
         Amplify.reset()
         sleep(2)
     }

Original file line number	Diff line number	Diff line change
`@@ -14,13 +14,11 @@ import AmplifyTestCommon`
`14`	`14`
`15`	`15`	`class AuthDeleteUserTests: AWSAuthBaseTest {`
`16`	`16`
`17`		`- override func setUp() {`
`18`		`- super.setUp()`
`19`		`- initializeAmplify()`
	`17`	`+ override func setUpWithError() throws {`
	`18`	`+ try initializeAmplify()`
`20`	`19`	`}`
`21`	`20`
`22`		`- override func tearDown() {`
`23`		`- super.tearDown()`
	`21`	`+ override func tearDownWithError() throws {`
`24`	`22`	`Amplify.reset()`
`25`	`23`	`sleep(2)`
`26`	`24`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,13 +17,11 @@ import AWSMobileClientXCF`
`17`	`17`
`18`	`18`	`class AuthDeviceOperationTests: AWSAuthBaseTest {`
`19`	`19`
`20`		`- override func setUp() {`
`21`		`- super.setUp()`
`22`		`- initializeAmplify()`
	`20`	`+ override func setUpWithError() throws {`
	`21`	`+ try initializeAmplify()`
`23`	`22`	`}`
`24`	`23`
`25`		`- override func tearDown() {`
`26`		`- super.tearDown()`
	`24`	`+ override func tearDownWithError() throws {`
`27`	`25`	`Amplify.reset()`
`28`	`26`	`sleep(2)`
`29`	`27`	`}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ import AmplifyTestCommon`
`15`	`15`	`class SignedInAuthSessionTests: AWSAuthBaseTest {`
`16`	`16`
`17`	`17`	`override func setUpWithError() throws {`
`18`		`- try initializeAmplifyWithError()`
	`18`	`+ try initializeAmplify()`
`19`	`19`	`AuthSessionHelper.clearKeychain()`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,11 @@ import AWSPluginsCore`
`12`	`12`
`13`	`13`	`class SignedOutAuthSessionTests: AWSAuthBaseTest {`
`14`	`14`
`15`		`- override func setUp() {`
`16`		`- super.setUp()`
`17`		`- initializeAmplify()`
	`15`	`+ override func setUpWithError() throws {`
	`16`	`+ try initializeAmplify()`
`18`	`17`	`}`
`19`	`18`
`20`		`- override func tearDown() {`
`21`		`- super.tearDown()`
	`19`	`+ override func tearDownWithError() throws {`
`22`	`20`	`Amplify.reset()`
`23`	`21`	`sleep(2)`
`24`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -12,13 +12,11 @@ import AmplifyTestCommon`
`12`	`12`
`13`	`13`	`class AuthUsernamePasswordSignInTests: AWSAuthBaseTest {`
`14`	`14`
`15`		`- override func setUp() {`
`16`		`- super.setUp()`
`17`		`- initializeAmplify()`
	`15`	`+ override func setUpWithError() throws {`
	`16`	`+ try initializeAmplify()`
`18`	`17`	`}`
`19`	`18`
`20`		`- override func tearDown() {`
`21`		`- super.tearDown()`
	`19`	`+ override func tearDownWithError() throws {`
`22`	`20`	`Amplify.reset()`
`23`	`21`	`sleep(2)`
`24`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,13 +11,11 @@ import AWSCognitoAuthPlugin`
`11`	`11`
`12`	`12`	`class AuthConfirmSignUpTests: AWSAuthBaseTest {`
`13`	`13`
`14`		`- override func setUp() {`
`15`		`- super.setUp()`
`16`		`- initializeAmplify()`
	`14`	`+ override func setUpWithError() throws {`
	`15`	`+ try initializeAmplify()`
`17`	`16`	`}`
`18`	`17`
`19`		`- override func tearDown() {`
`20`		`- super.tearDown()`
	`18`	`+ override func tearDownWithError() throws {`
`21`	`19`	`Amplify.reset()`
`22`	`20`	`sleep(2)`
`23`	`21`	`}`