Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java?rev=650346&r1=650345&r2=650346&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/GadgetTestFixture.java Mon Apr 21 18:29:35 2008 @@ -27,8 +27,12 @@ public abstract class GadgetTestFixture extends EasyMockTestCase { public final HttpServletRequest request = mock(HttpServletRequest.class); public final HttpServletResponse response = mock(HttpServletResponse.class); + public final GadgetTokenDecoder gadgetTokenDecoder + = mock(GadgetTokenDecoder.class); public final GadgetServer gadgetServer; - public final RemoteContentFetcher fetcher = mock(RemoteContentFetcher.class); + public final ContentFetcherFactory fetcherFactory + = mock(ContentFetcherFactory.class); + public final ContentFetcher fetcher = mock(ContentFetcher.class); public final GadgetBlacklist blacklist = mock(GadgetBlacklist.class); public GadgetFeatureRegistry registry; public ContainerConfig containerConfig; @@ -54,7 +58,7 @@ fail("Failed to create container config"); } - gadgetServer = new GadgetServer(executor, registry, blacklist, fetcher, - fetcher, fetcher); + gadgetServer = new GadgetServer(executor, registry, blacklist, + fetcherFactory, fetcher, fetcher); } }
Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/InterceptingContentFetcher.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/InterceptingContentFetcher.java?rev=650346&r1=650345&r2=650346&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/InterceptingContentFetcher.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/InterceptingContentFetcher.java Mon Apr 21 18:29:35 2008 @@ -17,7 +17,7 @@ /** * Test utility to intercept remote content requests for inspection. */ -public class InterceptingContentFetcher extends RemoteContentFetcher { +public class InterceptingContentFetcher extends ChainedContentFetcher { protected InterceptingContentFetcher() { super(null); @@ -25,7 +25,6 @@ public RemoteContentRequest interceptedRequest; - @Override public RemoteContent fetch(RemoteContentRequest request) { interceptedRequest = request; return null; 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=650346&r1=650345&r2=650346&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 Mon Apr 21 18:29:35 2008 @@ -78,7 +78,7 @@ } public void testUrl() throws Exception { - RemoteContentFetcher mockFetcher = mock(RemoteContentFetcher.class); + ContentFetcher mockFetcher = mock(ContentFetcher.class); URI location = new URI("http://example.org/file.js";); RemoteContentRequest request = new RemoteContentRequest(location); RemoteContent content 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=650346&r1=650345&r2=650346&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 Mon Apr 21 18:29:35 2008 @@ -14,15 +14,15 @@ package org.apache.shindig.gadgets; +import junit.framework.TestCase; + import net.oauth.OAuth; +import net.oauth.OAuth.Parameter; import net.oauth.OAuthAccessor; import net.oauth.OAuthConsumer; import net.oauth.OAuthMessage; -import net.oauth.OAuth.Parameter; import net.oauth.signature.RSA_SHA1; -import junit.framework.TestCase; - import java.net.URI; import java.net.URISyntaxException; import java.net.URL; @@ -34,7 +34,7 @@ */ public class SigningFetcherTest extends TestCase { private static final String PRIVATE_KEY_TEXT = - "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALRiMLAh9iimur8V" + + "MIICdgIBADANBgkqhkiG9w0BAQEFAASCAmAwggJcAgEAAoGBALRiMLAh9iimur8V" + "A7qVvdqxevEuUkW4K+2KdMXmnQbG9Aa7k7eBjK1S+0LYmVjPKlJGNXHDGuy5Fw/d" + "7rjVJ0BLB+ubPK8iA/Tw3hLQgXMRRGRXXCn8ikfuQfjUS1uZSatdLB81mydBETlJ" + "hI6GH4twrbDJCR2Bwy/XWXgqgGRzAgMBAAECgYBYWVtleUzavkbrPjy0T5FMou8H" + @@ -63,15 +63,17 @@ "-----END CERTIFICATE-----"; private InterceptingContentFetcher interceptor; + private ContentCache cache; private SigningFetcher signer; private BasicGadgetToken authToken; private OAuthAccessor accessor; @Override public void setUp() throws Exception { + cache = new BasicContentCache(); interceptor = new InterceptingContentFetcher(); authToken = new BasicGadgetToken("o", "v", "a", "d", "u", "m"); - signer = SigningFetcher.makeFromB64PrivateKey( + signer = SigningFetcher.makeFromB64PrivateKey(cache, interceptor, authToken, "foo", PRIVATE_KEY_TEXT); OAuthConsumer consumer = new OAuthConsumer(null, null, null, null); consumer.setProperty(RSA_SHA1.X509_CERTIFICATE, CERTIFICATE_TEXT); Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/GadgetRenderingTaskTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/GadgetRenderingTaskTest.java?rev=650346&r1=650345&r2=650346&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/GadgetRenderingTaskTest.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/GadgetRenderingTaskTest.java Mon Apr 21 18:29:35 2008 @@ -16,18 +16,15 @@ * specific language governing permissions and limitations * under the License. */ - package org.apache.shindig.gadgets.http; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.isA; - +import org.apache.shindig.gadgets.ContainerConfig; import org.apache.shindig.gadgets.GadgetContext; import org.apache.shindig.gadgets.RemoteContent; import org.apache.shindig.gadgets.RemoteContentRequest; -import org.apache.shindig.gadgets.ContainerConfig; import org.apache.shindig.gadgets.spec.GadgetSpec; - +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.isA; import org.json.JSONArray; import org.json.JSONObject; @@ -81,7 +78,7 @@ expect(fetcher.fetch(SPEC_REQUEST)).andReturn(new RemoteContent(SPEC_XML)); expect(response.getWriter()).andReturn(writer); replay(); - gadgetRenderer.render(request, response); + gadgetRenderer.process(request, response); verify(); writer.close(); return new String(baos.toByteArray(), "UTF-8"); Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpGadgetContextTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpGadgetContextTest.java?rev=650346&r1=650345&r2=650346&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpGadgetContextTest.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpGadgetContextTest.java Mon Apr 21 18:29:35 2008 @@ -18,10 +18,9 @@ package org.apache.shindig.gadgets.http; -import static org.easymock.EasyMock.expect; - import org.apache.shindig.gadgets.GadgetContext; import org.apache.shindig.gadgets.GadgetTestFixture; +import static org.easymock.EasyMock.expect; import java.util.Locale; @@ -30,7 +29,7 @@ expect(request.getParameter("nocache")).andReturn( Integer.toString(Integer.MAX_VALUE)); replay(); - GadgetContext context = new HttpGadgetContext(request); + GadgetContext context = new HttpGadgetContext(request, gadgetTokenDecoder); verify(); assertEquals(true, context.getIgnoreCache()); } @@ -40,7 +39,7 @@ expect(request.getParameter("country")).andReturn( Locale.CHINA.getCountry()); replay(); - GadgetContext context = new HttpGadgetContext(request); + GadgetContext context = new HttpGadgetContext(request, gadgetTokenDecoder); verify(); assertEquals(Locale.CHINA, context.getLocale()); } @@ -48,7 +47,7 @@ public void testDebug() { expect(request.getParameter("debug")).andReturn("1"); replay(); - GadgetContext context = new HttpGadgetContext(request); + GadgetContext context = new HttpGadgetContext(request, gadgetTokenDecoder); verify(); assertEquals(true, context.getDebug()); } Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpTestFixture.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpTestFixture.java?rev=650346&r1=650345&r2=650346&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpTestFixture.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/HttpTestFixture.java Mon Apr 21 18:29:35 2008 @@ -18,17 +18,17 @@ */ package org.apache.shindig.gadgets.http; +import org.apache.shindig.gadgets.ContentFetcherFactory; import org.apache.shindig.gadgets.GadgetTestFixture; import org.apache.shindig.gadgets.GadgetTokenDecoder; -import org.apache.shindig.gadgets.SigningFetcherFactory; public abstract class HttpTestFixture extends GadgetTestFixture { public final ProxyHandler proxyHandler; - public final GadgetRenderer gadgetRenderer; + public final GadgetRenderingTask gadgetRenderer; public final JsonRpcHandler jsonRpcHandler; - public final SigningFetcherFactory signingFetcherFactory - = mock(SigningFetcherFactory.class); + public final ContentFetcherFactory contentFetcherFactory + = mock(ContentFetcherFactory.class); public final UrlGenerator urlGenerator = mock(UrlGenerator.class); public final GadgetTokenDecoder gadgetTokenDecoder = mock(GadgetTokenDecoder.class); @@ -36,12 +36,10 @@ public HttpTestFixture() { super(); proxyHandler = new ProxyHandler( - fetcher, - gadgetTokenDecoder, - signingFetcherFactory, - null); - gadgetRenderer = new GadgetRenderer( - gadgetServer, registry, containerConfig, urlGenerator); + contentFetcherFactory, + gadgetTokenDecoder); + gadgetRenderer = new GadgetRenderingTask(gadgetServer, registry, + containerConfig, urlGenerator, gadgetTokenDecoder); jsonRpcHandler = new JsonRpcHandler(executor, gadgetServer, urlGenerator); } } Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java?rev=650346&r1=650345&r2=650346&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/http/ProxyHandlerTest.java Mon Apr 21 18:29:35 2008 @@ -19,17 +19,16 @@ package org.apache.shindig.gadgets.http; -import static org.easymock.EasyMock.eq; -import static org.easymock.EasyMock.expect; -import static org.easymock.EasyMock.isA; - import org.apache.shindig.gadgets.FakeGadgetToken; import org.apache.shindig.gadgets.GadgetException; import org.apache.shindig.gadgets.GadgetToken; import org.apache.shindig.gadgets.RemoteContent; -import org.apache.shindig.gadgets.RemoteContentFetcher; import org.apache.shindig.gadgets.RemoteContentRequest; - +import org.apache.shindig.gadgets.spec.Auth; +import org.apache.shindig.gadgets.spec.Preload; +import static org.easymock.EasyMock.eq; +import static org.easymock.EasyMock.expect; +import static org.easymock.EasyMock.isA; import org.json.JSONObject; import java.io.ByteArrayOutputStream; @@ -52,6 +51,7 @@ RemoteContentRequest req = new RemoteContentRequest( "GET", new URI(url), null, null, new RemoteContentRequest.Options()); RemoteContent resp = new RemoteContent(200, data, null); + expect(contentFetcherFactory.get()).andReturn(fetcher); expect(fetcher.fetch(req)).andReturn(resp); } @@ -60,6 +60,7 @@ RemoteContentRequest req = new RemoteContentRequest( "POST", new URI(url), null, body, new RemoteContentRequest.Options()); RemoteContent resp = new RemoteContent(200, data, null); + expect(contentFetcherFactory.get()).andReturn(fetcher); expect(fetcher.fetch(req)).andReturn(resp); } @@ -148,11 +149,11 @@ expect(gadgetTokenDecoder.createToken("fake-token")).andReturn(DUMMY_TOKEN); expect(request.getParameter(ProxyHandler.SECURITY_TOKEN_PARAM)) .andReturn("fake-token").atLeastOnce(); - expect(request.getParameter(ProxyHandler.AUTHZ_PARAM)) - .andReturn(ProxyHandler.AUTHZ_SIGNED).atLeastOnce(); + expect(request.getParameter(Preload.AUTHZ_ATTR)) + .andReturn(Auth.SIGNED.toString()).atLeastOnce(); RemoteContent resp = new RemoteContent(200, DATA_ONE.getBytes(), null); - expect(signingFetcherFactory.getSigningFetcher( - isA(RemoteContentFetcher.class), eq(DUMMY_TOKEN))).andReturn(fetcher); + expect(contentFetcherFactory.getSigningFetcher(eq(DUMMY_TOKEN))) + .andReturn(fetcher); expect(fetcher.fetch(isA(RemoteContentRequest.class))).andReturn(resp); replay(); proxyHandler.fetchJson(request, response); @@ -168,11 +169,11 @@ expect(gadgetTokenDecoder.createToken("fake-token")).andReturn(DUMMY_TOKEN); expect(request.getParameter(ProxyHandler.SECURITY_TOKEN_PARAM)) .andReturn("fake-token").atLeastOnce(); - expect(request.getParameter(ProxyHandler.AUTHZ_PARAM)) - .andReturn(ProxyHandler.AUTHZ_SIGNED).atLeastOnce(); + expect(request.getParameter(Preload.AUTHZ_ATTR)) + .andReturn(Auth.SIGNED.toString()).atLeastOnce(); RemoteContent resp = new RemoteContent(200, DATA_ONE.getBytes(), null); - expect(signingFetcherFactory.getSigningFetcher( - isA(RemoteContentFetcher.class), eq(DUMMY_TOKEN))).andReturn(fetcher); + expect(contentFetcherFactory.getSigningFetcher(eq(DUMMY_TOKEN))) + .andReturn(fetcher); expect(fetcher.fetch(isA(RemoteContentRequest.class))).andReturn(resp); replay(); proxyHandler.fetchJson(request, response); @@ -184,7 +185,7 @@ setupGetRequestMock(URL_ONE); expect(request.getParameter(ProxyHandler.SECURITY_TOKEN_PARAM)) .andReturn("fake-token").atLeastOnce(); - expect(request.getParameter(ProxyHandler.AUTHZ_PARAM)) + expect(request.getParameter(Preload.AUTHZ_ATTR)) .andReturn("garbage").atLeastOnce(); replay(); try { Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java?rev=650346&r1=650345&r2=650346&view=diff ============================================================================== --- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java (original) +++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/spec/ModulePrefsTest.java Mon Apr 21 18:29:35 2008 @@ -45,7 +45,7 @@ " category2=\"category2\">" + " <Require feature=\"require\"/>" + " <Optional feature=\"optional\"/>" + - " <Preload href=\"http://example.org\"/>" + + " <Preload href=\"http://example.org\"; authz=\"signed\"/>" + " <Icon/>" + " <Locale/>" + "</ModulePrefs>";
