This is an automated email from the ASF dual-hosted git repository.

etudenhoefner pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/iceberg.git


The following commit(s) were added to refs/heads/main by this push:
     new 87810c8f2b AWS: Rename test helper to deconflict with Assertions 
(#10511)
87810c8f2b is described below

commit 87810c8f2b6e47c45d1d179f9f84ccb461a5b9bb
Author: Piotr Findeisen <[email protected]>
AuthorDate: Mon Jun 17 15:00:56 2024 +0200

    AWS: Rename test helper to deconflict with Assertions (#10511)
    
    The test helper `assertThatThrownBy` had same name like
    `Assertions.assertThatThrownBy` but different API (not assertion
    builder). Rename to avoid confusion.
---
 .../java/org/apache/iceberg/aws/TestAwsClientFactories.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git 
a/aws/src/test/java/org/apache/iceberg/aws/TestAwsClientFactories.java 
b/aws/src/test/java/org/apache/iceberg/aws/TestAwsClientFactories.java
index 01c14790a3..9598860d6f 100644
--- a/aws/src/test/java/org/apache/iceberg/aws/TestAwsClientFactories.java
+++ b/aws/src/test/java/org/apache/iceberg/aws/TestAwsClientFactories.java
@@ -195,12 +195,15 @@ public class TestAwsClientFactories {
   public void assertAllClientObjectsThrownBy(
       AwsClientFactory defaultAwsClientFactory, String containsMessage) {
     // invoking sdk client apis to ensure resolveCredentials() being called
-    assertThatThrownBy(() -> defaultAwsClientFactory.s3().listBuckets(), 
containsMessage);
-    assertThatThrownBy(
+    assertIllegalArgumentException(
+        () -> defaultAwsClientFactory.s3().listBuckets(), containsMessage);
+    assertIllegalArgumentException(
         () -> 
defaultAwsClientFactory.glue().getTables(GetTablesRequest.builder().build()),
         containsMessage);
-    assertThatThrownBy(() -> defaultAwsClientFactory.dynamo().listTables(), 
containsMessage);
-    assertThatThrownBy(() -> defaultAwsClientFactory.kms().listAliases(), 
containsMessage);
+    assertIllegalArgumentException(
+        () -> defaultAwsClientFactory.dynamo().listTables(), containsMessage);
+    assertIllegalArgumentException(
+        () -> defaultAwsClientFactory.kms().listAliases(), containsMessage);
   }
 
   private void assertClientObjectsNotNull(AwsClientFactory 
defaultAwsClientFactory) {
@@ -210,7 +213,7 @@ public class TestAwsClientFactories {
     Assertions.assertThat(defaultAwsClientFactory.kms()).isNotNull();
   }
 
-  private void assertThatThrownBy(
+  private void assertIllegalArgumentException(
       ThrowableAssert.ThrowingCallable shouldRaiseThrowable, String 
containsMessage) {
     Assertions.assertThatThrownBy(shouldRaiseThrowable)
         .isInstanceOf(IllegalArgumentException.class)

Reply via email to