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

switched setup annotation to operate on Class to avoid InterruptedExceptions; accomodated OpenJDK behavior change wrt Expect: 100-continue

This commit is contained in:
Adrian Cole 2012-12-01 18:40:07 -08:00
parent dc2650f089
commit 1001021ecd
1 changed files with 79 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
core/src/test/java/org/jclouds/http/BaseJettyTest.java
View File

@ -60,8 +60,8 @@ import org.jclouds.ContextBuilder;
import org.jclouds.io.InputSuppliers; import org.jclouds.io.InputSuppliers;
import org.jclouds.providers.AnonymousProviderMetadata; import org.jclouds.providers.AnonymousProviderMetadata;
import org.jclouds.rest.RestContext; import org.jclouds.rest.RestContext;
import org.testng.annotations.AfterTest; import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeTest; import org.testng.annotations.BeforeClass;
import org.testng.annotations.Optional; import org.testng.annotations.Optional;
import org.testng.annotations.Parameters; import org.testng.annotations.Parameters;
@ -90,7 +90,7 @@ public abstract class BaseJettyTest {
protected String md5; protected String md5;
static final Pattern actionPattern = Pattern.compile("/objects/(.*)/action/([a-z]*);?(.*)"); static final Pattern actionPattern = Pattern.compile("/objects/(.*)/action/([a-z]*);?(.*)");
@BeforeTest @BeforeClass
@Parameters({ "test-jetty-port" }) @Parameters({ "test-jetty-port" })
public void setUpJetty(@Optional("8123") final int testPort) throws Exception { public void setUpJetty(@Optional("8123") final int testPort) throws Exception {
this.testPort = testPort; this.testPort = testPort;
@ -102,8 +102,6 @@ public abstract class BaseJettyTest {
Handler server1Handler = new AbstractHandler() { Handler server1Handler = new AbstractHandler() {
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException { throws IOException, ServletException {
InputStream body = request.getInputStream();
try {
if (failIfNoContentLength(request, response)) { if (failIfNoContentLength(request, response)) {
return; return;
} else if (target.indexOf("sleep") > 0) { } else if (target.indexOf("sleep") > 0) {
@ -111,6 +109,12 @@ public abstract class BaseJettyTest {
response.setContentType("text/xml"); response.setContentType("text/xml");
response.setStatus(SC_OK); response.setStatus(SC_OK);
} else if (target.indexOf("redirect") > 0) { } else if (target.indexOf("redirect") > 0) {
// in OpenJDK 7.0, expect continue handling is enforced, so we
// have to consume the stream.
// http://hg.openjdk.java.net/jdk7/tl/jdk/rev/045aeb76b0ff
// getInputStream address the expect-continue, per jetty docs
// http://wiki.eclipse.org/Jetty/Feature/1xx_Responses#100_Continue
toStringAndClose(request.getInputStream());
response.sendRedirect("https://localhost:" + (testPort + 1) + "/"); response.sendRedirect("https://localhost:" + (testPort + 1) + "/");
} else if (target.indexOf("101constitutions") > 0) { } else if (target.indexOf("101constitutions") > 0) {
response.setContentType("text/plain"); response.setContentType("text/plain");
@ -120,7 +124,7 @@ public abstract class BaseJettyTest {
} else if (request.getMethod().equals("PUT")) { } else if (request.getMethod().equals("PUT")) {
if (request.getContentLength() > 0) { if (request.getContentLength() > 0) {
response.setStatus(SC_OK); response.setStatus(SC_OK);
response.getWriter().println(toStringAndClose(body) + "PUT"); response.getWriter().println(toStringAndClose(request.getInputStream()) + "PUT");
} else { } else {
response.sendError(500, "no content"); response.sendError(500, "no content");
} }
@ -142,8 +146,7 @@ public abstract class BaseJettyTest {
response.setStatus(SC_OK); response.setStatus(SC_OK);
response.getWriter().println("test"); response.getWriter().println("test");
} else if (request.getMethod().equals("HEAD")) { } else if (request.getMethod().equals("HEAD")) {
// by HTML specification, HEAD response MUST NOT include a // by HTML specification, HEAD response MUST NOT include a body
// body
response.setContentType("text/xml"); response.setContentType("text/xml");
response.setStatus(SC_OK); response.setStatus(SC_OK);
} else { } else {
@ -153,11 +156,7 @@ public abstract class BaseJettyTest {
response.setStatus(SC_OK); response.setStatus(SC_OK);
response.getWriter().println(XML); response.getWriter().println(XML);
} }
((Request) request).setHandled(true); Request.class.cast(request).setHandled(true);
} catch (IOException e) {
closeQuietly(body);
response.sendError(500, getStackTraceAsString(e));
}
} }
}; };
@ -201,6 +200,7 @@ public abstract class BaseJettyTest {
response.setStatus(SC_OK); response.setStatus(SC_OK);
response.getWriter().println(responseString); response.getWriter().println(responseString);
} }
Request.class.cast(request).setHandled(true);
} catch (IOException e) { } catch (IOException e) {
closeQuietly(body); closeQuietly(body);
response.sendError(500, getStackTraceAsString(e)); response.sendError(500, getStackTraceAsString(e));
@ -211,13 +211,10 @@ public abstract class BaseJettyTest {
Handler server2Handler = new AbstractHandler() { Handler server2Handler = new AbstractHandler() {
public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response) public void handle(String target, Request baseRequest, HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException { throws IOException, ServletException {
InputStream body = request.getInputStream();
try {
if (request.getMethod().equals("PUT")) { if (request.getMethod().equals("PUT")) {
String text = toStringAndClose(body);
body = null;
if (request.getContentLength() > 0) { if (request.getContentLength() > 0) {
response.setStatus(SC_OK); response.setStatus(SC_OK);
String text = toStringAndClose(request.getInputStream());
response.getWriter().println(text + "PUTREDIRECT"); response.getWriter().println(text + "PUTREDIRECT");
} }
} else if (request.getMethod().equals("POST")) { } else if (request.getMethod().equals("POST")) {
@ -227,8 +224,7 @@ public abstract class BaseJettyTest {
handleAction(request, response); handleAction(request, response);
} }
} else if (request.getMethod().equals("HEAD")) { } else if (request.getMethod().equals("HEAD")) {
// by HTML specification, HEAD response MUST NOT include a // by HTML specification, HEAD response MUST NOT include a body
// body
response.setContentType("text/xml"); response.setContentType("text/xml");
response.setStatus(SC_OK); response.setStatus(SC_OK);
} else { } else {
@ -236,11 +232,7 @@ public abstract class BaseJettyTest {
response.setStatus(SC_OK); response.setStatus(SC_OK);
response.getWriter().println(XML2); response.getWriter().println(XML2);
} }
((Request) request).setHandled(true); Request.class.cast(request).setHandled(true);
} catch (IOException e) {
closeQuietly(body);
response.sendError(500, getStackTraceAsString(e));
}
} }
}; };
@ -284,7 +276,7 @@ public abstract class BaseJettyTest {
.modules(ImmutableSet.<Module> copyOf(connectionModules)).overrides(properties); .modules(ImmutableSet.<Module> copyOf(connectionModules)).overrides(properties);
} }
@AfterTest @AfterClass
public void tearDownJetty() throws Exception { public void tearDownJetty() throws Exception {
closeQuietly(context); closeQuietly(context);
if (server2 != null) if (server2 != null)
@ -307,7 +299,7 @@ public abstract class BaseJettyTest {
protected boolean failEveryTenRequests(HttpServletRequest request, HttpServletResponse response) throws IOException { protected boolean failEveryTenRequests(HttpServletRequest request, HttpServletResponse response) throws IOException {
if (cycle.incrementAndGet() % 10 == 0) { if (cycle.incrementAndGet() % 10 == 0) {
response.sendError(500, "unlucky 10"); response.sendError(500, "unlucky 10");
((Request) request).setHandled(true); Request.class.cast(request).setHandled(true);
return true; return true;
} }
return false; return false;
@ -317,7 +309,7 @@ public abstract class BaseJettyTest {
throws IOException { throws IOException {
if (cycle.incrementAndGet() % 20 == 0) { if (cycle.incrementAndGet() % 20 == 0) {
response.sendRedirect("http://localhost:" + (testPort + 1) + "/"); response.sendRedirect("http://localhost:" + (testPort + 1) + "/");
((Request) request).setHandled(true); Request.class.cast(request).setHandled(true);
return true; return true;
} }
return false; return false;
@ -337,7 +329,7 @@ public abstract class BaseJettyTest {
response.getWriter().println("no content length!"); response.getWriter().println("no content length!");
response.getWriter().println(realHeaders.toString()); response.getWriter().println(realHeaders.toString());
response.sendError(500, "no content length!"); response.sendError(500, "no content length!");
((Request) request).setHandled(true); Request.class.cast(request).setHandled(true);
return true; return true;
} }
return false; return false;
@ -359,4 +351,5 @@ public abstract class BaseJettyTest {
response.sendError(500, "no content"); response.sendError(500, "no content");
} }
} }
} }