svn commit: r1152949 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/js/ test/java/org/apache/shindig/gadgets/js/

[mhermanto]

Author: mhermanto
Date: Mon Aug  1 22:06:13 2011
New Revision: 1152949

URL: http://svn.apache.org/viewvc?rev=1152949&view=rev
Log:
Quick fix to undefined ___jsl.
http://codereview.appspot.com/4816065/

Modified:
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java
    
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java
    
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessorTest.java

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java?rev=1152949&r1=1152948&r2=1152949&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessor.java
 Mon Aug  1 22:06:13 2011
@@ -48,6 +48,7 @@ public class ConfigInjectionProcessor im
   static final String CONFIG_FEATURE = "core.config.base";
   @VisibleForTesting
   static final String CONFIG_INJECT_CODE =
+      "window['___jsl'] = window['___jsl'] || {};" +
       "(window['___jsl']['ci'] = (window['___jsl']['ci'] || [])).push(%s);";
 
   private final FeatureRegistryProvider registryProvider;

Modified: 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java?rev=1152949&r1=1152948&r2=1152949&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/AddJslInfoVariableProcessorTest.java
 Mon Aug  1 22:06:13 2011
@@ -64,16 +64,16 @@ public class AddJslInfoVariableProcessor
   }
 
   @Test
-  public void testSkipsWhenNohintIsTrue() throws Exception {
-    response = control.createMock(JsResponseBuilder.class);
+  public void skipsWhenNohintIsTrue() throws Exception {
     setJsUri(URI + "?nohint=1");
     control.replay();
     processor.process(request, response);
+    assertEquals("", response.build().toJsString());
     control.verify();
   }
   
   @Test
-  public void testAddsHint() throws Exception {
+  public void addsHint() throws Exception {
     setJsUri(URI);
     control.replay();
     processor.process(request, response);
@@ -86,7 +86,7 @@ public class AddJslInfoVariableProcessor
   }
 
   @Test
-  public void testAddsHintWithoutJsLoad() throws Exception {
+  public void addsHintWithoutJsLoad() throws Exception {
     setJsUri(URI + "?jsload=1");
     Capture<JsUri> captureJsUri = new Capture<JsUri>();
     
EasyMock.expect(jsUriManager.makeExternJsUri(EasyMock.capture(captureJsUri))).andReturn(Uri.parse(GENERATED_URI));
@@ -103,7 +103,7 @@ public class AddJslInfoVariableProcessor
   }
   
   @Test
-  public void testAddsHintWithoutUriIfBlank() throws Exception {
+  public void addsHintWithoutUriIfBlank() throws Exception {
     setJsUri("");
     control.replay();
     processor.process(request, response);

Modified: 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessorTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessorTest.java?rev=1152949&r1=1152948&r2=1152949&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessorTest.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/js/ConfigInjectionProcessorTest.java
 Mon Aug  1 22:06:13 2011
@@ -212,7 +212,8 @@ public class ConfigInjectionProcessorTes
     assertTrue(processor.process(request, builder));
     control.verify();
     String jsCode = builder.build().toJsString();
-    String baseMatch = "(window['___jsl']['ci'] = (window['___jsl']['ci'] || 
[])).push(";
+    String baseMatch = "window['___jsl'] = window['___jsl'] || {};" +
+        "(window['___jsl']['ci'] = (window['___jsl']['ci'] || [])).push(";
     assertTrue(jsCode.startsWith(baseMatch));
     String endMatch = ");\n";
     assertTrue(jsCode.endsWith(endMatch));