Process ordered list items as a single WebText

javatests/org/chromium/distiller/webdocument/ElementActionTest.java

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.distiller.webdocument;
 
 import org.chromium.distiller.DomDistillerJsTestCase;
 import org.chromium.distiller.DomUtil;
 import org.chromium.distiller.labels.DefaultLabels;
 
 import com.google.gwt.dom.client.Document;
 import com.google.gwt.dom.client.Element;
 
 public class ElementActionTest extends DomDistillerJsTestCase {
-    private ElementAction getForHtml(String html) {
+    private Element createElementWithInnerHtml(String html) {
         Element container = Document.get().createDivElement();
         mBody.appendChild(container);
         container.setInnerHTML(html);
+        return container;
+    }
+
+    private ElementAction getForHtml(String html) {
+        Element container = createElementWithInnerHtml(html);
         assertEquals(1, container.getChildCount());
         Element e = container.getFirstChildElement();
         return ElementAction.getForElement(e);
     }
 
+    private ElementAction getForHtmlFirstChild(String html) {
+        Element container = createElementWithInnerHtml(html);
+        assertEquals(1, container.getChildCount());
+        Element e = container.getFirstChildElement();
+
+        assertEquals(1, e.getChildCount());
+        Element firstChild = e.getFirstChildElement();
+
+        return ElementAction.getForElement(firstChild);
+    }
+
     public void testFlush() {
         assertFalse(getForHtml("<span></span>").flush);
         assertTrue(getForHtml("<div></div>").flush);
 
         assertTrue(getForHtml("<span style=\"display: block\"></span>").flush);
         assertTrue(getForHtml("<span style=\"display: flex\"></span>").flush);
 
         assertFalse(getForHtml("<div style=\"display: inline\"></div>").flush);
+
+        assertTrue(getForHtml("<li></li>").flush);
+        assertTrue(getForHtmlFirstChild("<ul><li></li></ul>").flush);
+        assertFalse(getForHtmlFirstChild("<ol><li></li></ol>").flush);
     }
 
     public void testIsAnchor() {
         assertFalse(getForHtml("<span></span>").isAnchor);
         assertFalse(getForHtml("<div></div>").isAnchor);
         assertFalse(getForHtml("<a></a>").isAnchor);
         assertTrue(getForHtml("<a href=\"http://example.com\"></a>").isAnchor);
     }
 
     public void testChangesTagLevel() {
         assertFalse(getForHtml("<span></span>").changesTagLevel);
         assertFalse(getForHtml("<font></font>").changesTagLevel);
         assertFalse(getForHtml("<div style=\"display: inline\"></div>").changesTagLevel);
 
         assertTrue(getForHtml("<a></a>").changesTagLevel);
         assertTrue(getForHtml("<div></div>").changesTagLevel);
         assertTrue(getForHtml("<span style=\"display: inline-block\"></span>").changesTagLevel);
         assertTrue(getForHtml("<span style=\"display: block\"></span>").changesTagLevel);
         assertTrue(getForHtml("<div style=\"display: inline-block\"></div>").changesTagLevel);
         assertTrue(getForHtml("<table></table>").changesTagLevel);
+
+        assertTrue(getForHtml("<li></li>").changesTagLevel);
+        assertTrue(getForHtmlFirstChild("<ul><li></li></ul>").changesTagLevel);
+        assertFalse(getForHtmlFirstChild("<ol><li></li></ol>").changesTagLevel);
     }
 
     private boolean hasLabel(ElementAction a, String label) {
         for (int i = 0; i < a.labels.length(); i++) {
             if (a.labels.get(i).equals(label)) {
                   return true;
             }
         }
         return false;
     }
@@ skipping 54 matching lines @@
 
         assertFalse(hasLabel(getForHtml(
                 "<div class=\"user-comments another-class lots-of-classes too-many-classes" +
                              "class1 class2 class3 class4 class5 class6 class7 class8\"></div>"),
                 DefaultLabels.STRICTLY_NOT_CONTENT));
         assertTrue(hasLabel(getForHtml(
                 "<div class=\"     user-comments                         a       b   \"></div>"),
                 DefaultLabels.STRICTLY_NOT_CONTENT));
     }
 }