@@ -380,7 +380,9 @@ void endpointContextBuild_shouldUseS2A_tlsEndpoint() throws IOException {
380380 defaultEndpointContextBuilder =
381381 defaultEndpointContextBuilder
382382 .setEnvProvider (envProvider )
383+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
383384 .setClientSettingsEndpoint ("" )
385+ .setTransportChannelProviderEndpoint ("" )
384386 .setUsingGDCH (false );
385387 EndpointContext endpointContext = defaultEndpointContextBuilder .build ();
386388 Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isTrue ();
@@ -477,7 +479,9 @@ void shouldUseS2A_envVarNotSet_returnsFalse() throws IOException {
477479 defaultEndpointContextBuilder =
478480 defaultEndpointContextBuilder
479481 .setEnvProvider (envProvider )
482+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
480483 .setClientSettingsEndpoint ("" )
484+ .setTransportChannelProviderEndpoint ("" )
481485 .setUsingGDCH (false );
482486 Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
483487 }
@@ -489,7 +493,9 @@ void shouldUseS2A_UsingGDCH_returnsFalse() throws IOException {
489493 defaultEndpointContextBuilder =
490494 defaultEndpointContextBuilder
491495 .setEnvProvider (envProvider )
496+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
492497 .setClientSettingsEndpoint ("" )
498+ .setTransportChannelProviderEndpoint ("" )
493499 .setUsingGDCH (true );
494500 Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
495501 }
@@ -501,7 +507,23 @@ void shouldUseS2A_customEndpointSetViaClientSettings_returnsFalse() throws IOExc
501507 defaultEndpointContextBuilder =
502508 defaultEndpointContextBuilder
503509 .setEnvProvider (envProvider )
510+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
504511 .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" )
505527 .setUsingGDCH (false );
506528 Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
507529 }
@@ -513,7 +535,9 @@ void shouldUseS2A_mtlsEndpointNull_returnsFalse() throws IOException {
513535 defaultEndpointContextBuilder =
514536 defaultEndpointContextBuilder
515537 .setEnvProvider (envProvider )
538+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
516539 .setClientSettingsEndpoint ("" )
540+ .setTransportChannelProviderEndpoint ("" )
517541 .setUsingGDCH (false )
518542 .setMtlsEndpoint (null );
519543 Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
@@ -526,7 +550,9 @@ void shouldUseS2A_mtlsEndpointEmpty_returnsFalse() throws IOException {
526550 defaultEndpointContextBuilder =
527551 defaultEndpointContextBuilder
528552 .setEnvProvider (envProvider )
553+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
529554 .setClientSettingsEndpoint ("" )
555+ .setTransportChannelProviderEndpoint ("" )
530556 .setMtlsEndpoint ("" )
531557 .setUsingGDCH (false );
532558 Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
@@ -539,7 +565,9 @@ void shouldUseS2A_mtlsEndpointNotGoogleDefaultUniverse_returnsFalse() throws IOE
539565 defaultEndpointContextBuilder =
540566 defaultEndpointContextBuilder
541567 .setEnvProvider (envProvider )
568+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
542569 .setClientSettingsEndpoint ("" )
570+ .setTransportChannelProviderEndpoint ("" )
543571 .setMtlsEndpoint ("test.mtls.abcd.com:443" )
544572 .setUsingGDCH (false );
545573 Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isFalse ();
@@ -552,7 +580,9 @@ void shouldUseS2A_success() throws IOException {
552580 defaultEndpointContextBuilder =
553581 defaultEndpointContextBuilder
554582 .setEnvProvider (envProvider )
583+ .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
555584 .setClientSettingsEndpoint ("" )
585+ .setTransportChannelProviderEndpoint ("" )
556586 .setUsingGDCH (false );
557587 Truth .assertThat (defaultEndpointContextBuilder .shouldUseS2A ()).isTrue ();
558588 }
0 commit comments