You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2011/10/14 12:54:04 UTC
svn commit: r1183293 - in
/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer: ./
src/test/java/org/apache/maven/doxia/siterenderer/
Author: ltheussl
Date: Fri Oct 14 10:54:04 2011
New Revision: 1183293
URL: http://svn.apache.org/viewvc?rev=1183293&view=rev
Log:
upgrade htmlunit
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml?rev=1183293&r1=1183292&r2=1183293&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml Fri Oct 14 10:54:04 2011
@@ -150,9 +150,9 @@ under the License.
<scope>test</scope>
</dependency>
<dependency>
- <groupId>htmlunit</groupId>
+ <groupId>net.sourceforge.htmlunit</groupId>
<artifactId>htmlunit</artifactId>
- <version>1.13</version>
+ <version>2.7</version>
<scope>test</scope>
</dependency>
</dependencies>
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java?rev=1183293&r1=1183292&r2=1183293&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AptVerifier.java Fri Oct 14 10:54:04 2011
@@ -20,13 +20,15 @@ package org.apache.maven.doxia.siterende
*/
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
+import com.gargoylesoftware.htmlunit.html.HtmlBold;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlHeader2;
-import com.gargoylesoftware.htmlunit.html.HtmlHeader3;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading3;
+import com.gargoylesoftware.htmlunit.html.HtmlItalic;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
-import com.gargoylesoftware.htmlunit.html.UnknownHtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlTeletype;
import java.util.Iterator;
@@ -52,126 +54,128 @@ public class AptVerifier
HtmlDivision division = (HtmlDivision) element;
assertNotNull( division );
- Iterator elementIterator = division.getAllHtmlChildElements();
+ Iterator<HtmlElement> elementIterator = division.getAllHtmlChildElements().iterator();
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
HtmlDivision div = (HtmlDivision) elementIterator.next();
- assertEquals( "section", div.getAttributeValue( "class" ) );
+ assertEquals( "section", div.getAttribute( "class" ) );
- HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next();
+ HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
assertEquals( "Links", h2.asText().trim() );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
- assertEquals( "Links", a.getAttributeValue( "name" ) );
+ assertEquals( "Links", a.getAttribute( "name" ) );
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
// Expected log: [APT Parser] Ambiguous link: 'cdc.html'. If this is a local link, prepend "./"!
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "Anchor", a.getAttributeValue( "name" ) );
+ assertEquals( "Anchor", a.getAttribute( "name" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "cdc.html", a.getAttributeValue( "name" ) );
+ assertEquals( "cdc.html", a.getAttribute( "name" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "#Anchor", a.getAttributeValue( "href" ) );
+ assertEquals( "#Anchor", a.getAttribute( "href" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "#Anchor", a.getAttributeValue( "href" ) );
+ assertEquals( "#Anchor", a.getAttribute( "href" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "Anchor_with_space", a.getAttributeValue( "name" ) );
+ assertEquals( "Anchor_with_space", a.getAttribute( "name" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "#Anchor_with_space", a.getAttributeValue( "href" ) );
+ assertEquals( "#Anchor_with_space", a.getAttribute( "href" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "http://maven.apache.org/", a.getAttributeValue( "href" ) );
- assertEquals( "externalLink", a.getAttributeValue( "class" ) );
+ assertEquals( "http://maven.apache.org/", a.getAttribute( "href" ) );
+ assertEquals( "externalLink", a.getAttribute( "class" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "http://maven.apache.org/", a.getAttributeValue( "href" ) );
- assertEquals( "externalLink", a.getAttributeValue( "class" ) );
+ assertEquals( "http://maven.apache.org/", a.getAttribute( "href" ) );
+ assertEquals( "externalLink", a.getAttribute( "class" ) );
// Expected log: [APT Parser] Ambiguous link: 'cdc.html'. If this is a local link, prepend "./"!
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "./cdc.html", a.getAttributeValue( "href" ) );
+ assertEquals( "./cdc.html", a.getAttribute( "href" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "#cdc.html", a.getAttributeValue( "href" ) );
+ assertEquals( "#cdc.html", a.getAttribute( "href" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "/index.html", a.getAttributeValue( "href" ) );
+ assertEquals( "/index.html", a.getAttribute( "href" ) );
div = (HtmlDivision) elementIterator.next();
- assertEquals( "section", div.getAttributeValue( "class" ) );
+ assertEquals( "section", div.getAttribute( "class" ) );
- h2 = (HtmlHeader2) elementIterator.next();
+ h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
- assertEquals( "Section formatting: italic bold mono", h2.asText().trim() );
+ // Note: htmlunit strips the white space, actual result is ok
+ assertEquals( "Section formatting: italicboldmono", h2.asText().trim() );
- UnknownHtmlElement unknown = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "i", unknown.getTagName() );
- assertEquals( "italic", unknown.asText().trim() );
+ HtmlItalic italic = (HtmlItalic) elementIterator.next();
+ assertEquals( "i", italic.getTagName() );
+ assertEquals( "italic", italic.asText().trim() );
- unknown = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "b", unknown.getTagName() );
- assertEquals( "bold", unknown.asText().trim() );
+ HtmlBold bold = (HtmlBold) elementIterator.next();
+ assertEquals( "b", bold.getTagName() );
+ assertEquals( "bold", bold.asText().trim() );
- unknown = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "tt", unknown.getTagName() );
- assertEquals( "mono", unknown.asText().trim() );
+ HtmlTeletype tt = (HtmlTeletype) elementIterator.next();
+ assertEquals( "tt", tt.getTagName() );
+ assertEquals( "mono", tt.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "Section_formatting:_italic_bold_mono", a.getAttributeValue( "name" ) );
+ assertEquals( "Section_formatting:_italic_bold_mono", a.getAttribute( "name" ) );
div = (HtmlDivision) elementIterator.next();
- assertEquals( "section", div.getAttributeValue( "class" ) );
+ assertEquals( "section", div.getAttribute( "class" ) );
- HtmlHeader3 h3 = (HtmlHeader3) elementIterator.next();
+ HtmlHeading3 h3 = (HtmlHeading3) elementIterator.next();
assertNotNull( h3 );
- assertEquals( "SubSection formatting: italic bold mono", h3.asText().trim() );
+ // Note: htmlunit strips the white space, actual result is ok
+ assertEquals( "SubSection formatting: italicboldmono", h3.asText().trim() );
- unknown = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "i", unknown.getTagName() );
- assertEquals( "italic", unknown.asText().trim() );
+ italic = (HtmlItalic) elementIterator.next();
+ assertEquals( "i", italic.getTagName() );
+ assertEquals( "italic", italic.asText().trim() );
- unknown = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "b", unknown.getTagName() );
- assertEquals( "bold", unknown.asText().trim() );
+ bold = (HtmlBold) elementIterator.next();
+ assertEquals( "b", bold.getTagName() );
+ assertEquals( "bold", bold.asText().trim() );
- unknown = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "tt", unknown.getTagName() );
- assertEquals( "mono", unknown.asText().trim() );
+ tt = (HtmlTeletype) elementIterator.next();
+ assertEquals( "tt", tt.getTagName() );
+ assertEquals( "mono", tt.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "SubSection_formatting:_italic_bold_mono", a.getAttributeValue( "name" ) );
+ assertEquals( "SubSection_formatting:_italic_bold_mono", a.getAttribute( "name" ) );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- unknown = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "i", unknown.getTagName() );
- assertEquals( "italic", unknown.asText().trim() );
-
- unknown = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "b", unknown.getTagName() );
- assertEquals( "bold", unknown.asText().trim() );
-
- unknown = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "tt", unknown.getTagName() );
- assertEquals( "mono", unknown.asText().trim() );
+ italic = (HtmlItalic) elementIterator.next();
+ assertEquals( "i", italic.getTagName() );
+ assertEquals( "italic", italic.asText().trim() );
+
+ bold = (HtmlBold) elementIterator.next();
+ assertEquals( "b", bold.getTagName() );
+ assertEquals( "bold", bold.asText().trim() );
+
+ tt = (HtmlTeletype) elementIterator.next();
+ assertEquals( "tt", tt.getTagName() );
+ assertEquals( "mono", tt.asText().trim() );
div = (HtmlDivision) elementIterator.next();
- assertEquals( "section", div.getAttributeValue( "class" ) );
+ assertEquals( "section", div.getAttribute( "class" ) );
- h2 = (HtmlHeader2) elementIterator.next();
+ h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
assertEquals( "No Default Anchor in Section Title with Explicit Anchor", h2.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "No_Default_Anchor_in_Section_Title_with_Explicit_Anchor", a.getAttributeValue( "name" ) );
+ assertEquals( "No_Default_Anchor_in_Section_Title_with_Explicit_Anchor", a.getAttribute( "name" ) );
div = (HtmlDivision) elementIterator.next();
- assertEquals( "section", div.getAttributeValue( "class" ) );
+ assertEquals( "section", div.getAttribute( "class" ) );
}
}
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java?rev=1183293&r1=1183292&r2=1183293&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/AttributesVerifier.java Fri Oct 14 10:54:04 2011
@@ -20,19 +20,24 @@ package org.apache.maven.doxia.siterende
*/
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
+import com.gargoylesoftware.htmlunit.html.HtmlBold;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlHeader2;
-import com.gargoylesoftware.htmlunit.html.HtmlHeader3;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading3;
import com.gargoylesoftware.htmlunit.html.HtmlImage;
+import com.gargoylesoftware.htmlunit.html.HtmlItalic;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
import com.gargoylesoftware.htmlunit.html.HtmlPreformattedText;
+import com.gargoylesoftware.htmlunit.html.HtmlS;
+import com.gargoylesoftware.htmlunit.html.HtmlSubscript;
+import com.gargoylesoftware.htmlunit.html.HtmlSuperscript;
import com.gargoylesoftware.htmlunit.html.HtmlTable;
import com.gargoylesoftware.htmlunit.html.HtmlTableDataCell;
import com.gargoylesoftware.htmlunit.html.HtmlTableHeaderCell;
import com.gargoylesoftware.htmlunit.html.HtmlTableRow;
-import com.gargoylesoftware.htmlunit.html.UnknownHtmlElement;
+import com.gargoylesoftware.htmlunit.html.HtmlUnderlined;
import java.util.Iterator;
@@ -58,49 +63,49 @@ public class AttributesVerifier
HtmlDivision division = (HtmlDivision) element;
assertNotNull( division );
- Iterator elementIterator = division.getAllHtmlChildElements();
+ Iterator<HtmlElement> elementIterator = division.getAllHtmlChildElements().iterator();
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
HtmlDivision div = (HtmlDivision) elementIterator.next();
- assertEquals( "section", div.getAttributeValue( "class" ) );
+ assertEquals( "section", div.getAttribute( "class" ) );
- HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next();
+ HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
assertEquals( "section", h2.asText().trim() );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( "section", a.getAttributeValue( "name" ) );
+ assertEquals( "section", a.getAttribute( "name" ) );
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( "ID", p.getAttributeValue( "id" ) );
- assertEquals( "CLASS", p.getAttributeValue( "class" ) );
- assertEquals( "TITLE", p.getAttributeValue( "title" ) );
- assertEquals( "STYLE", p.getAttributeValue( "style" ) );
- assertEquals( "LANG", p.getAttributeValue( "lang" ) );
+ assertEquals( "ID", p.getAttribute( "id" ) );
+ assertEquals( "CLASS", p.getAttribute( "class" ) );
+ assertEquals( "TITLE", p.getAttribute( "title" ) );
+ assertEquals( "STYLE", p.getAttribute( "style" ) );
+ assertEquals( "LANG", p.getAttribute( "lang" ) );
HtmlImage img = (HtmlImage) elementIterator.next();
assertNotNull( img );
- assertEquals( "project.png", img.getAttributeValue( "src" ) );
- assertEquals( "150", img.getAttributeValue( "width" ) );
- assertEquals( "93", img.getAttributeValue( "height" ) );
- assertEquals( "border: 1px solid silver", img.getAttributeValue( "style" ) );
- assertEquals( "Project", img.getAttributeValue( "alt" ) );
+ assertEquals( "project.png", img.getAttribute( "src" ) );
+ assertEquals( "150", img.getAttribute( "width" ) );
+ assertEquals( "93", img.getAttribute( "height" ) );
+ assertEquals( "border: 1px solid silver", img.getAttribute( "style" ) );
+ assertEquals( "Project", img.getAttribute( "alt" ) );
// test object identity to distinguish the case ATTRIBUTE_VALUE_EMPTY
- assertTrue( img.getAttributeValue( "dummy" ) == HtmlElement.ATTRIBUTE_NOT_DEFINED );
+ assertTrue( img.getAttribute( "dummy" ) == HtmlElement.ATTRIBUTE_NOT_DEFINED );
HtmlTable table = (HtmlTable) elementIterator.next();
- assertEquals( "1", table.getAttributeValue( "border" ) );
- assertEquals( "none", table.getAttributeValue( "class" ) );
+ assertEquals( "1", table.getAttribute( "border" ) );
+ assertEquals( "none", table.getAttribute( "class" ) );
- element = (HtmlElement) elementIterator.next();
+ element = elementIterator.next();
// this is a htmlunit bug
assertEquals( "tbody", element.getTagName() );
@@ -108,15 +113,15 @@ public class AttributesVerifier
HtmlTableHeaderCell th = (HtmlTableHeaderCell) elementIterator.next();
th = (HtmlTableHeaderCell) elementIterator.next();
- assertEquals( "center", th.getAttributeValue( "align" ) );
- assertEquals( "2", th.getAttributeValue( "colspan" ) );
- assertEquals( "50%", th.getAttributeValue( "width" ) );
+ assertEquals( "center", th.getAttribute( "align" ) );
+ assertEquals( "2", th.getAttribute( "colspan" ) );
+ assertEquals( "50%", th.getAttribute( "width" ) );
tr = (HtmlTableRow) elementIterator.next();
th = (HtmlTableHeaderCell) elementIterator.next();
- assertEquals( "2", th.getAttributeValue( "rowspan" ) );
- assertEquals( "middle", th.getAttributeValue( "valign" ) );
+ assertEquals( "2", th.getAttribute( "rowspan" ) );
+ assertEquals( "middle", th.getAttribute( "valign" ) );
HtmlTableDataCell td = (HtmlTableDataCell) elementIterator.next();
td = (HtmlTableDataCell) elementIterator.next();
@@ -127,92 +132,92 @@ public class AttributesVerifier
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- UnknownHtmlElement unk = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "u", unk.getTagName() );
- unk = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "s", unk.getTagName() );
- unk = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "sub", unk.getTagName() );
- unk = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "sup", unk.getTagName() );
+ HtmlUnderlined u = (HtmlUnderlined) elementIterator.next();
+ assertEquals( "u", u.getTagName() );
+ HtmlS s = (HtmlS) elementIterator.next();
+ assertEquals( "s", s.getTagName() );
+ HtmlSubscript sub = (HtmlSubscript) elementIterator.next();
+ assertEquals( "sub", sub.getTagName() );
+ HtmlSuperscript sup = (HtmlSuperscript) elementIterator.next();
+ assertEquals( "sup", sup.getTagName() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- unk = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "b", unk.getTagName() );
- unk = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "i", unk.getTagName() );
- unk = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "i", unk.getTagName() );
- unk = (UnknownHtmlElement) elementIterator.next();
- assertEquals( "b", unk.getTagName() );
+ HtmlBold b = (HtmlBold) elementIterator.next();
+ assertEquals( "b", b.getTagName() );
+ HtmlItalic i = (HtmlItalic) elementIterator.next();
+ assertEquals( "i", i.getTagName() );
+ i = (HtmlItalic) elementIterator.next();
+ assertEquals( "i", i.getTagName() );
+ b = (HtmlBold) elementIterator.next();
+ assertEquals( "b", b.getTagName() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( "color: red; margin-left: 20px", p.getAttributeValue( "style" ) );
+ assertEquals( "color: red; margin-left: 20px", p.getAttribute( "style" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "Anchor", a.getAttributeValue( "name" ) );
+ assertEquals( "Anchor", a.getAttribute( "name" ) );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "#Anchor", a.getAttributeValue( "href" ) );
+ assertEquals( "#Anchor", a.getAttribute( "href" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "#Anchor", a.getAttributeValue( "href" ) );
+ assertEquals( "#Anchor", a.getAttribute( "href" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "http://maven.apache.org/", a.getAttributeValue( "href" ) );
- assertEquals( "externalLink", a.getAttributeValue( "class" ) );
+ assertEquals( "http://maven.apache.org/", a.getAttribute( "href" ) );
+ assertEquals( "externalLink", a.getAttribute( "class" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "./cdc.html", a.getAttributeValue( "href" ) );
+ assertEquals( "./cdc.html", a.getAttribute( "href" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "cdc.html", a.getAttributeValue( "href" ) );
+ assertEquals( "cdc.html", a.getAttribute( "href" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "cdc.pdf", a.getAttributeValue( "href" ) );
+ assertEquals( "cdc.pdf", a.getAttribute( "href" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "./cdc.txt", a.getAttributeValue( "href" ) );
+ assertEquals( "./cdc.txt", a.getAttribute( "href" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "/index.html", a.getAttributeValue( "href" ) );
+ assertEquals( "/index.html", a.getAttribute( "href" ) );
div = (HtmlDivision) elementIterator.next();
- assertEquals( "source", div.getAttributeValue( "class" ) );
+ assertEquals( "source", div.getAttribute( "class" ) );
HtmlPreformattedText pre = (HtmlPreformattedText) elementIterator.next();
- assertEquals( "pretty", pre.getAttributeValue( "class" ) );
+ assertEquals( "pretty", pre.getAttribute( "class" ) );
div = (HtmlDivision) elementIterator.next();
- assertEquals( "source", div.getAttributeValue( "class" ) );
- assertEquals( "", div.getAttributeValue( "id" ) );
+ assertEquals( "source", div.getAttribute( "class" ) );
+ assertEquals( "", div.getAttribute( "id" ) );
pre = (HtmlPreformattedText) elementIterator.next();
- assertEquals( "pretty", pre.getAttributeValue( "id" ) );
+ assertEquals( "pretty", pre.getAttribute( "id" ) );
div = (HtmlDivision) elementIterator.next();
- assertEquals( "section", div.getAttributeValue( "class" ) );
- h2 = (HtmlHeader2) elementIterator.next();
+ assertEquals( "section", div.getAttribute( "class" ) );
+ h2 = (HtmlHeading2) elementIterator.next();
assertEquals( "Section without id", h2.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "Section_without_id", a.getAttributeValue( "name" ) );
+ assertEquals( "Section_without_id", a.getAttribute( "name" ) );
div = (HtmlDivision) elementIterator.next();
- assertEquals( "section", div.getAttributeValue( "class" ) );
- HtmlHeader3 h3 = (HtmlHeader3) elementIterator.next();
+ assertEquals( "section", div.getAttribute( "class" ) );
+ HtmlHeading3 h3 = (HtmlHeading3) elementIterator.next();
assertEquals( "Subsection without id", h3.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "Subsection_without_id", a.getAttributeValue( "name" ) );
+ assertEquals( "Subsection_without_id", a.getAttribute( "name" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "section-id", a.getAttributeValue( "name" ) );
+ assertEquals( "section-id", a.getAttribute( "name" ) );
div = (HtmlDivision) elementIterator.next();
- assertEquals( "section", div.getAttributeValue( "class" ) );
- h2 = (HtmlHeader2) elementIterator.next();
+ assertEquals( "section", div.getAttribute( "class" ) );
+ h2 = (HtmlHeading2) elementIterator.next();
assertEquals( "Section with id", h2.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( "subsection-id", a.getAttributeValue( "name" ) );
+ assertEquals( "subsection-id", a.getAttribute( "name" ) );
div = (HtmlDivision) elementIterator.next();
- assertEquals( "section", div.getAttributeValue( "class" ) );
- h3 = (HtmlHeader3) elementIterator.next();
+ assertEquals( "section", div.getAttribute( "class" ) );
+ h3 = (HtmlHeading3) elementIterator.next();
assertEquals( "Subsection with id", h3.asText().trim() );
assertFalse( elementIterator.hasNext() );
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java?rev=1183293&r1=1183292&r2=1183293&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/EntitiesVerifier.java Fri Oct 14 10:54:04 2011
@@ -22,9 +22,9 @@ package org.apache.maven.doxia.siterende
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlHeader2;
-import com.gargoylesoftware.htmlunit.html.HtmlHeader3;
-import com.gargoylesoftware.htmlunit.html.HtmlHeader4;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading3;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading4;
import com.gargoylesoftware.htmlunit.html.HtmlMeta;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
@@ -48,42 +48,42 @@ public class EntitiesVerifier
HtmlPage page = htmlPage( file );
assertNotNull( page );
- HtmlMeta author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 0 );
+ HtmlMeta author = (HtmlMeta) page.getElementsByName( "author" ).get( 0 );
assertNotNull( author );
assertTrue( author.toString().indexOf( "Ligature Æ" ) > 0 );
assertEquals( "Ligature \u00C6", author.getContentAttribute() );
- author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 1 );
+ author = (HtmlMeta) page.getElementsByName( "author" ).get( 1 );
assertNotNull( author );
assertTrue( author.toString().indexOf( "Ampersand &" ) > 0 );
assertEquals( "Ampersand &", author.getContentAttribute() );
- author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 2 );
+ author = (HtmlMeta) page.getElementsByName( "author" ).get( 2 );
assertNotNull( author );
assertTrue( author.toString().indexOf( "Less than <" ) > 0 );
assertEquals( "Less than <", author.getContentAttribute() );
- author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 3 );
+ author = (HtmlMeta) page.getElementsByName( "author" ).get( 3 );
assertNotNull( author );
assertTrue( author.toString().indexOf( "Greater than >" ) > 0 );
assertEquals( "Greater than >", author.getContentAttribute() );
- author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 4 );
+ author = (HtmlMeta) page.getElementsByName( "author" ).get( 4 );
assertNotNull( author );
assertTrue( author.getContentAttribute().equals( "Apostrophe '" ) );
assertEquals( "Apostrophe '", author.getContentAttribute() );
- author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 5 );
+ author = (HtmlMeta) page.getElementsByName( "author" ).get( 5 );
assertNotNull( author );
assertTrue( author.toString().indexOf( "Quote "" ) > 0 );
assertEquals( "Quote \"", author.getContentAttribute() );
- author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 6 );
+ author = (HtmlMeta) page.getElementsByName( "author" ).get( 6 );
assertNotNull( author );
assertTrue( author.toString().indexOf( "test@email.com" ) > 0 );
assertEquals( "test@email.com", author.getContentAttribute() );
- author = (HtmlMeta) page.getHtmlElementsByName( "author" ).get( 7 );
+ author = (HtmlMeta) page.getElementsByName( "author" ).get( 7 );
assertNotNull( author );
assertTrue( author.toString().indexOf( "test©email.com" ) > 0 );
assertEquals( "test©email.com", author.getContentAttribute() );
@@ -93,7 +93,7 @@ public class EntitiesVerifier
HtmlDivision division = (HtmlDivision) element;
assertNotNull( division );
- Iterator elementIterator = division.getAllHtmlChildElements();
+ Iterator<HtmlElement> elementIterator = division.getAllHtmlChildElements().iterator();
// ----------------------------------------------------------------------
//
@@ -101,35 +101,35 @@ public class EntitiesVerifier
HtmlDivision div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
- HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next();
+ HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
assertEquals( h2.asText().trim(), "section name with entities: '&' '\u0391' ' ' '\uD7ED'" );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttributeValue( "name" ), "section_name_with_entities:____" );
+ assertEquals( a.getAttribute( "name" ), "section_name_with_entities:____" );
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
- HtmlHeader4 h4 = (HtmlHeader4) elementIterator.next();
+ HtmlHeading4 h4 = (HtmlHeading4) elementIterator.next();
assertNotNull( h4 );
assertEquals( h4.asText().trim(), "Entities" );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttributeValue( "name" ), "Entities" );
+ assertEquals( a.getAttribute( "name" ), "Entities" );
div = (HtmlDivision) elementIterator.next();
- HtmlHeader3 h3 = (HtmlHeader3) elementIterator.next();
+ HtmlHeading3 h3 = (HtmlHeading3) elementIterator.next();
assertNotNull( h3 );
assertEquals( h3.asText().trim(), "Generic Entities: '&' '<' '>' '\"' '''" );
@@ -141,7 +141,7 @@ public class EntitiesVerifier
div = (HtmlDivision) elementIterator.next();
- h3 = (HtmlHeader3) elementIterator.next();
+ h3 = (HtmlHeading3) elementIterator.next();
assertNotNull( h3 );
assertEquals( h3.asText().trim(), "Local Entities: '\u0391' '\u0392' '\u0393' '\uD7ED'" );
@@ -153,7 +153,7 @@ public class EntitiesVerifier
div = (HtmlDivision) elementIterator.next();
- h3 = (HtmlHeader3) elementIterator.next();
+ h3 = (HtmlHeading3) elementIterator.next();
assertNotNull( h3 );
assertEquals( h3.asText().trim(), "DTD Entities: ' ' '\u00A1' '\u00A2'" );
@@ -165,19 +165,19 @@ public class EntitiesVerifier
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
- h4 = (HtmlHeader4) elementIterator.next();
+ h4 = (HtmlHeading4) elementIterator.next();
assertNotNull( h4 );
assertEquals( h4.asText().trim(), "CDATA" );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttributeValue( "name" ), "CDATA" );
+ assertEquals( a.getAttribute( "name" ), "CDATA" );
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttributeValue( "class" ), "source" );
+ assertEquals( div.getAttribute( "class" ), "source" );
HtmlPreformattedText pre = (HtmlPreformattedText) elementIterator.next();
assertNotNull( pre );
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java?rev=1183293&r1=1183292&r2=1183293&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/FaqVerifier.java Fri Oct 14 10:54:04 2011
@@ -25,7 +25,7 @@ import com.gargoylesoftware.htmlunit.htm
import com.gargoylesoftware.htmlunit.html.HtmlDefinitionTerm;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlHeader2;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
import com.gargoylesoftware.htmlunit.html.HtmlListItem;
import com.gargoylesoftware.htmlunit.html.HtmlOrderedList;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -36,7 +36,6 @@ import java.util.Iterator;
/**
- *
*
* @author ltheussl
* @version $Id$
@@ -56,75 +55,75 @@ public class FaqVerifier
HtmlDivision division = (HtmlDivision) element;
assertNotNull( division );
- Iterator elementIterator = division.getAllHtmlChildElements();
+ Iterator<HtmlElement> elementIterator = division.getAllHtmlChildElements().iterator();
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
HtmlDivision div = (HtmlDivision) elementIterator.next();
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
- HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next();
+ HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
assertEquals( h2.asText().trim(), "Oft Asked Questions" );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "name" ), "top" );
+ assertEquals( a.getAttribute( "name" ), "top" );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "name" ), "Oft_Asked_Questions" );
+ assertEquals( a.getAttribute( "name" ), "Oft_Asked_Questions" );
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
- element = (HtmlElement) elementIterator.next();
+ element = elementIterator.next();
assertEquals( element.getTagName(), "b" );
assertEquals( element.asText().trim(), "Contributing" );
HtmlOrderedList ol = (HtmlOrderedList) elementIterator.next();
- assertEquals( ol.getFirstDomChild().asText().trim(), "One stupid question & a silly answer?" );
+ assertEquals( ol.getFirstChild().asText().trim(), "One stupid question & a silly answer?" );
HtmlListItem li = (HtmlListItem) elementIterator.next();
- assertEquals( li.getFirstDomChild().asText().trim(), "One stupid question & a silly answer?" );
+ assertEquals( li.getFirstChild().asText().trim(), "One stupid question & a silly answer?" );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "href" ), "#stupid-question" );
+ assertEquals( a.getAttribute( "href" ), "#stupid-question" );
- element = (HtmlElement) elementIterator.next();
+ element = elementIterator.next();
assertEquals( element.getTagName(), "b" );
assertEquals( element.asText().trim(), "stupid" );
p = (HtmlParagraph) elementIterator.next();
- element = (HtmlElement) elementIterator.next();
+ element = elementIterator.next();
assertEquals( element.getTagName(), "b" );
assertEquals( element.asText().trim(), "Using Maven" );
ol = (HtmlOrderedList) elementIterator.next();
- assertEquals( ol.getFirstDomChild().asText().trim(), "How do I disable a report on my site?" );
+ assertEquals( ol.getFirstChild().asText().trim(), "How do I disable a report on my site?" );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "How do I disable a report on my site?" );
+ assertEquals( li.getFirstChild().asText().trim(), "How do I disable a report on my site?" );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "href" ), "#disable-reports" );
+ assertEquals( a.getAttribute( "href" ), "#disable-reports" );
div = (HtmlDivision) elementIterator.next();
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
- h2 = (HtmlHeader2) elementIterator.next();
+ h2 = (HtmlHeading2) elementIterator.next();
assertEquals( h2.asText().trim(), "Contributing" );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "name" ), "Contributing" );
+ assertEquals( a.getAttribute( "name" ), "Contributing" );
HtmlDefinitionList dl = (HtmlDefinitionList) elementIterator.next();
HtmlDefinitionTerm dt = (HtmlDefinitionTerm) elementIterator.next();
- assertEquals( dt.getFirstDomChild().asText().trim(), "One stupid question & a silly answer?" );
+ assertEquals( dt.getFirstChild().asText().trim(), "One stupid question & a silly answer?" );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "name" ), "stupid-question" );
+ assertEquals( a.getAttribute( "name" ), "stupid-question" );
- element = (HtmlElement) elementIterator.next();
+ element = elementIterator.next();
assertEquals( element.getTagName(), "b" );
assertEquals( element.asText().trim(), "stupid" );
@@ -133,65 +132,65 @@ public class FaqVerifier
p = (HtmlParagraph) elementIterator.next();
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "href" ), "#Using_Maven" );
+ assertEquals( a.getAttribute( "href" ), "#Using_Maven" );
assertEquals( a.asText().trim(), "local link" );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "href" ), "./cdc.html" );
+ assertEquals( a.getAttribute( "href" ), "./cdc.html" );
assertEquals( a.asText().trim(), "source document" );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "href" ), "http://maven.apache.org/?l=a&m=b" );
+ assertEquals( a.getAttribute( "href" ), "http://maven.apache.org/?l=a&m=b" );
assertEquals( a.asText().trim(), "external link" );
- element = (HtmlElement) elementIterator.next();
+ element = elementIterator.next();
assertEquals( element.getTagName(), "i" );
assertEquals( element.asText().trim(), "italic" );
p = (HtmlParagraph) elementIterator.next();
- assertEquals( p.getAttributeValue( "align" ), "right" );
+ assertEquals( p.getAttribute( "align" ), "right" );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "href" ), "#top" );
+ assertEquals( a.getAttribute( "href" ), "#top" );
assertEquals( a.asText().trim(), "[top]" );
div = (HtmlDivision) elementIterator.next();
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
- h2 = (HtmlHeader2) elementIterator.next();
+ h2 = (HtmlHeading2) elementIterator.next();
assertEquals( h2.asText().trim(), "Using Maven" );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "name" ), "Using_Maven" );
+ assertEquals( a.getAttribute( "name" ), "Using_Maven" );
dl = (HtmlDefinitionList) elementIterator.next();
dt = (HtmlDefinitionTerm) elementIterator.next();
- assertEquals( dt.getFirstDomChild().asText().trim(), "How do I disable a report on my site?" );
+ assertEquals( dt.getFirstChild().asText().trim(), "How do I disable a report on my site?" );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "name" ), "disable-reports" );
+ assertEquals( a.getAttribute( "name" ), "disable-reports" );
dd = (HtmlDefinitionDescription) elementIterator.next();
p = (HtmlParagraph) elementIterator.next();
- element = (HtmlElement) elementIterator.next();
+ element = elementIterator.next();
assertEquals( element.getTagName(), "tt" );
assertEquals( element.asText().trim(), "<source></source>" );
div = (HtmlDivision) elementIterator.next();
- assertEquals( div.getAttributeValue( "class" ), "source" );
+ assertEquals( div.getAttribute( "class" ), "source" );
HtmlPreformattedText pre = (HtmlPreformattedText) elementIterator.next();
assertEquals( pre.asText().trim(), "<source>1.5</source>" );
p = (HtmlParagraph) elementIterator.next();
- assertEquals( p.getAttributeValue( "align" ), "right" );
+ assertEquals( p.getAttribute( "align" ), "right" );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttributeValue( "href" ), "#top" );
+ assertEquals( a.getAttribute( "href" ), "#top" );
assertEquals( a.asText().trim(), "[top]" );
assertFalse( elementIterator.hasNext() );
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java?rev=1183293&r1=1183292&r2=1183293&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java Fri Oct 14 10:54:04 2011
@@ -49,25 +49,25 @@ public class HeadVerifier
HtmlPage page = htmlPage( file );
assertNotNull( page );
- HtmlElement html = page.getDocumentHtmlElement();
+ HtmlElement html = page.getDocumentElement();
assertNotNull( html );
- List tagNames = new ArrayList();
+ List<String> tagNames = new ArrayList<String>( 2 );
tagNames.add( "head" );
- List heads = html.getHtmlElementsByTagNames( tagNames );
+ List<HtmlElement> heads = html.getHtmlElementsByTagNames( tagNames );
assertEquals( 1, heads.size() );
- HtmlElement head = (HtmlElement) heads.get( 0 );
+ HtmlElement head = heads.get( 0 );
assertNotNull( head );
- Iterator elementIterator = head.getAllHtmlChildElements();
+ Iterator<HtmlElement> elementIterator = head.getAllHtmlChildElements().iterator();
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
HtmlMeta meta = (HtmlMeta) elementIterator.next();
- assertEquals( meta.getAttributeValue( "http-equiv" ), "Content-Type" );
- assertEquals( meta.getAttributeValue( "content" ), "text/html; charset=UTF-8" );
+ assertEquals( meta.getAttribute( "http-equiv" ), "Content-Type" );
+ assertEquals( meta.getAttribute( "content" ), "text/html; charset=UTF-8" );
HtmlTitle title = (HtmlTitle) elementIterator.next();
assertNotNull( title );
@@ -79,23 +79,23 @@ public class HeadVerifier
assertNotNull( link );
meta = (HtmlMeta) elementIterator.next();
- assertEquals( meta.getAttributeValue( "name" ), "author" );
- assertEquals( meta.getAttributeValue( "content" ).trim(), "John Doe" );
+ assertEquals( meta.getAttribute( "name" ), "author" );
+ assertEquals( meta.getAttribute( "content" ).trim(), "John Doe" );
meta = (HtmlMeta) elementIterator.next();
- assertEquals( meta.getAttributeValue( "name" ), "Date-Revision-yyyymmdd" );
- assertEquals( meta.getAttributeValue( "content" ), new SimpleDateFormat( "yyyyMMdd" ).format( new Date() ) );
+ assertEquals( meta.getAttribute( "name" ), "Date-Revision-yyyymmdd" );
+ assertEquals( meta.getAttribute( "content" ), new SimpleDateFormat( "yyyyMMdd" ).format( new Date() ) );
meta = (HtmlMeta) elementIterator.next();
- assertEquals( meta.getAttributeValue( "http-equiv" ), "Content-Language" );
- assertEquals( meta.getAttributeValue( "content" ), "en" );
+ assertEquals( meta.getAttribute( "http-equiv" ), "Content-Language" );
+ assertEquals( meta.getAttribute( "content" ), "en" );
meta = (HtmlMeta) elementIterator.next();
- assertEquals( meta.getAttributeValue( "name" ), "description" );
- assertEquals( meta.getAttributeValue( "content" ), "Free Web tutorials" );
+ assertEquals( meta.getAttribute( "name" ), "description" );
+ assertEquals( meta.getAttribute( "content" ), "Free Web tutorials" );
meta = (HtmlMeta) elementIterator.next();
- assertEquals( meta.getAttributeValue( "name" ), "keywords" );
- assertEquals( meta.getAttributeValue( "content" ), "HTML,CSS,XML,JavaScript" );
+ assertEquals( meta.getAttribute( "name" ), "keywords" );
+ assertEquals( meta.getAttribute( "content" ), "HTML,CSS,XML,JavaScript" );
}
}
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java?rev=1183293&r1=1183292&r2=1183293&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/JavascriptVerifier.java Fri Oct 14 10:54:04 2011
@@ -24,7 +24,7 @@ import com.gargoylesoftware.htmlunit.Web
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlHeader2;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
import com.gargoylesoftware.htmlunit.html.HtmlScript;
@@ -62,7 +62,7 @@ public class JavascriptVerifier
// HtmlUnit
WebClient webClient = new WebClient();
- final List collectedAlerts = new ArrayList();
+ final List<String> collectedAlerts = new ArrayList<String>( 4 );
webClient.setAlertHandler( new CollectingAlertHandler( collectedAlerts ) );
HtmlPage page = (HtmlPage) webClient.getPage( jsTest.toURI().toURL() );
@@ -73,7 +73,7 @@ public class JavascriptVerifier
HtmlDivision division = (HtmlDivision) element;
assertNotNull( division );
- Iterator elementIterator = division.getAllHtmlChildElements();
+ Iterator<HtmlElement> elementIterator = division.getAllHtmlChildElements().iterator();
// ----------------------------------------------------------------------
//
@@ -81,15 +81,15 @@ public class JavascriptVerifier
HtmlDivision div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
- HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next();
+ HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
assertEquals( h2.asText().trim(), "Test" );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttributeValue( "name" ), "Test" );
+ assertEquals( a.getAttribute( "name" ), "Test" );
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
@@ -97,9 +97,9 @@ public class JavascriptVerifier
HtmlScript script = (HtmlScript) elementIterator.next();
assertNotNull( script );
- assertEquals( script.getAttributeValue( "type" ), "text/javascript" );
+ assertEquals( script.getAttribute( "type" ), "text/javascript" );
assertEquals( script.asText().trim(), "" );
- final List expectedAlerts = Collections.singletonList( "Hello!" );
+ final List<String> expectedAlerts = Collections.singletonList( "Hello!" );
assertEquals( expectedAlerts, collectedAlerts );
}
}
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java?rev=1183293&r1=1183292&r2=1183293&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MiscVerifier.java Fri Oct 14 10:54:04 2011
@@ -29,7 +29,6 @@ import java.util.Iterator;
/**
- *
*
* @author ltheussl
* @version $Id$
@@ -49,18 +48,18 @@ public class MiscVerifier
HtmlDivision division = (HtmlDivision) element;
assertNotNull( division );
- Iterator elementIterator = division.getAllHtmlChildElements();
+ Iterator<HtmlElement> elementIterator = division.getAllHtmlChildElements().iterator();
// ----------------------------------------------------------------------
//
// ----------------------------------------------------------------------
HtmlApplet applet = (HtmlApplet) elementIterator.next();
- assertEquals( "org.micro.applet.Main", applet.getAttributeValue( "code" ) );
- assertEquals( "micro-applet.jar", applet.getAttributeValue( "archive" ) );
+ assertEquals( "org.micro.applet.Main", applet.getAttribute( "code" ) );
+ assertEquals( "micro-applet.jar", applet.getAttribute( "archive" ) );
HtmlParameter param = (HtmlParameter) elementIterator.next();
- assertEquals( "midlet", param.getAttributeValue( "name" ) );
- assertEquals( "org.micro.applet.SimpleDemoMIDlet", param.getAttributeValue( "value" ) );
+ assertEquals( "midlet", param.getAttribute( "name" ) );
+ assertEquals( "org.micro.applet.SimpleDemoMIDlet", param.getAttribute( "value" ) );
}
}
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java?rev=1183293&r1=1183292&r2=1183293&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java Fri Oct 14 10:54:04 2011
@@ -22,7 +22,7 @@ package org.apache.maven.doxia.siterende
import com.gargoylesoftware.htmlunit.html.HtmlAnchor;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlHeader2;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
import com.gargoylesoftware.htmlunit.html.HtmlListItem;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
import com.gargoylesoftware.htmlunit.html.HtmlParagraph;
@@ -32,7 +32,6 @@ import java.util.Iterator;
/**
- *
*
* @author ltheussl
* @version $Id$
@@ -52,7 +51,7 @@ public class MultipleBlockVerifier
HtmlDivision division = (HtmlDivision) element;
assertNotNull( division );
- Iterator elementIterator = division.getAllHtmlChildElements();
+ Iterator<HtmlElement> elementIterator = division.getAllHtmlChildElements().iterator();
// ----------------------------------------------------------------------
// Verify link
@@ -60,15 +59,15 @@ public class MultipleBlockVerifier
HtmlDivision div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
- HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next();
+ HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
assertEquals( h2.asText().trim(), "section name" );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttributeValue( "name" ), "section_name" );
+ assertEquals( a.getAttribute( "name" ), "section_name" );
// ----------------------------------------------------------------------
// Paragraph
@@ -87,7 +86,7 @@ public class MultipleBlockVerifier
HtmlListItem li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "list1" );
+ assertEquals( li.getFirstChild().asText().trim(), "list1" );
// ----------------------------------------------------------------------
// Paragraph
@@ -106,7 +105,7 @@ public class MultipleBlockVerifier
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "list1" );
+ assertEquals( li.getFirstChild().asText().trim(), "list1" );
// ----------------------------------------------------------------------
// Paragraph
@@ -128,7 +127,7 @@ public class MultipleBlockVerifier
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.getFirstDomChild().asText().trim(), "list1" );
+ assertEquals( p.getFirstChild().asText().trim(), "list1" );
assertFalse( elementIterator.hasNext() );
}
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java?rev=1183293&r1=1183292&r2=1183293&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java Fri Oct 14 10:54:04 2011
@@ -25,8 +25,8 @@ import com.gargoylesoftware.htmlunit.htm
import com.gargoylesoftware.htmlunit.html.HtmlDefinitionTerm;
import com.gargoylesoftware.htmlunit.html.HtmlDivision;
import com.gargoylesoftware.htmlunit.html.HtmlElement;
-import com.gargoylesoftware.htmlunit.html.HtmlHeader2;
-import com.gargoylesoftware.htmlunit.html.HtmlHeader4;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading2;
+import com.gargoylesoftware.htmlunit.html.HtmlHeading4;
import com.gargoylesoftware.htmlunit.html.HtmlListItem;
import com.gargoylesoftware.htmlunit.html.HtmlOrderedList;
import com.gargoylesoftware.htmlunit.html.HtmlPage;
@@ -37,7 +37,6 @@ import java.util.Iterator;
/**
- *
*
* @author ltheussl
* @version $Id$
@@ -57,7 +56,7 @@ public class NestedItemsVerifier
HtmlDivision division = (HtmlDivision) element;
assertNotNull( division );
- Iterator elementIterator = division.getAllHtmlChildElements();
+ Iterator<HtmlElement> elementIterator = division.getAllHtmlChildElements().iterator();
// ----------------------------------------------------------------------
// Verify link
@@ -65,34 +64,34 @@ public class NestedItemsVerifier
HtmlDivision div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
- HtmlHeader2 h2 = (HtmlHeader2) elementIterator.next();
+ HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
assertEquals( h2.asText().trim(), "List Section" );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttributeValue( "name" ), "List_Section" );
+ assertEquals( a.getAttribute( "name" ), "List_Section" );
// ----------------------------------------------------------------------
// Unordered lists
// ----------------------------------------------------------------------
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
- HtmlHeader4 h4 = (HtmlHeader4) elementIterator.next();
+ HtmlHeading4 h4 = (HtmlHeading4) elementIterator.next();
assertNotNull( h4 );
assertEquals( h4.asText().trim(), "Unordered lists" );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttributeValue( "name" ), "Unordered_lists" );
+ assertEquals( a.getAttribute( "name" ), "Unordered_lists" );
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
@@ -103,7 +102,7 @@ public class NestedItemsVerifier
HtmlListItem li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 1." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 1." );
ul = (HtmlUnorderedList) elementIterator.next();
assertNotNull( ul );
@@ -112,43 +111,43 @@ public class NestedItemsVerifier
assertNotNull( li );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.getFirstDomChild().asText().trim(), "Item 11." );
+ assertEquals( p.getFirstChild().asText().trim(), "Item 11." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.getFirstDomChild().asText().trim(), "Item 12." );
+ assertEquals( p.getFirstChild().asText().trim(), "Item 12." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 13." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 13." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 14." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 14." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 2." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 2." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 3." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 3." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 4." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 4." );
ul = (HtmlUnorderedList) elementIterator.next();
assertNotNull( ul );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 41." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 41." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 42." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 42." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 43." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 43." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 44." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 44." );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
@@ -174,15 +173,15 @@ public class NestedItemsVerifier
// ----------------------------------------------------------------------
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
- h4 = (HtmlHeader4) elementIterator.next();
+ h4 = (HtmlHeading4) elementIterator.next();
assertNotNull( h4 );
assertEquals( h4.asText().trim(), "Ordered lists" );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttributeValue( "name" ), "Ordered_lists" );
+ assertEquals( a.getAttribute( "name" ), "Ordered_lists" );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
@@ -193,48 +192,48 @@ public class NestedItemsVerifier
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 1." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 1." );
ol = (HtmlOrderedList) elementIterator.next();
assertNotNull( ol );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 11." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 11." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 12." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 12." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 13." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 13." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 14." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 14." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 2." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 2." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 3." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 3." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 4." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 4." );
ol = (HtmlOrderedList) elementIterator.next();
assertNotNull( ol );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 41." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 41." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 42." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 42." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 43." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 43." );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstDomChild().asText().trim(), "Item 44." );
+ assertEquals( li.getFirstChild().asText().trim(), "Item 44." );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
@@ -260,15 +259,15 @@ public class NestedItemsVerifier
// ----------------------------------------------------------------------
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttributeValue( "class" ), "section" );
+ assertEquals( div.getAttribute( "class" ), "section" );
- h4 = (HtmlHeader4) elementIterator.next();
+ h4 = (HtmlHeading4) elementIterator.next();
assertNotNull( h4 );
assertEquals( h4.asText().trim(), "Definition lists" );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttributeValue( "name" ), "Definition_lists" );
+ assertEquals( a.getAttribute( "name" ), "Definition_lists" );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
@@ -279,26 +278,26 @@ public class NestedItemsVerifier
HtmlDefinitionTerm dt = (HtmlDefinitionTerm) elementIterator.next();
assertNotNull( dt );
- assertEquals( dt.getFirstDomChild().asText().trim(), "Term 1." );
+ assertEquals( dt.getFirstChild().asText().trim(), "Term 1." );
HtmlDefinitionDescription dd = (HtmlDefinitionDescription) elementIterator.next();
assertNotNull( dd );
- assertEquals( dd.getFirstDomChild().asText().trim(), "Description 1." );
+ assertEquals( dd.getFirstChild().asText().trim(), "Description 1." );
dt = (HtmlDefinitionTerm) elementIterator.next();
assertNotNull( dt );
- assertEquals( dt.getFirstDomChild().asText().trim(), "Term 2." );
+ assertEquals( dt.getFirstChild().asText().trim(), "Term 2." );
dd = (HtmlDefinitionDescription) elementIterator.next();
assertNotNull( dd );
- assertEquals( dd.getFirstDomChild().asText().trim(), "Description 2." );
+ assertEquals( dd.getFirstChild().asText().trim(), "Description 2." );
dl = (HtmlDefinitionList) elementIterator.next();
assertNotNull( dl );
dt = (HtmlDefinitionTerm) elementIterator.next();
assertNotNull( dt );
- assertEquals( dt.getFirstDomChild().asText().trim(), "Term 21." );
+ assertEquals( dt.getFirstChild().asText().trim(), "Term 21." );
dd = (HtmlDefinitionDescription) elementIterator.next();
assertNotNull( dd );
- assertEquals( dd.getFirstDomChild().asText().trim(), "Description 21." );
+ assertEquals( dd.getFirstChild().asText().trim(), "Description 21." );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );