svn commit: r965557 - in /shindig/trunk/java/gadgets/src: main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java

[jo...@apache.org]

Author: johnh
Date: Mon Jul 19 16:59:42 2010
New Revision: 965557

URL: http://svn.apache.org/viewvc?rev=965557&view=rev
Log:
Fix case-sensitivity problem in ProxyingVisitor.

Patch provided by Kuntal Loya.


Modified:
    shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java
    shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java

Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java?rev=965557&r1=965556&r2=965557&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitor.java Mon Jul 19 16:59:42 2010
@@ -82,7 +82,8 @@ public class ProxyingVisitor implements 
         continue;
       }
       Element element = (Element)proxyPair.one;
-      element.setAttribute(RESOURCE_TAGS.get(element.getNodeName()), proxyPair.two.toString());
+      String nodeName = element.getNodeName().toLowerCase();
+      element.setAttribute(RESOURCE_TAGS.get(nodeName), proxyPair.two.toString());
       mutated = true;
     }
     
@@ -95,7 +96,8 @@ public class ProxyingVisitor implements 
     
     for (Node node : nodes) {
       Element element = (Element)node;
-      String uriStr = element.getAttribute(RESOURCE_TAGS.get(element.getNodeName()));
+      String nodeName = node.getNodeName().toLowerCase();
+      String uriStr = element.getAttribute(RESOURCE_TAGS.get(nodeName));
       try {
         reservedUris.add(new ProxyUriManager.ProxyUri(gadget, Uri.parse(uriStr)));
       } catch (UriException e) {

Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java?rev=965557&r1=965556&r2=965557&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ProxyingVisitorTest.java Mon Jul 19 16:59:42 2010
@@ -112,12 +112,14 @@ public class ProxyingVisitorTest extends
     // Includes one mod and one skip.
     // No need to test invalid nodes since visit() and DomWalker tests preclude this.
     String scriptSrc = "http://script.com/foo.js";
+    String imgSrc = "http://script.com/foo.jpg";
     Element e1 = elem("script", "src", scriptSrc);
     Element e2 = elem("script", "src", "^!,,|BLARGH");
-    List<Node> nodes = ImmutableList.<Node>of(e1, e2);
+    Element e3 = elem("IMG", "src", imgSrc);
+    List<Node> nodes = ImmutableList.<Node>of(e1, e2, e3);
     ProxyUriManager uriManager = createMock(ProxyUriManager.class);
     Uri rewrittenUri = Uri.parse("http://bar.com/");
-    List<Uri> returned = Lists.newArrayList(rewrittenUri, null);
+    List<Uri> returned = Lists.newArrayList(rewrittenUri, null, rewrittenUri);
     ContentRewriterFeature.Config config = createMock(ContentRewriterFeature.Config.class);
     Integer expires = new Integer(3);
     expect(config.getExpires()).andReturn(expires).once();
@@ -127,16 +129,18 @@ public class ProxyingVisitorTest extends
     expect(uriManager.make(capture(cap), capture(intCap))).andReturn(returned).once();
     replay(config, uriManager);
     Gadget gadget = gadget();
-    
+
     ProxyingVisitor rewriter = new ProxyingVisitor(config, uriManager);
     assertTrue(rewriter.revisit(gadget, nodes));
     verify(config, uriManager);
-    
-    assertEquals(2, cap.getValue().size());
+
+    assertEquals(3, cap.getValue().size());
     assertEquals(Uri.parse(scriptSrc), cap.getValue().get(0).getResource());
     assertNull(cap.getValue().get(1));
+    assertEquals(Uri.parse(imgSrc), cap.getValue().get(2).getResource());
     assertSame(expires, intCap.getValue());
     assertEquals(rewrittenUri.toString(), e1.getAttribute("src"));
     assertEquals("^!,,|BLARGH", e2.getAttribute("src"));
+    assertEquals(rewrittenUri.toString(), e3.getAttribute("src"));
   }
 }