svn commit: r773061 - in /incubator/shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/preload/ test/java/org/apache/shindig/gadgets/preload/

[be...@apache.org]

Author: beaton
Date: Fri May  8 18:42:39 2009
New Revision: 773061

URL: http://svn.apache.org/viewvc?rev=773061&view=rev
Log:
Fix to HttpPreloader to propagate ignore cache parameter.

Thanks to David Driscoll for the patch.


Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
    incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java?rev=773061&r1=773060&r2=773061&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/preload/HttpPreloader.java Fri May  8 18:42:39 2009
@@ -67,7 +67,6 @@
     return preloads;
   }
 
-
   // TODO: move somewhere more sensible
   public static HttpRequest newHttpRequest(GadgetContext context,
       RequestAuthenticationInfo authenticationInfo) throws GadgetException {
@@ -76,7 +75,8 @@
         .setOAuthArguments(new OAuthArguments(authenticationInfo))
         .setAuthType(authenticationInfo.getAuthType())
         .setContainer(context.getContainer())
-        .setGadget(context.getUrl());
+        .setGadget(context.getUrl())
+        .setIgnoreCache(context.getIgnoreCache());
   }
 
   class PreloadTask implements Callable<PreloadedData> {

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java?rev=773061&r1=773060&r2=773061&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/HttpPreloaderTest.java Fri May  8 18:42:39 2009
@@ -108,8 +108,36 @@
     PreloadedData data = preloaded.iterator().next().call();
 
     checkRequest(plainFetcher.requests.get(0));
+    assertFalse("request should not ignore cache", plainFetcher.requests.get(0).getIgnoreCache());
     checkResults(data.toJson().iterator().next());
   }
+  
+  @Test
+  public void ignoreCachePreloads() throws Exception {
+    String xml =
+        "<Module><ModulePrefs title=''>" +
+        " <Preload href='" + PRELOAD_HREF + "' authz='signed' sign_viewer='false'/>" +
+        "</ModulePrefs><Content/></Module>";
+    GadgetSpec spec = new GadgetSpec(GADGET_URL, xml);
+    Preloader preloader = new HttpPreloader(requestPipeline);
+    
+    ignoreCache = true;
+    
+    Gadget gadget = new Gadget()
+        .setContext(context)
+        .setSpec(spec)
+        .setCurrentView(spec.getView(GadgetSpec.DEFAULT_VIEW));
+    Collection<Callable<PreloadedData>> preloaded =
+        preloader.createPreloadTasks(gadget);
+
+    assertEquals(1, preloaded.size());
+    PreloadedData data = preloaded.iterator().next().call();
+
+    HttpRequest request = oauthFetcher.requests.get(0);
+    assertTrue("request should ignore cache", request.getIgnoreCache());
+    checkRequest(request);
+  }
+
 
   @Test
   public void signedPreloads() throws Exception {

Modified: incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java?rev=773061&r1=773060&r2=773061&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/preload/PreloaderTestFixture.java Fri May  8 18:42:39 2009
@@ -35,6 +35,7 @@
   protected static final String CONTAINER = "some-container";
   protected static final String HOST = "example.org";
   protected String view = "default";
+  protected boolean ignoreCache = false;
   public Map<String, String> contextParams = Maps.newHashMap();
 
   public final GadgetContext context = new GadgetContext() {
@@ -67,5 +68,10 @@
     public String getParameter(String name) {
       return contextParams.get(name);
     }
+    
+    @Override
+    public boolean getIgnoreCache() {
+      return ignoreCache;
+    }
   };
 }