@@ -380,7 +380,9 @@ void endpointContextBuild_shouldUseS2A_tlsEndpoint() throws IOException {
380
380
defaultEndpointContextBuilder =
381
381
defaultEndpointContextBuilder
382
382
.setEnvProvider (envProvider )
383
+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
383
384
.setClientSettingsEndpoint ("" )
385
+ .setTransportChannelProviderEndpoint ("" )
384
386
.setUsingGDCH (false );
385
387
EndpointContext endpointContext = defaultEndpointContextBuilder .build ();
386
388
Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isTrue ();
@@ -477,7 +479,9 @@ void shouldUseS2A_envVarNotSet_returnsFalse() throws IOException {
477
479
defaultEndpointContextBuilder =
478
480
defaultEndpointContextBuilder
479
481
.setEnvProvider (envProvider )
482
+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
480
483
.setClientSettingsEndpoint ("" )
484
+ .setTransportChannelProviderEndpoint ("" )
481
485
.setUsingGDCH (false );
482
486
Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
483
487
}
@@ -489,7 +493,9 @@ void shouldUseS2A_UsingGDCH_returnsFalse() throws IOException {
489
493
defaultEndpointContextBuilder =
490
494
defaultEndpointContextBuilder
491
495
.setEnvProvider (envProvider )
496
+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
492
497
.setClientSettingsEndpoint ("" )
498
+ .setTransportChannelProviderEndpoint ("" )
493
499
.setUsingGDCH (true );
494
500
Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
495
501
}
@@ -501,7 +507,23 @@ void shouldUseS2A_customEndpointSetViaClientSettings_returnsFalse() throws IOExc
501
507
defaultEndpointContextBuilder =
502
508
defaultEndpointContextBuilder
503
509
.setEnvProvider (envProvider )
510
+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
504
511
.setClientSettingsEndpoint ("test.endpoint.com:443" )
512
+ .setTransportChannelProviderEndpoint ("" )
513
+ .setUsingGDCH (false );
514
+ Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
515
+ }
516
+
517
+ @ Test
518
+ void shouldUseS2A_customEndpointSetViaTransportChannelProvider_returnsFalse () throws IOException {
519
+ EnvironmentProvider envProvider = Mockito .mock (EnvironmentProvider .class );
520
+ Mockito .when (envProvider .getenv (EndpointContext .S2A_ENV_ENABLE_USE_S2A )).thenReturn ("true" );
521
+ defaultEndpointContextBuilder =
522
+ defaultEndpointContextBuilder
523
+ .setEnvProvider (envProvider )
524
+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
525
+ .setClientSettingsEndpoint ("" )
526
+ .setTransportChannelProviderEndpoint ("test.endpoint.com:443" )
505
527
.setUsingGDCH (false );
506
528
Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
507
529
}
@@ -513,7 +535,9 @@ void shouldUseS2A_mtlsEndpointNull_returnsFalse() throws IOException {
513
535
defaultEndpointContextBuilder =
514
536
defaultEndpointContextBuilder
515
537
.setEnvProvider (envProvider )
538
+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
516
539
.setClientSettingsEndpoint ("" )
540
+ .setTransportChannelProviderEndpoint ("" )
517
541
.setUsingGDCH (false )
518
542
.setMtlsEndpoint (null );
519
543
Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
@@ -526,7 +550,9 @@ void shouldUseS2A_mtlsEndpointEmpty_returnsFalse() throws IOException {
526
550
defaultEndpointContextBuilder =
527
551
defaultEndpointContextBuilder
528
552
.setEnvProvider (envProvider )
553
+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
529
554
.setClientSettingsEndpoint ("" )
555
+ .setTransportChannelProviderEndpoint ("" )
530
556
.setMtlsEndpoint ("" )
531
557
.setUsingGDCH (false );
532
558
Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
@@ -539,7 +565,9 @@ void shouldUseS2A_mtlsEndpointNotGoogleDefaultUniverse_returnsFalse() throws IOE
539
565
defaultEndpointContextBuilder =
540
566
defaultEndpointContextBuilder
541
567
.setEnvProvider (envProvider )
568
+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
542
569
.setClientSettingsEndpoint ("" )
570
+ .setTransportChannelProviderEndpoint ("" )
543
571
.setMtlsEndpoint ("test.mtls.abcd.com:443" )
544
572
.setUsingGDCH (false );
545
573
Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
@@ -552,7 +580,9 @@ void shouldUseS2A_success() throws IOException {
552
580
defaultEndpointContextBuilder =
553
581
defaultEndpointContextBuilder
554
582
.setEnvProvider (envProvider )
583
+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
555
584
.setClientSettingsEndpoint ("" )
585
+ .setTransportChannelProviderEndpoint ("" )
556
586
.setUsingGDCH (false );
557
587
Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isTrue ();
558
588
}
0 commit comments