Updated Branches: refs/heads/1.6.x 12c23f39f -> af115a124
Get container name before creating with metadata Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/commit/af115a12 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/tree/af115a12 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds/diff/af115a12 Branch: refs/heads/1.6.x Commit: af115a12409abbda2c4c41c4fce9e6baf6b39f20 Parents: 12c23f3 Author: Andrew Gaul <[email protected]> Authored: Sat Oct 12 14:09:20 2013 -0700 Committer: Andrew Gaul <[email protected]> Committed: Sat Oct 12 14:11:04 2013 -0700 ---------------------------------------------------------------------- .../SwiftContainerIntegrationLiveTest.java | 30 ++++++++++++-------- 1 file changed, 18 insertions(+), 12 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds/blob/af115a12/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftContainerIntegrationLiveTest.java ---------------------------------------------------------------------- diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftContainerIntegrationLiveTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftContainerIntegrationLiveTest.java index 5836d3f..39074ed 100644 --- a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftContainerIntegrationLiveTest.java +++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/integration/SwiftContainerIntegrationLiveTest.java @@ -71,7 +71,6 @@ public class SwiftContainerIntegrationLiveTest extends BaseContainerIntegrationT public void testCreateDeleteContainerMetadata() throws InterruptedException { CommonSwiftClient swift = view.utils().injector().getInstance(CommonSwiftClient.class); - String containerName = getContainerName(); CreateContainerOptions options = CreateContainerOptions.Builder .withPublicAccess() .withMetadata(ImmutableMap.<String, String> of( @@ -79,18 +78,25 @@ public class SwiftContainerIntegrationLiveTest extends BaseContainerIntegrationT "key2", "value2", "key3", "value3")); - ContainerMetadata containerMetadata = swift.getContainerMetadata(containerName); - - assertEquals(containerMetadata.getMetadata().size(), 3); - assertEquals(containerMetadata.getMetadata().get("key1"), "value1"); - assertEquals(containerMetadata.getMetadata().get("key2"), "value2"); - assertEquals(containerMetadata.getMetadata().get("key3"), "value3"); + String containerName = getScratchContainerName(); + assertTrue(swift.createContainer(containerName, options)); - assertTrue(swift.deleteContainerMetadata(containerName, ImmutableList.<String> of("key2","key3"))); + try { + ContainerMetadata containerMetadata = swift.getContainerMetadata(containerName); - containerMetadata = swift.getContainerMetadata(containerName); - - assertEquals(containerMetadata.getMetadata().size(), 1); - assertEquals(containerMetadata.getMetadata().get("key1"), "value1"); + assertEquals(containerMetadata.getMetadata().size(), 3); + assertEquals(containerMetadata.getMetadata().get("key1"), "value1"); + assertEquals(containerMetadata.getMetadata().get("key2"), "value2"); + assertEquals(containerMetadata.getMetadata().get("key3"), "value3"); + + assertTrue(swift.deleteContainerMetadata(containerName, ImmutableList.<String> of("key2","key3"))); + + containerMetadata = swift.getContainerMetadata(containerName); + + assertEquals(containerMetadata.getMetadata().size(), 1); + assertEquals(containerMetadata.getMetadata().get("key1"), "value1"); + } finally { + returnContainer(containerName); + } } }
