commit 5803de0f8ea0fef324b15c4a5a3a801ea7e505f6
author David Currie <dcurrie@cloudbees.com> Tue Sep 11 10:47:05 2018 +0100
committer Andrew Gaul <gaul@apache.org> Wed Sep 12 08:01:43 2018 -0700
tree 3a5da21d01544d5d30d072282759bbb5a113e4c6
parent a07ab5a98263aa400484276359731b999fcbf472

Correct failing testUseBucketWithUpperCaseName

As of March 1 2018, bucket names must be DNS compliant in all regions
therefore removing failing test of legacy names in US regions.

providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientLiveTest.java

diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientLiveTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientLiveTest.java
index a5d3752..adf5b26 100644
--- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientLiveTest.java
+++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/AWSS3ClientLiveTest.java
@@ -28,7 +28,6 @@
 import org.jclouds.aws.domain.Region;
 import org.jclouds.blobstore.BlobStore;
 import org.jclouds.blobstore.domain.Blob;
-import org.jclouds.blobstore.domain.StorageMetadata;
 import org.jclouds.domain.Location;
 import org.jclouds.http.HttpRequest;
 import org.jclouds.http.HttpResponse;
@@ -43,8 +42,6 @@
 import org.testng.annotations.BeforeClass;
 import org.testng.annotations.Test;
 
-import com.google.common.collect.ImmutableSet;
-
 /**
  * Tests behavior of {@code S3Client}
  */
@@ -100,50 +97,13 @@
     */
    public void testUseBucketWithUpperCaseName() throws Exception {
       String bucketName = CONTAINER_PREFIX + "-TestBucket";
-      String blobName = "TestBlob.txt";
-      StorageMetadata container = null;
       BlobStore store = view.getBlobStore();
 
-      // Create and use a valid bucket name with uppercase characters in the bucket name (US regions only)
+       // As of March 1 2018, bucket names must be DNS compliant in all regions
+
       try {
          store.createContainerInLocation(null, bucketName);
-
-         for (StorageMetadata metadata : store.list()) {
-            if (metadata.getName().equals(bucketName)) {
-               container = metadata;
-               break;
-            }
-         }
-
-         assertNotNull(container);
-
-         store.putBlob(bucketName, store.blobBuilder(blobName)
-                                          .payload("This is a test!")
-                                          .contentType("text/plain")
-                                          .build());
-
-         assertNotNull(store.getBlob(bucketName, blobName));
-      } finally {
-         if (container != null) {
-            store.deleteContainer(bucketName);
-         }
-      }
-
-      // Try to create the same bucket successfully created above in one of the non-US regions to ensure an error is
-      // encountered as expected.
-      Location location = null;
-
-      for (Location pLocation : store.listAssignableLocations()) {
-         if (!ImmutableSet.of(Region.US_STANDARD, Region.US_EAST_1, Region.US_WEST_1, Region.US_WEST_2)
-            .contains(pLocation.getId())) {
-            location = pLocation;
-            break;
-         }
-      }
-
-      try {
-         store.createContainerInLocation(location, bucketName);
-         fail("Should had failed because in non-US regions, mixed-case bucket names are invalid.");
+         fail("Should have failed because mixed-case bucket names are invalid.");
       } catch (AWSResponseException e) {
          assertEquals("InvalidBucketName", e.getError().getCode());
       }