Upgrade to css4j 5.1

Author: carlosame

build.gradle

@@ -25,8 +25,8 @@ java {
 dependencies {
 	api('io.sf.carte:css4j') {
 		version {
-			strictly '[4.2.2,)'
-			prefer '5.0'
+			strictly '[5.1,)'
+			prefer '5.1'
 		}
 	}
 	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: '5.0'
+		version: '5.1'
 	testImplementation 'jaxen:jaxen:1.2.0'
 	testImplementation 'org.slf4j:slf4j-api:2.0.13'
 	testImplementation 'org.junit.jupiter:junit-jupiter:5.11.4'

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

@@ -73,7 +73,7 @@ public void attributeSetValue() {
 	public void childAddedNode() throws Exception {
 		Reader re = DOMCSSStyleSheetFactoryTest.sampleHTMLReader();
 		InputSource isrc = new InputSource(re);
-		CSSDocument xhtmlDoc = XHTMLDocumentFactoryTest.parseXML(isrc);
+		CSSDocument xhtmlDoc = TestUtil.parseXML(isrc);
 		re.close();
 		assertNotNull(xhtmlDoc.getBaseURL());
 		assertEquals("http://www.example.com/", xhtmlDoc.getBaseURL().toExternalForm());
@@ -82,7 +82,7 @@ public void childAddedNode() throws Exception {
 	@Test
 	public void childAddedNodeXPP3() throws Exception {
 		Reader re = DOMCSSStyleSheetFactoryTest.sampleHTMLReader();
-		CSSDocument xhtmlDoc = XHTMLDocumentFactoryTest.parseXPP3(re);
+		CSSDocument xhtmlDoc = TestUtil.parseXPP3(re);
 		assertNotNull(xhtmlDoc.getBaseURL());
 		assertEquals("http://www.example.com/", xhtmlDoc.getBaseURL().toExternalForm());
 		re.close();

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

@@ -42,7 +42,7 @@ public class CSSStylableElementTest {
 	public void setUp() throws Exception {
 		Reader re = DOMCSSStyleSheetFactoryTest.sampleHTMLReader();
 		InputSource isrc = new InputSource(re);
-		xhtmlDoc = XHTMLDocumentFactoryTest.parseXML(isrc);
+		xhtmlDoc = TestUtil.parseXML(isrc);
 		xhtmlDoc.setTargetMedium("screen");
 		re.close();
 	}

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

@@ -58,7 +58,7 @@ public static void setUpBeforeClass() throws IOException {
 
 	@BeforeEach
 	public void setUp() throws Exception {
-		xhtmlDoc = XHTMLDocumentFactoryTest.sampleXHTML();
+		xhtmlDoc = TestUtil.sampleXHTML();
 	}
 
 	@Test

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

@@ -0,0 +1,61 @@
+/*
+
+ Copyright (c) 2005-2025, Carlos Amengual.
+
+ SPDX-License-Identifier: BSD-3-Clause
+
+ Licensed under a BSD-style License. You can find the license here:
+ https://css4j.github.io/LICENSE.txt
+
+ */
+
+package io.sf.carte.doc.dom4j;
+
+import java.io.IOException;
+import java.io.Reader;
+
+import org.dom4j.DocumentException;
+import org.dom4j.io.SAXReader;
+import org.dom4j.io.XPP3Reader;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import io.sf.carte.doc.style.css.om.DOMCSSStyleSheetFactoryTest;
+import io.sf.carte.doc.xml.dtd.DefaultEntityResolver;
+
+public class TestUtil {
+
+	private static TestDocumentFactory factoryUASheet;
+
+	static {
+		factoryUASheet = new TestDocumentFactory();
+		factoryUASheet.getStyleSheetFactory().setDefaultHTMLUserAgentSheet();
+	}
+
+	private TestUtil() {
+	}
+
+	public static XHTMLDocument parseXML(InputSource is) throws DocumentException, SAXException {
+		SAXReader reader = new SAXReader(factoryUASheet);
+		reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", true);
+		reader.setEntityResolver(new DefaultEntityResolver());
+		XHTMLDocument document = (XHTMLDocument) reader.read(is);
+		return document;
+	}
+
+	public static XHTMLDocument parseXPP3(Reader re) throws Exception {
+		TestDocumentFactory factory = new TestDocumentFactory();
+		XPP3Reader reader = new XPP3Reader(factory);
+		XHTMLDocument document = (XHTMLDocument) reader.read(re);
+		return document;
+	}
+
+	public static XHTMLDocument sampleXHTML() throws DocumentException, SAXException, IOException {
+		Reader re = DOMCSSStyleSheetFactoryTest.sampleHTMLReader();
+		InputSource isrc = new InputSource(re);
+		XHTMLDocument xhtmlDoc = parseXML(isrc);
+		re.close();
+		return xhtmlDoc;
+	}
+
+}

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

@@ -23,16 +23,13 @@
 import java.net.URLConnection;
 import java.nio.charset.StandardCharsets;
 
-import org.dom4j.DocumentException;
 import org.dom4j.io.SAXReader;
-import org.dom4j.io.XPP3Reader;
 import org.junit.jupiter.api.BeforeAll;
 import org.junit.jupiter.api.Test;
 import org.w3c.dom.DocumentType;
 import org.w3c.dom.Node;
 import org.w3c.dom.NodeList;
 import org.xml.sax.InputSource;
-import org.xml.sax.SAXException;
 
 import io.sf.carte.doc.style.css.CSSDocument;
 import io.sf.carte.doc.style.css.om.DOMCSSStyleSheetFactoryTest;
@@ -46,7 +43,7 @@ public class XHTMLDocumentFactoryTest {
 	public static void setUpBeforeClass() throws Exception {
 		Reader re = DOMCSSStyleSheetFactoryTest.sampleHTMLReader();
 		InputSource isrc = new InputSource(re);
-		xhtmlDoc = parseXML(isrc);
+		xhtmlDoc = TestUtil.parseXML(isrc);
 		re.close();
 	}
 
@@ -154,29 +151,4 @@ public void testEntities2() throws Exception {
 		assertEquals("ítem", ent0.getNodeValue());
 	}
 
-	public static XHTMLDocument parseXML(InputSource is) throws DocumentException, SAXException {
-		TestDocumentFactory factory = new TestDocumentFactory();
-		factory.getStyleSheetFactory().setDefaultHTMLUserAgentSheet();
-		SAXReader reader = new SAXReader(factory);
-		reader.setFeature("http://apache.org/xml/features/nonvalidating/load-external-dtd", true);
-		reader.setEntityResolver(new DefaultEntityResolver());
-		XHTMLDocument document = (XHTMLDocument) reader.read(is);
-		return document;
-	}
-
-	public static XHTMLDocument parseXPP3(Reader re) throws Exception {
-		TestDocumentFactory factory = new TestDocumentFactory();
-		XPP3Reader reader = new XPP3Reader(factory);
-		XHTMLDocument document = (XHTMLDocument) reader.read(re);
-		return document;
-	}
-
-	public static XHTMLDocument sampleXHTML() throws DocumentException, SAXException, IOException {
-		Reader re = DOMCSSStyleSheetFactoryTest.sampleHTMLReader();
-		InputSource isrc = new InputSource(re);
-		XHTMLDocument xhtmlDoc = parseXML(isrc);
-		re.close();
-		return xhtmlDoc;
-	}
-
 }