You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@shindig.apache.org by et...@apache.org on 2008/05/13 11:19:03 UTC
svn commit: r655788 [2/2] - in /incubator/shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/
main/java/org/apache/shindig/gadgets/http/
main/java/org/apache/shindig/gadgets/oauth/
main/java/org/apache/shindig/gadgets/servlet/ test/ja...
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java?rev=655788&r1=655787&r2=655788&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsFeatureLoaderTest.java Tue May 13 02:19:01 2008
@@ -20,8 +20,8 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
-import org.apache.shindig.gadgets.http.RemoteContent;
-import org.apache.shindig.gadgets.http.RemoteContentRequest;
+import org.apache.shindig.gadgets.http.HttpResponse;
+import org.apache.shindig.gadgets.http.HttpRequest;
import java.io.BufferedWriter;
import java.io.File;
@@ -107,9 +107,9 @@
" <script src=\"" + JS_URL + "\"/>" +
" </gadget>" +
"</feature>";
- RemoteContentRequest request = new RemoteContentRequest(JS_URL);
- RemoteContent response
- = new RemoteContent(200, ALT_JS_CONTENT.getBytes(), null);
+ HttpRequest request = new HttpRequest(JS_URL);
+ HttpResponse response
+ = new HttpResponse(200, ALT_JS_CONTENT.getBytes(), null);
expect(fetcher.fetch(eq(request))).andReturn(response);
replay();
GadgetFeatureRegistry.Entry entry = loader.loadFeature(registry, xml);
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java?rev=655788&r1=655787&r2=655788&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/JsLibraryTest.java Tue May 13 02:19:01 2008
@@ -20,9 +20,9 @@
import static org.easymock.EasyMock.eq;
import static org.easymock.EasyMock.expect;
-import org.apache.shindig.gadgets.http.ContentFetcher;
-import org.apache.shindig.gadgets.http.RemoteContent;
-import org.apache.shindig.gadgets.http.RemoteContentRequest;
+import org.apache.shindig.gadgets.http.HttpFetcher;
+import org.apache.shindig.gadgets.http.HttpResponse;
+import org.apache.shindig.gadgets.http.HttpRequest;
import java.io.BufferedWriter;
import java.io.File;
@@ -82,12 +82,12 @@
}
public void testUrl() throws Exception {
- ContentFetcher mockFetcher = mock(ContentFetcher.class);
+ HttpFetcher mockFetcher = mock(HttpFetcher.class);
URI location = new URI("http://example.org/file.js");
- RemoteContentRequest request = new RemoteContentRequest(location);
- RemoteContent content
- = new RemoteContent(RemoteContent.SC_OK, URL_JS.getBytes(), null);
- expect(mockFetcher.fetch(eq(request))).andReturn(content);
+ HttpRequest request = new HttpRequest(location);
+ HttpResponse response
+ = new HttpResponse(HttpResponse.SC_OK, URL_JS.getBytes(), null);
+ expect(mockFetcher.fetch(eq(request))).andReturn(response);
replay();
JsLibrary lib = JsLibrary.create(
JsLibrary.Type.URL, location.toString(), null, mockFetcher);
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java?rev=655788&r1=655787&r2=655788&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/SigningFetcherTest.java Tue May 13 02:19:01 2008
@@ -17,9 +17,9 @@
import junit.framework.TestCase;
import org.apache.shindig.common.BasicSecurityToken;
-import org.apache.shindig.gadgets.http.BasicContentCache;
-import org.apache.shindig.gadgets.http.ContentCache;
-import org.apache.shindig.gadgets.http.RemoteContentRequest;
+import org.apache.shindig.gadgets.http.BasicHttpCache;
+import org.apache.shindig.gadgets.http.HttpCache;
+import org.apache.shindig.gadgets.http.HttpRequest;
import net.oauth.OAuth;
import net.oauth.OAuth.Parameter;
@@ -70,7 +70,7 @@
"-----END CERTIFICATE-----";
private InterceptingContentFetcher interceptor;
- private ContentCache cache;
+ private HttpCache cache;
private SigningFetcher signer;
private BasicSecurityToken authToken;
private OAuthAccessor accessor;
@@ -79,7 +79,7 @@
@Override
public void setUp() throws Exception {
super.setUp();
- cache = new BasicContentCache();
+ cache = new BasicHttpCache();
interceptor = new InterceptingContentFetcher();
authToken = new BasicSecurityToken("o", "v", "a", "d", "u", "m");
signer = SigningFetcher.makeFromB64PrivateKey(cache,
@@ -90,17 +90,17 @@
messageValidator = new SimpleOAuthValidator();
}
- private RemoteContentRequest makeContentRequest(String method, String url)
+ private HttpRequest makeHttpRequest(String method, String url)
throws URISyntaxException {
- return makeContentRequest(method, url, null);
+ return makeHttpRequest(method, url, null);
}
- private RemoteContentRequest makeContentRequest(String method, String url,
+ private HttpRequest makeHttpRequest(String method, String url,
byte[] body) throws URISyntaxException {
- return new RemoteContentRequest(method, new URI(url), null, body, null);
+ return new HttpRequest(method, new URI(url), null, body, null);
}
- private RemoteContentRequest signAndInspect(RemoteContentRequest orig)
+ private HttpRequest signAndInspect(HttpRequest orig)
throws Exception {
signer.fetch(orig);
assertSignatureOK(interceptor.interceptedRequest);
@@ -108,9 +108,9 @@
}
public void testParametersSet() throws Exception {
- RemoteContentRequest unsigned
- = makeContentRequest("GET", "http://test", null);
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest unsigned
+ = makeHttpRequest("GET", "http://test", null);
+ HttpRequest out = signAndInspect(unsigned);
List<OAuth.Parameter> queryParams
= OAuth.decodeForm(out.getUri().getRawQuery());
assertTrue(contains(queryParams, "opensocial_owner_id", "o"));
@@ -121,10 +121,10 @@
}
public void testNoSignViewer() throws Exception {
- RemoteContentRequest unsigned
- = makeContentRequest("GET", "http://test", null);
+ HttpRequest unsigned
+ = makeHttpRequest("GET", "http://test", null);
unsigned.getOptions().viewerSigned = false;
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest out = signAndInspect(unsigned);
List<OAuth.Parameter> queryParams
= OAuth.decodeForm(out.getUri().getRawQuery());
assertTrue(contains(queryParams, "opensocial_owner_id", "o"));
@@ -132,10 +132,10 @@
}
public void testNoSignOwner() throws Exception {
- RemoteContentRequest unsigned
- = makeContentRequest("GET", "http://test", null);
+ HttpRequest unsigned
+ = makeHttpRequest("GET", "http://test", null);
unsigned.getOptions().ownerSigned = false;
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest out = signAndInspect(unsigned);
List<OAuth.Parameter> queryParams
= OAuth.decodeForm(out.getUri().getRawQuery());
assertFalse(contains(queryParams, "opensocial_owner_id", "o"));
@@ -144,10 +144,10 @@
public void testTrickyParametersInQuery() throws Exception {
String tricky = "%6fpensocial_owner_id=gotcha";
- RemoteContentRequest unsigned
- = makeContentRequest("GET", "http://test?" + tricky, null);
+ HttpRequest unsigned
+ = makeHttpRequest("GET", "http://test?" + tricky, null);
try {
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest out = signAndInspect(unsigned);
fail("Should have thrown");
} catch (RequestSigningException e) {
// good.
@@ -156,10 +156,10 @@
public void testTrickyParametersInBody() throws Exception {
String tricky = "%6fpensocial_owner_id=gotcha";
- RemoteContentRequest unsigned
- = makeContentRequest("POST", "http://test", tricky.getBytes());
+ HttpRequest unsigned
+ = makeHttpRequest("POST", "http://test", tricky.getBytes());
try {
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest out = signAndInspect(unsigned);
fail("Should have thrown");
} catch (RequestSigningException e) {
// good.
@@ -167,24 +167,24 @@
}
public void testGetNoQuery() throws Exception {
- RemoteContentRequest unsigned
- = makeContentRequest("GET", "http://test", null);
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest unsigned
+ = makeHttpRequest("GET", "http://test", null);
+ HttpRequest out = signAndInspect(unsigned);
}
public void testGetWithQuery() throws Exception {
- RemoteContentRequest unsigned
- = makeContentRequest("GET", "http://test?a=b", null);
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest unsigned
+ = makeHttpRequest("GET", "http://test?a=b", null);
+ HttpRequest out = signAndInspect(unsigned);
List<OAuth.Parameter> queryParams
= OAuth.decodeForm(out.getUri().getRawQuery());
assertTrue(contains(queryParams, "a", "b"));
}
public void testGetWithQueryMultiParam() throws Exception {
- RemoteContentRequest unsigned
- = makeContentRequest("GET", "http://test?a=b&a=c");
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest unsigned
+ = makeHttpRequest("GET", "http://test?a=b&a=c");
+ HttpRequest out = signAndInspect(unsigned);
List<OAuth.Parameter> queryParams
= OAuth.decodeForm(out.getUri().getRawQuery());
assertTrue(contains(queryParams, "a", "b"));
@@ -193,51 +193,51 @@
public void testValidParameterCharacters() throws Exception {
String weird = "~!@$*()-_[]:,./";
- RemoteContentRequest unsigned
- = makeContentRequest("GET", "http://test?" + weird + "=foo");
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest unsigned
+ = makeHttpRequest("GET", "http://test?" + weird + "=foo");
+ HttpRequest out = signAndInspect(unsigned);
List<OAuth.Parameter> queryParams
= OAuth.decodeForm(out.getUri().getRawQuery());
assertTrue(contains(queryParams, weird, "foo"));
}
public void testPostNoQueryNoData() throws Exception {
- RemoteContentRequest unsigned = makeContentRequest("GET", "http://test");
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest unsigned = makeHttpRequest("GET", "http://test");
+ HttpRequest out = signAndInspect(unsigned);
}
public void testPostWithQueryNoData() throws Exception {
- RemoteContentRequest unsigned
- = makeContentRequest("GET", "http://test?name=value");
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest unsigned
+ = makeHttpRequest("GET", "http://test?name=value");
+ HttpRequest out = signAndInspect(unsigned);
List<OAuth.Parameter> queryParams
= OAuth.decodeForm(out.getUri().getRawQuery());
assertTrue(contains(queryParams, "name", "value"));
}
public void testPostNoQueryWithData() throws Exception {
- RemoteContentRequest unsigned = makeContentRequest(
+ HttpRequest unsigned = makeHttpRequest(
"POST", "http://test", "name=value".getBytes());
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest out = signAndInspect(unsigned);
List<OAuth.Parameter> queryParams
= OAuth.decodeForm(out.getUri().getRawQuery());
assertFalse(contains(queryParams, "name", "value"));
}
public void testPostWithQueryWithData() throws Exception {
- RemoteContentRequest unsigned = makeContentRequest(
+ HttpRequest unsigned = makeHttpRequest(
"POST", "http://test?queryName=queryValue", "name=value".getBytes());
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest out = signAndInspect(unsigned);
List<OAuth.Parameter> queryParams
= OAuth.decodeForm(out.getUri().getRawQuery());
assertTrue(contains(queryParams, "queryName", "queryValue"));
}
public void testStripOpenSocialParamsFromQuery() throws Exception {
- RemoteContentRequest unsigned = makeContentRequest(
+ HttpRequest unsigned = makeHttpRequest(
"POST", "http://test?opensocial_foo=bar");
try {
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest out = signAndInspect(unsigned);
fail("Should have thrown");
} catch (RequestSigningException e) {
// good
@@ -245,10 +245,10 @@
}
public void testStripOAuthParamsFromQuery() throws Exception {
- RemoteContentRequest unsigned = makeContentRequest(
+ HttpRequest unsigned = makeHttpRequest(
"POST", "http://test?oauth_foo=bar", "name=value".getBytes());
try {
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest out = signAndInspect(unsigned);
fail("Should have thrown");
} catch (RequestSigningException e) {
// good
@@ -256,10 +256,10 @@
}
public void testStripOpenSocialParamsFromBody() throws Exception {
- RemoteContentRequest unsigned = makeContentRequest(
+ HttpRequest unsigned = makeHttpRequest(
"POST", "http://test", "opensocial_foo=bar".getBytes());
try {
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest out = signAndInspect(unsigned);
fail("Should have thrown");
} catch (RequestSigningException e) {
// good.
@@ -267,17 +267,17 @@
}
public void testStripOAuthParamsFromBody() throws Exception {
- RemoteContentRequest unsigned = makeContentRequest(
+ HttpRequest unsigned = makeHttpRequest(
"POST", "http://test", "oauth_foo=bar".getBytes());
try {
- RemoteContentRequest out = signAndInspect(unsigned);
+ HttpRequest out = signAndInspect(unsigned);
fail("Should have thrown");
} catch (RequestSigningException e) {
// good.
}
}
- private void assertSignatureOK(RemoteContentRequest req)
+ private void assertSignatureOK(HttpRequest req)
throws Exception {
URL url = req.getUri().toURL();
URL noQuery = new URL(url.getProtocol(), url.getHost(), url.getPort(),
Copied: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java (from r655783, incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicContentCacheTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java?p2=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java&p1=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicContentCacheTest.java&r1=655783&r2=655788&rev=655788&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicContentCacheTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpCacheTest.java Tue May 13 02:19:01 2008
@@ -33,7 +33,7 @@
/**
* Tests for basic content cache
*/
-public class BasicContentCacheTest extends TestCase {
+public class BasicHttpCacheTest extends TestCase {
/**
* Used to parse Expires: header.
*/
@@ -43,12 +43,12 @@
dateFormat.setTimeZone(TimeZone.getTimeZone("GMT"));
}
- private ContentCache cache;
+ private HttpCache cache;
@Override
public void setUp() throws Exception {
super.setUp();
- cache = new BasicContentCache();
+ cache = new BasicHttpCache();
}
@Override
@@ -57,101 +57,101 @@
super.tearDown();
}
- private RemoteContentRequest createRequest(String method) {
- RemoteContentRequest req = new RemoteContentRequest(method,
+ private HttpRequest createRequest(String method) {
+ HttpRequest req = new HttpRequest(method,
URI.create("http://www.here.com"), new HashMap<String, List<String>>(),
- new byte[0], new RemoteContentRequest.Options());
+ new byte[0], new HttpRequest.Options());
return req;
}
- private RemoteContent createResponse(int statusCode, String header,
+ private HttpResponse createResponse(int statusCode, String header,
String headerValue) {
Map<String, List<String>> headers = new HashMap<String, List<String>>();
if (header != null) {
headers.put(header, Arrays.asList(headerValue));
}
- RemoteContent resp = new RemoteContent(statusCode, new byte[0], headers);
+ HttpResponse resp = new HttpResponse(statusCode, new byte[0], headers);
return resp;
}
- private RemoteContent createExpiresResponse(int statusCode, long expiration) {
+ private HttpResponse createExpiresResponse(int statusCode, long expiration) {
Date newExpiry = new Date(expiration);
return createResponse(statusCode, "Expires", dateFormat.format(newExpiry));
}
- private RemoteContent createMaxAgeResponse(int statusCode, long age) {
+ private HttpResponse createMaxAgeResponse(int statusCode, long age) {
return createResponse(statusCode, "Cache-Control", "max-age=" + age);
}
public void testEmptyCache() {
- assertNull(cache.getContent(createRequest("GET")));
+ assertNull(cache.getResponse(createRequest("GET")));
}
public void testCacheable() {
- RemoteContentRequest req = createRequest("GET");
- RemoteContent resp = createResponse(200, null, null);
- cache.addContent(req, resp);
- assertEquals(cache.getContent(req), resp);
+ HttpRequest req = createRequest("GET");
+ HttpResponse resp = createResponse(200, null, null);
+ cache.addResponse(req, resp);
+ assertEquals(cache.getResponse(req), resp);
}
public void testNotCacheableForPost() {
- RemoteContentRequest req = createRequest("POST");
- RemoteContent resp = createResponse(200, null, null);
- cache.addContent(req, resp);
- assertNull(cache.getContent(req));
+ HttpRequest req = createRequest("POST");
+ HttpResponse resp = createResponse(200, null, null);
+ cache.addResponse(req, resp);
+ assertNull(cache.getResponse(req));
}
public void testNotCacheableForErr() {
- RemoteContentRequest req = createRequest("GET");
- RemoteContent resp = createResponse(500, null, null);
- cache.addContent(req, resp);
- assertNull(cache.getContent(req));
+ HttpRequest req = createRequest("GET");
+ HttpResponse resp = createResponse(500, null, null);
+ cache.addResponse(req, resp);
+ assertNull(cache.getResponse(req));
}
public void testCacheableForFutureExpires() {
- RemoteContentRequest req = createRequest("GET");
- RemoteContent resp = createExpiresResponse(200,
+ HttpRequest req = createRequest("GET");
+ HttpResponse resp = createExpiresResponse(200,
System.currentTimeMillis() + 10000L);
- cache.addContent(req, resp);
- assertEquals(cache.getContent(req), resp);
+ cache.addResponse(req, resp);
+ assertEquals(cache.getResponse(req), resp);
}
public void testNotCacheableForPastExpires() {
- RemoteContentRequest req = createRequest("GET");
- RemoteContent resp = createExpiresResponse(200,
+ HttpRequest req = createRequest("GET");
+ HttpResponse resp = createExpiresResponse(200,
System.currentTimeMillis() - 10000L);
- cache.addContent(req, resp);
- assertNull(cache.getContent(req));
+ cache.addResponse(req, resp);
+ assertNull(cache.getResponse(req));
}
public void testNotCacheableForFutureExpiresWithError() {
- RemoteContentRequest req = createRequest("GET");
- RemoteContent resp = createExpiresResponse(500,
+ HttpRequest req = createRequest("GET");
+ HttpResponse resp = createExpiresResponse(500,
System.currentTimeMillis() - 10000L);
- cache.addContent(req, resp);
- assertNull(cache.getContent(req));
+ cache.addResponse(req, resp);
+ assertNull(cache.getResponse(req));
}
public void testCacheableForFutureMaxAge() {
- RemoteContentRequest req = createRequest("GET");
- RemoteContent resp = createMaxAgeResponse(200,
+ HttpRequest req = createRequest("GET");
+ HttpResponse resp = createMaxAgeResponse(200,
10000L);
- cache.addContent(req, resp);
- assertEquals(cache.getContent(req), resp);
+ cache.addResponse(req, resp);
+ assertEquals(cache.getResponse(req), resp);
}
public void testNotCacheableForNoCache() {
- RemoteContentRequest req = createRequest("GET");
- RemoteContent resp = createResponse(200, "Cache-Control", "no-cache");
- cache.addContent(req, resp);
- assertNull(cache.getContent(req));
+ HttpRequest req = createRequest("GET");
+ HttpResponse resp = createResponse(200, "Cache-Control", "no-cache");
+ cache.addResponse(req, resp);
+ assertNull(cache.getResponse(req));
}
public void testCacheableForExpiresWithWait() {
- RemoteContentRequest req = createRequest("GET");
- RemoteContent resp = createExpiresResponse(200,
+ HttpRequest req = createRequest("GET");
+ HttpResponse resp = createExpiresResponse(200,
System.currentTimeMillis() + 5000L);
- cache.addContent(req, resp);
+ cache.addResponse(req, resp);
try {
synchronized (cache) {
cache.wait(500L);
@@ -159,15 +159,15 @@
} catch (InterruptedException ie) {
fail("Failed to wait for cache");
}
- assertEquals(cache.getContent(req), resp);
+ assertEquals(cache.getResponse(req), resp);
}
public void testNotCacheableForExpiresWithWait() {
- RemoteContentRequest req = createRequest("GET");
- RemoteContent resp = createExpiresResponse(200,
+ HttpRequest req = createRequest("GET");
+ HttpResponse resp = createExpiresResponse(200,
System.currentTimeMillis() + 1000L);
- cache.addContent(req, resp);
+ cache.addResponse(req, resp);
try {
synchronized (cache) {
cache.wait(1001L);
@@ -175,7 +175,7 @@
} catch (InterruptedException ie) {
fail("Failed to wait for cache");
}
- assertNull(cache.getContent(req));
+ assertNull(cache.getResponse(req));
}
}
Copied: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java (from r655783, incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicRemoteContentFetcherTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java?p2=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java&p1=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicRemoteContentFetcherTest.java&r1=655783&r2=655788&rev=655788&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicRemoteContentFetcherTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/BasicHttpFetcherTest.java Tue May 13 02:19:01 2008
@@ -24,10 +24,10 @@
import java.io.FileWriter;
import java.net.URI;
-public class BasicRemoteContentFetcherTest extends TestCase {
- private ContentCache cache = new BasicContentCache();
- private ContentFetcher fetcher
- = new BasicRemoteContentFetcher(cache, Integer.MAX_VALUE);
+public class BasicHttpFetcherTest extends TestCase {
+ private HttpCache cache = new BasicHttpCache();
+ private HttpFetcher fetcher
+ = new BasicHttpFetcher(cache, Integer.MAX_VALUE);
public void testFetch() throws Exception {
String content = "Hello, world!";
@@ -36,17 +36,17 @@
BufferedWriter out = new BufferedWriter(new FileWriter(temp));
out.write(content);
out.close();
- RemoteContentRequest request = new RemoteContentRequest(temp.toURI());
- RemoteContent response = fetcher.fetch(request);
- assertEquals(RemoteContent.SC_OK, response.getHttpStatusCode());
+ HttpRequest request = new HttpRequest(temp.toURI());
+ HttpResponse response = fetcher.fetch(request);
+ assertEquals(HttpResponse.SC_OK, response.getHttpStatusCode());
assertEquals(content, response.getResponseAsString());
}
public void testNotExists() throws Exception {
- RemoteContentRequest request
- = new RemoteContentRequest(new URI("file:///does/not/exist"));
- RemoteContent response = fetcher.fetch(request);
- assertEquals(RemoteContent.SC_NOT_FOUND, response.getHttpStatusCode());
+ HttpRequest request
+ = new HttpRequest(new URI("file:///does/not/exist"));
+ HttpResponse response = fetcher.fetch(request);
+ assertEquals(HttpResponse.SC_NOT_FOUND, response.getHttpStatusCode());
}
// TODO simulate fake POST requests, headers, options, etc.
Copied: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java (from r655783, incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/RemoteContentRequestTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java?p2=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java&p1=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/RemoteContentRequestTest.java&r1=655783&r2=655788&rev=655788&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/RemoteContentRequestTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpRequestTest.java Tue May 13 02:19:01 2008
@@ -28,7 +28,7 @@
import java.util.List;
import java.util.Map;
-public class RemoteContentRequestTest extends TestCase {
+public class HttpRequestTest extends TestCase {
private static final String POST_BODY = "Hello, world!";
private static final String CONTENT_TYPE = "text/plain";
private static final String TEST_HEADER_KEY = "X-Test-Header";
@@ -36,8 +36,8 @@
private static final URI DEFAULT_URI = URI.create("http://example.org/");
public void testPostBodyCopied() throws Exception {
- RemoteContentRequest request
- = new RemoteContentRequest(DEFAULT_URI, POST_BODY.getBytes());
+ HttpRequest request
+ = new HttpRequest(DEFAULT_URI, POST_BODY.getBytes());
assertEquals(POST_BODY.length(), request.getPostBodyLength());
assertEquals(POST_BODY,
InputStreamConsumer.readToString(request.getPostBody()));
@@ -46,16 +46,16 @@
public void testContentTypeExtraction() throws Exception {
Map<String, List<String>> headers = new HashMap<String, List<String>>();
headers.put("Content-Type", Arrays.asList(CONTENT_TYPE));
- RemoteContentRequest request
- = new RemoteContentRequest(DEFAULT_URI, headers);
+ HttpRequest request
+ = new HttpRequest(DEFAULT_URI, headers);
assertEquals(CONTENT_TYPE, request.getContentType());
}
public void testGetHeader() throws Exception {
Map<String, List<String>> headers = new HashMap<String, List<String>>();
headers.put(TEST_HEADER_KEY, Arrays.asList(TEST_HEADER_VALUE));
- RemoteContentRequest request
- = new RemoteContentRequest(DEFAULT_URI, headers);
+ HttpRequest request
+ = new HttpRequest(DEFAULT_URI, headers);
assertEquals(TEST_HEADER_VALUE, request.getHeader(TEST_HEADER_KEY));
}
}
Copied: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java (from r655783, incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/RemoteContentTest.java)
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java?p2=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java&p1=incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/RemoteContentTest.java&r1=655783&r2=655788&rev=655788&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/RemoteContentTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpResponseTest.java Tue May 13 02:19:01 2008
@@ -27,7 +27,7 @@
import java.util.List;
import java.util.Map;
-public class RemoteContentTest extends TestCase {
+public class HttpResponseTest extends TestCase {
private Map<String, List<String>> headers;
@Override
@@ -47,8 +47,8 @@
public void testGetEncoding() throws Exception {
addHeader("Content-Type", "text/plain; charset=TEST-CHARACTER-SET");
- RemoteContent content = new RemoteContent(200, new byte[0], headers);
- assertEquals("TEST-CHARACTER-SET", content.getEncoding());
+ HttpResponse response = new HttpResponse(200, new byte[0], headers);
+ assertEquals("TEST-CHARACTER-SET", response.getEncoding());
}
public void testEncodingDetectionUtf8WithBom() throws Exception {
@@ -57,8 +57,8 @@
(byte)0xEF, (byte)0xBB, (byte)0xBF, 'h', 'e', 'l', 'l', 'o'
};
addHeader("Content-Type", "text/plain; charset=UTF-8");
- RemoteContent content = new RemoteContent(200, data, headers);
- assertEquals("hello", content.getResponseAsString());
+ HttpResponse response = new HttpResponse(200, data, headers);
+ assertEquals("hello", response.getResponseAsString());
}
public void testEncodingDetectionLatin1() throws Exception {
@@ -67,8 +67,8 @@
'h', (byte)0xE9, 'l', 'l', 'o'
};
addHeader("Content-Type", "text/plain; charset=iso-8859-1");
- RemoteContent content = new RemoteContent(200, data, headers);
- assertEquals("h\u00E9llo", content.getResponseAsString());
+ HttpResponse response = new HttpResponse(200, data, headers);
+ assertEquals("h\u00E9llo", response.getResponseAsString());
}
public void testEncodingDetectionBig5() throws Exception {
@@ -76,9 +76,9 @@
(byte)0xa7, (byte)0x41, (byte)0xa6, (byte)0x6e
};
addHeader("Content-Type", "text/plain; charset=BIG5");
- RemoteContent content = new RemoteContent(200, data, headers);
- String resp = content.getResponseAsString();
- assertEquals("\u4F60\u597D", content.getResponseAsString());
+ HttpResponse response = new HttpResponse(200, data, headers);
+ String resp = response.getResponseAsString();
+ assertEquals("\u4F60\u597D", response.getResponseAsString());
}
public void testPreserveBinaryData() throws Exception {
@@ -86,8 +86,8 @@
(byte)0x00, (byte)0xDE, (byte)0xEA, (byte)0xDB, (byte)0xEE, (byte)0xF0
};
addHeader("Content-Type", "application/octet-stream");
- RemoteContent content = new RemoteContent(200, data, headers);
- byte[] out = InputStreamConsumer.readToByteArray(content.getResponse());
+ HttpResponse response = new HttpResponse(200, data, headers);
+ byte[] out = InputStreamConsumer.readToByteArray(response.getResponse());
assertTrue(Arrays.equals(data, out));
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/FakeOAuthServiceProvider.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/FakeOAuthServiceProvider.java?rev=655788&r1=655787&r2=655788&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/FakeOAuthServiceProvider.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/FakeOAuthServiceProvider.java Tue May 13 02:19:01 2008
@@ -27,15 +27,15 @@
import org.apache.shindig.common.crypto.Crypto;
import org.apache.shindig.gadgets.GadgetException;
-import org.apache.shindig.gadgets.http.ContentFetcher;
-import org.apache.shindig.gadgets.http.RemoteContent;
-import org.apache.shindig.gadgets.http.RemoteContentRequest;
+import org.apache.shindig.gadgets.http.HttpFetcher;
+import org.apache.shindig.gadgets.http.HttpResponse;
+import org.apache.shindig.gadgets.http.HttpRequest;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
-public class FakeOAuthServiceProvider implements ContentFetcher {
+public class FakeOAuthServiceProvider implements HttpFetcher {
public final static String SP_HOST = "http://www.example.com";
@@ -113,7 +113,7 @@
validator = new SimpleOAuthValidator();
}
- public RemoteContent fetch(RemoteContentRequest request)
+ public HttpResponse fetch(HttpRequest request)
throws GadgetException {
String url = request.getUri().toASCIIString();
try {
@@ -132,7 +132,7 @@
"Unexpected request for " + url);
}
- private RemoteContent handleRequestTokenUrl(RemoteContentRequest request)
+ private HttpResponse handleRequestTokenUrl(HttpRequest request)
throws Exception {
OAuthMessage message = parseMessage(request);
OAuthAccessor accessor = new OAuthAccessor(consumer);
@@ -144,12 +144,12 @@
String resp = OAuth.formEncode(OAuth.newList(
"oauth_token", requestToken,
"oauth_token_secret", requestToken));
- return new RemoteContent(resp);
+ return new HttpResponse(resp);
}
// Loosely based off net.oauth.OAuthServlet, and even more loosely related
// to the OAuth specification
- private OAuthMessage parseMessage(RemoteContentRequest request) {
+ private OAuthMessage parseMessage(HttpRequest request) {
String method = request.getMethod();
if (!method.equals("GET")) {
throw new RuntimeException("Only GET supported for now");
@@ -229,7 +229,7 @@
state.setUserData(parsed.getQueryParam("user_data"));
}
- private RemoteContent handleAccessTokenUrl(RemoteContentRequest request)
+ private HttpResponse handleAccessTokenUrl(HttpRequest request)
throws Exception {
OAuthMessage message = parseMessage(request);
String requestToken = message.getParameter("oauth_token");
@@ -249,10 +249,10 @@
String resp = OAuth.formEncode(OAuth.newList(
"oauth_token", accessToken,
"oauth_token_secret", accessTokenSecret));
- return new RemoteContent(resp);
+ return new HttpResponse(resp);
}
- private RemoteContent handleResourceUrl(RemoteContentRequest request)
+ private HttpResponse handleResourceUrl(HttpRequest request)
throws Exception {
OAuthMessage message = parseMessage(request);
String accessToken = message.getParameter("oauth_token");
@@ -264,7 +264,7 @@
accessor.accessToken = accessToken;
accessor.tokenSecret = state.getSecret();
message.validateMessage(accessor, validator);
- return new RemoteContent("User data is " + state.getUserData());
+ return new HttpResponse("User data is " + state.getUserData());
}
}
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java?rev=655788&r1=655787&r2=655788&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/oauth/OAuthFetcherTest.java Tue May 13 02:19:01 2008
@@ -26,9 +26,9 @@
import org.apache.shindig.common.crypto.BasicBlobCrypter;
import org.apache.shindig.common.crypto.BlobCrypter;
import org.apache.shindig.gadgets.GadgetException;
-import org.apache.shindig.gadgets.http.ContentFetcher;
-import org.apache.shindig.gadgets.http.RemoteContent;
-import org.apache.shindig.gadgets.http.RemoteContentRequest;
+import org.apache.shindig.gadgets.http.HttpFetcher;
+import org.apache.shindig.gadgets.http.HttpResponse;
+import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.oauth.OAuthStore.HttpMethod;
import org.apache.shindig.gadgets.oauth.OAuthStore.OAuthParamLocation;
import org.apache.shindig.gadgets.oauth.OAuthStore.SignatureType;
@@ -101,7 +101,7 @@
super.tearDown();
}
- public ContentFetcher getFetcher(
+ public HttpFetcher getFetcher(
SecurityToken authToken, OAuthRequestParams params) throws GadgetException {
OAuthFetcher fetcher = new OAuthFetcher(
tokenStore, blobCrypter, serviceProvider, authToken, params);
@@ -111,14 +111,14 @@
public void testOAuthFlow() throws Exception {
- ContentFetcher fetcher;
- RemoteContentRequest request;
- RemoteContent response;
+ HttpFetcher fetcher;
+ HttpRequest request;
+ HttpResponse response;
fetcher = getFetcher(
getSecurityToken("owner", "owner"),
new OAuthRequestParams(SERVICE_NAME, null, null));
- request = new RemoteContentRequest(
+ request = new HttpRequest(
new URI(FakeOAuthServiceProvider.RESOURCE_URL));
response = fetcher.fetch(request);
String clientState = response.getMetadata().get("oauthState");
@@ -131,7 +131,7 @@
fetcher = getFetcher(
getSecurityToken("owner", "owner"),
new OAuthRequestParams(SERVICE_NAME, null, clientState));
- request = new RemoteContentRequest(
+ request = new HttpRequest(
new URI(FakeOAuthServiceProvider.RESOURCE_URL));
response = fetcher.fetch(request);
assertEquals("User data is hello-oauth", response.getResponseAsString());
@@ -139,7 +139,7 @@
fetcher = getFetcher(
getSecurityToken("owner", "somebody else"),
new OAuthRequestParams(SERVICE_NAME, null, null));
- request = new RemoteContentRequest(
+ request = new HttpRequest(
new URI(FakeOAuthServiceProvider.RESOURCE_URL));
response = fetcher.fetch(request);
assertEquals("User data is hello-oauth", response.getResponseAsString());
@@ -147,7 +147,7 @@
fetcher = getFetcher(
getSecurityToken("somebody else", "somebody else"),
new OAuthRequestParams(SERVICE_NAME, null, null));
- request = new RemoteContentRequest(
+ request = new HttpRequest(
new URI(FakeOAuthServiceProvider.RESOURCE_URL));
response = fetcher.fetch(request);
clientState = response.getMetadata().get("oauthState");
@@ -160,7 +160,7 @@
fetcher = getFetcher(
getSecurityToken("somebody else", "somebody else"),
new OAuthRequestParams(SERVICE_NAME, null, clientState));
- request = new RemoteContentRequest(
+ request = new HttpRequest(
new URI(FakeOAuthServiceProvider.RESOURCE_URL));
response = fetcher.fetch(request);
assertEquals("User data is somebody else", response.getResponseAsString());
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java?rev=655788&r1=655787&r2=655788&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetRenderingTaskTest.java Tue May 13 02:19:01 2008
@@ -24,8 +24,8 @@
import org.apache.shindig.gadgets.ContainerConfig;
import org.apache.shindig.gadgets.Gadget;
import org.apache.shindig.gadgets.GadgetContext;
-import org.apache.shindig.gadgets.http.RemoteContent;
-import org.apache.shindig.gadgets.http.RemoteContentRequest;
+import org.apache.shindig.gadgets.http.HttpResponse;
+import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.easymock.EasyMock;
@@ -55,8 +55,8 @@
final PrintWriter writer = new PrintWriter(baos);
final static URI SPEC_URL = URI.create("http://example.org/gadget.xml");
- final static RemoteContentRequest SPEC_REQUEST
- = new RemoteContentRequest(SPEC_URL);
+ final static HttpRequest SPEC_REQUEST
+ = new HttpRequest(SPEC_URL);
final static String CONTENT = "Hello, world!";
final static String ALT_CONTENT = "Goodbye, city.";
final static String SPEC_XML
@@ -101,7 +101,7 @@
}
private void expectFetchGadget() throws Exception {
- expect(fetcher.fetch(SPEC_REQUEST)).andReturn(new RemoteContent(SPEC_XML));
+ expect(fetcher.fetch(SPEC_REQUEST)).andReturn(new HttpResponse(SPEC_XML));
}
private void expectWriteResponse() throws Exception {
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java?rev=655788&r1=655787&r2=655788&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/JsonRpcHandlerTest.java Tue May 13 02:19:01 2008
@@ -22,8 +22,8 @@
import static org.easymock.EasyMock.isA;
import org.apache.shindig.gadgets.Gadget;
-import org.apache.shindig.gadgets.http.RemoteContent;
-import org.apache.shindig.gadgets.http.RemoteContentRequest;
+import org.apache.shindig.gadgets.http.HttpResponse;
+import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.spec.GadgetSpec;
import org.json.JSONArray;
@@ -36,11 +36,11 @@
public class JsonRpcHandlerTest extends HttpTestFixture {
private static final URI SPEC_URL = URI.create("http://example.org/g.xml");
- private static final RemoteContentRequest SPEC_REQUEST
- = new RemoteContentRequest(SPEC_URL);
+ private static final HttpRequest SPEC_REQUEST
+ = new HttpRequest(SPEC_URL);
private static final URI SPEC_URL2 = URI.create("http://example.org/g2.xml");
- private static final RemoteContentRequest SPEC_REQUEST2
- = new RemoteContentRequest(SPEC_URL2);
+ private static final HttpRequest SPEC_REQUEST2
+ = new HttpRequest(SPEC_URL2);
private static final String SPEC_TITLE = "JSON-TEST";
private static final String SPEC_TITLE2 = "JSON-TEST2";
private static final String SPEC_XML
@@ -76,7 +76,7 @@
GadgetSpec spec = new GadgetSpec(SPEC_URL, SPEC_XML);
- expect(fetcher.fetch(SPEC_REQUEST)).andReturn(new RemoteContent(SPEC_XML));
+ expect(fetcher.fetch(SPEC_REQUEST)).andReturn(new HttpResponse(SPEC_XML));
expect(urlGenerator.getIframeUrl(isA(Gadget.class)))
.andReturn(SPEC_URL.toString());
@@ -103,9 +103,9 @@
GadgetSpec spec2 = new GadgetSpec(SPEC_URL2, SPEC_XML2);
expect(fetcher.fetch(SPEC_REQUEST))
- .andReturn(new RemoteContent(SPEC_XML));
+ .andReturn(new HttpResponse(SPEC_XML));
expect(fetcher.fetch(SPEC_REQUEST2))
- .andReturn(new RemoteContent(SPEC_XML2));
+ .andReturn(new HttpResponse(SPEC_XML2));
replay();
JSONObject response = jsonRpcHandler.process(input);
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java?rev=655788&r1=655787&r2=655788&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyHandlerTest.java Tue May 13 02:19:01 2008
@@ -25,8 +25,8 @@
import org.apache.shindig.common.SecurityToken;
import org.apache.shindig.gadgets.FakeGadgetToken;
import org.apache.shindig.gadgets.GadgetException;
-import org.apache.shindig.gadgets.http.RemoteContent;
-import org.apache.shindig.gadgets.http.RemoteContentRequest;
+import org.apache.shindig.gadgets.http.HttpResponse;
+import org.apache.shindig.gadgets.http.HttpRequest;
import org.apache.shindig.gadgets.spec.Auth;
import org.apache.shindig.gadgets.spec.Preload;
@@ -69,18 +69,18 @@
private void expectGetAndReturnData(String url, byte[] data)
throws Exception {
- RemoteContentRequest req = new RemoteContentRequest(
- "GET", new URI(url), null, null, new RemoteContentRequest.Options());
- RemoteContent resp = new RemoteContent(200, data, null);
+ HttpRequest req = new HttpRequest(
+ "GET", new URI(url), null, null, new HttpRequest.Options());
+ HttpResponse resp = new HttpResponse(200, data, null);
expect(contentFetcherFactory.get()).andReturn(fetcher);
expect(fetcher.fetch(req)).andReturn(resp);
}
private void expectPostAndReturnData(String url, byte[] body, byte[] data)
throws Exception {
- RemoteContentRequest req = new RemoteContentRequest(
- "POST", new URI(url), null, body, new RemoteContentRequest.Options());
- RemoteContent resp = new RemoteContent(200, data, null);
+ HttpRequest req = new HttpRequest(
+ "POST", new URI(url), null, body, new HttpRequest.Options());
+ HttpResponse resp = new HttpResponse(200, data, null);
expect(contentFetcherFactory.get()).andReturn(fetcher);
expect(fetcher.fetch(req)).andReturn(resp);
}
@@ -212,10 +212,10 @@
.andReturn("fake-token").atLeastOnce();
expect(request.getParameter(Preload.AUTHZ_ATTR))
.andReturn(Auth.SIGNED.toString()).atLeastOnce();
- RemoteContent resp = new RemoteContent(200, DATA_ONE.getBytes(), null);
+ HttpResponse resp = new HttpResponse(200, DATA_ONE.getBytes(), null);
expect(contentFetcherFactory.getSigningFetcher(eq(DUMMY_TOKEN)))
.andReturn(fetcher);
- expect(fetcher.fetch(isA(RemoteContentRequest.class))).andReturn(resp);
+ expect(fetcher.fetch(isA(HttpRequest.class))).andReturn(resp);
replay();
proxyHandler.fetchJson(request, response);
verify();
@@ -232,10 +232,10 @@
.andReturn("fake-token").atLeastOnce();
expect(request.getParameter(Preload.AUTHZ_ATTR))
.andReturn(Auth.SIGNED.toString()).atLeastOnce();
- RemoteContent resp = new RemoteContent(200, DATA_ONE.getBytes(), null);
+ HttpResponse resp = new HttpResponse(200, DATA_ONE.getBytes(), null);
expect(contentFetcherFactory.getSigningFetcher(eq(DUMMY_TOKEN)))
.andReturn(fetcher);
- expect(fetcher.fetch(isA(RemoteContentRequest.class))).andReturn(resp);
+ expect(fetcher.fetch(isA(HttpRequest.class))).andReturn(resp);
replay();
proxyHandler.fetchJson(request, response);
verify();