[DOXIASITETOOLS-335] Upgrade to Doxia 2.0.0-M10

apache · Apr 17, 2024 · 3d2a293 · 3d2a293
1 parent 6d09d65
commit 3d2a293
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/doxia-integration-tools/pom.xml b/doxia-integration-tools/pom.xml
@@ -36,7 +36,7 @@
     <dependency>
       <groupId>org.apache.maven.reporting</groupId>
       <artifactId>maven-reporting-api</artifactId>
-      <version>4.0.0-M10</version>
+      <version>4.0.0-M11</version>
     </dependency>
 
     <dependency>

diff --git a/...a-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java b/...a-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
@@ -22,7 +22,7 @@
 
 import org.htmlunit.html.HtmlAnchor;
 import org.htmlunit.html.HtmlBold;
-import org.htmlunit.html.HtmlDivision;
+import org.htmlunit.html.HtmlCode;
 import org.htmlunit.html.HtmlElement;
 import org.htmlunit.html.HtmlHeading1;
 import org.htmlunit.html.HtmlHeading2;
@@ -177,16 +177,17 @@ public void verify(String file) throws Exception {
         a = (HtmlAnchor) elementIterator.next();
         assertEquals("/index.html", a.getAttribute("href"));
 
-        HtmlDivision div = (HtmlDivision) elementIterator.next();
-        assertEquals("verbatim source", div.getAttribute("class"));
         HtmlPreformattedText pre = (HtmlPreformattedText) elementIterator.next();
+        assertNotNull(pre);
         assertEquals("pretty", pre.getAttribute("class"));
+        HtmlCode code = (HtmlCode) elementIterator.next();
+        assertNotNull(code);
 
-        div = (HtmlDivision) elementIterator.next();
-        assertEquals("verbatim source", div.getAttribute("class"));
-        assertEquals("", div.getAttribute("id"));
         pre = (HtmlPreformattedText) elementIterator.next();
+        assertNotNull(pre);
         assertEquals("pretty", pre.getAttribute("id"));
+        code = (HtmlCode) elementIterator.next();
+        assertNotNull(code);
 
         section = (HtmlSection) elementIterator.next();
         anchor = (HtmlAnchor) elementIterator.next();

diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
@@ -21,6 +21,7 @@
 import java.util.Iterator;
 
 import org.htmlunit.html.HtmlAnchor;
+import org.htmlunit.html.HtmlCode;
 import org.htmlunit.html.HtmlDivision;
 import org.htmlunit.html.HtmlElement;
 import org.htmlunit.html.HtmlHeading1;
@@ -139,12 +140,11 @@ public void verify(String file) throws Exception {
         assertNotNull(h2);
         assertEquals("CDATA", h2.asNormalizedText().trim());
 
-        HtmlDivision div = (HtmlDivision) elementIterator.next();
-        assertNotNull(div);
-
         HtmlPreformattedText pre = (HtmlPreformattedText) elementIterator.next();
         assertNotNull(pre);
-        assertEquals("<project xmlns:ant=\"jelly:ant\">", pre.asNormalizedText().trim());
+        HtmlCode code = (HtmlCode) elementIterator.next();
+        assertNotNull(code);
+        assertEquals("<project xmlns:ant=\"jelly:ant\">", code.asNormalizedText().trim());
 
         p = (HtmlParagraph) elementIterator.next();
         assertNotNull(p);

diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
@@ -21,6 +21,7 @@
 import java.util.Iterator;
 
 import org.htmlunit.html.HtmlAnchor;
+import org.htmlunit.html.HtmlCode;
 import org.htmlunit.html.HtmlDefinitionDescription;
 import org.htmlunit.html.HtmlDefinitionList;
 import org.htmlunit.html.HtmlDefinitionTerm;
@@ -186,11 +187,10 @@ public void verify(String file) throws Exception {
         assertEquals("code", element.getTagName());
         assertEquals("<source></source>", element.asNormalizedText().trim());
 
-        HtmlDivision div = (HtmlDivision) elementIterator.next();
-        assertEquals("verbatim source", div.getAttribute("class"));
-
         HtmlPreformattedText pre = (HtmlPreformattedText) elementIterator.next();
-        assertEquals("<source>1.5</source>", pre.asNormalizedText().trim());
+        assertNotNull(pre);
+        HtmlCode code = (HtmlCode) elementIterator.next();
+        assertEquals("<source>1.5</source>", code.asNormalizedText().trim());
 
         p = (HtmlParagraph) elementIterator.next();
 

diff --git a/pom.xml b/pom.xml
@@ -67,7 +67,7 @@ under the License.
 
   <properties>
     <javaVersion>8</javaVersion>
-    <doxiaVersion>2.0.0-M9</doxiaVersion>
+    <doxiaVersion>2.0.0-M10</doxiaVersion>
     <slf4jVersion>1.7.36</slf4jVersion>
     <mavenVersion>3.2.5</mavenVersion>
     <aetherVersion>1.0.0.v20140518</aetherVersion>