You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by zh...@apache.org on 2010/09/15 22:56:52 UTC
svn commit: r997503 - in /shindig/trunk/java/gadgets/src:
main/java/org/apache/shindig/gadgets/parse/
main/java/org/apache/shindig/gadgets/render/
main/java/org/apache/shindig/gadgets/rewrite/
test/java/org/apache/shindig/gadgets/rewrite/
Author: zhoresh
Date: Wed Sep 15 20:56:51 2010
New Revision: 997503
URL: http://svn.apache.org/viewvc?rev=997503&view=rev
Log:
Ref http://codereview.appspot.com/2181041/
Let serializer handle html attributes escaping.
Modified:
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java?rev=997503&r1=997502&r2=997503&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/parse/DefaultHtmlSerializer.java Wed Sep 15 20:56:51 2010
@@ -79,7 +79,7 @@ public class DefaultHtmlSerializer imple
HTMLElements.Element htmlElement =
HTMLElements.getElement(elem.getNodeName());
-
+
printStartElement(elem, output, xmlMode && htmlElement.isEmpty());
// Special HTML elements - <script> in particular - will typically
@@ -114,7 +114,7 @@ public class DefaultHtmlSerializer imple
if (scriptType != null) {
Element replacement = elem.getOwnerDocument().createElement("script");
replacement.setAttribute("type", scriptType);
-
+
// Retain the remaining attributes of the node.
NamedNodeMap attribs = elem.getAttributes();
for (int i = 0; i < attribs.getLength(); ++i) {
@@ -168,10 +168,7 @@ public class DefaultHtmlSerializer imple
if (attr.getNodeValue() != null) {
output.append("=\"");
if (attr.getNodeValue().length() != 0) {
- boolean isUrlAttribute =
- elem.getNamespaceURI() == null &&
- HtmlSerialization.URL_ATTRIBUTES.contains(attrName);
- printAttributeValue(attr.getNodeValue(), output, isUrlAttribute);
+ printAttributeValue(attr.getNodeValue(), output);
}
output.append('"');
}
@@ -179,13 +176,14 @@ public class DefaultHtmlSerializer imple
output.append(withXmlClose ? "/>" : ">");
}
- private static void printAttributeValue(String text, Appendable output, boolean isUrl) throws IOException {
+ private static void printAttributeValue(String text, Appendable output) throws IOException {
int length = text.length();
for (int j = 0; j < length; j++) {
char c = text.charAt(j);
+ // TODO: Complete all special chars (http://www.w3.org/TR/REC-xml/#charsets)
if (c == '"') {
output.append(""");
- } else if (c == '&' && !isUrl) {
+ } else if (c == '&') {
output.append("&");
} else {
output.append(c);
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java?rev=997503&r1=997502&r2=997503&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/render/RenderingGadgetRewriter.java Wed Sep 15 20:56:51 2010
@@ -79,7 +79,7 @@ import com.google.inject.name.Named;
*/
public class RenderingGadgetRewriter implements GadgetRewriter {
private static final Logger LOG = Logger.getLogger(RenderingGadgetRewriter.class.getName());
-
+
private static final int INLINE_JS_BUFFER = 50;
protected static final String DEFAULT_CSS =
@@ -201,7 +201,7 @@ public class RenderingGadgetRewriter imp
onloadScript.appendChild(bodyTag.getOwnerDocument().createTextNode(
"gadgets.util.runOnLoadHandlers();"));
}
-
+
protected void injectGadgetBeacon(Gadget gadget, Node headTag, Node firstHeadChild)
throws GadgetException {
Element beaconNode = headTag.getOwnerDocument().createElement("script");
@@ -222,7 +222,7 @@ public class RenderingGadgetRewriter imp
Set<String> externForcedLibs = defaultExternLibs;
// gather the libraries we'll need to generate the extern libs
- String externParam = context.getParameter("libs");
+ String externParam = context.getParameter("libs");
if (StringUtils.isNotBlank(externParam)) {
externForcedLibs = Sets.newTreeSet(Arrays.asList(StringUtils.split(externParam, ':')));
}
@@ -230,14 +230,14 @@ public class RenderingGadgetRewriter imp
if (!externForcedLibs.isEmpty()) {
String jsUrl = jsUriManager.makeExternJsUri(gadget, externForcedLibs).toString();
Element libsTag = headTag.getOwnerDocument().createElement("script");
- libsTag.setAttribute("src", jsUrl.replace("&", "&"));
+ libsTag.setAttribute("src", jsUrl);
headTag.insertBefore(libsTag, firstHeadChild);
}
List<String> unsupported = Lists.newLinkedList();
List<FeatureResource> externForcedResources =
- featureRegistry.getFeatureResources(context, externForcedLibs, unsupported);
+ featureRegistry.getFeatureResources(context, externForcedLibs, unsupported);
if (!unsupported.isEmpty()) {
LOG.info("Unknown feature(s) in extern &libs=: " + unsupported.toString());
unsupported.clear();
@@ -259,10 +259,10 @@ public class RenderingGadgetRewriter imp
if (!requiredUnsupported.isEmpty()) {
throw new UnsupportedFeatureException(requiredUnsupported.toString());
}
- }
+ }
// Inline or externalize the gadgetFeatureKeys
- List<FeatureResource> inlineResources = Lists.newArrayList();
+ List<FeatureResource> inlineResources = Lists.newArrayList();
List<String> allRequested = Lists.newArrayList(gadgetFeatureKeys);
if (externalizeFeatures) {
@@ -272,7 +272,7 @@ public class RenderingGadgetRewriter imp
if (!externGadgetLibs.isEmpty()) {
String jsUrl = jsUriManager.makeExternJsUri(gadget, externGadgetLibs).toString();
Element libsTag = headTag.getOwnerDocument().createElement("script");
- libsTag.setAttribute("src", jsUrl.replace("&", "&"));
+ libsTag.setAttribute("src", jsUrl);
headTag.insertBefore(libsTag, firstHeadChild);
}
} else {
@@ -301,7 +301,7 @@ public class RenderingGadgetRewriter imp
String libraryConfig =
getLibraryConfig(gadget, featureRegistry.getFeatures(allRequested));
-
+
// Size has a small fudge factor added to it for delimiters and such.
StringBuilder inlineJs = new StringBuilder(size + libraryConfig.length() + INLINE_JS_BUFFER);
@@ -317,7 +317,7 @@ public class RenderingGadgetRewriter imp
inlineJs.setLength(0);
}
Element referenceTag = headTag.getOwnerDocument().createElement("script");
- referenceTag.setAttribute("src", theContent.replace("&", "&"));
+ referenceTag.setAttribute("src", theContent);
headTag.insertBefore(referenceTag, firstHeadChild);
} else {
inlineJs.append(theContent).append(";\n");
@@ -361,7 +361,7 @@ public class RenderingGadgetRewriter imp
if (conf != null) {
config.put(name, conf);
}
-
+
// See if this feature has configuration data
ConfigContributor contributor = configContributors.get(name);
if (contributor != null) {
Modified: shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java?rev=997503&r1=997502&r2=997503&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java (original)
+++ shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/rewrite/ConcatVisitor.java Wed Sep 15 20:56:51 2010
@@ -186,7 +186,7 @@ public class ConcatVisitor implements Do
// with new (concat) URI, immediately ahead of the first elem.
Element firstElem = sourceBatch.get(0);
Element elemConcat = (Element)firstElem.cloneNode(true);
- elemConcat.setAttribute(type.getSrcAttrib(), concatUri.getUri().toString().replace("&", "&"));
+ elemConcat.setAttribute(type.getSrcAttrib(), concatUri.getUri().toString());
firstElem.getParentNode().insertBefore(elemConcat, firstElem);
// Now for all Elements, either A) remove them or B) replace each
Modified: shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java
URL: http://svn.apache.org/viewvc/shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java?rev=997503&r1=997502&r2=997503&view=diff
==============================================================================
--- shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java (original)
+++ shindig/trunk/java/gadgets/src/test/java/org/apache/shindig/gadgets/rewrite/ConcatVisitorTest.java Wed Sep 15 20:56:51 2010
@@ -22,6 +22,7 @@ import static org.junit.Assert.assertEqu
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
+import static org.junit.Assert.assertFalse;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
@@ -29,11 +30,15 @@ import com.google.common.collect.Maps;
import org.apache.shindig.common.uri.Uri;
import org.apache.shindig.common.uri.UriBuilder;
+import org.apache.shindig.gadgets.parse.DefaultHtmlSerializer;
+import org.apache.shindig.gadgets.parse.HtmlSerializer;
+import org.apache.shindig.gadgets.parse.caja.CajaHtmlSerializer;
import org.apache.shindig.gadgets.rewrite.DomWalker.Visitor.VisitStatus;
import org.apache.shindig.gadgets.uri.ConcatUriManager;
import org.junit.Before;
import org.junit.Test;
+import org.w3c.dom.Attr;
import org.w3c.dom.Element;
import org.w3c.dom.Node;
@@ -43,46 +48,46 @@ import java.util.Map;
public class ConcatVisitorTest extends DomWalkerTestBase {
private static final String JS1_URL_STR = "http://one.com/foo.js?test=1&ui=2";
private Node js1;
-
+
private static final String JS2_URL_STR = "http://two.com/foo.js";
private Node js2;
-
+
private static final String JS3_URL_STR = "http://three.com/foo.js";
private Node js3;
-
+
private static final String JS4_URL_STR = "http://four.com/foo.js";
private Node js4;
-
+
private static final String JS5_URL_STR = "http://~^|BAD |^/foo.js";
private Node js5;
-
+
private static final String JS6_URL_STR = "http://six.com/foo.js";
private Node js6;
-
+
private static final String CSS1_URL_STR = "http://one.com/foo.js";
private Node css1;
-
+
private static final String CSS2_URL_STR = "http://two.com/foo.js";
private Node css2;
-
+
private static final String CSS3_URL_STR = "http://three.com/foo.js";
private Node css3;
-
+
private static final String CSS4_URL_STR = "http://four.com/foo.js";
private Node css4;
-
+
private static final String CSS5_URL_STR = "http://five.com/foo.js";
private Node css5;
-
+
private static final String CSS6_URL_STR = "http://six.com/foo.js";
private Node css6;
-
+
private static final String CSS7_URL_STR = "http://seven.com/foo.js";
private Node css7;
-
+
private static final String CSS8_URL_STR = "http://eight.com/foo.js";
private Node css8;
-
+
private static final String CSS9_URL_STR = "http://nine.com/foo.js";
private Node css9;
@@ -96,7 +101,8 @@ public class ConcatVisitorTest extends D
private Node css12;
private static final Uri CONCAT_BASE_URI = Uri.parse("http://test.com/proxy");
-
+
+ @Override
@Before
public void setUp() {
super.setUp();
@@ -119,28 +125,28 @@ public class ConcatVisitorTest extends D
css11 = elem("link", "rel", "stylesheet", "type", "text/css", "media", "all", "href", CSS11_URL_STR);
css12 = elem("link", "rel", "stylesheet", "type", "text/css", "media", "all", "href", CSS12_URL_STR);
}
-
+
@Test
public void dontVisitSingleJs() throws Exception {
assertEquals(VisitStatus.BYPASS, getVisitStatusJs(js1, null, false));
}
-
+
@Test
public void dontVisitSingleCss() throws Exception {
assertEquals(VisitStatus.BYPASS, getVisitStatusCss(css1, null));
}
-
+
@Test
public void dontVisitJsWithoutSrc() throws Exception {
assertEquals(VisitStatus.BYPASS, getVisitStatusJs(elem("script"), null, false));
}
-
+
@Test
public void dontVisitUnknown() throws Exception {
assertEquals(VisitStatus.BYPASS, getVisitStatusJs(elem("div"), null, true));
assertEquals(VisitStatus.BYPASS, getVisitStatusCss(elem("div"), null));
}
-
+
@Test
public void dontVisitContigJsMiddleNotRewritable() throws Exception {
ContentRewriterFeature.Config config = config(".*two.*", false);
@@ -149,7 +155,7 @@ public class ConcatVisitorTest extends D
assertEquals(VisitStatus.BYPASS, getVisitStatusJs(config, js2));
assertEquals(VisitStatus.BYPASS, getVisitStatusJs(config, js3));
}
-
+
@Test
public void dontVisitContigCssMiddleNotRewritable() throws Exception {
ContentRewriterFeature.Config config = config(".*two.*", true);
@@ -158,7 +164,7 @@ public class ConcatVisitorTest extends D
assertEquals(VisitStatus.BYPASS, getVisitStatusCss(config, css2));
assertEquals(VisitStatus.BYPASS, getVisitStatusCss(config, css3));
}
-
+
@Test
public void dontVisitSeparatedJsNotSplit() throws Exception {
ContentRewriterFeature.Config config = config(null, false);
@@ -194,7 +200,7 @@ public class ConcatVisitorTest extends D
seqNodes(node, css1);
assertEquals(VisitStatus.BYPASS, getVisitStatusCss(node, null));
}
-
+
@Test
public void dontVisitTypeCssFreeCss() throws Exception {
Node node = elem("link", "rel", "stylesheet", "href", CSS1_URL_STR);
@@ -215,14 +221,14 @@ public class ConcatVisitorTest extends D
seqNodes(node, css1);
assertEquals(VisitStatus.BYPASS, getVisitStatusCss(node, null));
}
-
+
@Test
public void dontVisitCssWithoutAttribs() throws Exception {
Node node = elem("link", "href", CSS1_URL_STR);
seqNodes(node, css1);
assertEquals(VisitStatus.BYPASS, getVisitStatusCss(node, null));
}
-
+
@Test
public void visitContigJs() throws Exception {
seqNodes(js1, js2, js3);
@@ -230,7 +236,7 @@ public class ConcatVisitorTest extends D
assertEquals(VisitStatus.RESERVE_NODE, getVisitStatusJs(js2, null, false));
assertEquals(VisitStatus.RESERVE_NODE, getVisitStatusJs(js3, null, false));
}
-
+
@Test
public void visitContigCss() throws Exception {
seqNodes(css1, css2, css3);
@@ -238,12 +244,12 @@ public class ConcatVisitorTest extends D
assertEquals(VisitStatus.RESERVE_NODE, getVisitStatusCss(css2, null));
assertEquals(VisitStatus.RESERVE_NODE, getVisitStatusCss(css3, null));
}
-
+
@Test
public void visitSplitJsSingle() throws Exception {
assertEquals(VisitStatus.RESERVE_NODE, getVisitStatusJs(js1, null, true));
}
-
+
@Test
public void visitSplitJsSeparated() throws Exception {
seqNodes(js1, elem("span"), js2, elem("div"), js3);
@@ -251,7 +257,7 @@ public class ConcatVisitorTest extends D
assertEquals(VisitStatus.RESERVE_NODE, getVisitStatusJs(js2, null, true));
assertEquals(VisitStatus.RESERVE_NODE, getVisitStatusJs(js3, null, true));
}
-
+
@Test
public void visitSplitJsContiguous() throws Exception {
seqNodes(js1, js2, js3);
@@ -259,23 +265,23 @@ public class ConcatVisitorTest extends D
assertEquals(VisitStatus.RESERVE_NODE, getVisitStatusJs(js2, null, true));
assertEquals(VisitStatus.RESERVE_NODE, getVisitStatusJs(js3, null, true));
}
-
+
@Test
public void concatSingleBatchJs() throws Exception {
List<Node> nodes = seqNodes(js1, js2, js3);
Node parent = js1.getParentNode();
-
+
// Sanity check.
assertEquals(3, parent.getChildNodes().getLength());
-
+
SimpleConcatUriManager mgr = simpleMgr();
ConcatVisitor.Js rewriter = new ConcatVisitor.Js(config(null, false), mgr);
assertTrue(rewriter.revisit(gadget(), nodes));
-
+
// Should be left with a single JS node child to parent.
assertEquals(1, parent.getChildNodes().getLength());
Element concatNode = (Element)parent.getChildNodes().item(0);
- Uri concatUri = Uri.parse(concatNode.getAttribute("src").replace("&", "&"));
+ Uri concatUri = Uri.parse(concatNode.getAttribute("src"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());
@@ -283,23 +289,23 @@ public class ConcatVisitorTest extends D
assertEquals(JS2_URL_STR, concatUri.getQueryParameter("2"));
assertEquals(JS3_URL_STR, concatUri.getQueryParameter("3"));
}
-
+
@Test
public void concatSingleBatchCss() throws Exception {
List<Node> nodes = seqNodes(css1, css2, css3);
Node parent = css1.getParentNode();
-
+
// Sanity check.
assertEquals(3, parent.getChildNodes().getLength());
-
+
SimpleConcatUriManager mgr = simpleMgr();
ConcatVisitor.Css rewriter = new ConcatVisitor.Css(config(null, false), mgr);
assertTrue(rewriter.revisit(gadget(), nodes));
-
+
// Should be left with a single JS node child to parent.
assertEquals(1, parent.getChildNodes().getLength());
Element concatNode = (Element)parent.getChildNodes().item(0);
- Uri concatUri = Uri.parse(concatNode.getAttribute("href").replace("&", "&"));
+ Uri concatUri = Uri.parse(concatNode.getAttribute("href"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());
@@ -307,36 +313,90 @@ public class ConcatVisitorTest extends D
assertEquals(CSS2_URL_STR, concatUri.getQueryParameter("2"));
assertEquals(CSS3_URL_STR, concatUri.getQueryParameter("3"));
}
-
+
+ protected Element elemWithNameSpace(String namespace, String tag, String... attrStrs) {
+ Element elem = doc.createElementNS(namespace, tag);
+ for (int i = 0; attrStrs != null && i < attrStrs.length; i += 2) {
+ Attr attr = doc.createAttribute(attrStrs[i]);
+ attr.setValue(attrStrs[i+1]);
+ elem.setAttributeNode(attr);
+ }
+ return elem;
+ }
+
+ @Test
+ public void concatSingleBatchCssWithNamespace() throws Exception {
+
+ String namespace = "http://www.w3.org/1999/xhtml";
+ css1 = elemWithNameSpace(namespace, "link", "rel", "Stylesheet", "type", "Text/css",
+ "href", CSS1_URL_STR);
+ css2 = elemWithNameSpace(namespace, "link", "rel", "stylesheet", "type", "text/css",
+ "href", CSS2_URL_STR);
+ css3 = elemWithNameSpace(namespace, "link", "rel", "stylesheet", "type", "text/css",
+ "href", CSS3_URL_STR);
+
+ List<Node> nodes = seqNodes(css1, css2, css3);
+ Node parent = css1.getParentNode();
+
+ // Sanity check.
+ assertEquals(3, parent.getChildNodes().getLength());
+
+ SimpleConcatUriManager mgr = simpleMgr();
+ ConcatVisitor.Css rewriter = new ConcatVisitor.Css(config(null, false), mgr);
+ assertTrue(rewriter.revisit(gadget(), nodes));
+
+ // Should be left with a single JS node child to parent.
+ assertEquals(1, parent.getChildNodes().getLength());
+ Element concatNode = (Element)parent.getChildNodes().item(0);
+
+ Uri concatUri = Uri.parse(concatNode.getAttribute("href"));
+ assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
+ assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
+ assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());
+ assertEquals(CSS1_URL_STR, concatUri.getQueryParameter("1"));
+ assertEquals(CSS2_URL_STR, concatUri.getQueryParameter("2"));
+ assertEquals(CSS3_URL_STR, concatUri.getQueryParameter("3"));
+
+ // Verify serializer escape '&' once:
+ assertFalse(concatUri.toString().contains("&"));
+ doc.appendChild(concatNode);
+ HtmlSerializer serializer = new DefaultHtmlSerializer();
+ String html = serializer.serialize(doc);
+ assertTrue(html.contains(concatUri.toString().replace("&", "&")));
+ serializer = new CajaHtmlSerializer();
+ html = serializer.serialize(doc);
+ assertTrue(html.contains(concatUri.toString().replace("&", "&")));
+ }
+
@Test
public void concatMultiBatchJs() throws Exception {
List<Node> fullListJs = Lists.newArrayList();
fullListJs.addAll(seqNodes(js1, js2));
Node parent1 = js1.getParentNode();
assertEquals(2, parent1.getChildNodes().getLength());
-
+
fullListJs.addAll(seqNodes(js3, js4));
Node parent2 = js3.getParentNode();
assertEquals(2, js3.getParentNode().getChildNodes().getLength());
-
+
SimpleConcatUriManager mgr = simpleMgr();
ConcatVisitor.Js rewriter = new ConcatVisitor.Js(config(null, false), mgr);
assertTrue(rewriter.revisit(gadget(), fullListJs));
-
+
// Should have been independently concatenated.
assertEquals(1, parent1.getChildNodes().getLength());
Element cn1 = (Element)parent1.getChildNodes().item(0);
- Uri concatUri1 = Uri.parse(cn1.getAttribute("src").replace("&", "&"));
+ Uri concatUri1 = Uri.parse(cn1.getAttribute("src"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri1.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri1.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri1.getPath());
assertEquals(JS1_URL_STR, concatUri1.getQueryParameter("1"));
assertEquals(JS2_URL_STR, concatUri1.getQueryParameter("2"));
assertNull(concatUri1.getQueryParameter("3"));
-
+
assertEquals(1, parent2.getChildNodes().getLength());
Element cn2 = (Element)parent2.getChildNodes().item(0);
- Uri concatUri2 = Uri.parse(cn2.getAttribute("src").replace("&", "&"));
+ Uri concatUri2 = Uri.parse(cn2.getAttribute("src"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri2.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri2.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri2.getPath());
@@ -344,36 +404,36 @@ public class ConcatVisitorTest extends D
assertEquals(JS4_URL_STR, concatUri2.getQueryParameter("2"));
assertNull(concatUri2.getQueryParameter("3"));
}
-
+
@Test
public void concatMultiBatchCss() throws Exception {
List<Node> fullListCss = Lists.newArrayList();
fullListCss.addAll(seqNodes(css1, css2));
Node parent1 = css1.getParentNode();
assertEquals(2, parent1.getChildNodes().getLength());
-
+
fullListCss.addAll(seqNodes(css3, css4, css5, css7, css6, css8, css9));
Node parent2 = css3.getParentNode();
assertEquals(7, css3.getParentNode().getChildNodes().getLength());
-
+
SimpleConcatUriManager mgr = simpleMgr();
ConcatVisitor.Css rewriter = new ConcatVisitor.Css(config(null, false), mgr);
assertTrue(rewriter.revisit(gadget(), fullListCss));
-
+
// Should have been independently concatenated.
assertEquals(1, parent1.getChildNodes().getLength());
Element cn1 = (Element)parent1.getChildNodes().item(0);
- Uri concatUri1 = Uri.parse(cn1.getAttribute("href").replace("&", "&"));
+ Uri concatUri1 = Uri.parse(cn1.getAttribute("href"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri1.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri1.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri1.getPath());
assertEquals(CSS1_URL_STR, concatUri1.getQueryParameter("1"));
assertEquals(CSS2_URL_STR, concatUri1.getQueryParameter("2"));
assertNull(concatUri1.getQueryParameter("3"));
-
+
assertEquals(2, parent2.getChildNodes().getLength());
Element cn2 = (Element)parent2.getChildNodes().item(0);
- Uri concatUri2 = Uri.parse(cn2.getAttribute("href").replace("&", "&"));
+ Uri concatUri2 = Uri.parse(cn2.getAttribute("href"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri2.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri2.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri2.getPath());
@@ -384,9 +444,9 @@ public class ConcatVisitorTest extends D
assertEquals(CSS9_URL_STR, concatUri2.getQueryParameter("5"));
assertNull(concatUri2.getQueryParameter("6"));
assertEquals("", cn2.getAttribute("media"));
-
+
Element cn3 = (Element)parent2.getChildNodes().item(1);
- Uri concatUri3 = Uri.parse(cn3.getAttribute("href").replace("&", "&"));
+ Uri concatUri3 = Uri.parse(cn3.getAttribute("href"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri3.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri3.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri3.getPath());
@@ -415,7 +475,7 @@ public class ConcatVisitorTest extends D
// Should have been split across 'all' media type and then batches should be independently
// concatenated.
Element cn1 = (Element)parent1.getChildNodes().item(0);
- Uri concatUri1 = Uri.parse(cn1.getAttribute("href").replace("&", "&"));
+ Uri concatUri1 = Uri.parse(cn1.getAttribute("href"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri1.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri1.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri1.getPath());
@@ -424,7 +484,7 @@ public class ConcatVisitorTest extends D
assertEquals("", cn1.getAttribute("media"));
Element cn2 = (Element)parent1.getChildNodes().item(1);
- Uri concatUri2 = Uri.parse(cn2.getAttribute("href").replace("&", "&"));
+ Uri concatUri2 = Uri.parse(cn2.getAttribute("href"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri2.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri2.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri2.getPath());
@@ -434,7 +494,7 @@ public class ConcatVisitorTest extends D
assertEquals("one", cn2.getAttribute("title"));
Element cn3 = (Element)parent1.getChildNodes().item(2);
- Uri concatUri3 = Uri.parse(cn3.getAttribute("href").replace("&", "&"));
+ Uri concatUri3 = Uri.parse(cn3.getAttribute("href"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri3.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri3.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri3.getPath());
@@ -445,7 +505,7 @@ public class ConcatVisitorTest extends D
assertEquals("two", cn3.getAttribute("title"));
Element cn4 = (Element)parent1.getChildNodes().item(3);
- Uri concatUri4 = Uri.parse(cn4.getAttribute("href").replace("&", "&"));
+ Uri concatUri4 = Uri.parse(cn4.getAttribute("href"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri4.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri4.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri4.getPath());
@@ -455,7 +515,7 @@ public class ConcatVisitorTest extends D
assertEquals("two", cn4.getAttribute("title"));
Element cn5 = (Element)parent1.getChildNodes().item(4);
- Uri concatUri5 = Uri.parse(cn5.getAttribute("href").replace("&", "&"));
+ Uri concatUri5 = Uri.parse(cn5.getAttribute("href"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri5.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri5.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri5.getPath());
@@ -466,7 +526,7 @@ public class ConcatVisitorTest extends D
assertEquals("", cn5.getAttribute("title"));
Element cn6 = (Element)parent1.getChildNodes().item(5);
- Uri concatUri6 = Uri.parse(cn6.getAttribute("href").replace("&", "&"));
+ Uri concatUri6 = Uri.parse(cn6.getAttribute("href"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri6.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri6.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri6.getPath());
@@ -484,59 +544,59 @@ public class ConcatVisitorTest extends D
fullListJs.addAll(seqNodes(js1, js2));
Node parent1 = js1.getParentNode();
assertEquals(2, parent1.getChildNodes().getLength());
-
+
fullListJs.addAll(seqNodes(js5, js6));
Node parent3 = js5.getParentNode();
assertEquals(2, parent3.getChildNodes().getLength());
-
+
fullListJs.addAll(seqNodes(js3, js4));
Node parent2 = js3.getParentNode();
assertEquals(2, js3.getParentNode().getChildNodes().getLength());
-
+
SimpleConcatUriManager mgr = simpleMgr();
ConcatVisitor.Js rewriter = new ConcatVisitor.Js(config(null, false), mgr);
assertTrue(rewriter.revisit(gadget(), fullListJs));
-
+
// Should have been independently concatenated. Batches #1 and #2 are OK. Middle skipped.
assertEquals(1, parent1.getChildNodes().getLength());
Element cn1 = (Element)parent1.getChildNodes().item(0);
- Uri concatUri1 = Uri.parse(cn1.getAttribute("src").replace("&", "&"));
+ Uri concatUri1 = Uri.parse(cn1.getAttribute("src"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri1.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri1.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri1.getPath());
assertEquals(JS1_URL_STR, concatUri1.getQueryParameter("1"));
assertEquals(JS2_URL_STR, concatUri1.getQueryParameter("2"));
-
+
assertEquals(2, parent3.getChildNodes().getLength());
assertSame(js5, parent3.getChildNodes().item(0));
assertSame(js6, parent3.getChildNodes().item(1));
-
+
assertEquals(1, parent2.getChildNodes().getLength());
Element cn2 = (Element)parent2.getChildNodes().item(0);
- Uri concatUri2 = Uri.parse(cn2.getAttribute("src").replace("&", "&"));
+ Uri concatUri2 = Uri.parse(cn2.getAttribute("src"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri2.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri2.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri2.getPath());
assertEquals(JS3_URL_STR, concatUri2.getQueryParameter("1"));
assertEquals(JS4_URL_STR, concatUri2.getQueryParameter("2"));
}
-
+
@Test
public void concatSplitJsSingleBatch() throws Exception {
List<Node> nodes = seqNodes(js1, js2);
Node parent = js1.getParentNode();
assertEquals(2, parent.getChildNodes().getLength());
-
+
SimpleConcatUriManager mgr = simpleMgr();
ConcatVisitor.Js rewriter = new ConcatVisitor.Js(config(null, true), mgr);
assertTrue(rewriter.revisit(gadget(), nodes));
-
+
// Same number of nodes. Now the second JS node is a new script node eval'ing JS.
// For test purposes the code is just the Uri.
assertEquals(3, parent.getChildNodes().getLength());
Element jsConcat = (Element)parent.getChildNodes().item(0);
assertEquals("script", jsConcat.getTagName());
- Uri concatUri = Uri.parse(jsConcat.getAttribute("src").replace("&", "&"));
+ Uri concatUri = Uri.parse(jsConcat.getAttribute("src"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());
@@ -544,19 +604,19 @@ public class ConcatVisitorTest extends D
assertEquals(JS2_URL_STR, concatUri.getQueryParameter("2"));
assertNull(concatUri.getQueryParameter("3"));
assertEquals("1", concatUri.getQueryParameter("SPLIT"));
-
+
// Split-eval nodes 1 and 2
Element splitEval1 = (Element)parent.getChildNodes().item(1);
assertEquals("script", splitEval1.getTagName());
assertNull(splitEval1.getAttributeNode("src"));
assertEquals(JS1_URL_STR, splitEval1.getTextContent());
-
+
Element splitEval2 = (Element)parent.getChildNodes().item(2);
assertEquals("script", splitEval2.getTagName());
assertNull(splitEval2.getAttributeNode("src"));
assertEquals(JS2_URL_STR, splitEval2.getTextContent());
}
-
+
@Test
public void concatSplitJsSplitNodes() throws Exception {
Node parent = doc.createElement("container");
@@ -568,17 +628,17 @@ public class ConcatVisitorTest extends D
parent.appendChild(doc.createElement("span"));
List<Node> nodes = ImmutableList.of(js1, js2);
assertEquals(6, parent.getChildNodes().getLength());
-
+
SimpleConcatUriManager mgr = simpleMgr();
ConcatVisitor.Js rewriter = new ConcatVisitor.Js(config(null, true), mgr);
assertTrue(rewriter.revisit(gadget(), nodes));
-
+
// Same number of nodes. Now the second JS node is a new script node eval'ing JS.
// For test purposes the code is just the Uri.
assertEquals(7, parent.getChildNodes().getLength());
Element jsConcat = (Element)parent.getChildNodes().item(1);
assertEquals("script", jsConcat.getTagName());
- Uri concatUri = Uri.parse(jsConcat.getAttribute("src").replace("&", "&"));
+ Uri concatUri = Uri.parse(jsConcat.getAttribute("src"));
assertEquals(CONCAT_BASE_URI.getScheme(), concatUri.getScheme());
assertEquals(CONCAT_BASE_URI.getAuthority(), concatUri.getAuthority());
assertEquals(CONCAT_BASE_URI.getPath(), concatUri.getPath());
@@ -586,47 +646,47 @@ public class ConcatVisitorTest extends D
assertEquals(JS2_URL_STR, concatUri.getQueryParameter("2"));
assertNull(concatUri.getQueryParameter("3"));
assertEquals("1", concatUri.getQueryParameter("SPLIT"));
-
+
// Split-eval nodes 1 and 2
Element splitEval1 = (Element)parent.getChildNodes().item(2);
assertEquals("script", splitEval1.getTagName());
assertNull(splitEval1.getAttributeNode("src"));
assertEquals(JS1_URL_STR, splitEval1.getTextContent());
-
+
Element splitEval2 = (Element)parent.getChildNodes().item(5);
assertEquals("script", splitEval2.getTagName());
assertNull(splitEval2.getAttributeNode("src"));
assertEquals(JS2_URL_STR, splitEval2.getTextContent());
}
-
+
private VisitStatus getVisitStatusJs(ContentRewriterFeature.Config config, Node node)
throws RewritingException {
return new ConcatVisitor.Js(config, null).visit(gadget(), node);
}
-
+
private VisitStatus getVisitStatusJs(Node node, String rewriteRegex, boolean splitJs)
throws Exception {
ContentRewriterFeature.Config config = config(rewriteRegex, splitJs);
return getVisitStatusJs(config, node);
}
-
+
private VisitStatus getVisitStatusCss(ContentRewriterFeature.Config config, Node node)
throws RewritingException {
return new ConcatVisitor.Css(config, null).visit(gadget(), node);
}
-
+
private VisitStatus getVisitStatusCss(Node node, String rewriteRegex)
throws Exception {
// True, but never used (splitJS support)
ContentRewriterFeature.Config config = config(rewriteRegex, true);
return getVisitStatusCss(config, node);
}
-
+
private ContentRewriterFeature.Config config(String exclude, boolean splitJs) {
return new ContentRewriterFeature.DefaultConfig(".*", exclude == null ? "" : exclude,
"0", "", false, splitJs);
}
-
+
private List<Node> seqNodes(Node... nodes) {
Node container = doc.createElement("container");
List<Node> seq = Lists.newArrayListWithCapacity(nodes.length);
@@ -636,14 +696,14 @@ public class ConcatVisitorTest extends D
}
return seq;
}
-
+
private SimpleConcatUriManager simpleMgr() {
return new SimpleConcatUriManager(CONCAT_BASE_URI);
}
-
+
private static class SimpleConcatUriManager implements ConcatUriManager {
private final Uri base;
-
+
private SimpleConcatUriManager(Uri base) {
this.base = base;
}
@@ -672,6 +732,6 @@ public class ConcatVisitorTest extends D
// Not used in test code.
throw new UnsupportedOperationException();
}
-
+
}
}