You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by za...@apache.org on 2015/04/07 23:33:09 UTC
[11/32] jclouds git commit: JCLOUDS-562: Decode object names with
spaces, added test cases and updated test names.
JCLOUDS-562: Decode object names with spaces, added test cases and updated test names.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0c22936a
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0c22936a
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0c22936a
Branch: refs/heads/master
Commit: 0c22936ab21f42bc4234197910a748d54b9a3d82
Parents: 010400c
Author: Jeremy Daggett <je...@rackspace.com>
Authored: Tue May 20 14:38:19 2014 -0700
Committer: Jeremy Daggett <je...@rackspace.com>
Committed: Sun May 25 18:49:47 2014 -0700
----------------------------------------------------------------------
.../v1/features/CloudFilesCDNApiMockTest.java | 33 +++++++++++++++++++-
.../src/test/resources/cdn_container_list.json | 2 +-
.../test/resources/cdn_container_list_at.json | 2 +-
3 files changed, 34 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c22936a/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java b/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
index 3e07de5..f90204e 100644
--- a/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
+++ b/apis/rackspace-cloudfiles/src/test/java/org/jclouds/rackspace/cloudfiles/v1/features/CloudFilesCDNApiMockTest.java
@@ -280,6 +280,26 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
}
}
+ public void testGetCDNContainerWithSpaces() throws Exception {
+ MockWebServer server = mockOpenStackServer();
+ server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
+ server.enqueue(addCommonHeaders(enabledResponse().setResponseCode(201)));
+
+ try {
+ CloudFilesApi api = api(server.getUrl("/").toString(), "rackspace-cloudfiles");
+
+ CDNContainer cdnContainer = api.getCDNApiForRegion("DFW").get("cdn-container with spaces");
+ assertCDNContainerNotNull(cdnContainer);
+ assertEquals(mockCDNContainerWithSpaces, cdnContainer);
+
+ assertEquals(server.getRequestCount(), 2);
+ assertAuthentication(server);
+ assertRequest(server.takeRequest(), "HEAD", "/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9/cdn-container%20with%20spaces");
+ } finally {
+ server.shutdown();
+ }
+ }
+
public void testGetFail() throws Exception {
MockWebServer server = mockOpenStackServer();
server.enqueue(addCommonHeaders(new MockResponse().setBody(stringFromResource("/access.json"))));
@@ -424,6 +444,17 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
.iosUri(URI.create("http://ios-id-1.iosr.rackspace.com"))
.build();
+ private static final CDNContainer mockCDNContainerWithSpaces = CDNContainer.builder()
+ .name("cdn-container with spaces")
+ .enabled(true)
+ .logRetention(false)
+ .ttl(777777)
+ .uri(URI.create("http://id-1.cdn.rackspace.com"))
+ .sslUri(URI.create("https://ssl-id-1.ssl.rackspace.com"))
+ .streamingUri(URI.create("http://streaming-id-1.stream.rackspace.com"))
+ .iosUri(URI.create("http://ios-id-1.iosr.rackspace.com"))
+ .build();
+
private static MockResponse enabledResponse() {
return new MockResponse()
.addHeader(CDN_ENABLED, "true")
@@ -482,7 +513,7 @@ public class CloudFilesCDNApiMockTest extends BaseOpenStackMockTest<CloudFilesAp
.iosUri(URI.create("http://ios-id-3.iosr.rackspace.com"))
.build(),
CDNContainer.builder()
- .name("cdn-container-4")
+ .name("cdn-container-4 with spaces")
.enabled(true)
.logRetention(true)
.ttl(777777)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c22936a/apis/rackspace-cloudfiles/src/test/resources/cdn_container_list.json
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudfiles/src/test/resources/cdn_container_list.json b/apis/rackspace-cloudfiles/src/test/resources/cdn_container_list.json
index 4dce8db..5a36ca3 100644
--- a/apis/rackspace-cloudfiles/src/test/resources/cdn_container_list.json
+++ b/apis/rackspace-cloudfiles/src/test/resources/cdn_container_list.json
@@ -31,7 +31,7 @@
},
{
"cdn_streaming_uri": "http://streaming-id-4.stream.rackspace.com",
- "name": "cdn-container-4",
+ "name": "cdn-container-4 with spaces",
"cdn_ios_uri": "http://ios-id-4.iosr.rackspace.com",
"cdn_ssl_uri": "https://ssl-id-4.ssl.rackspace.com",
"cdn_enabled": true,
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0c22936a/apis/rackspace-cloudfiles/src/test/resources/cdn_container_list_at.json
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudfiles/src/test/resources/cdn_container_list_at.json b/apis/rackspace-cloudfiles/src/test/resources/cdn_container_list_at.json
index f1fa9ee..b3ae802 100644
--- a/apis/rackspace-cloudfiles/src/test/resources/cdn_container_list_at.json
+++ b/apis/rackspace-cloudfiles/src/test/resources/cdn_container_list_at.json
@@ -11,7 +11,7 @@
},
{
"cdn_streaming_uri": "http://streaming-id-4.stream.rackspace.com",
- "name": "cdn-container-4",
+ "name": "cdn-container-4 with spaces",
"cdn_ios_uri": "http://ios-id-4.iosr.rackspace.com",
"cdn_ssl_uri": "https://ssl-id-4.ssl.rackspace.com",
"cdn_enabled": true,