From b748e9b5e56b5124c5058e4ddfc2a826b1109864 Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 6 Jun 2025 14:46:04 -0700 Subject: [PATCH 1/2] Rename VertexAITestApp to FirebaseAITestApp --- .../project.pbxproj | 46 ++++----- .../xcschemes/FirebaseAITestApp-SPM.xcscheme | 97 +++++++++++++++++++ .../CountTokensIntegrationTests.swift | 2 +- .../GenerateContentIntegrationTests.swift | 2 +- .../Integration/ImagenIntegrationTests.swift | 2 +- .../Tests/Integration/IntegrationTests.swift | 2 +- .../Tests/Integration/SchemaTests.swift | 2 +- .../Tests/Utilities/InstanceConfig.swift | 2 +- scripts/build.sh | 8 +- 9 files changed, 130 insertions(+), 33 deletions(-) rename FirebaseAI/Tests/TestApp/{VertexAITestApp.xcodeproj => FirebaseAITestApp.xcodeproj}/project.pbxproj (94%) create mode 100644 FirebaseAI/Tests/TestApp/FirebaseAITestApp.xcodeproj/xcshareddata/xcschemes/FirebaseAITestApp-SPM.xcscheme diff --git a/FirebaseAI/Tests/TestApp/VertexAITestApp.xcodeproj/project.pbxproj b/FirebaseAI/Tests/TestApp/FirebaseAITestApp.xcodeproj/project.pbxproj similarity index 94% rename from FirebaseAI/Tests/TestApp/VertexAITestApp.xcodeproj/project.pbxproj rename to FirebaseAI/Tests/TestApp/FirebaseAITestApp.xcodeproj/project.pbxproj index 50303ad511b..fc62b25f132 100644 --- a/FirebaseAI/Tests/TestApp/VertexAITestApp.xcodeproj/project.pbxproj +++ b/FirebaseAI/Tests/TestApp/FirebaseAITestApp.xcodeproj/project.pbxproj @@ -37,14 +37,14 @@ containerPortal = 866138502CC943DD00F4B78E /* Project object */; proxyType = 1; remoteGlobalIDString = 866138572CC943DD00F4B78E; - remoteInfo = VertexAITestApp; + remoteInfo = FirebaseAITestApp; }; /* End PBXContainerItemProxy section */ /* Begin PBXFileReference section */ 862218802D04E08D007ED2D4 /* IntegrationTestUtils.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = IntegrationTestUtils.swift; sourceTree = ""; }; 864F8F702D4980D60002EA7E /* ImagenIntegrationTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ImagenIntegrationTests.swift; sourceTree = ""; }; - 866138582CC943DD00F4B78E /* VertexAITestApp-SPM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "VertexAITestApp-SPM.app"; sourceTree = BUILT_PRODUCTS_DIR; }; + 866138582CC943DD00F4B78E /* FirebaseAITestApp-SPM.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "FirebaseAITestApp-SPM.app"; sourceTree = BUILT_PRODUCTS_DIR; }; 8661385B2CC943DD00F4B78E /* TestApp.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TestApp.swift; sourceTree = ""; }; 8661385D2CC943DD00F4B78E /* ContentView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ContentView.swift; sourceTree = ""; }; 866138692CC943DE00F4B78E /* IntegrationTests-SPM.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = "IntegrationTests-SPM.xctest"; sourceTree = BUILT_PRODUCTS_DIR; }; @@ -100,7 +100,7 @@ 866138592CC943DD00F4B78E /* Products */ = { isa = PBXGroup; children = ( - 866138582CC943DD00F4B78E /* VertexAITestApp-SPM.app */, + 866138582CC943DD00F4B78E /* FirebaseAITestApp-SPM.app */, 866138692CC943DE00F4B78E /* IntegrationTests-SPM.xctest */, ); name = Products; @@ -173,9 +173,9 @@ /* End PBXGroup section */ /* Begin PBXNativeTarget section */ - 866138572CC943DD00F4B78E /* VertexAITestApp-SPM */ = { + 866138572CC943DD00F4B78E /* FirebaseAITestApp-SPM */ = { isa = PBXNativeTarget; - buildConfigurationList = 8661387D2CC943DE00F4B78E /* Build configuration list for PBXNativeTarget "VertexAITestApp-SPM" */; + buildConfigurationList = 8661387D2CC943DE00F4B78E /* Build configuration list for PBXNativeTarget "FirebaseAITestApp-SPM" */; buildPhases = ( 866138542CC943DD00F4B78E /* Sources */, 866138552CC943DD00F4B78E /* Frameworks */, @@ -185,15 +185,15 @@ ); dependencies = ( ); - name = "VertexAITestApp-SPM"; + name = "FirebaseAITestApp-SPM"; packageProductDependencies = ( 86E8505A2DBAFBC3002E8D94 /* FirebaseAI */, 86E8505C2DBAFBC3002E8D94 /* FirebaseAppCheck */, 86E8505E2DBAFBC3002E8D94 /* FirebaseAuth */, 86E850602DBAFBC3002E8D94 /* FirebaseStorage */, ); - productName = VertexAITestApp; - productReference = 866138582CC943DD00F4B78E /* VertexAITestApp-SPM.app */; + productName = FirebaseAITestApp; + productReference = 866138582CC943DD00F4B78E /* FirebaseAITestApp-SPM.app */; productType = "com.apple.product-type.application"; }; 866138682CC943DE00F4B78E /* IntegrationTests-SPM */ = { @@ -210,7 +210,7 @@ 8661386B2CC943DE00F4B78E /* PBXTargetDependency */, ); name = "IntegrationTests-SPM"; - productName = VertexAITestAppTests; + productName = FirebaseAITestAppTests; productReference = 866138692CC943DE00F4B78E /* IntegrationTests-SPM.xctest */; productType = "com.apple.product-type.bundle.unit-test"; }; @@ -233,7 +233,7 @@ }; }; }; - buildConfigurationList = 866138532CC943DD00F4B78E /* Build configuration list for PBXProject "VertexAITestApp" */; + buildConfigurationList = 866138532CC943DD00F4B78E /* Build configuration list for PBXProject "FirebaseAITestApp" */; compatibilityVersion = "Xcode 15.0"; developmentRegion = en; hasScannedForEncodings = 0; @@ -249,7 +249,7 @@ projectDirPath = ""; projectRoot = ""; targets = ( - 866138572CC943DD00F4B78E /* VertexAITestApp-SPM */, + 866138572CC943DD00F4B78E /* FirebaseAITestApp-SPM */, 866138682CC943DE00F4B78E /* IntegrationTests-SPM */, ); }; @@ -310,7 +310,7 @@ /* Begin PBXTargetDependency section */ 8661386B2CC943DE00F4B78E /* PBXTargetDependency */ = { isa = PBXTargetDependency; - target = 866138572CC943DD00F4B78E /* VertexAITestApp-SPM */; + target = 866138572CC943DD00F4B78E /* FirebaseAITestApp-SPM */; targetProxy = 8661386A2CC943DE00F4B78E /* PBXContainerItemProxy */; }; /* End PBXTargetDependency section */ @@ -459,8 +459,8 @@ "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 12.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.VertexAITestApp; - PRODUCT_MODULE_NAME = VertexAITestApp; + PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.FirebaseAITestApp; + PRODUCT_MODULE_NAME = FirebaseAITestApp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -497,8 +497,8 @@ "LD_RUNPATH_SEARCH_PATHS[sdk=macosx*]" = "@executable_path/../Frameworks"; MACOSX_DEPLOYMENT_TARGET = 12.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.VertexAITestApp; - PRODUCT_MODULE_NAME = VertexAITestApp; + PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.FirebaseAITestApp; + PRODUCT_MODULE_NAME = FirebaseAITestApp; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; @@ -519,14 +519,14 @@ IPHONEOS_DEPLOYMENT_TARGET = 15.0; MACOSX_DEPLOYMENT_TARGET = 12.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.VertexAITestAppTests; + PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.FirebaseAITestAppTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/VertexAITestApp-SPM.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/VertexAITestApp-SPM"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FirebaseAITestApp-SPM.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/FirebaseAITestApp-SPM"; }; name = Debug; }; @@ -541,21 +541,21 @@ IPHONEOS_DEPLOYMENT_TARGET = 15.0; MACOSX_DEPLOYMENT_TARGET = 12.0; MARKETING_VERSION = 1.0; - PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.VertexAITestAppTests; + PRODUCT_BUNDLE_IDENTIFIER = com.google.firebase.FirebaseAITestAppTests; PRODUCT_NAME = "$(TARGET_NAME)"; SDKROOT = auto; SUPPORTED_PLATFORMS = "iphoneos iphonesimulator macosx"; SWIFT_EMIT_LOC_STRINGS = NO; SWIFT_VERSION = 5.0; TARGETED_DEVICE_FAMILY = "1,2"; - TEST_HOST = "$(BUILT_PRODUCTS_DIR)/VertexAITestApp-SPM.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/VertexAITestApp-SPM"; + TEST_HOST = "$(BUILT_PRODUCTS_DIR)/FirebaseAITestApp-SPM.app/$(BUNDLE_EXECUTABLE_FOLDER_PATH)/FirebaseAITestApp-SPM"; }; name = Release; }; /* End XCBuildConfiguration section */ /* Begin XCConfigurationList section */ - 866138532CC943DD00F4B78E /* Build configuration list for PBXProject "VertexAITestApp" */ = { + 866138532CC943DD00F4B78E /* Build configuration list for PBXProject "FirebaseAITestApp" */ = { isa = XCConfigurationList; buildConfigurations = ( 8661387B2CC943DE00F4B78E /* Debug */, @@ -564,7 +564,7 @@ defaultConfigurationIsVisible = 0; defaultConfigurationName = Release; }; - 8661387D2CC943DE00F4B78E /* Build configuration list for PBXNativeTarget "VertexAITestApp-SPM" */ = { + 8661387D2CC943DE00F4B78E /* Build configuration list for PBXNativeTarget "FirebaseAITestApp-SPM" */ = { isa = XCConfigurationList; buildConfigurations = ( 8661387E2CC943DE00F4B78E /* Debug */, @@ -587,7 +587,7 @@ /* Begin XCLocalSwiftPackageReference section */ 86E850592DBAFBC3002E8D94 /* XCLocalSwiftPackageReference "../../.." */ = { isa = XCLocalSwiftPackageReference; - relativePath = "../../.."; + relativePath = ../../..; }; /* End XCLocalSwiftPackageReference section */ diff --git a/FirebaseAI/Tests/TestApp/FirebaseAITestApp.xcodeproj/xcshareddata/xcschemes/FirebaseAITestApp-SPM.xcscheme b/FirebaseAI/Tests/TestApp/FirebaseAITestApp.xcodeproj/xcshareddata/xcschemes/FirebaseAITestApp-SPM.xcscheme new file mode 100644 index 00000000000..8d78bfa6563 --- /dev/null +++ b/FirebaseAI/Tests/TestApp/FirebaseAITestApp.xcodeproj/xcshareddata/xcschemes/FirebaseAITestApp-SPM.xcscheme @@ -0,0 +1,97 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/FirebaseAI/Tests/TestApp/Tests/Integration/CountTokensIntegrationTests.swift b/FirebaseAI/Tests/TestApp/Tests/Integration/CountTokensIntegrationTests.swift index 9be7f1dcb02..1aa7fdebb86 100644 --- a/FirebaseAI/Tests/TestApp/Tests/Integration/CountTokensIntegrationTests.swift +++ b/FirebaseAI/Tests/TestApp/Tests/Integration/CountTokensIntegrationTests.swift @@ -17,7 +17,7 @@ import FirebaseAuth import FirebaseCore import FirebaseStorage import Testing -import VertexAITestApp +import FirebaseAITestApp @testable import struct FirebaseAI.APIConfig diff --git a/FirebaseAI/Tests/TestApp/Tests/Integration/GenerateContentIntegrationTests.swift b/FirebaseAI/Tests/TestApp/Tests/Integration/GenerateContentIntegrationTests.swift index 608c28b4833..daa920f41a1 100644 --- a/FirebaseAI/Tests/TestApp/Tests/Integration/GenerateContentIntegrationTests.swift +++ b/FirebaseAI/Tests/TestApp/Tests/Integration/GenerateContentIntegrationTests.swift @@ -17,7 +17,7 @@ import FirebaseAuth import FirebaseCore import FirebaseStorage import Testing -import VertexAITestApp +import FirebaseAITestApp #if canImport(UIKit) import UIKit diff --git a/FirebaseAI/Tests/TestApp/Tests/Integration/ImagenIntegrationTests.swift b/FirebaseAI/Tests/TestApp/Tests/Integration/ImagenIntegrationTests.swift index b7533c08aa1..9815624c9fb 100644 --- a/FirebaseAI/Tests/TestApp/Tests/Integration/ImagenIntegrationTests.swift +++ b/FirebaseAI/Tests/TestApp/Tests/Integration/ImagenIntegrationTests.swift @@ -17,7 +17,7 @@ import FirebaseAuth import FirebaseCore import FirebaseStorage import Testing -import VertexAITestApp +import FirebaseAITestApp #if canImport(UIKit) import UIKit diff --git a/FirebaseAI/Tests/TestApp/Tests/Integration/IntegrationTests.swift b/FirebaseAI/Tests/TestApp/Tests/Integration/IntegrationTests.swift index e61b5ed3470..6c15c63678f 100644 --- a/FirebaseAI/Tests/TestApp/Tests/Integration/IntegrationTests.swift +++ b/FirebaseAI/Tests/TestApp/Tests/Integration/IntegrationTests.swift @@ -16,7 +16,7 @@ import FirebaseAI import FirebaseAuth import FirebaseCore import FirebaseStorage -import VertexAITestApp +import FirebaseAITestApp import XCTest // TODO(#14405): Migrate to Swift Testing and parameterize tests to run on both `v1` and `v1beta`. diff --git a/FirebaseAI/Tests/TestApp/Tests/Integration/SchemaTests.swift b/FirebaseAI/Tests/TestApp/Tests/Integration/SchemaTests.swift index 431134d315a..dc8e10b773f 100644 --- a/FirebaseAI/Tests/TestApp/Tests/Integration/SchemaTests.swift +++ b/FirebaseAI/Tests/TestApp/Tests/Integration/SchemaTests.swift @@ -17,7 +17,7 @@ import FirebaseAuth import FirebaseCore import FirebaseStorage import Testing -import VertexAITestApp +import FirebaseAITestApp #if canImport(UIKit) import UIKit diff --git a/FirebaseAI/Tests/TestApp/Tests/Utilities/InstanceConfig.swift b/FirebaseAI/Tests/TestApp/Tests/Utilities/InstanceConfig.swift index ebafa1be61c..c2c4a03fad7 100644 --- a/FirebaseAI/Tests/TestApp/Tests/Utilities/InstanceConfig.swift +++ b/FirebaseAI/Tests/TestApp/Tests/Utilities/InstanceConfig.swift @@ -15,7 +15,7 @@ import FirebaseAI import FirebaseCore import Testing -import VertexAITestApp +import FirebaseAITestApp @testable import struct FirebaseAI.APIConfig diff --git a/scripts/build.sh b/scripts/build.sh index b11fba7d804..80cc79f0bb5 100755 --- a/scripts/build.sh +++ b/scripts/build.sh @@ -510,15 +510,15 @@ case "$product-$platform-$method" in FirebaseAIIntegration-*-*) # Build RunXcodebuild \ - -project 'FirebaseAI/Tests/TestApp/VertexAITestApp.xcodeproj' \ - -scheme "VertexAITestApp-SPM" \ + -project 'FirebaseAI/Tests/TestApp/FirebaseAITestApp.xcodeproj' \ + -scheme "FirebaseAITestApp-SPM" \ "${xcb_flags[@]}" \ build # Run tests RunXcodebuild \ - -project 'FirebaseAI/Tests/TestApp/VertexAITestApp.xcodeproj' \ - -scheme "VertexAITestApp-SPM" \ + -project 'FirebaseAI/Tests/TestApp/FirebaseAITestApp.xcodeproj' \ + -scheme "FirebaseAITestApp-SPM" \ "${xcb_flags[@]}" \ -parallel-testing-enabled NO \ test From 08b36d6bdfba36a152f5656c0a8a18fc7138c91c Mon Sep 17 00:00:00 2001 From: Paul Beusterien Date: Fri, 6 Jun 2025 15:08:33 -0700 Subject: [PATCH 2/2] style --- .../TestApp/Tests/Integration/CountTokensIntegrationTests.swift | 2 +- .../Tests/Integration/GenerateContentIntegrationTests.swift | 2 +- .../TestApp/Tests/Integration/ImagenIntegrationTests.swift | 2 +- .../Tests/TestApp/Tests/Integration/IntegrationTests.swift | 2 +- FirebaseAI/Tests/TestApp/Tests/Integration/SchemaTests.swift | 2 +- FirebaseAI/Tests/TestApp/Tests/Utilities/InstanceConfig.swift | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/FirebaseAI/Tests/TestApp/Tests/Integration/CountTokensIntegrationTests.swift b/FirebaseAI/Tests/TestApp/Tests/Integration/CountTokensIntegrationTests.swift index 1aa7fdebb86..7d849c9f0bc 100644 --- a/FirebaseAI/Tests/TestApp/Tests/Integration/CountTokensIntegrationTests.swift +++ b/FirebaseAI/Tests/TestApp/Tests/Integration/CountTokensIntegrationTests.swift @@ -13,11 +13,11 @@ // limitations under the License. import FirebaseAI +import FirebaseAITestApp import FirebaseAuth import FirebaseCore import FirebaseStorage import Testing -import FirebaseAITestApp @testable import struct FirebaseAI.APIConfig diff --git a/FirebaseAI/Tests/TestApp/Tests/Integration/GenerateContentIntegrationTests.swift b/FirebaseAI/Tests/TestApp/Tests/Integration/GenerateContentIntegrationTests.swift index daa920f41a1..f5288733da7 100644 --- a/FirebaseAI/Tests/TestApp/Tests/Integration/GenerateContentIntegrationTests.swift +++ b/FirebaseAI/Tests/TestApp/Tests/Integration/GenerateContentIntegrationTests.swift @@ -13,11 +13,11 @@ // limitations under the License. import FirebaseAI +import FirebaseAITestApp import FirebaseAuth import FirebaseCore import FirebaseStorage import Testing -import FirebaseAITestApp #if canImport(UIKit) import UIKit diff --git a/FirebaseAI/Tests/TestApp/Tests/Integration/ImagenIntegrationTests.swift b/FirebaseAI/Tests/TestApp/Tests/Integration/ImagenIntegrationTests.swift index 9815624c9fb..ade781e6176 100644 --- a/FirebaseAI/Tests/TestApp/Tests/Integration/ImagenIntegrationTests.swift +++ b/FirebaseAI/Tests/TestApp/Tests/Integration/ImagenIntegrationTests.swift @@ -13,11 +13,11 @@ // limitations under the License. import FirebaseAI +import FirebaseAITestApp import FirebaseAuth import FirebaseCore import FirebaseStorage import Testing -import FirebaseAITestApp #if canImport(UIKit) import UIKit diff --git a/FirebaseAI/Tests/TestApp/Tests/Integration/IntegrationTests.swift b/FirebaseAI/Tests/TestApp/Tests/Integration/IntegrationTests.swift index 6c15c63678f..0cfe64d3086 100644 --- a/FirebaseAI/Tests/TestApp/Tests/Integration/IntegrationTests.swift +++ b/FirebaseAI/Tests/TestApp/Tests/Integration/IntegrationTests.swift @@ -13,10 +13,10 @@ // limitations under the License. import FirebaseAI +import FirebaseAITestApp import FirebaseAuth import FirebaseCore import FirebaseStorage -import FirebaseAITestApp import XCTest // TODO(#14405): Migrate to Swift Testing and parameterize tests to run on both `v1` and `v1beta`. diff --git a/FirebaseAI/Tests/TestApp/Tests/Integration/SchemaTests.swift b/FirebaseAI/Tests/TestApp/Tests/Integration/SchemaTests.swift index dc8e10b773f..4382a8e76dc 100644 --- a/FirebaseAI/Tests/TestApp/Tests/Integration/SchemaTests.swift +++ b/FirebaseAI/Tests/TestApp/Tests/Integration/SchemaTests.swift @@ -13,11 +13,11 @@ // limitations under the License. import FirebaseAI +import FirebaseAITestApp import FirebaseAuth import FirebaseCore import FirebaseStorage import Testing -import FirebaseAITestApp #if canImport(UIKit) import UIKit diff --git a/FirebaseAI/Tests/TestApp/Tests/Utilities/InstanceConfig.swift b/FirebaseAI/Tests/TestApp/Tests/Utilities/InstanceConfig.swift index c2c4a03fad7..1acbcb1925a 100644 --- a/FirebaseAI/Tests/TestApp/Tests/Utilities/InstanceConfig.swift +++ b/FirebaseAI/Tests/TestApp/Tests/Utilities/InstanceConfig.swift @@ -13,9 +13,9 @@ // limitations under the License. import FirebaseAI +import FirebaseAITestApp import FirebaseCore import Testing -import FirebaseAITestApp @testable import struct FirebaseAI.APIConfig