@@ -380,7 +380,7 @@ void endpointContextBuild_shouldUseS2A_tlsEndpoint() throws IOException {
380380 defaultEndpointContextBuilder =
381381 defaultEndpointContextBuilder
382382 .setEnvProvider (envProvider )
383- .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
383+ .setResolvedUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
384384 .setClientSettingsEndpoint ("" )
385385 .setTransportChannelProviderEndpoint ("" )
386386 .setUsingGDCH (false );
@@ -479,7 +479,7 @@ void shouldUseS2A_envVarNotSet_returnsFalse() throws IOException {
479479 defaultEndpointContextBuilder =
480480 defaultEndpointContextBuilder
481481 .setEnvProvider (envProvider )
482- .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
482+ .setResolvedUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
483483 .setClientSettingsEndpoint ("" )
484484 .setTransportChannelProviderEndpoint ("" )
485485 .setUsingGDCH (false );
@@ -493,7 +493,7 @@ void shouldUseS2A_UsingGDCH_returnsFalse() throws IOException {
493493 defaultEndpointContextBuilder =
494494 defaultEndpointContextBuilder
495495 .setEnvProvider (envProvider )
496- .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
496+ .setResolvedUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
497497 .setClientSettingsEndpoint ("" )
498498 .setTransportChannelProviderEndpoint ("" )
499499 .setUsingGDCH (true );
@@ -507,7 +507,7 @@ void shouldUseS2A_customEndpointSetViaClientSettings_returnsFalse() throws IOExc
507507 defaultEndpointContextBuilder =
508508 defaultEndpointContextBuilder
509509 .setEnvProvider (envProvider )
510- .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
510+ .setResolvedUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
511511 .setClientSettingsEndpoint ("test.endpoint.com:443" )
512512 .setTransportChannelProviderEndpoint ("" )
513513 .setUsingGDCH (false );
@@ -521,7 +521,7 @@ void shouldUseS2A_customEndpointSetViaTransportChannelProvider_returnsFalse() th
521521 defaultEndpointContextBuilder =
522522 defaultEndpointContextBuilder
523523 .setEnvProvider (envProvider )
524- .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
524+ .setResolvedUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
525525 .setClientSettingsEndpoint ("" )
526526 .setTransportChannelProviderEndpoint ("test.endpoint.com:443" )
527527 .setUsingGDCH (false );
@@ -535,7 +535,7 @@ void shouldUseS2A_mtlsEndpointNull_returnsFalse() throws IOException {
535535 defaultEndpointContextBuilder =
536536 defaultEndpointContextBuilder
537537 .setEnvProvider (envProvider )
538- .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
538+ .setResolvedUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
539539 .setClientSettingsEndpoint ("" )
540540 .setTransportChannelProviderEndpoint ("" )
541541 .setUsingGDCH (false )
@@ -550,7 +550,7 @@ void shouldUseS2A_mtlsEndpointEmpty_returnsFalse() throws IOException {
550550 defaultEndpointContextBuilder =
551551 defaultEndpointContextBuilder
552552 .setEnvProvider (envProvider )
553- .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
553+ .setResolvedUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
554554 .setClientSettingsEndpoint ("" )
555555 .setTransportChannelProviderEndpoint ("" )
556556 .setMtlsEndpoint ("" )
@@ -565,7 +565,7 @@ void shouldUseS2A_mtlsEndpointNotGoogleDefaultUniverse_returnsFalse() throws IOE
565565 defaultEndpointContextBuilder =
566566 defaultEndpointContextBuilder
567567 .setEnvProvider (envProvider )
568- .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
568+ .setResolvedUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
569569 .setClientSettingsEndpoint ("" )
570570 .setTransportChannelProviderEndpoint ("" )
571571 .setMtlsEndpoint ("test.mtls.abcd.com:443" )
@@ -580,7 +580,7 @@ void shouldUseS2A_success() throws IOException {
580580 defaultEndpointContextBuilder =
581581 defaultEndpointContextBuilder
582582 .setEnvProvider (envProvider )
583- .setUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
583+ .setResolvedUniverseDomain (Credentials .GOOGLE_DEFAULT_UNIVERSE )
584584 .setClientSettingsEndpoint ("" )
585585 .setTransportChannelProviderEndpoint ("" )
586586 .setUsingGDCH (false );
0 commit comments