@@ -19,8 +19,15 @@ import XCTest
1919
2020@available ( iOS 15 . 0 , macOS 12 . 0 , tvOS 15 . 0 , watchOS 8 . 0 , * )
2121class InstanceTests : XCTestCase {
22- static var defaultApp : FirebaseApp ?
23- static var appTwo : FirebaseApp ?
22+ static var defaultApp : FirebaseApp ? = {
23+ FirebaseApp . configure ( options: options)
24+ return FirebaseApp . app ( )
25+ } ( )
26+
27+ static var appTwo : FirebaseApp ? = {
28+ FirebaseApp . configure ( name: " app-two " , options: optionsTwo)
29+ return FirebaseApp . app ( name: " app-two " )
30+ } ( )
2431
2532 static var options : FirebaseOptions = {
2633 let options = FirebaseOptions ( googleAppID: " 0:0000000000000:ios:0000000000000000 " ,
@@ -51,18 +58,6 @@ class InstanceTests: XCTestCase {
5158 connector: " blogs "
5259 )
5360
54- override class func setUp( ) {
55- if defaultApp == nil {
56- FirebaseApp . configure ( options: options)
57- defaultApp = FirebaseApp . app ( )
58- }
59-
60- if appTwo == nil {
61- FirebaseApp . configure ( name: " app-two " , options: optionsTwo)
62- appTwo = FirebaseApp . app ( name: " app-two " )
63- }
64- }
65-
6661 // same connector config, same app, instance returned should be same
6762 func testSameInstance( ) throws {
6863 let dcOne = DataConnect . dataConnect ( connectorConfig: fakeConnectorConfigOne)
0 commit comments