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:09:38 UTC
[maven-doxia-sitetools] branch htmlunit-2.24 updated: more fixes
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
The following commit(s) were added to refs/heads/htmlunit-2.24 by this push:
new b278706 more fixes
b278706 is described below
commit b2787065b41eed2c62cc51176a61b7c14ca63c7d
Author: Michael Osipov <mi...@apache.org>
AuthorDate: Thu Jun 6 22:09:30 2019 +0200
more fixes
---
.../java/org/apache/maven/doxia/siterenderer/AptVerifier.java | 4 ++--
.../java/org/apache/maven/doxia/siterenderer/FaqVerifier.java | 8 ++++----
.../org/apache/maven/doxia/siterenderer/JavascriptVerifier.java | 1 +
.../java/org/apache/maven/doxia/siterenderer/MiscVerifier.java | 4 ++--
4 files changed, 9 insertions(+), 8 deletions(-)
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/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" ) );