refactoring: assertEquals(expected, actual)
git-svn-id: https://svn.apache.org/repos/asf/maven/doxia/doxia-sitetools/trunk@1737482 13f79535-47bb-0310-9956-ffa450edef68
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
index 86a7e97..6787936 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
@@ -26,7 +26,6 @@
import static org.mockito.Mockito.when;
import java.io.File;
-import java.io.FileNotFoundException;
import java.io.FileOutputStream;
import java.io.FileReader;
import java.io.IOException;
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 6f3a7ce..e8afb84 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
@@ -101,7 +101,7 @@
HtmlDivision div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
@@ -109,83 +109,83 @@
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttribute( "name" ), "section_name_with_entities:____" );
+ assertEquals( "section_name_with_entities:____", a.getAttribute( "name" ) );
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
HtmlHeading4 h4 = (HtmlHeading4) elementIterator.next();
assertNotNull( h4 );
- assertEquals( h4.asText().trim(), "Entities" );
+ assertEquals( "Entities", h4.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttribute( "name" ), "Entities" );
+ assertEquals( "Entities", a.getAttribute( "name" ) );
div = (HtmlDivision) elementIterator.next();
HtmlHeading3 h3 = (HtmlHeading3) elementIterator.next();
assertNotNull( h3 );
- assertEquals( h3.asText().trim(), "Generic Entities: '&' '<' '>' '\"' '''" );
+ assertEquals( "Generic Entities: '&' '<' '>' '\"' '''", h3.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "'&' '<' '>' '\"' '''" );
+ assertEquals( "'&' '<' '>' '\"' '''", p.asText().trim() );
div = (HtmlDivision) elementIterator.next();
h3 = (HtmlHeading3) elementIterator.next();
assertNotNull( h3 );
- assertEquals( h3.asText().trim(), "Local Entities: '\u0391' '\u0392' '\u0393' '\uD7ED'" );
+ assertEquals( "Local Entities: '\u0391' '\u0392' '\u0393' '\uD7ED'", h3.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "'\u0391' '\u0392' '\u0393' '\uD7ED\uD7ED' '\u0159\u0159' '\u0159'" );
+ assertEquals( "'\u0391' '\u0392' '\u0393' '\uD7ED\uD7ED' '\u0159\u0159' '\u0159'", p.asText().trim() );
div = (HtmlDivision) elementIterator.next();
h3 = (HtmlHeading3) elementIterator.next();
assertNotNull( h3 );
- assertEquals( h3.asText().trim(), "DTD Entities: ' ' '\u00A1' '\u00A2'" );
+ assertEquals( "DTD Entities: ' ' '\u00A1' '\u00A2'", h3.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "' ' '\u00A1' '\u00A2'" );
+ assertEquals( "' ' '\u00A1' '\u00A2'", p.asText().trim() );
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
h4 = (HtmlHeading4) elementIterator.next();
assertNotNull( h4 );
- assertEquals( h4.asText().trim(), "CDATA" );
+ assertEquals( "CDATA", h4.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttribute( "name" ), "CDATA" );
+ assertEquals( "CDATA", a.getAttribute( "name" ) );
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttribute( "class" ), "source" );
+ assertEquals( "source", div.getAttribute( "class" ) );
HtmlPreformattedText pre = (HtmlPreformattedText) elementIterator.next();
assertNotNull( pre );
- assertEquals( pre.asText().trim(), "<project xmlns:ant=\"jelly:ant\">" );
+ assertEquals( "<project xmlns:ant=\"jelly:ant\">", pre.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "' ' '¡'" );
+ assertEquals( "' ' '¡'", p.asText().trim() );
assertFalse( elementIterator.hasNext() );
}
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 1854acc..a9003c2 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
@@ -34,7 +34,6 @@
import java.util.Iterator;
-
/**
*
* @author ltheussl
@@ -62,140 +61,140 @@
// ----------------------------------------------------------------------
HtmlDivision div = (HtmlDivision) elementIterator.next();
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
- assertEquals( h2.asText().trim(), "Oft Asked Questions" );
+ assertEquals( "Oft Asked Questions", h2.asText().trim() );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
- assertEquals( "Oft_Asked_Questions", a.getAttribute( "name" ) );
+ assertEquals( a.getAttribute( "name" ), "Oft_Asked_Questions" );
a = (HtmlAnchor) elementIterator.next();
assertEquals( "top", a.getAttribute( "name" ) );
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
element = elementIterator.next();
- assertEquals( element.getTagName(), "b" );
- assertEquals( element.asText().trim(), "Contributing" );
+ assertEquals( "b", element.getTagName() );
+ assertEquals( "Contributing", element.asText().trim() );
HtmlOrderedList ol = (HtmlOrderedList) elementIterator.next();
- assertEquals( ol.getFirstChild().asText().trim(), "One stupid question & a silly answer?" );
+ assertEquals( "One stupid question & a silly answer?", ol.getFirstChild().asText().trim() );
HtmlListItem li = (HtmlListItem) elementIterator.next();
- assertEquals( li.getFirstChild().asText().trim(), "One stupid question & a silly answer?" );
+ assertEquals( "One stupid question & a silly answer?", li.getFirstChild().asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttribute( "href" ), "#stupid-question" );
+ assertEquals( "#stupid-question", a.getAttribute( "href" ) );
element = elementIterator.next();
- assertEquals( element.getTagName(), "b" );
- assertEquals( element.asText().trim(), "stupid" );
+ assertEquals( "b", element.getTagName() );
+ assertEquals( "stupid", element.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
element = elementIterator.next();
- assertEquals( element.getTagName(), "b" );
- assertEquals( element.asText().trim(), "Using Maven" );
+ assertEquals( "b", element.getTagName() );
+ assertEquals( "Using Maven", element.asText().trim() );
ol = (HtmlOrderedList) elementIterator.next();
- assertEquals( ol.getFirstChild().asText().trim(), "How do I disable a report on my site?" );
+ assertEquals( "How do I disable a report on my site?", ol.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "How do I disable a report on my site?" );
+ assertEquals( "How do I disable a report on my site?", li.getFirstChild().asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttribute( "href" ), "#disable-reports" );
+ assertEquals( "#disable-reports", a.getAttribute( "href" ) );
div = (HtmlDivision) elementIterator.next();
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
h2 = (HtmlHeading2) elementIterator.next();
- assertEquals( h2.asText().trim(), "Contributing" );
+ assertEquals( "Contributing", h2.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttribute( "name" ), "Contributing" );
+ assertEquals( "Contributing", a.getAttribute( "name" ) );
HtmlDefinitionList dl = (HtmlDefinitionList) elementIterator.next();
HtmlDefinitionTerm dt = (HtmlDefinitionTerm) elementIterator.next();
- assertEquals( dt.getFirstChild().asText().trim(), "One stupid question & a silly answer?" );
+ assertEquals( "One stupid question & a silly answer?", dt.getFirstChild().asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttribute( "name" ), "stupid-question" );
+ assertEquals( "stupid-question", a.getAttribute( "name" ) );
element = elementIterator.next();
- assertEquals( element.getTagName(), "b" );
- assertEquals( element.asText().trim(), "stupid" );
+ assertEquals( "b", element.getTagName() );
+ assertEquals( "stupid", element.asText().trim() );
HtmlDefinitionDescription dd = (HtmlDefinitionDescription) elementIterator.next();
p = (HtmlParagraph) elementIterator.next();
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttribute( "href" ), "#Using_Maven" );
- assertEquals( a.asText().trim(), "local link" );
+ assertEquals( "#Using_Maven", a.getAttribute( "href" ) );
+ assertEquals( "local link", a.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttribute( "href" ), "./cdc.html" );
- assertEquals( a.asText().trim(), "source document" );
+ assertEquals( "./cdc.html", a.getAttribute( "href" ) );
+ assertEquals( "source document", a.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttribute( "href" ), "http://maven.apache.org/?l=a&m=b" );
- assertEquals( a.asText().trim(), "external link" );
+ assertEquals( "http://maven.apache.org/?l=a&m=b", a.getAttribute( "href" ) );
+ assertEquals( "external link", a.asText().trim() );
element = elementIterator.next();
- assertEquals( element.getTagName(), "i" );
- assertEquals( element.asText().trim(), "italic" );
+ assertEquals( "i", element.getTagName() );
+ assertEquals( "italic", element.asText().trim() );
element = elementIterator.next();
- assertEquals( element.getTagName(), "b" );
- assertEquals( element.asText().trim(), "non-US-ASCII characters: àéèç" );
+ assertEquals( "b", element.getTagName() );
+ assertEquals( "non-US-ASCII characters: àéèç", element.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
- assertEquals( p.getAttribute( "align" ), "right" );
+ assertEquals( "right", p.getAttribute( "align" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttribute( "href" ), "#top" );
- assertEquals( a.asText().trim(), "[top]" );
+ assertEquals( "#top", a.getAttribute( "href" ) );
+ assertEquals( "[top]", a.asText().trim() );
div = (HtmlDivision) elementIterator.next();
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
h2 = (HtmlHeading2) elementIterator.next();
- assertEquals( h2.asText().trim(), "Using Maven" );
+ assertEquals( "Using Maven", h2.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttribute( "name" ), "Using_Maven" );
+ assertEquals( "Using_Maven", a.getAttribute( "name" ) );
dl = (HtmlDefinitionList) elementIterator.next();
dt = (HtmlDefinitionTerm) elementIterator.next();
- assertEquals( dt.getFirstChild().asText().trim(), "How do I disable a report on my site?" );
+ assertEquals( "How do I disable a report on my site?", dt.getFirstChild().asText().trim() );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttribute( "name" ), "disable-reports" );
+ assertEquals( "disable-reports", a.getAttribute( "name" ) );
dd = (HtmlDefinitionDescription) elementIterator.next();
p = (HtmlParagraph) elementIterator.next();
element = elementIterator.next();
- assertEquals( element.getTagName(), "tt" );
- assertEquals( element.asText().trim(), "<source></source>" );
+ assertEquals( "tt", element.getTagName() );
+ assertEquals( "<source></source>", element.asText().trim() );
div = (HtmlDivision) elementIterator.next();
- assertEquals( div.getAttribute( "class" ), "source" );
+ assertEquals( "source", div.getAttribute( "class" ) );
HtmlPreformattedText pre = (HtmlPreformattedText) elementIterator.next();
- assertEquals( pre.asText().trim(), "<source>1.5</source>" );
+ assertEquals( "<source>1.5</source>", pre.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
- assertEquals( p.getAttribute( "align" ), "right" );
+ assertEquals( "right", p.getAttribute( "align" ) );
a = (HtmlAnchor) elementIterator.next();
- assertEquals( a.getAttribute( "href" ), "#top" );
- assertEquals( a.asText().trim(), "[top]" );
+ assertEquals( "#top", a.getAttribute( "href" ) );
+ assertEquals( "[top]", a.asText().trim() );
assertFalse( elementIterator.hasNext() );
}
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
index b714996..655f489 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/HeadVerifier.java
@@ -27,9 +27,7 @@
import com.gargoylesoftware.htmlunit.html.HtmlStyle;
import com.gargoylesoftware.htmlunit.html.HtmlTitle;
-import java.text.SimpleDateFormat;
import java.util.ArrayList;
-import java.util.Date;
import java.util.Iterator;
import java.util.List;
@@ -67,8 +65,8 @@
// ----------------------------------------------------------------------
HtmlMeta meta = (HtmlMeta) elementIterator.next();
- assertEquals( meta.getAttribute( "http-equiv" ), "Content-Type" );
- assertEquals( meta.getAttribute( "content" ), "text/html; charset=UTF-8" );
+ assertEquals( "Content-Type", meta.getAttribute( "http-equiv" ) );
+ assertEquals( "text/html; charset=UTF-8", meta.getAttribute( "content" ) );
HtmlTitle title = (HtmlTitle) elementIterator.next();
assertNotNull( title );
@@ -80,22 +78,22 @@
assertNotNull( link );
meta = (HtmlMeta) elementIterator.next();
- assertEquals( meta.getAttribute( "name" ), "author" );
- assertEquals( meta.getAttribute( "content" ).trim(), "John Doe" );
+ assertEquals( "author", meta.getAttribute( "name" ) );
+ assertEquals( "John Doe", meta.getAttribute( "content" ).trim() );
meta = (HtmlMeta) elementIterator.next();
- assertEquals( meta.getAttribute( "http-equiv" ), "Content-Language" );
- assertEquals( meta.getAttribute( "content" ), "en" );
+ assertEquals( "Content-Language", meta.getAttribute( "http-equiv" ) );
+ assertEquals( "en", meta.getAttribute( "content" ) );
meta = (HtmlMeta) elementIterator.next();
- assertEquals( meta.getAttribute( "name" ), "description" );
- assertEquals( meta.getAttribute( "content" ), "Free Web tutorials" );
+ assertEquals( "description", meta.getAttribute( "name" ) );
+ assertEquals( "Free Web tutorials", meta.getAttribute( "content" ) );
meta = (HtmlMeta) elementIterator.next();
- assertEquals( meta.getAttribute( "name" ), "keywords" );
- assertEquals( meta.getAttribute( "content" ), "HTML,CSS,XML,JavaScript" );
+ assertEquals( "keywords", meta.getAttribute( "name" ) );
+ assertEquals( "HTML,CSS,XML,JavaScript", meta.getAttribute( "content" ) );
HtmlBase base = (HtmlBase) elementIterator.next();
- assertEquals( base.getAttribute( "href" ), "http://maven.apache.org/" );
+ assertEquals( "http://maven.apache.org/", base.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 26d28b3..c60215d 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
@@ -81,24 +81,24 @@
HtmlDivision div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
- assertEquals( h2.asText().trim(), "Test" );
+ assertEquals( "Test", h2.asText().trim() );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttribute( "name" ), "Test" );
+ assertEquals( "Test", a.getAttribute( "name" ) );
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "You should see a JavaScript alert..." );
+ assertEquals( "You should see a JavaScript alert...", p.asText().trim() );
HtmlScript script = (HtmlScript) elementIterator.next();
assertNotNull( script );
- assertEquals( script.getAttribute( "type" ), "text/javascript" );
- assertEquals( script.asText().trim(), "" );
+ assertEquals( "text/javascript", script.getAttribute( "type" ) );
+ assertEquals( "", script.asText().trim() );
final List<String> expectedAlerts = Collections.singletonList( "Hello!" );
assertEquals( expectedAlerts, collectedAlerts );
}
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java
index 451936f..e5552f6 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/MultipleBlockVerifier.java
@@ -30,7 +30,6 @@
import java.util.Iterator;
-
/**
*
* @author ltheussl
@@ -59,15 +58,15 @@
HtmlDivision div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
- assertEquals( h2.asText().trim(), "section name" );
+ assertEquals( "section name", h2.asText().trim() );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttribute( "name" ), "section_name" );
+ assertEquals( "section_name", a.getAttribute( "name" ) );
// ----------------------------------------------------------------------
// Paragraph
@@ -75,7 +74,7 @@
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "text" );
+ assertEquals( "text", p.asText().trim() );
// ----------------------------------------------------------------------
// Unordered list
@@ -86,7 +85,7 @@
HtmlListItem li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "list1" );
+ assertEquals( "list1", li.getFirstChild().asText().trim() );
// ----------------------------------------------------------------------
// Paragraph
@@ -94,7 +93,7 @@
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "text2" );
+ assertEquals( "text2", p.asText().trim() );
// ----------------------------------------------------------------------
// Unordered list
@@ -105,7 +104,7 @@
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "list1" );
+ assertEquals( "list1", li.getFirstChild().asText().trim() );
// ----------------------------------------------------------------------
// Paragraph
@@ -113,7 +112,7 @@
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "text3" );
+ assertEquals( "text3", p.asText().trim() );
// ----------------------------------------------------------------------
// Unordered list
@@ -127,7 +126,7 @@
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.getFirstChild().asText().trim(), "list1" );
+ assertEquals( "list1", p.getFirstChild().asText().trim() );
assertFalse( elementIterator.hasNext() );
}
diff --git a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
index d1886ed..553596a 100644
--- a/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
+++ b/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/NestedItemsVerifier.java
@@ -35,7 +35,6 @@
import java.util.Iterator;
-
/**
*
* @author ltheussl
@@ -64,45 +63,45 @@
HtmlDivision div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
HtmlHeading2 h2 = (HtmlHeading2) elementIterator.next();
assertNotNull( h2 );
- assertEquals( h2.asText().trim(), "List Section" );
+ assertEquals( "List Section", h2.asText().trim() );
HtmlAnchor a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttribute( "name" ), "List_Section" );
+ assertEquals( "List_Section", a.getAttribute( "name" ) );
// ----------------------------------------------------------------------
// Unordered lists
// ----------------------------------------------------------------------
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
HtmlHeading4 h4 = (HtmlHeading4) elementIterator.next();
assertNotNull( h4 );
- assertEquals( h4.asText().trim(), "Unordered lists" );
+ assertEquals( "Unordered lists", h4.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttribute( "name" ), "Unordered_lists" );
+ assertEquals( "Unordered_lists", a.getAttribute( "name" ) );
HtmlParagraph p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Below is an unordered list, followed by six paragraphs." );
+ assertEquals( "Below is an unordered list, followed by six paragraphs.", p.asText().trim() );
HtmlUnorderedList ul = (HtmlUnorderedList) elementIterator.next();
assertNotNull( ul );
HtmlListItem li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 1." );
+ assertEquals( "Item 1.", li.getFirstChild().asText().trim() );
ul = (HtmlUnorderedList) elementIterator.next();
assertNotNull( ul );
@@ -111,212 +110,212 @@
assertNotNull( li );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.getFirstChild().asText().trim(), "Item 11." );
+ assertEquals( "Item 11.", p.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.getFirstChild().asText().trim(), "Item 12." );
+ assertEquals( "Item 12.", p.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 13." );
+ assertEquals( "Item 13.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 14." );
+ assertEquals( "Item 14.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 2." );
+ assertEquals( "Item 2.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 3." );
+ assertEquals( "Item 3.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 4." );
+ assertEquals( "Item 4.", li.getFirstChild().asText().trim() );
ul = (HtmlUnorderedList) elementIterator.next();
assertNotNull( ul );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 41." );
+ assertEquals( "Item 41.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 42." );
+ assertEquals( "Item 42.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 43." );
+ assertEquals( "Item 43.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 44." );
+ assertEquals( "Item 44.", li.getFirstChild().asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 1 below list." );
+ assertEquals( "Paragraph 1 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 2 below list." );
+ assertEquals( "Paragraph 2 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 3 below list." );
+ assertEquals( "Paragraph 3 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 4 below list." );
+ assertEquals( "Paragraph 4 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 5 below list." );
+ assertEquals( "Paragraph 5 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 6 below list." );
+ assertEquals( "Paragraph 6 below list.", p.asText().trim() );
// ----------------------------------------------------------------------
// Ordered lists
// ----------------------------------------------------------------------
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
h4 = (HtmlHeading4) elementIterator.next();
assertNotNull( h4 );
- assertEquals( h4.asText().trim(), "Ordered lists" );
+ assertEquals( "Ordered lists", h4.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttribute( "name" ), "Ordered_lists" );
+ assertEquals( "Ordered_lists", a.getAttribute( "name" ) );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Below is an ordered list, followed by six paragraphs." );
+ assertEquals( "Below is an ordered list, followed by six paragraphs.", p.asText().trim() );
HtmlOrderedList ol = (HtmlOrderedList) elementIterator.next();
assertNotNull( ol );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 1." );
+ assertEquals( "Item 1.", li.getFirstChild().asText().trim() );
ol = (HtmlOrderedList) elementIterator.next();
assertNotNull( ol );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 11." );
+ assertEquals( "Item 11.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 12." );
+ assertEquals( "Item 12.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 13." );
+ assertEquals( "Item 13.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 14." );
+ assertEquals( "Item 14.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 2." );
+ assertEquals( "Item 2.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 3." );
+ assertEquals( "Item 3.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 4." );
+ assertEquals( "Item 4.", li.getFirstChild().asText().trim() );
ol = (HtmlOrderedList) elementIterator.next();
assertNotNull( ol );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 41." );
+ assertEquals( "Item 41.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 42." );
+ assertEquals( "Item 42.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 43." );
+ assertEquals( "Item 43.", li.getFirstChild().asText().trim() );
li = (HtmlListItem) elementIterator.next();
assertNotNull( li );
- assertEquals( li.getFirstChild().asText().trim(), "Item 44." );
+ assertEquals( "Item 44.", li.getFirstChild().asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 1 below list." );
+ assertEquals( "Paragraph 1 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 2 below list." );
+ assertEquals( "Paragraph 2 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 3 below list." );
+ assertEquals( "Paragraph 3 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 4 below list." );
+ assertEquals( "Paragraph 4 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 5 below list." );
+ assertEquals( "Paragraph 5 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 6 below list." );
+ assertEquals( "Paragraph 6 below list.", p.asText().trim() );
// ----------------------------------------------------------------------
// Definition lists
// ----------------------------------------------------------------------
div = (HtmlDivision) elementIterator.next();
assertNotNull( div );
- assertEquals( div.getAttribute( "class" ), "section" );
+ assertEquals( "section", div.getAttribute( "class" ) );
h4 = (HtmlHeading4) elementIterator.next();
assertNotNull( h4 );
- assertEquals( h4.asText().trim(), "Definition lists" );
+ assertEquals( "Definition lists", h4.asText().trim() );
a = (HtmlAnchor) elementIterator.next();
assertNotNull( a );
- assertEquals( a.getAttribute( "name" ), "Definition_lists" );
+ assertEquals( "Definition_lists", a.getAttribute( "name" ) );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Below is a definition list, followed by six paragraphs." );
+ assertEquals( "Below is a definition list, followed by six paragraphs.", p.asText().trim() );
HtmlDefinitionList dl = (HtmlDefinitionList) elementIterator.next();
assertNotNull( dl );
HtmlDefinitionTerm dt = (HtmlDefinitionTerm) elementIterator.next();
assertNotNull( dt );
- assertEquals( dt.getFirstChild().asText().trim(), "Term 1." );
+ assertEquals( "Term 1.", dt.getFirstChild().asText().trim() );
HtmlDefinitionDescription dd = (HtmlDefinitionDescription) elementIterator.next();
assertNotNull( dd );
- assertEquals( dd.getFirstChild().asText().trim(), "Description 1." );
+ assertEquals( "Description 1.", dd.getFirstChild().asText().trim() );
dt = (HtmlDefinitionTerm) elementIterator.next();
assertNotNull( dt );
- assertEquals( dt.getFirstChild().asText().trim(), "Term 2." );
+ assertEquals( "Term 2.", dt.getFirstChild().asText().trim() );
dd = (HtmlDefinitionDescription) elementIterator.next();
assertNotNull( dd );
- assertEquals( dd.getFirstChild().asText().trim(), "Description 2." );
+ assertEquals( "Description 2.", dd.getFirstChild().asText().trim() );
dl = (HtmlDefinitionList) elementIterator.next();
assertNotNull( dl );
dt = (HtmlDefinitionTerm) elementIterator.next();
assertNotNull( dt );
- assertEquals( dt.getFirstChild().asText().trim(), "Term 21." );
+ assertEquals( "Term 21.", dt.getFirstChild().asText().trim() );
dd = (HtmlDefinitionDescription) elementIterator.next();
assertNotNull( dd );
- assertEquals( dd.getFirstChild().asText().trim(), "Description 21." );
+ assertEquals( "Description 21.", dd.getFirstChild().asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 1 below list." );
+ assertEquals( "Paragraph 1 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 2 below list." );
+ assertEquals( "Paragraph 2 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 3 below list." );
+ assertEquals( "Paragraph 3 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 4 below list." );
+ assertEquals( "Paragraph 4 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 5 below list." );
+ assertEquals( "Paragraph 5 below list.", p.asText().trim() );
p = (HtmlParagraph) elementIterator.next();
assertNotNull( p );
- assertEquals( p.asText().trim(), "Paragraph 6 below list." );
+ assertEquals( "Paragraph 6 below list.", p.asText().trim() );
assertFalse( elementIterator.hasNext() );
}
