Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1559 from jclouds/cleanup-terremark-mock 

cleaned up style in mock responses that need to consider the port of the current MockWebServer
This commit is contained in:
Adrian Cole 2013-04-23 13:05:06 -07:00
parent 630d4cf57e 592d27f5ef
commit 3ec631356b
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
providers/trmk-ecloud/src/test/java/org/jclouds/trmk/ecloud/TerremarkECloudClientMockTest.java
View File

@ -23,12 +23,10 @@ import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.testng.Assert.assertEquals; import static org.testng.Assert.assertEquals;
import java.io.IOException; import java.io.IOException;
import java.net.URL;
import java.util.Properties; import java.util.Properties;
import java.util.Set; import java.util.Set;
import java.util.concurrent.BlockingQueue; import java.util.concurrent.BlockingQueue;
import java.util.concurrent.LinkedBlockingQueue; import java.util.concurrent.LinkedBlockingQueue;
import java.util.concurrent.atomic.AtomicReference;
import org.jclouds.ContextBuilder; import org.jclouds.ContextBuilder;
import org.jclouds.concurrent.config.ExecutorServiceModule; import org.jclouds.concurrent.config.ExecutorServiceModule;
@ -59,7 +57,7 @@ public class TerremarkECloudClientMockTest {
.endpoint(uri) .endpoint(uri)
.overrides(overrides) .overrides(overrides)
.modules(modules) .modules(modules)
.build(TerremarkECloudApiMetadata.CONTEXT_TOKEN).getApi(); .buildApi(TerremarkECloudClient.class);
} }
String versionXML = "<SupportedVersions><VersionInfo><Version>0.8b-ext2.8</Version><LoginUrl>URLv0.8/login</LoginUrl></VersionInfo></SupportedVersions>"; String versionXML = "<SupportedVersions><VersionInfo><Version>0.8b-ext2.8</Version><LoginUrl>URLv0.8/login</LoginUrl></VersionInfo></SupportedVersions>";
@ -67,19 +65,17 @@ public class TerremarkECloudClientMockTest {
@Test @Test
public void testLoginSetsContentLength() throws IOException, InterruptedException { public void testLoginSetsContentLength() throws IOException, InterruptedException {
MockWebServer server = new MockWebServer(); MockWebServer server = new MockWebServer();
AtomicReference<URL> url = setURLReplacingDispatcher(server); server.play();
server.setDispatcher(replaceURLWithLocalhostPort(server.getPort()));
server.enqueue(new MockResponse().setResponseCode(200).setBody(versionXML)); server.enqueue(new MockResponse().setResponseCode(200).setBody(versionXML));
server.enqueue(new MockResponse().setResponseCode(200) server.enqueue(new MockResponse().setResponseCode(200)
.addHeader("x-vcloud-authorization", "cookie") .addHeader("x-vcloud-authorization", "cookie")
.setBody("<OrgList />")); .setBody("<OrgList />"));
server.play();
url.set(server.getUrl("/"));
TerremarkECloudClient api = mockTerremarkECloudClient(url.get().toString()); TerremarkECloudClient api = mockTerremarkECloudClient(server.getUrl("/").toString());
try { try {
api.listOrgs(); api.listOrgs();
} finally {
RecordedRequest getVersions = server.takeRequest(); RecordedRequest getVersions = server.takeRequest();
assertEquals(getVersions.getRequestLine(), "GET /versions HTTP/1.1"); assertEquals(getVersions.getRequestLine(), "GET /versions HTTP/1.1");
@ -87,26 +83,25 @@ public class TerremarkECloudClientMockTest {
assertEquals(login.getRequestLine(), "POST /v0.8/login HTTP/1.1"); assertEquals(login.getRequestLine(), "POST /v0.8/login HTTP/1.1");
assertEquals(login.getHeader("Authorization"), "Basic dXNlcjpwYXNzd29yZA=="); assertEquals(login.getHeader("Authorization"), "Basic dXNlcjpwYXNzd29yZA==");
assertEquals(login.getHeader("Content-Length"), "0"); assertEquals(login.getHeader("Content-Length"), "0");
} finally {
server.shutdown(); server.shutdown();
} }
} }
/** /**
* there's no built-in way to defer evaluation of a response header, hence this * this pattern is used for HATEOAS or similar apis which return urls for
* method, which allows us to send back links to the mock server. * further requests. If we don't replace here, the test cannot be bound to
*/ * the same MWS instance as it was created with.
private AtomicReference<URL> setURLReplacingDispatcher(MockWebServer server) { */
final AtomicReference<URL> url = new AtomicReference<URL>(); private QueueDispatcher replaceURLWithLocalhostPort(final int port) {
return new QueueDispatcher() {
final QueueDispatcher dispatcher = new QueueDispatcher() {
protected final BlockingQueue<MockResponse> responseQueue = new LinkedBlockingQueue<MockResponse>(); protected final BlockingQueue<MockResponse> responseQueue = new LinkedBlockingQueue<MockResponse>();
@Override @Override
public MockResponse dispatch(RecordedRequest request) throws InterruptedException { public MockResponse dispatch(RecordedRequest request) throws InterruptedException {
MockResponse response = responseQueue.take(); MockResponse response = responseQueue.take();
if (response.getBody() != null) { if (response.getBody() != null) {
String newBody = new String(response.getBody()).replace("URL", url.get().toString()); String newBody = new String(response.getBody()).replace("URL", "http://localhost:" + port + "/");
response = response.setBody(newBody); response = response.setBody(newBody);
} }
return response; return response;
@ -117,7 +112,5 @@ public class TerremarkECloudClientMockTest {
responseQueue.add(response); responseQueue.add(response);
} }
}; };
server.setDispatcher(dispatcher);
return url;
} }
} }