fixing test cases and checkstyle

Author: RanVaknin

core/arns/src/test/java/software/amazon/awssdk/arns/ArnTest.java

@@ -320,41 +320,40 @@ public void invalidArnWithoutAccountId_ThrowsIllegalArgumentException() {
 
     private static Stream<Arguments> validArnTestCases() {
         return Stream.of(
-            // Test case name, ARN string
-            Arguments.of("Basic Resource", "arn:aws:s3:us-east-1:12345678910:myresource"),
-            Arguments.of("Minimal Requirements", "arn:aws:foobar:::myresource"),
-            Arguments.of("Qualified Resource", "arn:aws:s3:us-east-1:12345678910:myresource:foobar:1"),
-            Arguments.of("Minimal Resources", "arn:aws:s3:::bucket"),
-            Arguments.of("Without Region", "arn:aws:iam::123456789012:root"),
-            Arguments.of("Resource Type And Resource", "arn:aws:s3:us-east-1:12345678910:bucket:foobar"),
-            Arguments.of("Resource Type And Resource And Qualifier", "arn:aws:s3:us-east-1:12345678910:bucket:foobar:1"),
-            Arguments.of("Resource Type And Resource With Slash", "arn:aws:s3:us-east-1:12345678910:bucket/foobar"),
-            Arguments.of("Resource Type And Resource And Qualifier With Slash", "arn:aws:s3:us-east-1:12345678910:bucket/foobar/1"),
-            Arguments.of("Without Region", "arn:aws:s3::123456789012:myresource"),
-            Arguments.of("Without AccountId", "arn:aws:s3:us-east-1::myresource"),
-            Arguments.of("Resource Containing Dots", "arn:aws:s3:us-east-1:12345678910:myresource:foobar.1")
+            Arguments.of("Basic resource", "arn:aws:s3:us-east-1:12345678910:myresource"),
+            Arguments.of("Minimal requirements", "arn:aws:foobar:::myresource"),
+            Arguments.of("Qualified resource", "arn:aws:s3:us-east-1:12345678910:myresource:foobar:1"),
+            Arguments.of("Minimal resources", "arn:aws:s3:::bucket"),
+            Arguments.of("Without region", "arn:aws:iam::123456789012:root"),
+            Arguments.of("Resource type and resource", "arn:aws:s3:us-east-1:12345678910:bucket:foobar"),
+            Arguments.of("Resource type And resource and qualifier",
+                         "arn:aws:s3:us-east-1:12345678910:bucket:foobar:1"),
+            Arguments.of("Resource type And resource with slash", "arn:aws:s3:us-east-1:12345678910:bucket/foobar"),
+            Arguments.of("Resource type and resource and qualifier slash",
+                         "arn:aws:s3:us-east-1:12345678910:bucket/foobar/1"),
+            Arguments.of("Without region", "arn:aws:s3::123456789012:myresource"),
+            Arguments.of("Without accountId", "arn:aws:s3:us-east-1::myresource"),
+            Arguments.of("Resource with dots", "arn:aws:s3:us-east-1:12345678910:myresource:foobar.1")
         );
     }
 
     private static Stream<Arguments> invalidArnTestCases() {
         return Stream.of(
-            // Test case name, ARN string
-            Arguments.of("Without Partition", "arn::s3:us-east-1:12345678910:myresource"),
-            Arguments.of("Without Service", "arn:aws::us-east-1:12345678910:myresource"),
-            Arguments.of("Without Resource", "arn:aws:s3:us-east-1:12345678910:"),
-            Arguments.of("Invalid ARN", "arn:aws:"),
-            Arguments.of("Doesn't Start With ARN", "fakearn:aws:"),
-            Arguments.of("Invalid Without Partition", "arn:"),
-            Arguments.of("Invalid Without Service", "arn:aws:"),
-            Arguments.of("Invalid Without Region", "arn:aws:s3:"),
-            Arguments.of("Invalid Without AccountId", "arn:aws:s3:us-east-1:")
+            Arguments.of("Without resource", "arn:aws:s3:us-east-1:12345678910:"),
+            Arguments.of("Invalid arn", "arn:aws:"),
+            Arguments.of("Doesn't start with arn", "fakearn:aws:"),
+            Arguments.of("Invalid without partition", "arn:"),
+            Arguments.of("Invalid without service", "arn:aws:"),
+            Arguments.of("Invalid without region", "arn:aws:s3:"),
+            Arguments.of("Invalid without accountId", "arn:aws:s3:us-east-1:"),
+            Arguments.of("Null Arn", null)
         );
     }
 
     private static Stream<Arguments> exceptionThrowingArnTestCases() {
         return Stream.of(
-            Arguments.of("Without Partition", "arn::s3:us-east-1:12345678910:myresource"),
-            Arguments.of("Without Service", "arn:aws::us-east-1:12345678910:myresource")
+            Arguments.of("Valid without partition", "arn::s3:us-east-1:12345678910:myresource"),
+            Arguments.of("Valid without service", "arn:aws::us-east-1:12345678910:myresource")
         );
     }
 
@@ -365,7 +364,6 @@ public void optionalArnFromString_ValidArns_ReturnsPopulatedOptional(String test
 
         assertThat(optionalArn).isPresent();
 
-        // Compare with the original fromString implementation
         Arn expectedArn = Arn.fromString(arnString);
         Arn actualArn = optionalArn.get();
 
@@ -375,7 +373,6 @@ public void optionalArnFromString_ValidArns_ReturnsPopulatedOptional(String test
         assertThat(actualArn.accountId()).isEqualTo(expectedArn.accountId());
         assertThat(actualArn.resourceAsString()).isEqualTo(expectedArn.resourceAsString());
 
-        // Verify the ARN string representation matches
         assertThat(actualArn.toString()).isEqualTo(arnString);
     }
 
@@ -394,31 +391,4 @@ public void tryFromString_InvalidArns_ShouldThrowExceptions(String testName, Str
         });
     }
 
-    @Test
-    public void optionalArnFromString_NullInput_ReturnsEmptyOptional() {
-        Optional<Arn> optionalArn = Arn.tryFromString(null);
-        assertThat(optionalArn).isEmpty();
-    }
-
-    @ParameterizedTest(name = "Resource parsing: {0}")
-    @MethodSource("validArnTestCases")
-    public void tryFromString_ResourceParsing_MatchesOriginalImplementation(String testName, String arnString) {
-        // Skip test cases that would throw exceptions in the resource parsing
-        if (arnString.contains("bucket:") || arnString.contains("bucket/")) {
-            Optional<Arn> optionalArn = Arn.tryFromString(arnString);
-            assertThat(optionalArn).isPresent();
-
-            Arn expectedArn = Arn.fromString(arnString);
-            Arn actualArn = optionalArn.get();
-
-            // Verify resource parsing
-            ArnResource expectedResource = expectedArn.resource();
-            ArnResource actualResource = actualArn.resource();
-
-            assertThat(actualResource.resourceType()).isEqualTo(expectedResource.resourceType());
-            assertThat(actualResource.resource()).isEqualTo(expectedResource.resource());
-            assertThat(actualResource.qualifier()).isEqualTo(expectedResource.qualifier());
-        }
-    }
-
 }