PR fixes

Author: katcharov

driver-sync/src/test/functional/com/mongodb/internal/connection/OidcAuthenticationProseTests.java

@@ -107,6 +107,10 @@ private static String getOidcEnv() {
  return getenv("OIDC_ENV");
  }
 
+ private static void assumeAzure() {
+ assumeTrue(getOidcEnv().equals("azure"));
+ }
+
  @Nullable
  private static String getUserWithDomain(@Nullable final String user) {
  return user == null ? null : user + "@" + getenv("OIDC_DOMAIN");
@@ -368,14 +372,14 @@ private static void performInsert(final MongoClient mongoClient) {
 
  @Test
  public void test5p1AzureSucceedsWithNoUsername() {
- assumeTrue(getOidcEnv().equals("azure"));
+ assumeAzure();
  String oidcUri = getOidcUri();
  MongoClientSettings clientSettings = createSettings(oidcUri, createCallback(), null);
  // Create an OIDC configured client with `ENVIRONMENT:azure` and a valid
  // `TOKEN_RESOURCE` and no username.
  MongoCredential credential = Assertions.assertNotNull(new ConnectionString(oidcUri).getCredential());
  assertNotNull(credential.getMechanismProperty(TOKEN_RESOURCE_KEY, null));
- assertNull(Assertions.assertNotNull(clientSettings.getCredential()).getUserName());
+ assertNull(credential.getUserName());
  try (MongoClient mongoClient = createMongoClient(clientSettings)) {
  // Perform a `find` operation that succeeds.
  performFind(mongoClient);
@@ -384,7 +388,7 @@ public void test5p1AzureSucceedsWithNoUsername() {
 
  @Test
  public void test5p2AzureFailsWithBadUsername() {
- assumeTrue(getOidcEnv().equals("azure"));
+ assumeAzure();
  String oidcUri = getOidcUri();
  ConnectionString cs = new ConnectionString(oidcUri);
  MongoCredential oldCredential = Assertions.assertNotNull(cs.getCredential());