Test Fixes

Author: Anuj Modi

hadoop-tools/hadoop-azure/src/main/java/org/apache/hadoop/fs/azurebfs/AzureBlobFileSystemStore.java

@@ -301,7 +301,7 @@ public void validateConfiguredServiceType(TracingContext tracingContext)
     }
     if (getIsNamespaceEnabled(tracingContext) && getConfiguredServiceType() == AbfsServiceType.BLOB) {
       // This could be because of either wrongly configured url or wrongly configured fns service type.
-      if(identifyAbfsServiceTypeFromUrl() == AbfsServiceType.BLOB) {
+      if (identifyAbfsServiceTypeFromUrl() == AbfsServiceType.BLOB) {
         throw new InvalidConfigurationValueException(FS_DEFAULT_NAME_KEY);
       }
       throw new InvalidConfigurationValueException(FS_AZURE_FNS_ACCOUNT_SERVICE_TYPE);

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

@@ -25,6 +25,8 @@
 import org.apache.hadoop.conf.Configuration;
 import org.apache.hadoop.fs.FileSystem;
 import org.apache.hadoop.fs.azurebfs.constants.FSOperationType;
+import org.apache.hadoop.fs.azurebfs.contracts.exceptions.AzureBlobFileSystemException;
+import org.apache.hadoop.fs.azurebfs.contracts.exceptions.InvalidConfigurationValueException;
 import org.apache.hadoop.fs.azurebfs.services.AbfsBlobClient;
 import org.apache.hadoop.fs.azurebfs.services.AbfsClient;
 import org.apache.hadoop.fs.azurebfs.utils.Base64;
@@ -51,9 +53,9 @@ public void testAbfsBlobClient() throws Exception {
       Assertions.assertThat(client).isInstanceOf(AbfsBlobClient.class);
       // Make sure all client.REST_API_CALLS succeed with right parameters
       testClientAPIs(client, getTestTracingContext(fs));
-    } catch (UnsupportedOperationException ex) {
-      // Todo: [FnsOverBlob] - Remove this block once all Blob Endpoint Support is ready.
-      Assertions.assertThat(ex.getMessage()).contains("Blob Endpoint Support is not yet implemented");
+    } catch (AzureBlobFileSystemException ex) {
+      // Todo: [FnsOverBlob] - Remove this block once complete Blob Endpoint Support is ready.
+      Assertions.assertThat(ex).isInstanceOf(InvalidConfigurationValueException.class);
     }
   }