Restructure TestApp for future CocoaPods support.

Author: andrewheard

.github/workflows/vertexai.yml

@@ -136,25 +136,23 @@ jobs:
     runs-on: ${{ matrix.os }}
     needs: spm-package-resolved
     env:
-      TEST_RUNNER_VertexAIRunIntegrationTests: 1
-      TEST_RUNNER_VertexAIIntegrationAuthEmail1: ${{ secrets.VERTEXAI_INTEGRATION_AUTH_EMAIL_1 }}
-      TEST_RUNNER_VertexAIIntegrationAuthEmailPassword1: ${{ secrets.VERTEXAI_INTEGRATION_AUTH_EMAIL_1_PW }}
       TEST_RUNNER_FIRAAppCheckDebugToken: ${{ secrets.VERTEXAI_INTEGRATION_FAC_DEBUG_TOKEN }}
       FIREBASECI_USE_LATEST_GOOGLEAPPMEASUREMENT: 1
-      plist_secret: ${{ secrets.GHASecretsGPGPassphrase1 }}
+      secrets_passphrase: ${{ secrets.GHASecretsGPGPassphrase1 }}
     steps:
     - uses: actions/checkout@v4
     - uses: actions/cache/restore@v4
       with:
         path: .build
         key: ${{needs.spm-package-resolved.outputs.cache_key}}
     - name: Install Secret GoogleService-Info.plist
-      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/vertexai-testapp.plist.gpg \
-        FirebaseVertexAI/Tests/TestApp/Resources/GoogleService-Info.plist "$plist_secret"
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/VertexAI/TestApp-GoogleService-Info.plist.gpg \
+        FirebaseVertexAI/Tests/TestApp/Resources/GoogleService-Info.plist "$secrets_passphrase"
+    - name: Install Secret Credentials.swift
+      run: scripts/decrypt_gha_secret.sh scripts/gha-encrypted/VertexAI/TestApp-Credentials.swift.gpg \
+        FirebaseVertexAI/Tests/TestApp/Tests/Integration/Credentials.swift "$secrets_passphrase"
     - name: Xcode
       run: sudo xcode-select -s /Applications/${{ matrix.xcode }}.app/Contents/Developer
-    - name: Initialize xcodebuild
-      run: scripts/setup_spm_tests.sh
     - name: Run IntegrationTests
       run: scripts/build.sh VertexIntegration ${{ matrix.target }}
 

FirebaseVertexAI/Tests/TestApp/VertexAITestApp/Assets.xcassets/AccentColor.colorset/Contents.json renamed to FirebaseVertexAI/Tests/TestApp/Resources/Assets.xcassets/AccentColor.colorset/Contents.json

@@ -17,7 +17,7 @@ import FirebaseCore
 import SwiftUI
 
 @main
-struct VertexAITestApp: App {
+struct TestApp: App {
   init() {
     AppCheck.setAppCheckProviderFactory(AppCheckDebugProviderFactory())
     FirebaseApp.configure()

FirebaseVertexAI/Tests/TestApp/VertexAITestApp/Assets.xcassets/AppIcon.appiconset/Contents.json renamed to FirebaseVertexAI/Tests/TestApp/Resources/Assets.xcassets/AppIcon.appiconset/Contents.json

@@ -42,29 +42,14 @@ final class IntegrationTests: XCTestCase {
   var vertex: VertexAI!
   var model: GenerativeModel!
   var storage: Storage!
-  var userID = ""
-
-  static let emailEnvVar = "VertexAIIntegrationAuthEmail1"
-  static let passwordEnvVar = "VertexAIIntegrationAuthEmailPassword1"
+  var userID1 = ""
 
   override func setUp() async throws {
-    let environment = ProcessInfo.processInfo.environment
-    try XCTSkipIf(environment["VertexAIRunIntegrationTests"] == nil, """
-    Vertex AI integration tests skipped; to enable them, set the VertexAIRunIntegrationTests \
-    environment variable in Xcode or CI jobs.
-    """)
-
-    let email = try XCTUnwrap(
-      environment[IntegrationTests.emailEnvVar],
-      "No email address specified in environment variable \(IntegrationTests.emailEnvVar)."
-    )
-    let password = try XCTUnwrap(
-      environment[IntegrationTests.passwordEnvVar],
-      "No email address specified in environment variable \(IntegrationTests.passwordEnvVar)."
+    let authResult = try await Auth.auth().signIn(
+      withEmail: Credentials.emailAddress1,
+      password: Credentials.emailPassword1
     )
-
-    let authResult = try await Auth.auth().signIn(withEmail: email, password: password)
-    userID = authResult.user.uid
+    userID1 = authResult.user.uid
 
     vertex = VertexAI.vertexAI()
     model = vertex.generativeModel(
@@ -149,7 +134,7 @@ final class IntegrationTests: XCTestCase {
   }
 
   func testCountTokens_image_fileData_requiresUserAuth_userSignedIn() async throws {
-    let storageRef = storage.reference(withPath: "vertexai/authenticated/user/\(userID)/red.webp")
+    let storageRef = storage.reference(withPath: "vertexai/authenticated/user/\(userID1)/red.webp")
 
     let fileData = FileDataPart(uri: storageRef.gsURI, mimeType: "image/webp")