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=687214&r1=687213&r2=687214&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 Aug 19 18:14:33 2008 @@ -26,13 +26,14 @@ import org.apache.shindig.common.SecurityToken; import org.apache.shindig.common.SecurityTokenDecoder; import org.apache.shindig.common.testing.FakeGadgetToken; +import org.apache.shindig.common.uri.Uri; import org.apache.shindig.common.util.Utf8UrlCoder; import org.apache.shindig.gadgets.Gadget; import org.apache.shindig.gadgets.GadgetContext; import org.apache.shindig.gadgets.http.HttpRequest; import org.apache.shindig.gadgets.http.HttpResponse; -import org.apache.shindig.gadgets.oauth.OAuthFetcher; import org.apache.shindig.gadgets.oauth.OAuthArguments; +import org.apache.shindig.gadgets.oauth.OAuthFetcher; import org.apache.shindig.gadgets.oauth.OAuthResponseParams; import org.apache.shindig.gadgets.spec.GadgetSpec; @@ -40,7 +41,6 @@ import org.json.JSONArray; import org.json.JSONObject; -import java.net.URI; import java.util.Collection; import java.util.Collections; import java.util.Enumeration; @@ -57,28 +57,28 @@ } }; - final static URI SPEC_URL = URI.create("http://example.org/gadget.xml";); + final static Uri SPEC_URL = Uri.parse("http://example.org/gadget.xml";); 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 - = "<Module>" + - "<ModulePrefs title='hello'/>" + - "<Content type='html' quirks='false'>" + CONTENT + "</Content>" + - "<Content type='html' view='quirks' quirks='true'/>" + - "<Content type='html' view='ALIAS'>" + ALT_CONTENT + "</Content>" + - "</Module>"; + = "<Module>" + + "<ModulePrefs title='hello'/>" + + "<Content type='html' quirks='false'>" + CONTENT + "</Content>" + + "<Content type='html' view='quirks' quirks='true'/>" + + "<Content type='html' view='ALIAS'>" + ALT_CONTENT + "</Content>" + + "</Module>"; final static String LIBS = "dummy:blah"; - + final static String PRELOAD_XML = - "<Module>" + - "<ModulePrefs title='hello'>" + - "<Preload authz='oauth' href='http://oauth.example.com'/>" + - "</ModulePrefs>" + - "<Content type='html' quirks='false'>" + CONTENT + "</Content>" + - "<Content type='html' view='quirks' quirks='true'/>" + - "<Content type='html' view='ALIAS'>" + ALT_CONTENT + "</Content>" + - "</Module>"; + "<Module>" + + "<ModulePrefs title='hello'>" + + "<Preload authz='oauth' href='http://oauth.example.com'/>" + + "</ModulePrefs>" + + "<Content type='html' quirks='false'>" + CONTENT + "</Content>" + + "<Content type='html' view='quirks' quirks='true'/>" + + "<Content type='html' view='ALIAS'>" + ALT_CONTENT + "</Content>" + + "</Module>"; private ServletTestFixture fixture; @@ -88,15 +88,14 @@ fixture = new ServletTestFixture(); } - /** * Performs boilerplate operations to get basic gadgets rendered * @return Output of the rendering request * @throws Exception */ - private String parseBasicGadget(String view, String xml) throws Exception { + private String parseBasicGadget(String view, String xml, boolean ignoreCache) throws Exception { expectParseRequestParams(view); - expectFetchGadget(xml); + expectFetchGadget(xml, ignoreCache); expectLockedDomainCheck(); expectWriteResponse(); replay(); @@ -107,6 +106,10 @@ return fixture.recorder.getResponseAsString(); } + private String parseBasicGadget(String view, String xml) throws Exception { + return parseBasicGadget(view, xml, false); + } + private void expectParseRequestParams(String view) throws Exception { expect(fixture.request.getParameter("url")).andReturn(SPEC_URL.toString()); expect(fixture.request.getParameter("view")).andReturn(view); @@ -123,8 +126,10 @@ EasyMock.eq("default"))).andReturn(true); } - private void expectFetchGadget(String xml) throws Exception { - expect(fetcher.fetch(SPEC_REQUEST)).andReturn(new HttpResponse(xml)); + private void expectFetchGadget(String xml, boolean ignoreCache) throws Exception { + HttpRequest req = new HttpRequest(SPEC_REQUEST); + req.setIgnoreCache(ignoreCache); + expect(fetcher.fetch(req)).andReturn(new HttpResponse(xml)); } private void expectWriteResponse() throws Exception { @@ -159,16 +164,16 @@ public void testViewAliases() throws Exception { JSONArray aliases = new JSONArray().put("ALIAS"); expect(containerConfig.getJsonArray(ContainerConfig.DEFAULT_CONTAINER, - "gadgets.features/views/dummy/aliases")).andReturn(aliases); + "gadgets.features/views/dummy/aliases")).andReturn(aliases); String content = parseBasicGadget("dummy", SPEC_XML); assertTrue(content.contains(ALT_CONTENT)); } - + public void testOAuthPreload_data() throws Exception { expectParseRequestParams(GadgetSpec.DEFAULT_VIEW); - expectFetchGadget(PRELOAD_XML); + expectFetchGadget(PRELOAD_XML, false); expect(securityTokenDecoder.createToken( Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, "fake-token"))). andStubReturn(mock(SecurityToken.class)); @@ -178,7 +183,7 @@ andReturn(oauthFetcher); expect(oauthFetcher.fetch(isA(HttpRequest.class))). - andReturn(new HttpResponse("preloaded data")); + andReturn(new HttpResponse("preloaded data")); expectLockedDomainCheck(); expectWriteResponse(); @@ -190,10 +195,10 @@ String content = fixture.recorder.getResponseAsString(); assertTrue(content.contains("preloaded data")); } - + public void testOAuthPreload_metadata() throws Exception { expectParseRequestParams(GadgetSpec.DEFAULT_VIEW); - expectFetchGadget(PRELOAD_XML); + expectFetchGadget(PRELOAD_XML, false); expect(securityTokenDecoder.createToken( Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, "fake-token"))). andStubReturn(mock(SecurityToken.class)); @@ -222,7 +227,7 @@ public void testLockedDomainFailure() throws Exception { expectParseRequestParams(GadgetSpec.DEFAULT_VIEW); - expectFetchGadget(SPEC_XML); + expectFetchGadget(SPEC_XML, false); expectLockedDomainFailure(); expectSendRedirect(); replay(); @@ -328,7 +333,7 @@ public void testRenderSetsNoCacheHeadersWhenNoCacheParamIsSet() throws Exception { expect(fixture.request.getParameter("nocache")).andReturn("1"); - parseBasicGadget(GadgetSpec.DEFAULT_VIEW, SPEC_XML); + parseBasicGadget(GadgetSpec.DEFAULT_VIEW, SPEC_XML, true); fixture.checkCacheControlHeaders(0, true); } @@ -338,10 +343,10 @@ String libsUrl = "&libs="; String jsUrl = "core.js?v=12345&container=apache&debug=0"; String gadgetXml - = "<Module>" + - "<ModulePrefs title='hello'/>" + - "<Content type='url' href='" + contentUrl + "'/>" + - "</Module>"; + = "<Module>" + + "<ModulePrefs title='hello'/>" + + "<Content type='url' href='" + contentUrl + "'/>" + + "</Module>"; expect(fixture.request.getParameter("url")).andReturn(SPEC_URL.toString()); expect(fixture.request.getParameter("view")).andReturn(GadgetSpec.DEFAULT_VIEW); @@ -349,7 +354,7 @@ expect(fixture.request.getParameter("container")).andReturn(null); expect(fetcher.fetch(SPEC_REQUEST)).andReturn(new HttpResponse(gadgetXml)); expect(urlGenerator.getBundledJsParam(isA(Collection.class), isA(GadgetContext.class))) - .andReturn(jsUrl); + .andReturn(jsUrl); response.sendRedirect(contentUrl + '?' + libsUrl + Utf8UrlCoder.encode(jsUrl)); expectLastCall().once(); @@ -366,10 +371,10 @@ String libsUrl = "&libs="; String jsUrl = "core.js?v=12345&container=apache&debug=0"; String gadgetXml - = "<Module>" + - "<ModulePrefs title='hello'/>" + - "<Content type='url' href='" + contentUrl + contentQuery + contentFragment + "'/>" + - "</Module>"; + = "<Module>" + + "<ModulePrefs title='hello'/>" + + "<Content type='url' href='" + contentUrl + contentQuery + contentFragment + "'/>" + + "</Module>"; expect(fixture.request.getParameter("url")).andReturn(SPEC_URL.toString()); expect(fixture.request.getParameter("view")).andReturn(GadgetSpec.DEFAULT_VIEW); @@ -377,9 +382,9 @@ expect(fixture.request.getParameter("container")).andReturn(null); expect(fetcher.fetch(SPEC_REQUEST)).andReturn(new HttpResponse(gadgetXml)); expect(urlGenerator.getBundledJsParam(isA(Collection.class), isA(GadgetContext.class))) - .andReturn(jsUrl); + .andReturn(jsUrl); response.sendRedirect(contentUrl + contentQuery + libsUrl + Utf8UrlCoder.encode(jsUrl) + - contentFragment); + contentFragment); expectLastCall().once(); replay();
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=687214&r1=687213&r2=687214&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 Aug 19 18:14:33 2008 @@ -21,6 +21,7 @@ import static org.easymock.EasyMock.expect; import static org.easymock.EasyMock.isA; +import org.apache.shindig.common.uri.Uri; import org.apache.shindig.gadgets.Gadget; import org.apache.shindig.gadgets.http.HttpRequest; import org.apache.shindig.gadgets.http.HttpResponse; @@ -30,14 +31,13 @@ import org.json.JSONException; import org.json.JSONObject; -import java.net.URI; import java.util.Collections; import java.util.Map; public class JsonRpcHandlerTest extends HttpTestFixture { - private static final URI SPEC_URL = URI.create("http://example.org/g.xml";); + private static final Uri SPEC_URL = Uri.parse("http://example.org/g.xml";); 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 Uri SPEC_URL2 = Uri.parse("http://example.org/g2.xml";); 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"; Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java?rev=687214&r1=687213&r2=687214&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestHandlerTest.java Tue Aug 19 18:14:33 2008 @@ -30,6 +30,7 @@ import org.apache.shindig.common.SecurityTokenDecoder; import org.apache.shindig.common.SecurityTokenException; import org.apache.shindig.common.testing.FakeGadgetToken; +import org.apache.shindig.common.uri.Uri; import org.apache.shindig.gadgets.GadgetException; import org.apache.shindig.gadgets.http.HttpFetcher; import org.apache.shindig.gadgets.http.HttpRequest; @@ -45,7 +46,6 @@ import org.junit.Before; import org.junit.Test; -import java.net.URI; import java.util.Collections; import java.util.List; @@ -55,7 +55,7 @@ * Tests for MakeRequestHandler. */ public class MakeRequestHandlerTest { - private static final String REQUEST_URL = "http://example.org/file";; + private static final Uri REQUEST_URL = Uri.parse("http://example.org/file";); private static final String REQUEST_BODY = "I+am+the+request+body!foo=baz%20la"; private static final String RESPONSE_BODY = "makeRequest response body"; private static final SecurityToken DUMMY_TOKEN = new FakeGadgetToken(); @@ -69,7 +69,7 @@ } private void expectGetAndReturnBody(HttpFetcher fetcher, String response) throws Exception { - HttpRequest request = HttpRequest.getRequest(URI.create(REQUEST_URL), false); + HttpRequest request = new HttpRequest(REQUEST_URL); expect(fetcher.fetch(request)).andReturn(new HttpResponse(response)); } @@ -79,25 +79,26 @@ private void expectPostAndReturnBody(HttpFetcher fetcher, String postData, String response) throws Exception { - HttpRequest request = new HttpRequest(URI.create(REQUEST_URL), REQUEST_BODY.getBytes("UTF-8")); + HttpRequest req = new HttpRequest(REQUEST_URL).setMethod("POST") + .setPostBody(REQUEST_BODY.getBytes("UTF-8")); + expect(fetcher.fetch(req)).andReturn(new HttpResponse(response)); expect(fixture.request.getParameter(MakeRequestHandler.METHOD_PARAM)).andReturn("POST"); expect(fixture.request.getParameter(MakeRequestHandler.POST_DATA_PARAM)) .andReturn(REQUEST_BODY); - expect(fetcher.fetch(request)).andReturn(new HttpResponse(response)); } private JSONObject extractJsonFromResponse() throws JSONException { String body = fixture.recorder.getResponseAsString(); assertStartsWith(MakeRequestHandler.UNPARSEABLE_CRUFT, body); body = body.substring(MakeRequestHandler.UNPARSEABLE_CRUFT.length()); - return new JSONObject(body).getJSONObject(REQUEST_URL); + return new JSONObject(body).getJSONObject(REQUEST_URL.toString()); } @Before public void setUp() { expect(fixture.request.getMethod()).andReturn("POST").anyTimes(); expect(fixture.request.getParameter(MakeRequestHandler.URL_PARAM)) - .andReturn(REQUEST_URL).anyTimes(); + .andReturn(REQUEST_URL.toString()).anyTimes(); } @Test @@ -143,8 +144,8 @@ @Test public void postRequest() throws Exception { - expectPostAndReturnBody(REQUEST_BODY, RESPONSE_BODY); expect(fixture.request.getParameter(MakeRequestHandler.METHOD_PARAM)).andReturn("POST"); + expectPostAndReturnBody(REQUEST_BODY, RESPONSE_BODY); fixture.replay(); handler.fetch(fixture.request, fixture.recorder); @@ -249,7 +250,9 @@ public void signedGetRequest() throws Exception { // Doesn't actually sign since it returns the standard fetcher. // Signing tests are in SigningFetcherTest - expect(fixture.securityTokenDecoder.createToken(Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, "fake-token"))).andReturn(DUMMY_TOKEN); + expect(fixture.securityTokenDecoder.createToken( + Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, "fake-token"))) + .andReturn(DUMMY_TOKEN); expect(fixture.request.getParameter(MakeRequestHandler.SECURITY_TOKEN_PARAM)) .andReturn("fake-token").atLeastOnce(); expect(fixture.request.getParameter(Preload.AUTHZ_ATTR)) @@ -269,7 +272,9 @@ // Doesn't actually sign since it returns the standard fetcher. // Signing tests are in SigningFetcherTest expectPostAndReturnBody(fixture.signingFetcher, REQUEST_BODY, RESPONSE_BODY); - expect(fixture.securityTokenDecoder.createToken(Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, "fake-token"))).andReturn(DUMMY_TOKEN); + expect(fixture.securityTokenDecoder.createToken( + Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, "fake-token"))) + .andReturn(DUMMY_TOKEN); expect(fixture.request.getParameter(MakeRequestHandler.SECURITY_TOKEN_PARAM)) .andReturn("fake-token").atLeastOnce(); expect(fixture.request.getParameter(Preload.AUTHZ_ATTR)) @@ -290,7 +295,9 @@ // Signing tests are in SigningFetcherTest expectGetAndReturnBody(fixture.signingFetcher, RESPONSE_BODY); FakeGadgetToken authToken = new FakeGadgetToken().setUpdatedToken("updated"); - expect(fixture.securityTokenDecoder.createToken(Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, "fake-token"))).andReturn(authToken); + expect(fixture.securityTokenDecoder.createToken + (Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, "fake-token"))) + .andReturn(authToken); expect(fixture.request.getParameter(MakeRequestHandler.SECURITY_TOKEN_PARAM)) .andReturn("fake-token").atLeastOnce(); expect(fixture.request.getParameter(Preload.AUTHZ_ATTR)) @@ -310,7 +317,9 @@ // OAuth tests are in OAuthFetcherTest expectGetAndReturnBody(fixture.oauthFetcher, RESPONSE_BODY); FakeGadgetToken authToken = new FakeGadgetToken().setUpdatedToken("updated"); - expect(fixture.securityTokenDecoder.createToken(Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, "fake-token"))).andReturn(authToken); + expect(fixture.securityTokenDecoder.createToken( + Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, "fake-token"))) + .andReturn(authToken); expect(fixture.request.getParameter(MakeRequestHandler.SECURITY_TOKEN_PARAM)) .andReturn("fake-token").atLeastOnce(); expect(fixture.request.getParameter(Preload.AUTHZ_ATTR)) @@ -341,7 +350,7 @@ @Test public void badHttpResponseIsPropagated() throws Exception { - HttpRequest request = HttpRequest.getRequest(URI.create(REQUEST_URL), false); + HttpRequest request = new HttpRequest(REQUEST_URL); expect(fixture.httpFetcher.fetch(request)).andReturn(HttpResponse.error()); fixture.replay(); @@ -357,7 +366,8 @@ .andReturn("fake-token").atLeastOnce(); expect(fixture.request.getParameter(Preload.AUTHZ_ATTR)) .andReturn(Auth.SIGNED.toString()).atLeastOnce(); - expect(fixture.securityTokenDecoder.createToken(Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, "fake-token"))) + expect(fixture.securityTokenDecoder.createToken( + Collections.singletonMap(SecurityTokenDecoder.SECURITY_TOKEN_NAME, "fake-token"))) .andThrow(new SecurityTokenException("No!")); fixture.replay(); @@ -369,7 +379,7 @@ @Test public void metadataCopied() throws Exception { - HttpRequest request = HttpRequest.getRequest(URI.create(REQUEST_URL), false); + HttpRequest request = new HttpRequest(REQUEST_URL); HttpResponse response = new HttpResponse("foo"); response.getMetadata().put("foo", RESPONSE_BODY); expect(fixture.httpFetcher.fetch(request)).andReturn(response); Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestServletTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestServletTest.java?rev=687214&r1=687213&r2=687214&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestServletTest.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/MakeRequestServletTest.java Tue Aug 19 18:14:33 2008 @@ -24,6 +24,7 @@ import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; +import org.apache.shindig.common.uri.Uri; import org.apache.shindig.gadgets.GadgetException; import org.apache.shindig.gadgets.http.HttpRequest; import org.apache.shindig.gadgets.http.HttpResponse; @@ -33,7 +34,6 @@ import org.junit.Before; import org.junit.Test; -import java.net.URI; import java.util.Collections; import java.util.Enumeration; @@ -45,7 +45,7 @@ * Tests are trivial; real tests are in MakeRequestHandlerTest. */ public class MakeRequestServletTest { - private static final String REQUEST_URL = "http://example.org/file";; + private static final Uri REQUEST_URL = Uri.parse("http://example.org/file";); private static final String RESPONSE_BODY = "Hello, world!"; private static final String ERROR_MESSAGE = "Broken!"; private static final Enumeration<String> EMPTY_ENUM @@ -57,7 +57,7 @@ fixture.securityTokenDecoder, fixture.rewriter); private final HttpServletResponseRecorder recorder = new HttpServletResponseRecorder(fixture.response); - private final HttpRequest request = HttpRequest.getRequest(URI.create(REQUEST_URL), false); + private final HttpRequest request = new HttpRequest(REQUEST_URL); private final HttpResponse response = new HttpResponse(RESPONSE_BODY); @Before @@ -66,7 +66,8 @@ expect(fixture.request.getHeaderNames()).andReturn(EMPTY_ENUM).anyTimes(); expect(fixture.request.getParameter(MakeRequestHandler.METHOD_PARAM)) .andReturn("GET").anyTimes(); - expect(fixture.request.getParameter(ProxyBase.URL_PARAM)).andReturn(REQUEST_URL).anyTimes(); + expect(fixture.request.getParameter(ProxyBase.URL_PARAM)) + .andReturn(REQUEST_URL.toString()).anyTimes(); } private void setupGet() { @@ -83,7 +84,7 @@ assertStartsWith(MakeRequestHandler.UNPARSEABLE_CRUFT, body); body = body.substring(MakeRequestHandler.UNPARSEABLE_CRUFT.length()); JSONObject object = new JSONObject(body); - object = object.getJSONObject(REQUEST_URL); + object = object.getJSONObject(REQUEST_URL.toString()); assertEquals(expectedStatus, object.getInt("rc")); assertEquals(expectedBody, object.getString("body")); } else { Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java?rev=687214&r1=687213&r2=687214&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyBaseTest.java Tue Aug 19 18:14:33 2008 @@ -23,6 +23,7 @@ import static org.junit.Assert.assertNotNull; import static org.junit.Assert.assertNull; +import org.apache.shindig.common.uri.Uri; import org.apache.shindig.gadgets.GadgetException; import org.apache.shindig.gadgets.http.HttpResponse; @@ -30,7 +31,6 @@ import org.junit.Test; -import java.net.URI; import java.util.Arrays; import java.util.List; import java.util.Map; @@ -54,10 +54,9 @@ @Test public void validateUrlNoPath() throws Exception { - URI url = proxy.validateUrl("http://www.example.com";); + Uri url = proxy.validateUrl("http://www.example.com";); assertEquals("http", url.getScheme()); - assertEquals("www.example.com", url.getHost()); - assertEquals(-1, url.getPort()); + assertEquals("www.example.com", url.getAuthority()); assertEquals("/", url.getPath()); assertNull(url.getQuery()); assertNull(url.getFragment()); @@ -65,10 +64,9 @@ @Test public void validateUrlHttps() throws Exception { - URI url = proxy.validateUrl("https://www.example.com";); + Uri url = proxy.validateUrl("https://www.example.com";); assertEquals("https", url.getScheme()); - assertEquals("www.example.com", url.getHost()); - assertEquals(-1, url.getPort()); + assertEquals("www.example.com", url.getAuthority()); assertEquals("/", url.getPath()); assertNull(url.getQuery()); assertNull(url.getFragment()); @@ -76,10 +74,9 @@ @Test public void validateUrlWithPath() throws Exception { - URI url = proxy.validateUrl("http://www.example.com/foo";); + Uri url = proxy.validateUrl("http://www.example.com/foo";); assertEquals("http", url.getScheme()); - assertEquals("www.example.com", url.getHost()); - assertEquals(-1, url.getPort()); + assertEquals("www.example.com", url.getAuthority()); assertEquals("/foo", url.getPath()); assertNull(url.getQuery()); assertNull(url.getFragment()); @@ -87,10 +84,9 @@ @Test public void validateUrlWithPort() throws Exception { - URI url = proxy.validateUrl("http://www.example.com:8080/foo";); + Uri url = proxy.validateUrl("http://www.example.com:8080/foo";); assertEquals("http", url.getScheme()); - assertEquals("www.example.com", url.getHost()); - assertEquals(8080, url.getPort()); + assertEquals("www.example.com:8080", url.getAuthority()); assertEquals("/foo", url.getPath()); assertNull(url.getQuery()); assertNull(url.getFragment()); @@ -98,37 +94,32 @@ @Test public void validateUrlWithEncodedPath() throws Exception { - URI url = proxy.validateUrl("http://www.example.com:8080/foo%20bar";); + Uri url = proxy.validateUrl("http://www.example.com/foo%20bar";); assertEquals("http", url.getScheme()); - assertEquals("www.example.com", url.getHost()); - assertEquals(8080, url.getPort()); - assertEquals("/foo%20bar", url.getRawPath()); - assertEquals("/foo bar", url.getPath()); + assertEquals("www.example.com", url.getAuthority()); + assertEquals("/foo%20bar", url.getPath()); assertNull(url.getQuery()); assertNull(url.getFragment()); } @Test public void validateUrlWithEncodedQuery() throws Exception { - URI url = proxy.validateUrl("http://www.example.com:8080/foo?q=with%20space";); + Uri url = proxy.validateUrl("http://www.example.com/foo?q=with%20space";); assertEquals("http", url.getScheme()); - assertEquals("www.example.com", url.getHost()); - assertEquals(8080, url.getPort()); + assertEquals("www.example.com", url.getAuthority()); assertEquals("/foo", url.getPath()); - assertEquals("q=with%20space", url.getRawQuery()); - assertEquals("q=with space", url.getQuery()); + assertEquals("q=with%20space", url.getQuery()); + assertEquals("with space", url.getQueryParameter("q")); assertNull(url.getFragment()); } @Test public void validateUrlWithNoPathAndEncodedQuery() throws Exception { - URI url = proxy.validateUrl("http://www.example.com?q=with%20space";); + Uri url = proxy.validateUrl("http://www.example.com?q=with%20space";); assertEquals("http", url.getScheme()); - assertEquals("www.example.com", url.getHost()); - assertEquals(-1, url.getPort()); + assertEquals("www.example.com", url.getAuthority()); assertEquals("/", url.getPath()); - assertEquals("q=with%20space", url.getRawQuery()); - assertEquals("q=with space", url.getQuery()); + assertEquals("q=with%20space", url.getQuery()); assertNull(url.getFragment()); } 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=687214&r1=687213&r2=687214&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 Aug 19 18:14:33 2008 @@ -21,13 +21,13 @@ import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertEquals; +import org.apache.shindig.common.uri.Uri; import org.apache.shindig.gadgets.GadgetException; import org.apache.shindig.gadgets.http.HttpRequest; import org.apache.shindig.gadgets.http.HttpResponse; import org.junit.Test; -import java.net.URI; import java.util.Arrays; import java.util.HashMap; import java.util.List; @@ -46,14 +46,14 @@ = new HttpServletResponseRecorder(fixture.response); private void expectGetAndReturnData(String url, byte[] data) throws Exception { - HttpRequest req = new HttpRequest(new URI(url), new HttpRequest.Options()); + HttpRequest req = new HttpRequest(Uri.parse(url)); HttpResponse resp = new HttpResponse(200, data, null); expect(fixture.httpFetcher.fetch(req)).andReturn(resp); } private void expectGetAndReturnHeaders(String url, Map<String, List<String>> headers) throws Exception { - HttpRequest req = new HttpRequest(new URI(url), new HttpRequest.Options()); + HttpRequest req = new HttpRequest(Uri.parse(url)); HttpResponse resp = new HttpResponse(200, null, headers); expect(fixture.httpFetcher.fetch(req)).andReturn(resp); } Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java?rev=687214&r1=687213&r2=687214&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ProxyServletTest.java Tue Aug 19 18:14:33 2008 @@ -22,6 +22,7 @@ import static org.easymock.EasyMock.expect; import static org.junit.Assert.assertEquals; +import org.apache.shindig.common.uri.Uri; import org.apache.shindig.gadgets.GadgetException; import org.apache.shindig.gadgets.http.HttpRequest; import org.apache.shindig.gadgets.http.HttpResponse; @@ -29,8 +30,6 @@ import org.junit.Before; import org.junit.Test; -import java.net.URI; - import javax.servlet.http.HttpServletResponse; /** @@ -40,7 +39,7 @@ */ public class ProxyServletTest { private static final String REQUEST_DOMAIN = "example.org"; - private static final String REQUEST_URL = "http://example.org/file";; + private static final Uri REQUEST_URL = Uri.parse("http://example.org/file";); private static final String BASIC_SYNTAX_URL = "http://opensocial.org/proxy?foo=bar&url="; + REQUEST_URL; private static final String ALT_SYNTAX_URL @@ -52,14 +51,14 @@ private final ProxyHandler proxyHandler = new ProxyHandler(fixture.httpFetcher, fixture.lockedDomainService, fixture.rewriter); private final ProxyServlet servlet = new ProxyServlet(); - private final HttpRequest request = HttpRequest.getRequest(URI.create(REQUEST_URL), false); + private final HttpRequest request = new HttpRequest(REQUEST_URL); private final HttpResponse response = new HttpResponse(RESPONSE_BODY); @Before public void setUp() { servlet.setProxyHandler(proxyHandler); expect(fixture.request.getParameter(ProxyBase.URL_PARAM)) - .andReturn(REQUEST_URL).anyTimes(); + .andReturn(REQUEST_URL.toString()).anyTimes(); expect(fixture.request.getHeader("Host")).andReturn(REQUEST_DOMAIN).anyTimes(); expect(fixture.lockedDomainService.embedCanRender(REQUEST_DOMAIN)) .andReturn(true).anyTimes();
