Fix tests

Author: andrewheard

FirebaseVertexAI/Sources/Constants.swift

@@ -22,7 +22,7 @@ import Foundation
 enum Constants {
   /// The Vertex AI backend endpoint URL.
   ///
-  /// TODO(andrewheard): Update to "https://firebasevertexai.googleapis.com" after the Firebase
-  /// Vertex AI API launch.
+  /// TODO(andrewheard): Update to "https://firebasevertexai.googleapis.com" after the Vertex AI in
+  /// Firebase API launch.
   static let baseURL = "https://firebaseml.googleapis.com"
 }

FirebaseVertexAI/Sources/Errors.swift

@@ -31,13 +31,13 @@ struct RPCError: Error {
     self.details = details
   }
 
-  // TODO(andrewheard): Remove this method after the Firebase Vertex AI API launch.
+  // TODO(andrewheard): Remove this method after the Vertex AI in Firebase API launch.
   func isFirebaseMLServiceDisabledError() -> Bool {
     return details.contains { $0.isFirebaseMLServiceDisabledErrorDetails() }
   }
 
-  func isFirebaseVertexAIServiceDisabledError() -> Bool {
-    return details.contains { $0.isFirebaseVertexAIServiceDisabledErrorDetails() }
+  func isVertexAIInFirebaseServiceDisabledError() -> Bool {
+    return details.contains { $0.isVertexAIInFirebaseServiceDisabledErrorDetails() }
   }
 }
 
@@ -95,7 +95,7 @@ struct ErrorDetails {
     return isErrorInfo() && reason == "SERVICE_DISABLED" && domain == "googleapis.com"
   }
 
-  // TODO(andrewheard): Remove this method after the Firebase Vertex AI API launch.
+  // TODO(andrewheard): Remove this method after the Vertex AI in Firebase API launch.
   func isFirebaseMLServiceDisabledErrorDetails() -> Bool {
     guard isServiceDisabledError() else {
       return false
@@ -106,7 +106,7 @@ struct ErrorDetails {
     return true
   }
 
-  func isFirebaseVertexAIServiceDisabledErrorDetails() -> Bool {
+  func isVertexAIInFirebaseServiceDisabledErrorDetails() -> Bool {
     guard isServiceDisabledError() else {
       return false
     }

FirebaseVertexAI/Sources/GenerativeAIRequest.swift

@@ -32,7 +32,7 @@ public struct RequestOptions {
 
   /// The API version to use in requests to the backend.
   ///
-  /// TODO(andrewheard): Update to "v1beta" after the Firebase Vertex AI API launch.
+  /// TODO(andrewheard): Update to "v1beta" after the Vertex AI in Firebase API launch.
   let apiVersion = "v2beta"
 
   /// Initializes a request options object.

FirebaseVertexAI/Sources/GenerativeAIService.swift

@@ -266,9 +266,9 @@ struct GenerativeAIService {
   // Log specific RPC errors that cannot be mitigated or handled by user code.
   // These errors do not produce specific GenerateContentError or CountTokensError cases.
   private func logRPCError(_ error: RPCError) {
-    // TODO(andrewheard): Remove this check after the Firebase Vertex AI API launch.
+    // TODO(andrewheard): Remove this check after the Vertex AI in Firebase API launch.
     if error.isFirebaseMLServiceDisabledError() {
-      VertexLog.error(code: .firebaseVertexAIAPIDisabled, """
+      VertexLog.error(code: .vertexAIInFirebaseAPIDisabled, """
       The Vertex AI for Firebase SDK requires the Firebase ML API `firebaseml.googleapis.com` to \
       be enabled for your project. Get started in the Firebase Console \
       (https://console.firebase.google.com/project/\(projectID)/genai/vertex) or verify that the \
@@ -278,8 +278,8 @@ struct GenerativeAIService {
       """)
     }
 
-    if error.isFirebaseVertexAIServiceDisabledError() {
-      VertexLog.error(code: .firebaseVertexAIAPIDisabled, """
+    if error.isVertexAIInFirebaseServiceDisabledError() {
+      VertexLog.error(code: .vertexAIInFirebaseAPIDisabled, """
       The Vertex AI for Firebase SDK requires the Firebase Vertex AI API \
       `firebasevertexai.googleapis.com` to be enabled for your project. Get started by visiting \
       the Firebase Console at: \

FirebaseVertexAI/Sources/VertexLog.swift

@@ -29,7 +29,7 @@ enum VertexLog {
     case verboseLoggingEnabled = 101
 
     // API Enablement Errors
-    case firebaseVertexAIAPIDisabled = 200
+    case vertexAIInFirebaseAPIDisabled = 200
 
     // Model Configuration
     case generativeModelInitialized = 1000

FirebaseVertexAI/Tests/Unit/GenerativeModelTests.swift

@@ -453,7 +453,7 @@ final class GenerativeModelTests: XCTestCase {
     }
   }
 
-  // TODO(andrewheard): Remove this test case after the Firebase Vertex AI API launch.
+  // TODO(andrewheard): Remove this test case after the Vertex AI in Firebase API launch.
   func testGenerateContent_failure_firebaseMLAPINotEnabled() async throws {
     let expectedStatusCode = 403
     MockURLProtocol
@@ -494,7 +494,7 @@ final class GenerativeModelTests: XCTestCase {
       XCTAssertEqual(error.status, .permissionDenied)
       XCTAssertTrue(error.message
         .starts(with: "Vertex AI in Firebase API has not been used in project"))
-      XCTAssertTrue(error.isFirebaseMLServiceDisabledError())
+      XCTAssertTrue(error.isVertexAIInFirebaseServiceDisabledError())
       return
     } catch {
       XCTFail("Should throw GenerateContentError.internalError(RPCError); error thrown: \(error)")
@@ -799,6 +799,7 @@ final class GenerativeModelTests: XCTestCase {
     XCTFail("Should have caught an error.")
   }
 
+  // TODO(andrewheard): Remove this test case after the Vertex AI in Firebase API launch.
   func testGenerateContentStream_failure_firebaseMLAPINotEnabled() async throws {
     let expectedStatusCode = 403
     MockURLProtocol
@@ -824,6 +825,31 @@ final class GenerativeModelTests: XCTestCase {
     XCTFail("Should have caught an error.")
   }
 
+  func testGenerateContentStream_failure_vertexAIInFirebaseAPINotEnabled() async throws {
+    let expectedStatusCode = 403
+    MockURLProtocol
+      .requestHandler = try httpRequestHandler(
+        forResource: "unary-failure-firebasevertexai-api-not-enabled",
+        withExtension: "json",
+        statusCode: expectedStatusCode
+      )
+
+    do {
+      let stream = try model.generateContentStream(testPrompt)
+      for try await _ in stream {
+        XCTFail("No content is there, this shouldn't happen.")
+      }
+    } catch let GenerateContentError.internalError(error as RPCError) {
+      XCTAssertEqual(error.httpResponseCode, expectedStatusCode)
+      XCTAssertEqual(error.status, .permissionDenied)
+      XCTAssertTrue(error.message.starts(with: "Vertex AI in Firebase API has not been used in project"))
+      XCTAssertTrue(error.isVertexAIInFirebaseServiceDisabledError())
+      return
+    }
+
+    XCTFail("Should have caught an error.")
+  }
+
   func testGenerateContentStream_failureEmptyContent() async throws {
     MockURLProtocol
       .requestHandler = try httpRequestHandler(