Updated Branches: refs/heads/master a54cdca7d -> 41e25838c
Renamed BaseOpenStackMockTest variable and method more appropriately. 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/be16c972 Tree: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/tree/be16c972 Diff: http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/diff/be16c972 Branch: refs/heads/master Commit: be16c972f936cdd85caa834b23914a718ee699d0 Parents: a54cdca Author: Everett Toews <[email protected]> Authored: Mon Oct 14 09:58:58 2013 -0500 Committer: Everett Toews <[email protected]> Committed: Tue Oct 15 13:28:41 2013 -0500 ---------------------------------------------------------------------- .../swift/v1/AuthenticationMockTest.java | 4 +- .../swift/v1/TemporaryUrlSignerMockTest.java | 8 ++-- .../swift/v1/features/AccountApiMockTest.java | 16 +++---- .../swift/v1/features/BulkApiMockTest.java | 4 +- .../swift/v1/features/ContainerApiMockTest.java | 44 ++++++++++---------- .../swift/v1/features/ObjectApiMockTest.java | 36 ++++++++-------- .../features/StaticLargeObjectApiMockTest.java | 12 +++--- 7 files changed, 62 insertions(+), 62 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/be16c972/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 be63df6..a40ea16 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 @@ -51,8 +51,8 @@ public class AuthenticationMockTest extends BaseOpenStackMockTest<SwiftApi> { @Test(dataProvider = "jclouds.keystone.credential-type") public void authenticateCredentialType(String credentialType, String expectedPost) throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(accountResponse()); try { http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/be16c972/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 0a26115..f7ebb7d 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 @@ -34,8 +34,8 @@ public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi> } public void whenAccountApiHasKey() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(accountResponse().addHeader("X-Account-Meta-Temp-URL-Key", "mykey")); try { @@ -56,8 +56,8 @@ public class TemporaryUrlSignerMockTest extends BaseOpenStackMockTest<SwiftApi> @Test(expectedExceptions = IllegalStateException.class, expectedExceptionsMessageRegExp = ".*returned a null temporaryUrlKey!") public void whenAccountApiDoesntHaveKey() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(accountResponse()); try { http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/be16c972/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 0af9a63..730e0c2 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 @@ -40,8 +40,8 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> { /** upper-cases first char, and lower-cases rest!! **/ public void getKnowingServerMessesWithMetadataKeyCaseFormat() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(accountResponse() // // note silly casing .addHeader("X-Account-Meta-Apiname", "swift") // @@ -67,8 +67,8 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void updateMetadata() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(accountResponse() // .addHeader("X-Account-Meta-ApiName", "swift") // .addHeader("X-Account-Meta-ApiVersion", "v1.1")); @@ -91,8 +91,8 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void updateTemporaryUrlKey() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(accountResponse()); try { @@ -111,8 +111,8 @@ public class AccountApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void deleteMetadata() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(accountResponse()); try { http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/be16c972/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 10de7fa..d73e448 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 @@ -46,8 +46,8 @@ public class BulkApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } byte[] tarGz = ByteStreams.toByteArray(files.as(TarGzExporter.class).exportAsInputStream()); - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setResponseCode(201).setBody("{\"Number Files Created\": 10, \"Errors\": []}")); try { http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/be16c972/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 b0c25e6..bb6eba6 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 @@ -46,8 +46,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { + "]"; public void listFirstPage() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setBody(containerList)); try { @@ -73,8 +73,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void listAt() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setBody(containerList)); try { @@ -100,8 +100,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void createIfAbsent() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setResponseCode(201)); try { @@ -119,8 +119,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void createWithOptions() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setResponseCode(201)); try { @@ -142,8 +142,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void alreadyCreated() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setResponseCode(202)); try { @@ -162,8 +162,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { /** upper-cases first char, and lower-cases rest!! **/ public void getKnowingServerMessesWithMetadataKeyCaseFormat() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(containerResponse() // // note silly casing .addHeader("X-Container-Meta-Apiname", "swift") // @@ -189,8 +189,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void updateMetadata() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(containerResponse() // .addHeader("X-Container-Meta-ApiName", "swift") // .addHeader("X-Container-Meta-ApiVersion", "v1.1")); @@ -213,8 +213,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void deleteMetadata() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(containerResponse()); try { @@ -235,8 +235,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void deleteIfEmpty() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setResponseCode(204)); try { @@ -254,8 +254,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void alreadyDeleted() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setResponseCode(404)); try { @@ -274,8 +274,8 @@ public class ContainerApiMockTest extends BaseOpenStackMockTest<SwiftApi> { @Test(expectedExceptions = IllegalStateException.class) public void deleteWhenNotEmpty() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setResponseCode(409)); try { http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/be16c972/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 2bcf0b1..b4fb56e 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 @@ -82,8 +82,8 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void list() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(containerResponse() // .addHeader("X-Container-Read", ".r:*,.rlistings") // .setBody(objectList)); @@ -105,8 +105,8 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void listOptions() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(containerResponse().setBody(objectList)); try { @@ -124,8 +124,8 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void replace() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse() // .setResponseCode(201) // .addHeader("ETag", "d9f5eb4bba4e2f2f046e54611bc8196b")); @@ -152,8 +152,8 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { /** upper-cases first char, and lower-cases rest!! **/ public void headKnowingServerMessesWithMetadataKeyCaseFormat() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(objectResponse() // // note silly casing .addHeader("X-Object-Meta-Apiname", "swift") // @@ -182,8 +182,8 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void get() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(objectResponse() // // note silly casing .addHeader("X-Object-Meta-Apiname", "swift") // @@ -215,8 +215,8 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void updateMetadata() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(objectResponse() // .addHeader("X-Object-Meta-ApiName", "swift") // .addHeader("X-Object-Meta-ApiVersion", "v1.1")); @@ -239,8 +239,8 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void deleteMetadata() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(objectResponse()); try { @@ -261,8 +261,8 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void delete() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setResponseCode(204)); try { @@ -280,8 +280,8 @@ public class ObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { } public void alreadyDeleted() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setResponseCode(404)); try { http://git-wip-us.apache.org/repos/asf/incubator-jclouds-labs-openstack/blob/be16c972/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 8224845..529d7be 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 @@ -34,8 +34,8 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest; public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi> { public void replaceManifest() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().addHeader(HttpHeaders.ETAG, "\"abcd\"")); try { @@ -70,8 +70,8 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi } public void delete() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setResponseCode(204)); try { @@ -89,8 +89,8 @@ public class StaticLargeObjectApiMockTest extends BaseOpenStackMockTest<SwiftApi } public void alreadyDeleted() throws Exception { - MockWebServer server = mockSwiftServer(); - server.enqueue(new MockResponse().setBody(access)); + MockWebServer server = mockOpenStackServer(); + server.enqueue(new MockResponse().setBody(accessRackspace)); server.enqueue(new MockResponse().setResponseCode(404)); try {
