You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by mi...@apache.org on 2019/06/06 20:17:11 UTC
[maven-doxia-sitetools] branch htmlunit-2.24 updated (b278706 ->
b567fa1)
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a change to branch htmlunit-2.24
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git.
discard b278706 more fixes
discard 7d88875 Entities
discard 348e026 Entities
discard 88d9b97 Disable CSS
discard 67d53d4 Disable CSS
discard b53d6e8 Upgrade htmlunit to 2.24
new b567fa1 [DOXIASITETOOLS-198] Upgrade htmlunit to 2.24
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (b278706)
\
N -- N -- N refs/heads/htmlunit-2.24 (b567fa1)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../test/java/org/apache/maven/doxia/siterenderer/AbstractVerifier.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
[maven-doxia-sitetools] 01/01: [DOXIASITETOOLS-198] Upgrade
htmlunit to 2.24
Posted by mi...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
michaelo pushed a commit to branch htmlunit-2.24
in repository https://gitbox.apache.org/repos/asf/maven-doxia-sitetools.git
commit b567fa1b54bff8d56c0bc104282f5e2728b5a243
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 12:43:35 2019 +0200
[DOXIASITETOOLS-198] Upgrade htmlunit to 2.24
---
doxia-site-renderer/pom.xml | 2 +-
.../apache/maven/doxia/siterenderer/AbstractVerifier.java | 1 +
.../org/apache/maven/doxia/siterenderer/AptVerifier.java | 4 ++--
.../apache/maven/doxia/siterenderer/EntitiesVerifier.java | 12 ++++++------
.../org/apache/maven/doxia/siterenderer/FaqVerifier.java | 8 ++++----
.../apache/maven/doxia/siterenderer/JavascriptVerifier.java | 1 +
.../org/apache/maven/doxia/siterenderer/MiscVerifier.java | 4 ++--
7 files changed, 17 insertions(+), 15 deletions(-)
diff --git a/doxia-site-renderer/pom.xml b/doxia-site-renderer/pom.xml
index 68a9678..79b55d8 100644
--- a/doxia-site-renderer/pom.xml
+++ b/doxia-site-renderer/pom.xml
@@ -161,7 +161,7 @@ under the License.
<dependency>
<groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>2.7</version>
+ <version>2.24</version>
<scope>test</scope>
</dependency>
<dependency>
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AbstractVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AbstractVerifier.java
index 60ef4bc..7b42cb5 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AbstractVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AbstractVerifier.java
@@ -52,6 +52,7 @@ public abstract class AbstractVerifier
// HtmlUnit
WebClient webClient = new WebClient();
+ webClient.getOptions().setCssEnabled( false );
return (HtmlPage) webClient.getPage( file.toURI().toURL() );
}
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
index ae87060..00d047e 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
@@ -110,7 +110,7 @@ public class AptVerifier
h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
// Note: htmlunit strips the white space, actual result is ok
- assertEquals( "Section formatting: italicboldmono", h2.asText().trim() );
+ assertEquals( "Section formatting: italic bold mono", h2.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "Section_formatting:_italic_bold_mono", a.getAttribute( "name" ) );
@@ -133,7 +133,7 @@ public class AptVerifier
HtmlHeading3 h3 = (HtmlHeading3) elementIterator.next();
assertNotNull( h3 );
// Note: htmlunit strips the white space, actual result is ok
- assertEquals( "SubSection formatting: italicboldmono", h3.asText().trim() );
+ assertEquals( "SubSection formatting: italic bold mono", h3.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "SubSection_formatting:_italic_bold_mono", a.getAttribute( "name" ) );
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
index fb34027..4fda9c0 100644
--- 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
@@ -49,7 +49,7 @@ public class EntitiesVerifier
HtmlMeta author = (HtmlMeta) page.getElementsByName( "author" ).get( 0 );
assertNotNull( author );
- assertTrue( author.toString().indexOf( "Ligature Æ" ) > 0 );
+ assertTrue( author.toString().indexOf( "Ligature \u00C6" ) > 0 );
assertEquals( "Ligature \u00C6", author.getContentAttribute() );
author = (HtmlMeta) page.getElementsByName( "author" ).get( 1 );
@@ -64,7 +64,7 @@ public class EntitiesVerifier
author = (HtmlMeta) page.getElementsByName( "author" ).get( 3 );
assertNotNull( author );
- assertTrue( author.toString().indexOf( "Greater than >" ) > 0 );
+ assertTrue( author.toString().indexOf( "Greater than >" ) > 0 );
assertEquals( "Greater than >", author.getContentAttribute() );
author = (HtmlMeta) page.getElementsByName( "author" ).get( 4 );
@@ -84,7 +84,7 @@ public class EntitiesVerifier
author = (HtmlMeta) page.getElementsByName( "author" ).get( 7 );
assertNotNull( author );
- assertTrue( author.toString().indexOf( "test©email.com" ) > 0 );
+ assertTrue( author.toString().indexOf( "test\u00A9email.com" ) > 0 );
assertEquals( "test\u00A9email.com", author.getContentAttribute() );
HtmlElement element = page.getHtmlElementById( "contentBox" );
@@ -104,7 +104,7 @@ public class EntitiesVerifier
HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
- assertEquals( h2.asText().trim(), "section name with entities: '&' '\u0391' ' ' '\uD7ED'" );
+ assertEquals( h2.asText().trim(), "section name with entities: '&' '\u0391' ' ' '\uD835\uDFED'" );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
@@ -143,13 +143,13 @@ public class EntitiesVerifier
h3 = (HtmlHeading3) elementIterator.next();
assertNotNull( h3 );
- assertEquals( "Local Entities: '\u0391' '\u0392' '\u0393' '\uD7ED'", h3.asText().trim() );
+ assertEquals( "Local Entities: '\u0391' '\u0392' '\u0393' '\uD835\uDFED'", h3.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( "'\u0391' '\u0392' '\u0393' '\uD7ED\uD7ED' '\u0159\u0159' '\u0159'", p.asText().trim() );
+ assertEquals( "'\u0391' '\u0392' '\u0393' '\uD835\uDFED\uD835\uDFED' '\u0159\u0159' '\u0159'", p.asText().trim() );
div = (HtmlDivision) elementIterator.next();
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 7896abc..7e18dca 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
@@ -77,10 +77,10 @@ public class FaqVerifier
assertEquals( "Contributing", element.asText().trim() );
HtmlOrderedList ol = (HtmlOrderedList) elementIterator.next();
- assertEquals( "One stupid question & a silly answer?", ol.getFirstChild().asText().trim() );
+ assertEquals( "One stupid question & a silly answer?", ol.getFirstElementChild().asText().trim() );
HtmlListItem li = (HtmlListItem) elementIterator.next();
- assertEquals( "One stupid question & a silly answer?", li.getFirstChild().asText().trim() );
+ assertEquals( "One stupid question & a silly answer?", li.getFirstElementChild().asText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "#stupid-question", a.getAttribute( "href" ) );
@@ -95,11 +95,11 @@ public class FaqVerifier
assertEquals( "Using Maven", element.asText().trim() );
ol = (HtmlOrderedList) elementIterator.next();
- assertEquals( "How do I disable a report on my site?", ol.getFirstChild().asText().trim() );
+ assertEquals( "How do I disable a report on my site?", ol.getFirstElementChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( "How do I disable a report on my site?", li.getFirstChild().asText().trim() );
+ assertEquals( "How do I disable a report on my site?", li.getFirstElementChild().asText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "#disable-reports", a.getAttribute( "href" ) );
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
index 169c3cb..156db91 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
@@ -60,6 +60,7 @@ public class JavascriptVerifier
// HtmlUnit
WebClient webClient = new WebClient();
+ webClient.getOptions().setCssEnabled( false );
final List<String> collectedAlerts = new ArrayList<String>( 4 );
webClient.setAlertHandler( new CollectingAlertHandler( collectedAlerts ) );
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java
index 2b30d84..e1664d1 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java
@@ -19,11 +19,11 @@ package org.apache.maven.doxia.siterenderer;
* under the License.
*/
-import com.gargoylesoftware.htmlunit.html.HtmlApplet;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParameter;
+import com.gargoylesoftware.htmlunit.html.HtmlUnknownElement;
import java.util.Iterator;
@@ -53,7 +53,7 @@ public class MiscVerifier
//
// ----------------------------------------------------------------------
- HtmlApplet applet = (HtmlApplet) elementIterator.next();
+ HtmlUnknownElement applet = (HtmlUnknownElement) elementIterator.next();
assertEquals( "org.micro.applet.Main", applet.getAttribute( "code" ) );
assertEquals( "micro-applet.jar", applet.getAttribute( "archive" ) );