Upgrade to css4j 3.9.0

Author: carlosame

build.gradle

@@ -26,7 +26,7 @@ dependencies {
 	api('io.sf.carte:css4j') {
 		version {
 			strictly '[3.7.1,)'
-			prefer '3.8.0'
+			prefer '3.9.0'
 		}
 	}
 	useragentImplementation('io.sf.carte:css4j-agent') {
@@ -48,7 +48,7 @@ dependencies {
 	xmlpullImplementation 'xmlpull:xmlpull:1.2.0'
 	xmlpullImplementation 'xpp3:xpp3_min:1.2.0'
 	testImplementation group: 'io.sf.carte', name: 'css4j', classifier: 'tests',
-		version: '3.8.0'
+		version: '3.9.0'
 	testImplementation 'jaxen:jaxen:1.2.0'
 	testImplementation('org.slf4j:slf4j-api') {
 		version {

junit/io/sf/carte/doc/dom4j/XHTMLDocumentTest.java

@@ -45,17 +45,24 @@
 import io.sf.carte.doc.style.css.nsac.CSSParseException;
 import io.sf.carte.doc.style.css.nsac.InputSource;
 import io.sf.carte.doc.style.css.nsac.LexicalUnit;
+import io.sf.carte.doc.style.css.nsac.SelectorList;
 import io.sf.carte.doc.style.css.om.AbstractCSSRule;
 import io.sf.carte.doc.style.css.om.AbstractCSSStyleDeclaration;
 import io.sf.carte.doc.style.css.om.AbstractCSSStyleSheet;
 import io.sf.carte.doc.style.css.om.BaseCSSDeclarationRule;
+import io.sf.carte.doc.style.css.om.BaseCSSStyleSheet;
 import io.sf.carte.doc.style.css.om.CSSOMParser;
 import io.sf.carte.doc.style.css.om.CSSRuleArrayList;
 import io.sf.carte.doc.style.css.om.ComputedCSSStyle;
 import io.sf.carte.doc.style.css.om.DOMCSSStyleSheetFactoryTest;
 import io.sf.carte.doc.style.css.om.MediaRule;
+import io.sf.carte.doc.style.css.om.PropertyCountVisitor;
+import io.sf.carte.doc.style.css.om.StyleCountVisitor;
+import io.sf.carte.doc.style.css.om.StyleRule;
+import io.sf.carte.doc.style.css.parser.CSSParser;
 import io.sf.carte.doc.style.css.parser.SyntaxParser;
 import io.sf.carte.doc.style.css.property.LexicalValue;
+import io.sf.carte.doc.style.css.property.TypedValue;
 
 public class XHTMLDocumentTest {
 
@@ -893,6 +900,60 @@ public void testCascade() throws IOException {
 		assertEquals("#8a2be2", style.getPropertyValue("color"));
 	}
 
+	@Test
+	public void testCascade2() throws IOException {
+		BaseCSSStyleSheet sheet = (BaseCSSStyleSheet) xhtmlDoc.getStyleSheets().item(5);
+
+		// Obtain the rule where a value is declared
+		CSSParser parser = new CSSParser();
+		SelectorList selist = parser.parseSelectors("p.boldmargin");
+		StyleRule rule = (StyleRule) sheet.getFirstStyleRule(selist);
+		assertNotNull(rule);
+
+		AbstractCSSStyleDeclaration declStyle = rule.getStyle();
+		TypedValue declMarginLeft = (TypedValue) declStyle.getPropertyCSSValue("margin-left");
+		assertEquals("2%", declMarginLeft.getCssText());
+
+		/*
+		 * Get an element that obtains the above value as computed style
+		 */
+		XHTMLElement elm = xhtmlDoc.getElementById("para1");
+		assertNotNull(elm);
+		CSSStyleDeclaration style = elm.getComputedStyle(null);
+		assertEquals("2%", style.getPropertyValue("margin-left"));
+
+		// Change the value itself
+		declMarginLeft.setFloatValue(CSSUnit.CSS_PX, 6f);
+		style = elm.getComputedStyle(null);
+		assertEquals("6px", style.getPropertyValue("margin-left"));
+
+		// Overwrite the property's value
+		declStyle.setProperty("margin-left", "4px", null);
+		style = elm.getComputedStyle(null);
+		// The new value is not there yet
+		assertEquals("6px", style.getPropertyValue("margin-left"));
+
+		// Rebuild the cascade
+		xhtmlDoc.rebuildCascade();
+		style = elm.getComputedStyle(null);
+		assertEquals("4px", style.getPropertyValue("margin-left"));
+	}
+
+	@Test
+	public void testVisitors() throws IOException {
+		StyleCountVisitor visitor = new StyleCountVisitor();
+		xhtmlDoc.getStyleSheets().acceptStyleRuleVisitor(visitor);
+		assertEquals(29, visitor.getCount());
+		//
+		PropertyCountVisitor visitorP = new PropertyCountVisitor();
+		xhtmlDoc.getStyleSheets().acceptDeclarationRuleVisitor(visitorP);
+		assertEquals(111, visitorP.getCount());
+		//
+		visitorP.reset();
+		xhtmlDoc.getStyleSheets().acceptDescriptorRuleVisitor(visitorP);
+		assertEquals(2, visitorP.getCount());
+	}
+
 	@Test
 	public void testStyleElement() {
 		StyleElement style = (StyleElement) xhtmlDoc.getElementsByTagName("style").item(0);

junit/io/sf/carte/doc/dom4j/XMLDocumentBuilderTest.java

@@ -12,6 +12,7 @@
 package io.sf.carte.doc.dom4j;
 
 import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
@@ -153,9 +154,14 @@ private void testPlainXML(Document document) {
 		Element docElement = document.getDocumentElement();
 		assertNotNull(docElement);
 		assertEquals("body", docElement.getNodeName());
+
 		Element element = document.getElementById("divid");
 		assertNotNull(element);
 		assertTrue(element.hasChildNodes());
+		assertEquals("divid", element.getAttribute("id"));
+
+		assertFalse(element.hasAttribute("xmlns"));
+
 		Node parent = element.getParentNode();
 		assertNotNull(parent);
 		assertEquals("body", parent.getNodeName());

src/io/sf/carte/doc/dom4j/XHTMLDocument.java

@@ -610,6 +610,11 @@ public CSSCanvas getCanvas() {
 		return canvas;
 	}
 
+	@Override
+	public void rebuildCascade() {
+		onStyleModify();
+	}
+
 	@Override
 	protected XHTMLDocumentFactory getDocumentFactory() {
 		return (XHTMLDocumentFactory) super.getDocumentFactory();