Test cases fixes

Author: bhattmanish98

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAzureBlobFileSystemInitAndCreate.java

@@ -33,7 +33,6 @@
 import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AbfsRestOperationException;
 import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AzureBlobFileSystemException;
 import org.apache.hadoop.fs.azurebfs.contracts.exceptions.InvalidConfigurationValueException;
-import org.apache.hadoop.fs.azurebfs.contracts.exceptions.TrileanConversionException;
 import org.apache.hadoop.fs.azurebfs.enums.Trilean;
 import org.apache.hadoop.fs.azurebfs.services.AbfsClient;
 import org.apache.hadoop.fs.azurebfs.services.AbfsRestOperation;
@@ -83,10 +82,6 @@ public void testGetAclCallOnHnsConfigAbsence() throws Exception {
     AzureBlobFileSystemStore store = Mockito.spy(fs.getAbfsStore());
     AbfsClient client = Mockito.spy(fs.getAbfsStore().getClient(AbfsServiceType.DFS));
     Mockito.doReturn(client).when(store).getClient(AbfsServiceType.DFS);
-
-    Mockito.doThrow(TrileanConversionException.class)
-        .when(store)
-        .isNamespaceEnabled();
     store.setNamespaceEnabled(Trilean.UNKNOWN);
 
     TracingContext tracingContext = getSampleTracingContext(fs, true);

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestGetNameSpaceEnabled.java

@@ -29,7 +29,6 @@
 import org.apache.hadoop.fs.CommonConfigurationKeysPublic;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.azurebfs.constants.AbfsServiceType;
-import org.apache.hadoop.fs.azurebfs.constants.ConfigurationKeys;
 import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AbfsRestOperationException;
 import org.apache.hadoop.fs.azurebfs.services.AbfsClient;
 import org.apache.hadoop.fs.azurebfs.services.AbfsDfsClient;
@@ -283,6 +282,9 @@ private void ensureGetAclDetermineHnsStatusAccuratelyInternal(int statusCode,
     boolean isHnsEnabled = store.getIsNamespaceEnabled(
         getTestTracingContext(getFileSystem(), false));
     Assertions.assertThat(isHnsEnabled).isEqualTo(expectedValue);
+    Assertions.assertThat(store.getClient().getIsNamespaceEnabled())
+        .describedAs("ABFS Client should return same isNameSpace value as store")
+        .isEqualTo(expectedValue);
 
     // GetAcl() should be called only once to determine the HNS status.
     Mockito.verify(mockClient, times(1))
@@ -344,57 +346,33 @@ public void testAccountSpecificConfig() throws Exception {
 
   /**
    * Tests the behavior of AbfsConfiguration when the namespace-enabled
-   * configuration is not explicitly set (i.e., set to an empty string).
+   * configuration set based on config provided.
    *
-   * Expects the namespace value to be set as UNKNOWN.
+   * Expects the namespace value based on config provided.
    *
    * @throws Exception if any error occurs during configuration setup or evaluation
    */
   @Test
-  public void testNameSpaceConfigNotSet() throws Exception {
+  public void testNameSpaceConfig() throws Exception {
     Configuration configuration = new Configuration();
-    configuration.set(ConfigurationKeys.FS_AZURE_ACCOUNT_IS_HNS_ENABLED, "");
+    configuration.unset(FS_AZURE_ACCOUNT_IS_HNS_ENABLED);
     AbfsConfiguration abfsConfig = new AbfsConfiguration(configuration, "bogusAccountName");
 
-    // Test that the namespace enabled config is set correctly
+    // Test that the namespace value when config is not set
     Assertions.assertThat(abfsConfig.getIsNamespaceEnabledAccount())
         .describedAs("Namespace enabled should be unknown in case config is not set")
         .isEqualTo(Trilean.UNKNOWN);
-  }
 
-  /**
-   * Tests the behavior of AbfsConfiguration when the namespace-enabled
-   * configuration is explicitly set to "true".
-   *
-   * Expects the namespace value to be set as TRUE.
-   *
-   * @throws Exception if any error occurs during configuration setup or evaluation
-   */
-  @Test
-  public void testNameSpaceConfigSetToTrue() throws Exception {
-    Configuration configuration = new Configuration();
-    configuration.set(ConfigurationKeys.FS_AZURE_ACCOUNT_IS_HNS_ENABLED, "true");
-    AbfsConfiguration abfsConfig = new AbfsConfiguration(configuration, "bogusAccountName");
+    configuration.set(FS_AZURE_ACCOUNT_IS_HNS_ENABLED, TRUE_STR);
+    abfsConfig = new AbfsConfiguration(configuration, "bogusAccountName");
 
     // Test that the namespace enabled config is set correctly
     Assertions.assertThat(abfsConfig.getIsNamespaceEnabledAccount())
         .describedAs("Namespace enabled should be true in case config is set to true")
         .isEqualTo(Trilean.TRUE);
-  }
 
-  /**
-   * Tests the behavior of AbfsConfiguration when the namespace-enabled
-   * configuration is explicitly set to "false".
-   *
-   * Expects the namespace value to be set as FALSE.
-   *
-   * @throws Exception if any error occurs during configuration setup or evaluation
-   */
-  @Test
-  public void testNameSpaceConfigSetToFalse() throws Exception {
-    Configuration configuration = new Configuration();
-    configuration.set(ConfigurationKeys.FS_AZURE_ACCOUNT_IS_HNS_ENABLED, "false");
-    AbfsConfiguration abfsConfig = new AbfsConfiguration(configuration, "bogusAccountName");
+    configuration.set(FS_AZURE_ACCOUNT_IS_HNS_ENABLED, FALSE_STR);
+    abfsConfig = new AbfsConfiguration(configuration, "bogusAccountName");
 
     // Test that the namespace enabled config is set correctly
     Assertions.assertThat(abfsConfig.getIsNamespaceEnabledAccount())

hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/services/TestAbfsRenameRetryRecovery.java

@@ -40,7 +40,6 @@
 import org.apache.hadoop.fs.azurebfs.AzureBlobFileSystemStore;
 import org.apache.hadoop.fs.azurebfs.commit.ResilientCommitByRename;
 import org.apache.hadoop.fs.azurebfs.constants.HttpHeaderConfigurations;
-import org.apache.hadoop.fs.azurebfs.constants.TestConfigurationKeys;
 import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AbfsRestOperationException;
 import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AzureBlobFileSystemException;
 import org.apache.hadoop.fs.azurebfs.contracts.services.AzureServiceErrorCode;
@@ -76,11 +75,8 @@ public class TestAbfsRenameRetryRecovery extends AbstractAbfsIntegrationTest {
   private static final Logger LOG =
       LoggerFactory.getLogger(TestAbfsRenameRetryRecovery.class);
 
-  private boolean isNamespaceEnabled;
-
   public TestAbfsRenameRetryRecovery() throws Exception {
-    isNamespaceEnabled = getConfiguration()
-            .getBoolean(TestConfigurationKeys.FS_AZURE_TEST_NAMESPACE_ENABLED_ACCOUNT, false);
+    // do nothing
   }
 
   /**
@@ -461,11 +457,11 @@ public void testExistingPathCorrectlyRejected() throws Exception {
    */
   @Test
   public void testRenameRecoveryUnsupportedForFlatNamespace() throws Exception {
-    Assume.assumeTrue(!isNamespaceEnabled);
     // In DFS endpoint, renamePath is O(1) API call and idempotency issue can happen.
     // For blob endpoint, client orchestrates the rename operation.
     assumeDfsServiceType();
     AzureBlobFileSystem fs = getFileSystem();
+    Assume.assumeTrue(!getIsNamespaceEnabled(fs));
     AzureBlobFileSystemStore abfsStore = fs.getAbfsStore();
     TracingContext testTracingContext = getTestTracingContext(fs, false);