@@ -68,11 +68,7 @@ final class GenerativeModelTests: XCTestCase {
68
68
urlSession = try XCTUnwrap ( URLSession ( configuration: configuration) )
69
69
model = GenerativeModel (
70
70
name: testModelResourceName,
71
- firebaseInfo: FirebaseInfo (
72
- projectID: " my-project-id " ,
73
- apiKey: " API_KEY " ,
74
- googleAppID: " My app ID "
75
- ) ,
71
+ firebaseInfo: testFirebaseInfo ( ) ,
76
72
tools: nil ,
77
73
requestOptions: RequestOptions ( ) ,
78
74
urlSession: urlSession
@@ -270,11 +266,7 @@ final class GenerativeModelTests: XCTestCase {
270
266
let model = GenerativeModel (
271
267
// Model name is prefixed with "models/".
272
268
name: " models/test-model " ,
273
- firebaseInfo: FirebaseInfo (
274
- projectID: " my-project-id " ,
275
- apiKey: " API_KEY " ,
276
- googleAppID: " My app ID "
277
- ) ,
269
+ firebaseInfo: testFirebaseInfo ( ) ,
278
270
tools: nil ,
279
271
requestOptions: RequestOptions ( ) ,
280
272
urlSession: urlSession
@@ -391,12 +383,7 @@ final class GenerativeModelTests: XCTestCase {
391
383
let appCheckToken = " test-valid-token "
392
384
model = GenerativeModel (
393
385
name: testModelResourceName,
394
- firebaseInfo: FirebaseInfo (
395
- appCheck: AppCheckInteropFake ( token: appCheckToken) ,
396
- projectID: " my-project-id " ,
397
- apiKey: " API_KEY " ,
398
- googleAppID: " My app ID "
399
- ) ,
386
+ firebaseInfo: testFirebaseInfo ( appCheck: AppCheckInteropFake ( token: appCheckToken) ) ,
400
387
tools: nil ,
401
388
requestOptions: RequestOptions ( ) ,
402
389
urlSession: urlSession
@@ -415,12 +402,8 @@ final class GenerativeModelTests: XCTestCase {
415
402
let appCheckToken = " test-valid-token "
416
403
model = GenerativeModel (
417
404
name: testModelResourceName,
418
- firebaseInfo: FirebaseInfo (
419
- appCheck: AppCheckInteropFake ( token: appCheckToken) ,
420
- projectID: " my-project-id " ,
421
- apiKey: " API_KEY " ,
422
- googleAppID: nil
423
- ) ,
405
+ firebaseInfo: testFirebaseInfo ( appCheck: AppCheckInteropFake ( token: appCheckToken) ,
406
+ privateAppID: true ) ,
424
407
tools: nil ,
425
408
requestOptions: RequestOptions ( ) ,
426
409
urlSession: urlSession
@@ -439,12 +422,7 @@ final class GenerativeModelTests: XCTestCase {
439
422
func testGenerateContent_appCheck_tokenRefreshError( ) async throws {
440
423
model = GenerativeModel (
441
424
name: testModelResourceName,
442
- firebaseInfo: FirebaseInfo (
443
- appCheck: AppCheckInteropFake ( error: AppCheckErrorFake ( ) ) ,
444
- projectID: " my-project-id " ,
445
- apiKey: " API_KEY " ,
446
- googleAppID: " My app ID "
447
- ) ,
425
+ firebaseInfo: testFirebaseInfo ( appCheck: AppCheckInteropFake ( error: AppCheckErrorFake ( ) ) ) ,
448
426
tools: nil ,
449
427
requestOptions: RequestOptions ( ) ,
450
428
urlSession: urlSession
@@ -463,12 +441,7 @@ final class GenerativeModelTests: XCTestCase {
463
441
let authToken = " test-valid-token "
464
442
model = GenerativeModel (
465
443
name: testModelResourceName,
466
- firebaseInfo: FirebaseInfo (
467
- auth: AuthInteropFake ( token: authToken) ,
468
- projectID: " my-project-id " ,
469
- apiKey: " API_KEY " ,
470
- googleAppID: " My app ID "
471
- ) ,
444
+ firebaseInfo: testFirebaseInfo ( auth: AuthInteropFake ( token: authToken) ) ,
472
445
tools: nil ,
473
446
requestOptions: RequestOptions ( ) ,
474
447
urlSession: urlSession
@@ -486,12 +459,7 @@ final class GenerativeModelTests: XCTestCase {
486
459
func testGenerateContent_auth_nilAuthToken( ) async throws {
487
460
model = GenerativeModel (
488
461
name: testModelResourceName,
489
- firebaseInfo: FirebaseInfo (
490
- auth: AuthInteropFake ( token: nil ) ,
491
- projectID: " my-project-id " ,
492
- apiKey: " API_KEY " ,
493
- googleAppID: " My app ID "
494
- ) ,
462
+ firebaseInfo: testFirebaseInfo ( auth: AuthInteropFake ( token: nil ) ) ,
495
463
tools: nil ,
496
464
requestOptions: RequestOptions ( ) ,
497
465
urlSession: urlSession
@@ -509,12 +477,7 @@ final class GenerativeModelTests: XCTestCase {
509
477
func testGenerateContent_auth_authTokenRefreshError( ) async throws {
510
478
model = GenerativeModel (
511
479
name: " my-model " ,
512
- firebaseInfo: FirebaseInfo (
513
- auth: AuthInteropFake ( error: AuthErrorFake ( ) ) ,
514
- projectID: " my-project-id " ,
515
- apiKey: " API_KEY " ,
516
- googleAppID: " My app ID "
517
- ) ,
480
+ firebaseInfo: testFirebaseInfo ( auth: AuthInteropFake ( error: AuthErrorFake ( ) ) ) ,
518
481
tools: nil ,
519
482
requestOptions: RequestOptions ( ) ,
520
483
urlSession: urlSession
@@ -893,11 +856,7 @@ final class GenerativeModelTests: XCTestCase {
893
856
let requestOptions = RequestOptions ( timeout: expectedTimeout)
894
857
model = GenerativeModel (
895
858
name: testModelResourceName,
896
- firebaseInfo: FirebaseInfo (
897
- projectID: " my-project-id " ,
898
- apiKey: " API_KEY " ,
899
- googleAppID: " My app ID "
900
- ) ,
859
+ firebaseInfo: testFirebaseInfo ( ) ,
901
860
tools: nil ,
902
861
requestOptions: requestOptions,
903
862
urlSession: urlSession
@@ -1189,12 +1148,7 @@ final class GenerativeModelTests: XCTestCase {
1189
1148
let appCheckToken = " test-valid-token "
1190
1149
model = GenerativeModel (
1191
1150
name: testModelResourceName,
1192
- firebaseInfo: FirebaseInfo (
1193
- appCheck: AppCheckInteropFake ( token: appCheckToken) ,
1194
- projectID: " my-project-id " ,
1195
- apiKey: " API_KEY " ,
1196
- googleAppID: " My app ID "
1197
- ) ,
1151
+ firebaseInfo: testFirebaseInfo ( appCheck: AppCheckInteropFake ( token: appCheckToken) ) ,
1198
1152
tools: nil ,
1199
1153
requestOptions: RequestOptions ( ) ,
1200
1154
urlSession: urlSession
@@ -1213,12 +1167,7 @@ final class GenerativeModelTests: XCTestCase {
1213
1167
func testGenerateContentStream_appCheck_tokenRefreshError( ) async throws {
1214
1168
model = GenerativeModel (
1215
1169
name: testModelResourceName,
1216
- firebaseInfo: FirebaseInfo (
1217
- appCheck: AppCheckInteropFake ( error: AppCheckErrorFake ( ) ) ,
1218
- projectID: " my-project-id " ,
1219
- apiKey: " API_KEY " ,
1220
- googleAppID: " My app ID "
1221
- ) ,
1170
+ firebaseInfo: testFirebaseInfo ( appCheck: AppCheckInteropFake ( error: AppCheckErrorFake ( ) ) ) ,
1222
1171
tools: nil ,
1223
1172
requestOptions: RequestOptions ( ) ,
1224
1173
urlSession: urlSession
@@ -1361,11 +1310,7 @@ final class GenerativeModelTests: XCTestCase {
1361
1310
let requestOptions = RequestOptions ( timeout: expectedTimeout)
1362
1311
model = GenerativeModel (
1363
1312
name: testModelResourceName,
1364
- firebaseInfo: FirebaseInfo (
1365
- projectID: " my-project-id " ,
1366
- apiKey: " API_KEY " ,
1367
- googleAppID: " My app ID "
1368
- ) ,
1313
+ firebaseInfo: testFirebaseInfo ( ) ,
1369
1314
tools: nil ,
1370
1315
requestOptions: requestOptions,
1371
1316
urlSession: urlSession
@@ -1437,11 +1382,7 @@ final class GenerativeModelTests: XCTestCase {
1437
1382
)
1438
1383
model = GenerativeModel (
1439
1384
name: testModelResourceName,
1440
- firebaseInfo: FirebaseInfo (
1441
- projectID: " my-project-id " ,
1442
- apiKey: " API_KEY " ,
1443
- googleAppID: " My app ID "
1444
- ) ,
1385
+ firebaseInfo: testFirebaseInfo ( ) ,
1445
1386
generationConfig: generationConfig,
1446
1387
tools: [ Tool ( functionDeclarations: [ sumFunction] ) ] ,
1447
1388
systemInstruction: systemInstruction,
@@ -1497,11 +1438,7 @@ final class GenerativeModelTests: XCTestCase {
1497
1438
let requestOptions = RequestOptions ( timeout: expectedTimeout)
1498
1439
model = GenerativeModel (
1499
1440
name: testModelResourceName,
1500
- firebaseInfo: FirebaseInfo (
1501
- projectID: " my-project-id " ,
1502
- apiKey: " API_KEY " ,
1503
- googleAppID: " My app ID "
1504
- ) ,
1441
+ firebaseInfo: testFirebaseInfo ( ) ,
1505
1442
tools: nil ,
1506
1443
requestOptions: requestOptions,
1507
1444
urlSession: urlSession
@@ -1514,6 +1451,18 @@ final class GenerativeModelTests: XCTestCase {
1514
1451
1515
1452
// MARK: - Helpers
1516
1453
1454
+ private func testFirebaseInfo( appCheck: AppCheckInterop ? = nil ,
1455
+ auth: AuthInterop ? = nil ,
1456
+ privateAppID: Bool = false ) -> FirebaseInfo {
1457
+ FirebaseInfo (
1458
+ appCheck: appCheck,
1459
+ auth: auth,
1460
+ projectID: " my-project-id " ,
1461
+ apiKey: " API_KEY " ,
1462
+ googleAppID: privateAppID ? nil : " My app ID "
1463
+ )
1464
+ }
1465
+
1517
1466
private func nonHTTPRequestHandler( ) throws -> ( ( URLRequest ) -> (
1518
1467
URLResponse ,
1519
1468
AsyncLineSequence < URL . AsyncBytes > ?
0 commit comments