This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit dfc7b1a74b85f553c05bbf8e317b6ed09b3b408b
Author: Michael Osipov <micha...@apache.org>
AuthorDate: Thu Jan 26 22:56:52 2023 +0100
[DOXIASITETOOLS-280] Upgrade to Doxia 2.0.0-M5
---
.../doxia/siterenderer/AttributesVerifier.java | 4 +--
.../maven/doxia/siterenderer/FaqVerifier.java | 32 +++++++++++-----------
pom.xml | 2 +-
3 files changed, 19 insertions(+), 19 deletions(-)
diff --git
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
index 6cbae01..3378f94 100644
---
a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
+++
b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
@@ -181,12 +181,12 @@ public class AttributesVerifier
assertEquals( "/index.html", a.getAttribute( "href" ) );
HtmlDivision div = (HtmlDivision) elementIterator.next();
- assertEquals( "source", div.getAttribute( "class" ) );
+ assertEquals( "verbatim source", div.getAttribute( "class" ) );
HtmlPreformattedText pre = (HtmlPreformattedText)
elementIterator.next();
assertEquals( "pretty", pre.getAttribute( "class" ) );
div = (HtmlDivision) elementIterator.next();
- assertEquals( "source", div.getAttribute( "class" ) );
+ assertEquals( "verbatim source", div.getAttribute( "class" ) );
assertEquals( "", div.getAttribute( "id" ) );
pre = (HtmlPreformattedText) elementIterator.next();
assertEquals( "pretty", pre.getAttribute( "id" ) );
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
index 7928dcf..256869e 100644
---
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
@@ -67,12 +67,12 @@ public class FaqVerifier
HtmlSection section = (HtmlSection) elementIterator.next();
- HtmlHeading1 h1 = (HtmlHeading1) elementIterator.next();
- assertEquals( "Often Asked Questions", h1.asNormalizedText().trim() );
-
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertEquals( "top", a.getAttribute( "id" ) );
+ HtmlHeading1 h1 = (HtmlHeading1) elementIterator.next();
+ assertEquals( "Often Asked Questions", h1.asNormalizedText().trim() );
+
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
element = elementIterator.next();
assertEquals( "b", element.getTagName() );
@@ -108,20 +108,20 @@ public class FaqVerifier
section = (HtmlSection) elementIterator.next();
- h1 = (HtmlHeading1) elementIterator.next();
-
a = (HtmlAnchor) elementIterator.next();
assertEquals( "contributing", a.getAttribute( "id" ) );
- assertEquals( "Contributing", a.asNormalizedText().trim() );
- HtmlDefinitionList dl = (HtmlDefinitionList) elementIterator.next();
+ h1 = (HtmlHeading1) elementIterator.next();
+ assertEquals( "Contributing", h1.asNormalizedText().trim() );
- HtmlDefinitionTerm dt = (HtmlDefinitionTerm) elementIterator.next();
- assertEquals( "One stupid question & a silly answer?",
dt.getFirstChild().asNormalizedText().trim() );
+ HtmlDefinitionList dl = (HtmlDefinitionList) elementIterator.next();
a = (HtmlAnchor) elementIterator.next();
assertEquals( "stupid-question", a.getAttribute( "id" ) );
+ HtmlDefinitionTerm dt = (HtmlDefinitionTerm) elementIterator.next();
+ assertEquals( "One stupid question & a silly answer?",
dt.asNormalizedText().trim() );
+
element = elementIterator.next();
assertEquals( "b", element.getTagName() );
assertEquals( "stupid", element.asNormalizedText().trim() );
@@ -158,20 +158,20 @@ public class FaqVerifier
section = (HtmlSection) elementIterator.next();
- h1 = (HtmlHeading1) elementIterator.next();
-
a = (HtmlAnchor) elementIterator.next();
assertEquals( "using", a.getAttribute( "id" ) );
- assertEquals( "Using Maven", a.asNormalizedText().trim() );
- dl = (HtmlDefinitionList) elementIterator.next();
+ h1 = (HtmlHeading1) elementIterator.next();
+ assertEquals( "Using Maven", h1.asNormalizedText().trim() );
- dt = (HtmlDefinitionTerm) elementIterator.next();
- assertEquals( "How do I disable a report on my site?",
dt.getFirstChild().asNormalizedText().trim() );
+ dl = (HtmlDefinitionList) elementIterator.next();
a = (HtmlAnchor) elementIterator.next();
assertEquals( "disable-reports", a.getAttribute( "id" ) );
+ dt = (HtmlDefinitionTerm) elementIterator.next();
+ assertEquals( "How do I disable a report on my site?",
dt.getFirstChild().asNormalizedText().trim() );
+
dd = (HtmlDefinitionDescription) elementIterator.next();
p = (HtmlParagraph) elementIterator.next();
@@ -181,7 +181,7 @@ public class FaqVerifier
assertEquals( "<source></source>", element.asNormalizedText().trim() );
HtmlDivision div = (HtmlDivision) elementIterator.next();
- assertEquals( "source", div.getAttribute( "class" ) );
+ assertEquals( "verbatim source", div.getAttribute( "class" ) );
HtmlPreformattedText pre = (HtmlPreformattedText)
elementIterator.next();
assertEquals( "<source>1.5</source>", pre.asNormalizedText().trim() );
diff --git a/pom.xml b/pom.xml
index 1b724db..f13e356 100644
--- a/pom.xml
+++ b/pom.xml
@@ -67,7 +67,7 @@ under the License.
<properties>
<javaVersion>8</javaVersion>
- <doxiaVersion>2.0.0-M4</doxiaVersion>
+ <doxiaVersion>2.0.0-M5</doxiaVersion>
<slf4jVersion>1.7.36</slf4jVersion>
<mavenVersion>3.2.5</mavenVersion>
<aetherVersion>1.0.0.v20140518</aetherVersion>
