svn commit: r1050750 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java

[lindner]

Author: lindner
Date: Sun Dec 19 03:12:33 2010
New Revision: 1050750

URL: http://svn.apache.org/viewvc?rev=1050750&view=rev
Log:
Patch from Pulkit Goyal | Js errors in concat responses should appear in 
comments

Modified:
    
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
    
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java

Modified: 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java?rev=1050750&r1=1050749&r2=1050750&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/servlet/ConcatProxyServlet.java
 Sun Dec 19 03:12:33 2010
@@ -262,11 +262,13 @@ public class ConcatProxyServlet extends 
   private static String formatError(String methodname, GadgetException excep, 
Uri uri)
       throws IOException {
     StringBuilder err = new StringBuilder();
+    err.append("/* ---- Error ");
     err.append(excep.getCode().toString());
     err.append(" concat(");
     err.append(uri.toString());
     err.append(") ");
     err.append(excep.getMessage());
+    err.append(" ---- */");
 
     // Log the errors here for now. We might want different severity levels
     // for different error codes.
@@ -295,7 +297,7 @@ public class ConcatProxyServlet extends 
 
     public boolean outputError(Uri uri, GadgetException e)
         throws IOException {
-      print(formatError("outputError", e, uri));
+      println(formatError("outputError", e, uri));
       return e.getHttpStatusCode() == HttpResponse.SC_INTERNAL_SERVER_ERROR;
     }
 

Modified: 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
URL: 
http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java?rev=1050750&r1=1050749&r2=1050750&view=diff
==============================================================================
--- 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
 (original)
+++ 
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/servlet/ConcatProxyServletTest.java
 Sun Dec 19 03:12:33 2010
@@ -101,6 +101,9 @@ public class ConcatProxyServletTest exte
     return "/* ---- Error " + code + " (" + url + ") ---- */\r\n";
   }
 
+  private String addConcatErrComment(GadgetException.Code code , String url) {
+    return "/* ---- Error " + code.toString() + " concat(" + url + ") null 
---- */\r\n";
+  }
   /**
    * Simulate the asJSON result of one script
    * @param url - the script url
@@ -171,7 +174,7 @@ public class ConcatProxyServletTest exte
     verify();
 
     String results = addComment(SCRT1, URL1.toString())
-        + "HTML_PARSE_ERROR concat(http://example.org/4.js) null";
+        + addConcatErrComment(GadgetException.Code.HTML_PARSE_ERROR, 
URL4.toString());
     assertEquals(results, recorder.getResponseAsString());
     
     assertEquals(400, recorder.getHttpStatusCode());
@@ -251,7 +254,7 @@ public class ConcatProxyServletTest exte
     verify();
     String results = "_js={\r\n"
       + addVar(URL1.toString(), SCRT1_ESCAPED)
-      + "FAILED_TO_RETRIEVE_CONTENT concat(http://example.org/4.js) 
null};\r\n";
+      + addConcatErrComment(GadgetException.Code.FAILED_TO_RETRIEVE_CONTENT, 
URL4.toString()) + "};\r\n";
     assertEquals(results, recorder.getResponseAsString());
     assertEquals(400, recorder.getHttpStatusCode());
   }
@@ -266,7 +269,7 @@ public class ConcatProxyServletTest exte
 
     String results = "_js={\r\n"
         + addVar(URL1.toString(), SCRT1_ESCAPED)
-        + "HTML_PARSE_ERROR concat(http://example.org/4.js) null};\r\n";
+        + addConcatErrComment(GadgetException.Code.HTML_PARSE_ERROR, 
URL4.toString()) + "};\r\n";
 
     expectRequestWithUris(Lists.newArrayList(URL1, URL4), "_js");