From a6f2c4617ec226ea4cbd161745d30458dd8e39b3 Mon Sep 17 00:00:00 2001 From: Anuj Modi <128447756+anujmodi2021@users.noreply.github.com> Date: Mon, 29 Apr 2024 22:18:34 +0530 Subject: [PATCH] HADOOP-19150: [ABFS] Fixing Test Code for ITestAbfsRestOperationException#testAuthFailException (#6756) Contributed by: Anuj Modi --- .../ITestAbfsRestOperationException.java | 31 +++++++++---------- 1 file changed, 14 insertions(+), 17 deletions(-) diff --git a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsRestOperationException.java b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsRestOperationException.java index 2672b676f9..ca2ab9dabc 100644 --- a/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsRestOperationException.java +++ b/hadoop-tools/hadoop-azure/src/test/java/org/apache/hadoop/fs/azurebfs/ITestAbfsRestOperationException.java @@ -187,21 +187,18 @@ public void testAuthFailException() throws Exception { config.set(AZURE_CREATE_REMOTE_FILESYSTEM_DURING_INITIALIZATION, "false"); final AzureBlobFileSystem fs = getFileSystem(config); - try { - intercept(Exception.class, - () -> { - fs.getFileStatus(new Path("/")); - }); - } catch (AbfsRestOperationException e) { - String errorDesc = "Should throw RestOp exception on AAD failure"; - Assertions.assertThat(e.getStatusCode()) - .describedAs("Incorrect status code. " + errorDesc).isEqualTo(-1); - Assertions.assertThat(e.getErrorCode()) - .describedAs("Incorrect error code. " + errorDesc) - .isEqualTo(AzureServiceErrorCode.UNKNOWN); - Assertions.assertThat(e.getErrorMessage()) - .describedAs("Incorrect error message. " + errorDesc) - .contains("Auth failure: "); - } + AbfsRestOperationException e = intercept(AbfsRestOperationException.class, () -> { + fs.getFileStatus(new Path("/")); + }); + + String errorDesc = "Should throw RestOp exception on AAD failure"; + Assertions.assertThat(e.getStatusCode()) + .describedAs("Incorrect status code: " + errorDesc).isEqualTo(-1); + Assertions.assertThat(e.getErrorCode()) + .describedAs("Incorrect error code: " + errorDesc) + .isEqualTo(AzureServiceErrorCode.UNKNOWN); + Assertions.assertThat(e.getErrorMessage()) + .describedAs("Incorrect error message: " + errorDesc) + .contains("Auth failure: "); } -} \ No newline at end of file +}