svn commit: r1035369 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java

[zhoresh]

Author: zhoresh
Date: Mon Nov 15 17:40:30 2010
New Revision: 1035369

URL: http://svn.apache.org/viewvc?rev=1035369&view=rev
Log:
Fix name type of jscontent field in GadgetHandler

Modified:
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
    
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java?rev=1035369&r1=1035368&r2=1035369&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerService.java
 Mon Nov 15 17:40:30 2010
@@ -201,7 +201,7 @@ public class GadgetsHandlerService {
 
     String content = null;
     Long expireMs = null;
-    if (isFieldIncluded(fields, "content")) {
+    if (isFieldIncluded(fields, "jsContent")) {
       JsHandler.Response response = jsHandler.getJsContent(jsUri, 
servedUri.getAuthority());
       content = response.getJsData().toString();
       if (content.length() == 0) {

Modified: 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java?rev=1035369&r1=1035368&r2=1035369&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/GadgetsHandlerServiceTest.java
 Mon Nov 15 17:40:30 2010
@@ -303,7 +303,7 @@ public class GadgetsHandlerServiceTest e
 
   @Test
   public void testGetJsData() throws Exception {
-    List<String> fields = ImmutableList.of("*");
+    List<String> fields = ImmutableList.of("jscontent");
     List<String> features = ImmutableList.of("rpc");
     Uri resUri = Uri.parse("http://server.com/gadgets/js/rpc";);
     Capture<JsUri> uriCapture = new Capture<JsUri>();
@@ -322,12 +322,13 @@ public class GadgetsHandlerServiceTest e
     JsUri expectedUri = new JsUri(null, false, false, CONTAINER, 
FakeProcessor.SPEC_URL.toString(),
         features, onload, false, RenderingContext.CONTAINER);
     assertEquals(expectedUri, uriCapture.getValue());
-    assertEquals(resUri, response.getJsUrl());
+    assertNull(response.getJsUrl());
     assertEquals(jsContent, response.getJsContent());
     assertEquals(timeSource.currentTimeMillis() + HttpUtil.getDefaultTtl() * 
1000,
         response.getExpireTimeMs().longValue());
     verify();
   }
+
   @Test
   public void testCreateProxyUri() throws Exception {
     GadgetsHandlerApi.ImageParams image = 
mock(GadgetsHandlerApi.ImageParams.class);