Updated Branches: refs/heads/master 849a079e1 -> a54cdca7d
New base class for all OpenStack mock tests. Project: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/commit/a54cdca7 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/tree/a54cdca7 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/diff/a54cdca7 Branch: refs/heads/master Commit: a54cdca7d80b6e7f75806e2718eaae218770340f Parents: 849a079 Author: Everett Toews <[email protected]> Authored: Fri Oct 11 18:09:01 2013 -0500 Committer: Everett Toews <[email protected]> Committed: Fri Oct 11 18:38:37 2013 -0500 ---------------------------------------------------------------------- .../swift/v1/AuthenticationMockTest.java | 6 +- .../swift/v1/TemporaryUrlSignerMockTest.java | 8 +- .../swift/v1/features/AccountApiMockTest.java | 12 +-- .../swift/v1/features/BulkApiMockTest.java | 6 +- .../swift/v1/features/ContainerApiMockTest.java | 26 ++--- .../swift/v1/features/ObjectApiMockTest.java | 22 ++--- .../features/StaticLargeObjectApiMockTest.java | 10 +- .../swift/v1/internal/BaseSwiftMockTest.java | 99 -------------------- 8 files changed, 45 insertions(+), 144 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/a54cdca7/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java index db6ca3b..be63df6 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/AuthenticationMockTest.java @@ -23,7 +23,7 @@ import static org.testng.Assert.assertEquals; import java.util.Properties; import org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties; -import org.jclouds.openstack.swift.v1.internal.BaseSwiftMockTest; +import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.testng.annotations.DataProvider; import org.testng.annotations.Test; @@ -37,7 +37,7 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest; * @author Adrian Cole */ @Test -public class AuthenticationMockTest extends BaseSwiftMockTest { +public class AuthenticationMockTest extends BaseOpenStackMockTest<SwiftApi> { @DataProvider(name = "jclouds.keystone.credential-type") Object[][] credentialTypeToPostBody() { @@ -59,7 +59,7 @@ public class AuthenticationMockTest extends BaseSwiftMockTest { Properties overrides = new Properties(); overrides.setProperty("jclouds.keystone.credential-type", credentialType); - SwiftApi api = swiftApi(server.getUrl("/").toString(), overrides); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift", overrides); api.accountApiInRegion("DFW").get(); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/a54cdca7/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java index c3711a8..0a26115 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TemporaryUrlSignerMockTest.java @@ -19,14 +19,14 @@ package org.jclouds.openstack.swift.v1; import static org.jclouds.openstack.swift.v1.features.AccountApiMockTest.accountResponse; import static org.testng.Assert.assertEquals; -import org.jclouds.openstack.swift.v1.internal.BaseSwiftMockTest; +import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.testng.annotations.Test; import com.squareup.okhttp.mockwebserver.MockResponse; import com.squareup.okhttp.mockwebserver.MockWebServer; @Test -public class TemporaryUrlSignerMockTest extends BaseSwiftMockTest { +public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi> { @Test(expectedExceptions = NullPointerException.class, expectedExceptionsMessageRegExp = "accountApi") public void whenAccountApiIsNull() { @@ -39,7 +39,7 @@ public class TemporaryUrlSignerMockTest extends BaseSwiftMockTest { server.enqueue(accountResponse().addHeader("X-Account-Meta-Temp-URL-Key", "mykey")); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); String signature = TemporaryUrlSigner.checkApiEvery(api.accountApiInRegion("DFW"), 10000) .sign("GET", "/v1/AUTH_account/container/object", 1323479485l); @@ -61,7 +61,7 @@ public class TemporaryUrlSignerMockTest extends BaseSwiftMockTest { server.enqueue(accountResponse()); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); TemporaryUrlSigner.checkApiEvery(api.accountApiInRegion("DFW"), 10000) .sign("GET","/v1/AUTH_account/container/object", 1323479485l); } finally { http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/a54cdca7/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java index d4f7eda..0af9a63 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/AccountApiMockTest.java @@ -22,9 +22,9 @@ import static org.testng.Assert.assertTrue; import java.util.Map; import java.util.Map.Entry; +import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.swift.v1.SwiftApi; import org.jclouds.openstack.swift.v1.domain.Account; -import org.jclouds.openstack.swift.v1.internal.BaseSwiftMockTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableMap; @@ -36,7 +36,7 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest; * @author Jeremy Daggett */ @Test -public class AccountApiMockTest extends BaseSwiftMockTest { +public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> { /** upper-cases first char, and lower-cases rest!! **/ public void getKnowingServerMessesWithMetadataKeyCaseFormat() throws Exception { @@ -48,7 +48,7 @@ public class AccountApiMockTest extends BaseSwiftMockTest { .addHeader("X-Account-Meta-Apiversion", "v1.1")); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); Account account = api.accountApiInRegion("DFW").get(); assertEquals(account.containerCount(), 3l); assertEquals(account.objectCount(), 42l); @@ -74,7 +74,7 @@ public class AccountApiMockTest extends BaseSwiftMockTest { .addHeader("X-Account-Meta-ApiVersion", "v1.1")); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertTrue(api.accountApiInRegion("DFW").updateMetadata(metadata)); assertEquals(server.getRequestCount(), 2); @@ -96,7 +96,7 @@ public class AccountApiMockTest extends BaseSwiftMockTest { server.enqueue(accountResponse()); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertTrue(api.accountApiInRegion("DFW").updateTemporaryUrlKey("foobar")); assertEquals(server.getRequestCount(), 2); @@ -116,7 +116,7 @@ public class AccountApiMockTest extends BaseSwiftMockTest { server.enqueue(accountResponse()); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertTrue(api.accountApiInRegion("DFW").deleteMetadata(metadata)); assertEquals(server.getRequestCount(), 2); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/a54cdca7/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java index 86832b4..10de7fa 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/BulkApiMockTest.java @@ -24,9 +24,9 @@ import org.jboss.shrinkwrap.api.GenericArchive; import org.jboss.shrinkwrap.api.ShrinkWrap; import org.jboss.shrinkwrap.api.asset.StringAsset; import org.jboss.shrinkwrap.api.exporter.TarGzExporter; +import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.swift.v1.SwiftApi; import org.jclouds.openstack.swift.v1.domain.ExtractArchiveResponse; -import org.jclouds.openstack.swift.v1.internal.BaseSwiftMockTest; import org.testng.annotations.Test; import com.google.common.io.ByteStreams; @@ -36,7 +36,7 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest; // TODO: cannot yet test bulk delete offline @Test -public class BulkApiMockTest extends BaseSwiftMockTest { +public class BulkApiMockTest extends BaseOpenStackMockTest<SwiftApi> { public void extractArchive() throws Exception { GenericArchive files = ShrinkWrap.create(GenericArchive.class, "files.tar.gz"); @@ -51,7 +51,7 @@ public class BulkApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setResponseCode(201).setBody("{\"Number Files Created\": 10, \"Errors\": []}")); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); ExtractArchiveResponse response = api.bulkApiInRegion("DFW").extractArchive("myContainer", newByteArrayPayload(tarGz), "tar.gz"); assertEquals(response.created(), 10); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/a54cdca7/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java index 6431a99..b0c25e6 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ContainerApiMockTest.java @@ -26,7 +26,7 @@ import java.util.Map.Entry; import org.jclouds.openstack.swift.v1.SwiftApi; import org.jclouds.openstack.swift.v1.domain.Container; -import org.jclouds.openstack.swift.v1.internal.BaseSwiftMockTest; +import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.swift.v1.options.CreateContainerOptions; import org.testng.annotations.Test; @@ -37,7 +37,7 @@ import com.squareup.okhttp.mockwebserver.MockWebServer; import com.squareup.okhttp.mockwebserver.RecordedRequest; @Test -public class ContainerApiMockTest extends BaseSwiftMockTest { +public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { String containerList = "" // + "[\n" // @@ -51,7 +51,7 @@ public class ContainerApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setBody(containerList)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); ImmutableList<Container> containers = api.containerApiInRegion("DFW").listFirstPage().toList(); assertEquals(containers, ImmutableList.of(// Container.builder() // @@ -78,7 +78,7 @@ public class ContainerApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setBody(containerList)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); ImmutableList<Container> containers = api.containerApiInRegion("DFW").listAt("test").toList(); assertEquals(containers, ImmutableList.of(// Container.builder() // @@ -105,7 +105,7 @@ public class ContainerApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setResponseCode(201)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertTrue(api.containerApiInRegion("DFW").createIfAbsent("myContainer", new CreateContainerOptions())); assertEquals(server.getRequestCount(), 2); @@ -124,7 +124,7 @@ public class ContainerApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setResponseCode(201)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertTrue(api.containerApiInRegion("DFW").createIfAbsent("myContainer", anybodyRead().metadata(metadata))); assertEquals(server.getRequestCount(), 2); @@ -147,7 +147,7 @@ public class ContainerApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setResponseCode(202)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertFalse(api.containerApiInRegion("DFW").createIfAbsent("myContainer", new CreateContainerOptions())); assertEquals(server.getRequestCount(), 2); @@ -170,7 +170,7 @@ public class ContainerApiMockTest extends BaseSwiftMockTest { .addHeader("X-Container-Meta-Apiversion", "v1.1")); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); Container container = api.containerApiInRegion("DFW").get("myContainer"); assertEquals(container.name(), "myContainer"); assertEquals(container.objectCount(), 42l); @@ -196,7 +196,7 @@ public class ContainerApiMockTest extends BaseSwiftMockTest { .addHeader("X-Container-Meta-ApiVersion", "v1.1")); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertTrue(api.containerApiInRegion("DFW").updateMetadata("myContainer", metadata)); assertEquals(server.getRequestCount(), 2); @@ -218,7 +218,7 @@ public class ContainerApiMockTest extends BaseSwiftMockTest { server.enqueue(containerResponse()); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertTrue(api.containerApiInRegion("DFW").deleteMetadata("myContainer", metadata)); assertEquals(server.getRequestCount(), 2); @@ -240,7 +240,7 @@ public class ContainerApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setResponseCode(204)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertTrue(api.containerApiInRegion("DFW").deleteIfEmpty("myContainer")); assertEquals(server.getRequestCount(), 2); @@ -259,7 +259,7 @@ public class ContainerApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setResponseCode(404)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertFalse(api.containerApiInRegion("DFW").deleteIfEmpty("myContainer")); assertEquals(server.getRequestCount(), 2); @@ -279,7 +279,7 @@ public class ContainerApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setResponseCode(409)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); api.containerApiInRegion("DFW").deleteIfEmpty("myContainer"); } finally { http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/a54cdca7/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java index 3b54eac..2bcf0b1 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/ObjectApiMockTest.java @@ -32,10 +32,10 @@ import java.util.Map.Entry; import org.jclouds.date.internal.SimpleDateFormatDateService; import org.jclouds.io.Payload; import org.jclouds.io.Payloads; +import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.jclouds.openstack.swift.v1.SwiftApi; import org.jclouds.openstack.swift.v1.domain.ObjectList; import org.jclouds.openstack.swift.v1.domain.SwiftObject; -import org.jclouds.openstack.swift.v1.internal.BaseSwiftMockTest; import org.jclouds.openstack.swift.v1.options.ListContainerOptions; import org.jclouds.util.Strings2; import org.testng.annotations.Test; @@ -47,7 +47,7 @@ import com.squareup.okhttp.mockwebserver.MockWebServer; import com.squareup.okhttp.mockwebserver.RecordedRequest; @Test -public class ObjectApiMockTest extends BaseSwiftMockTest { +public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { SimpleDateFormatDateService dates = new SimpleDateFormatDateService(); String objectList = "" // @@ -89,7 +89,7 @@ public class ObjectApiMockTest extends BaseSwiftMockTest { .setBody(objectList)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); ObjectList objects = api.objectApiInRegionForContainer("DFW", "myContainer").list(new ListContainerOptions()); assertEquals(objects, parsedObjectsForUrl(server.getUrl("/").toString())); assertEquals(objects.container().name(), "myContainer"); @@ -110,7 +110,7 @@ public class ObjectApiMockTest extends BaseSwiftMockTest { server.enqueue(containerResponse().setBody(objectList)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); ObjectList objects = api.objectApiInRegionForContainer("DFW", "myContainer").list(marker("test")); assertEquals(objects, parsedObjectsForUrl(server.getUrl("/").toString())); @@ -131,7 +131,7 @@ public class ObjectApiMockTest extends BaseSwiftMockTest { .addHeader("ETag", "d9f5eb4bba4e2f2f046e54611bc8196b")); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertEquals( api.objectApiInRegionForContainer("DFW", "myContainer").replace("myObject", newStringPayload("swifty"), metadata), "d9f5eb4bba4e2f2f046e54611bc8196b"); @@ -160,7 +160,7 @@ public class ObjectApiMockTest extends BaseSwiftMockTest { .addHeader("X-Object-Meta-Apiversion", "v1.1")); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftObject object = api.objectApiInRegionForContainer("DFW", "myContainer").head("myObject"); assertEquals(object.name(), "myObject"); assertEquals(object.etag(), "8a964ee2a5e88be344f36c22562a6486"); @@ -190,7 +190,7 @@ public class ObjectApiMockTest extends BaseSwiftMockTest { .addHeader("X-Object-Meta-Apiversion", "v1.1")); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); SwiftObject object = api.objectApiInRegionForContainer("DFW", "myContainer").get("myObject", tail(1)); assertEquals(object.name(), "myObject"); assertEquals(object.etag(), "8a964ee2a5e88be344f36c22562a6486"); @@ -222,7 +222,7 @@ public class ObjectApiMockTest extends BaseSwiftMockTest { .addHeader("X-Object-Meta-ApiVersion", "v1.1")); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertTrue(api.objectApiInRegionForContainer("DFW", "myContainer").updateMetadata("myObject", metadata)); assertEquals(server.getRequestCount(), 2); @@ -244,7 +244,7 @@ public class ObjectApiMockTest extends BaseSwiftMockTest { server.enqueue(objectResponse()); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertTrue(api.objectApiInRegionForContainer("DFW", "myContainer").deleteMetadata("myObject", metadata)); assertEquals(server.getRequestCount(), 2); @@ -266,7 +266,7 @@ public class ObjectApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setResponseCode(204)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); api.objectApiInRegionForContainer("DFW", "myContainer").delete("myObject"); assertEquals(server.getRequestCount(), 2); @@ -285,7 +285,7 @@ public class ObjectApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setResponseCode(404)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); api.objectApiInRegionForContainer("DFW", "myContainer").delete("myObject"); assertEquals(server.getRequestCount(), 2); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/a54cdca7/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiMockTest.java index a44e2d1..8224845 100644 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiMockTest.java +++ b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/features/StaticLargeObjectApiMockTest.java @@ -20,7 +20,7 @@ import static org.testng.Assert.assertEquals; import org.jclouds.openstack.swift.v1.SwiftApi; import org.jclouds.openstack.swift.v1.domain.Segment; -import org.jclouds.openstack.swift.v1.internal.BaseSwiftMockTest; +import org.jclouds.openstack.v2_0.internal.BaseOpenStackMockTest; import org.testng.annotations.Test; import com.google.common.collect.ImmutableList; @@ -31,7 +31,7 @@ import com.squareup.okhttp.mockwebserver.MockWebServer; import com.squareup.okhttp.mockwebserver.RecordedRequest; @Test -public class StaticLargeObjectApiMockTest extends BaseSwiftMockTest { +public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { public void replaceManifest() throws Exception { MockWebServer server = mockSwiftServer(); @@ -39,7 +39,7 @@ public class StaticLargeObjectApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().addHeader(HttpHeaders.ETAG, "\"abcd\"")); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); assertEquals( api.staticLargeObjectApiInRegionForContainer("DFW", "myContainer").replaceManifest( "myObject", @@ -75,7 +75,7 @@ public class StaticLargeObjectApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setResponseCode(204)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); api.staticLargeObjectApiInRegionForContainer("DFW", "myContainer").delete("myObject"); assertEquals(server.getRequestCount(), 2); @@ -94,7 +94,7 @@ public class StaticLargeObjectApiMockTest extends BaseSwiftMockTest { server.enqueue(new MockResponse().setResponseCode(404)); try { - SwiftApi api = swiftApi(server.getUrl("/").toString()); + SwiftApi api = api(server.getUrl("/").toString(), "openstack-swift"); api.staticLargeObjectApiInRegionForContainer("DFW", "myContainer").delete("myObject"); assertEquals(server.getRequestCount(), 2); http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/a54cdca7/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftMockTest.java ---------------------------------------------------------------------- diff --git a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftMockTest.java b/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftMockTest.java deleted file mode 100644 index 300b097..0000000 --- a/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/internal/BaseSwiftMockTest.java +++ /dev/null @@ -1,99 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one or more - * contributor license agreements. See the NOTICE file distributed with - * this work for additional information regarding copyright ownership. - * The ASF licenses this file to You under the Apache License, Version 2.0 - * (the "License"); you may not use this file except in compliance with - * the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package org.jclouds.openstack.swift.v1.internal; - -import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor; -import static org.jclouds.Constants.PROPERTY_MAX_RETRIES; - -import java.io.IOException; -import java.net.URL; -import java.util.Properties; -import java.util.Set; -import java.util.concurrent.BlockingQueue; -import java.util.concurrent.LinkedBlockingQueue; - -import org.jclouds.ContextBuilder; -import org.jclouds.concurrent.config.ExecutorServiceModule; -import org.jclouds.openstack.swift.v1.SwiftApi; - -import com.google.common.collect.ImmutableSet; -import com.google.inject.Module; -import com.squareup.okhttp.mockwebserver.MockResponse; -import com.squareup.okhttp.mockwebserver.MockWebServer; -import com.squareup.okhttp.mockwebserver.QueueDispatcher; -import com.squareup.okhttp.mockwebserver.RecordedRequest; - -/** - * @author Jeremy Daggett - */ -public class BaseSwiftMockTest { - - public static String access = "{\"access\":{\"token\":{\"id\":\"b84f4a37-5126-4603-9521-ccd0665fbde1\",\"expires\":\"2013-04-13T16:49:57.000-05:00\",\"tenant\":{\"id\":\"123123\",\"name\":\"123123\"}},\"serviceCatalog\":[{\"endpoints\":[{\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudMonitoring\",\"type\":\"rax:monitor\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"publicURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\"},{\"region\":\"ORD\",\"tenantId\":\"MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"publicURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\"}],\"name\":\"cloudFilesCDN\",\"type\":\"rax:object-cdn\"},{\"endpoints\":[{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"},{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudLoadBalancers\",\"type\":\"rax:load-balancer\"},{\" endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"},{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudDatabases\",\"type\":\"rax:database\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"publicURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"internalURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\"},{\"region\":\"ORD\",\"tenantId\":\"MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"publicURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"internalURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\"}],\"name\":\"cloudFiles\",\"type\":\"object-store\"},{\"endpoints\":[{\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\",\"versionInfo\":\"URL/v1.0\",\"versionList\":\"URL/\",\"versionId\":\"1.0\"}],\"name\":\"cloudServers\",\"type\":\"compute\"},{\"endpoints\":[{\"re gion\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v2/123123\",\"versionInfo\":\"URL/v2\",\"versionList\":\"URL/\",\"versionId\":\"2\"},{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v2/123123\",\"versionInfo\":\"URL/v2\",\"versionList\":\"URL/\",\"versionId\":\"2\"}],\"name\":\"cloudServersOpenStack\",\"type\":\"compute\"},{\"endpoints\":[{\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudDNS\",\"type\":\"rax:dns\"},{\"endpoints\":[{\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudBackup\",\"type\":\"rax:backup\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1/123123\"},{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1/123123\"}],\"name\":\"cloudBlockStorage\",\"type\":\"volume\"}],\"user\":{\"id\":\"1234\",\"roles\":[{\"id\":\"3\",\"description\":\"User Admin Role.\",\"name\":\"identity:user-admin\"}],\"name\":\"jclouds-joe\",\"RAX-AUTH:defaultRegion\" :\"DFW\"}}}"; - - public static SwiftApi swiftApi(String uri, Properties overrides) { - overrides.setProperty(PROPERTY_MAX_RETRIES, "1"); - - return ContextBuilder.newBuilder("openstack-swift") // - .credentials("jclouds:joe", "letmein") // - .endpoint(uri) // - .overrides(overrides) // - .modules(modules) // - .buildApi(SwiftApi.class); - } - - public static SwiftApi swiftApi(String uri) { - return swiftApi(uri, new Properties()); - } - - private static final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(), - sameThreadExecutor())); - - public static MockWebServer mockSwiftServer() throws IOException { - MockWebServer server = new MockWebServer(); - server.play(); - URL url = server.getUrl(""); - server.setDispatcher(getURLReplacingQueueDispatcher(url)); - return server; - } - - /** - * there's no built-in way to defer evaluation of a response header, hence - * this method, which allows us to send back links to the mock server. - */ - public static QueueDispatcher getURLReplacingQueueDispatcher(final URL url) { - final QueueDispatcher dispatcher = new QueueDispatcher() { - protected final BlockingQueue<MockResponse> responseQueue = new LinkedBlockingQueue<MockResponse>(); - - @Override - public MockResponse dispatch(RecordedRequest request) throws InterruptedException { - MockResponse response = responseQueue.take(); - if (response.getBody() != null) { - String newBody = new String(response.getBody()).replace(":\"URL", ":\"" + url.toString()); - response = response.setBody(newBody); - } - return response; - } - - @Override - public void enqueueResponse(MockResponse response) { - responseQueue.add(response); - } - }; - - return dispatcher; - } -}
