| Index: javatests/org/chromium/distiller/DomUtilTest.java
|
| diff --git a/javatests/org/chromium/distiller/DomUtilTest.java b/javatests/org/chromium/distiller/DomUtilTest.java
|
| index a636a5e181f8e99e66ba9ff21716f351d42758b9..cfe3070259c3337c4d8c38aeb0225d574be96ad5 100644
|
| --- a/javatests/org/chromium/distiller/DomUtilTest.java
|
| +++ b/javatests/org/chromium/distiller/DomUtilTest.java
|
| @@ -10,6 +10,7 @@ import com.google.gwt.core.client.JsArray;
|
| import com.google.gwt.dom.client.Document;
|
| import com.google.gwt.dom.client.Element;
|
| import com.google.gwt.dom.client.Node;
|
| +import com.google.gwt.dom.client.NodeList;
|
|
|
| import java.util.Map;
|
| import java.util.List;
|
| @@ -110,8 +111,9 @@ public class DomUtilTest extends DomDistillerJsTestCase {
|
| currDiv.appendChild(TestUtil.createDiv(5));
|
|
|
| assertEquals(div2, DomUtil.getNearestCommonAncestor(finalDiv1, currDiv.getChild(0)));
|
| - assertEquals(div2, DomUtil.getNearestCommonAncestor(
|
| - DomUtil.querySelectorAll(mRoot, "[id=\"3\"],[id=\"5\"]")));
|
| + NodeList<Element> nodeList = DomUtil.querySelectorAll(mRoot, "[id=\"3\"],[id=\"5\"]");
|
| + assertEquals(div2, DomUtil.getNearestCommonAncestor(TestUtil.nodeListToList(nodeList)));
|
| +
|
| }
|
|
|
| /**
|
| @@ -129,8 +131,8 @@ public class DomUtilTest extends DomDistillerJsTestCase {
|
| div2.appendChild(div3);
|
|
|
| assertEquals(div, DomUtil.getNearestCommonAncestor(div, div3));
|
| - assertEquals(div, DomUtil.getNearestCommonAncestor(
|
| - DomUtil.querySelectorAll(mRoot, "[id=\"1\"],[id=\"3\"]")));
|
| + NodeList<Element> nodeList = DomUtil.querySelectorAll(mRoot, "[id=\"1\"],[id=\"3\"]");
|
| + assertEquals(div, DomUtil.getNearestCommonAncestor(TestUtil.nodeListToList(nodeList)));
|
| }
|
|
|
| public void testNodeDepth() {
|
| @@ -345,4 +347,34 @@ public class DomUtilTest extends DomDistillerJsTestCase {
|
| DomUtil.stripStyleAttributes(mBody);
|
| assertEquals(expected, mBody.getInnerHTML());
|
| }
|
| +
|
| + public void testIsVisibleByItsOffsetParentDisplayNone() {
|
| + String html =
|
| + "<div style=\"display: none;\">" +
|
| + "<div>Some Text</div>" +
|
| + "</div>";
|
| + mBody.setInnerHTML(html);
|
| + Element child = mBody.getFirstChildElement().getFirstChildElement();
|
| + assertFalse(DomUtil.isVisibleByItsOffset(child));
|
| + }
|
| +
|
| + public void testIsVisibleByItsOffsetChildDisplayNone() {
|
| + String html =
|
| + "<div>" +
|
| + "<div style=\"display: none;\">Some Text</div>" +
|
| + "</div>";
|
| + mBody.setInnerHTML(html);
|
| + Element child = mBody.getFirstChildElement().getFirstChildElement();
|
| + assertFalse(DomUtil.isVisibleByItsOffset(child));
|
| + }
|
| +
|
| + public void testIsVisibleByItsOffsetDisplayBlock() {
|
| + String html =
|
| + "<div>" +
|
| + "<div>Some Text</div>" +
|
| + "</div>";
|
| + mBody.setInnerHTML(html);
|
| + Element child = mBody.getFirstChildElement().getFirstChildElement();
|
| + assertTrue(DomUtil.isVisibleByItsOffset(child));
|
| + }
|
| }
|
|
|