You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2013/04/11 22:45:00 UTC
svn commit: r1467081 -
/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
Author: rfscholte
Date: Thu Apr 11 20:44:59 2013
New Revision: 1467081
URL: http://svn.apache.org/r1467081
Log:
remove () from old casts
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
Modified: maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java?rev=1467081&r1=1467080&r2=1467081&view=diff
==============================================================================
--- maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java (original)
+++ maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/parser/XhtmlBaseParserTest.java Thu Apr 11 20:44:59 2013
@@ -81,34 +81,34 @@ public class XhtmlBaseParserTest
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "paragraph", ( it.next() ).getName() );
- assertEquals( "section1", ( it.next() ).getName() );
- assertEquals( "sectionTitle1", ( it.next() ).getName() );
- assertEquals( "sectionTitle1_", ( it.next() ).getName() );
- assertEquals( "section2", ( it.next() ).getName() );
- assertEquals( "sectionTitle2", ( it.next() ).getName() );
- assertEquals( "sectionTitle2_", ( it.next() ).getName() );
- assertEquals( "section3", ( it.next() ).getName() );
- assertEquals( "sectionTitle3", ( it.next() ).getName() );
- assertEquals( "sectionTitle3_", ( it.next() ).getName() );
- assertEquals( "section4", ( it.next() ).getName() );
- assertEquals( "sectionTitle4", ( it.next() ).getName() );
- assertEquals( "sectionTitle4_", ( it.next() ).getName() );
- assertEquals( "section5", ( it.next() ).getName() );
- assertEquals( "sectionTitle5", ( it.next() ).getName() );
- assertEquals( "sectionTitle5_", ( it.next() ).getName() );
- assertEquals( "section5_", ( it.next() ).getName() );
- assertEquals( "section4_", ( it.next() ).getName() );
- assertEquals( "section3_", ( it.next() ).getName() );
- assertEquals( "section2_", ( it.next() ).getName() );
- assertEquals( "section1_", ( it.next() ).getName() );
- assertEquals( "section1", ( it.next() ).getName() );
- assertEquals( "sectionTitle1", ( it.next() ).getName() );
- assertEquals( "sectionTitle1_", ( it.next() ).getName() );
+ assertEquals( "paragraph", it.next().getName() );
+ assertEquals( "section1", it.next().getName() );
+ assertEquals( "sectionTitle1", it.next().getName() );
+ assertEquals( "sectionTitle1_", it.next().getName() );
+ assertEquals( "section2", it.next().getName() );
+ assertEquals( "sectionTitle2", it.next().getName() );
+ assertEquals( "sectionTitle2_", it.next().getName() );
+ assertEquals( "section3", it.next().getName() );
+ assertEquals( "sectionTitle3", it.next().getName() );
+ assertEquals( "sectionTitle3_", it.next().getName() );
+ assertEquals( "section4", it.next().getName() );
+ assertEquals( "sectionTitle4", it.next().getName() );
+ assertEquals( "sectionTitle4_", it.next().getName() );
+ assertEquals( "section5", it.next().getName() );
+ assertEquals( "sectionTitle5", it.next().getName() );
+ assertEquals( "sectionTitle5_", it.next().getName() );
+ assertEquals( "section5_", it.next().getName() );
+ assertEquals( "section4_", it.next().getName() );
+ assertEquals( "section3_", it.next().getName() );
+ assertEquals( "section2_", it.next().getName() );
+ assertEquals( "section1_", it.next().getName() );
+ assertEquals( "section1", it.next().getName() );
+ assertEquals( "sectionTitle1", it.next().getName() );
+ assertEquals( "sectionTitle1_", it.next().getName() );
// this one is missing because we enclose everything in <p> which is not valid xhtml,
// needs to be tested in overriding parser, eg XhtmlParser, XdocParser.
- //assertEquals( "section1_", ( it.next() ).getName() );
- assertEquals( "paragraph_", ( it.next() ).getName() );
+ //assertEquals( "section1_", it.next().getName() );
+ assertEquals( "paragraph_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -123,32 +123,32 @@ public class XhtmlBaseParserTest
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "paragraph", ( it.next() ).getName() );
- assertEquals( "section1", ( it.next() ).getName() );
- assertEquals( "sectionTitle1", ( it.next() ).getName() );
- assertEquals( "sectionTitle1_", ( it.next() ).getName() );
-
- assertEquals( "section2", ( it.next() ).getName() );
- assertEquals( "section3", ( it.next() ).getName() );
- assertEquals( "section4", ( it.next() ).getName() );
-
- assertEquals( "section5", ( it.next() ).getName() );
- assertEquals( "sectionTitle5", ( it.next() ).getName() );
- assertEquals( "sectionTitle5_", ( it.next() ).getName() );
- assertEquals( "section5_", ( it.next() ).getName() );
-
- assertEquals( "section4_", ( it.next() ).getName() );
- assertEquals( "section3_", ( it.next() ).getName() );
- assertEquals( "section2_", ( it.next() ).getName() );
-
- assertEquals( "section2", ( it.next() ).getName() );
- assertEquals( "sectionTitle2", ( it.next() ).getName() );
- assertEquals( "sectionTitle2_", ( it.next() ).getName() );
+ assertEquals( "paragraph", it.next().getName() );
+ assertEquals( "section1", it.next().getName() );
+ assertEquals( "sectionTitle1", it.next().getName() );
+ assertEquals( "sectionTitle1_", it.next().getName() );
+
+ assertEquals( "section2", it.next().getName() );
+ assertEquals( "section3", it.next().getName() );
+ assertEquals( "section4", it.next().getName() );
+
+ assertEquals( "section5", it.next().getName() );
+ assertEquals( "sectionTitle5", it.next().getName() );
+ assertEquals( "sectionTitle5_", it.next().getName() );
+ assertEquals( "section5_", it.next().getName() );
+
+ assertEquals( "section4_", it.next().getName() );
+ assertEquals( "section3_", it.next().getName() );
+ assertEquals( "section2_", it.next().getName() );
+
+ assertEquals( "section2", it.next().getName() );
+ assertEquals( "sectionTitle2", it.next().getName() );
+ assertEquals( "sectionTitle2_", it.next().getName() );
// these two are missing because we enclose everything in <p> which is not valid xhtml,
// needs to be tested in overriding parser, eg XhtmlParser, XdocParser.
- //assertEquals( "section2_", ( it.next() ).getName() );
- //assertEquals( "section1_", ( it.next() ).getName() );
- assertEquals( "paragraph_", ( it.next() ).getName() );
+ //assertEquals( "section2_", it.next().getName() );
+ //assertEquals( "section1_", it.next().getName() );
+ assertEquals( "paragraph_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -162,7 +162,7 @@ public class XhtmlBaseParserTest
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "figureGraphics", ( it.next() ).getName() );
+ assertEquals( "figureGraphics", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -178,20 +178,20 @@ public class XhtmlBaseParserTest
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "table", ( it.next() ).getName() );
- assertEquals( "tableRows", ( it.next() ).getName() );
- assertEquals( "tableRow", ( it.next() ).getName() );
- assertEquals( "tableHeaderCell", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "tableHeaderCell_", ( it.next() ).getName() );
- assertEquals( "tableRow_", ( it.next() ).getName() );
- assertEquals( "tableRow", ( it.next() ).getName() );
- assertEquals( "tableCell", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "tableCell_", ( it.next() ).getName() );
- assertEquals( "tableRow_", ( it.next() ).getName() );
- assertEquals( "tableRows_", ( it.next() ).getName() );
- assertEquals( "table_", ( it.next() ).getName() );
+ assertEquals( "table", it.next().getName() );
+ assertEquals( "tableRows", it.next().getName() );
+ assertEquals( "tableRow", it.next().getName() );
+ assertEquals( "tableHeaderCell", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "tableHeaderCell_", it.next().getName() );
+ assertEquals( "tableRow_", it.next().getName() );
+ assertEquals( "tableRow", it.next().getName() );
+ assertEquals( "tableCell", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "tableCell_", it.next().getName() );
+ assertEquals( "tableRow_", it.next().getName() );
+ assertEquals( "tableRows_", it.next().getName() );
+ assertEquals( "table_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -207,19 +207,19 @@ public class XhtmlBaseParserTest
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "paragraph", ( it.next() ).getName() );
- assertEquals( "bold", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "bold_", ( it.next() ).getName() );
+ assertEquals( "paragraph", it.next().getName() );
+ assertEquals( "bold", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "bold_", it.next().getName() );
SinkEventElement el = it.next();
assertEquals( "text", el.getName() );
assertEquals( " ", (String) el.getArgs()[0] );
- assertEquals( "italic", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "italic_", ( it.next() ).getName() );
- assertEquals( "paragraph_", ( it.next() ).getName() );
+ assertEquals( "italic", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "italic_", it.next().getName() );
+ assertEquals( "paragraph_", it.next().getName() );
assertFalse( it.hasNext() );
@@ -231,20 +231,20 @@ public class XhtmlBaseParserTest
parser.parse( text, sink );
it = sink.getEventList().iterator();
- assertEquals( "paragraph", ( it.next() ).getName() );
- assertEquals( "bold", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "bold_", ( it.next() ).getName() );
+ assertEquals( "paragraph", it.next().getName() );
+ assertEquals( "bold", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "bold_", it.next().getName() );
el = it.next();
assertEquals( "text", el.getName() );
// according to section 2.11 of the XML spec, parsers must normalize line breaks to "\n"
assertEquals( "\n", (String) el.getArgs()[0] );
- assertEquals( "italic", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "italic_", ( it.next() ).getName() );
- assertEquals( "paragraph_", ( it.next() ).getName() );
+ assertEquals( "italic", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "italic_", it.next().getName() );
+ assertEquals( "paragraph_", it.next().getName() );
assertFalse( it.hasNext() );
@@ -255,17 +255,17 @@ public class XhtmlBaseParserTest
parser.parse( text, sink );
it = sink.getEventList().iterator();
- assertEquals( "paragraph", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "italic", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "italic_", ( it.next() ).getName() );
+ assertEquals( "paragraph", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "italic", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "italic_", it.next().getName() );
el = it.next();
assertEquals( "text", el.getName() );
assertEquals( ".", (String) el.getArgs()[0] );
- assertEquals( "paragraph_", ( it.next() ).getName() );
+ assertEquals( "paragraph_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -278,11 +278,11 @@ public class XhtmlBaseParserTest
parser.parse( text, sink );
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "verbatim", ( it.next() ).getName() );
- assertEquals( "link", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "link_", ( it.next() ).getName() );
- assertEquals( "verbatim_", ( it.next() ).getName() );
+ assertEquals( "verbatim", it.next().getName() );
+ assertEquals( "link", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "link_", it.next().getName() );
+ assertEquals( "verbatim_", it.next().getName() );
assertFalse( it.hasNext() );
text = "<pre><![CDATA[<a href=\"what.html\">what</a>]]></pre>";
@@ -290,9 +290,9 @@ public class XhtmlBaseParserTest
parser.parse( text, sink );
it = sink.getEventList().iterator();
- assertEquals( "verbatim", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "verbatim_", ( it.next() ).getName() );
+ assertEquals( "verbatim", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "verbatim_", it.next().getName() );
assertFalse( it.hasNext() );
text = "<pre><![CDATA[<pre>what</pre>]]></pre>";
@@ -300,9 +300,9 @@ public class XhtmlBaseParserTest
parser.parse( text, sink );
it = sink.getEventList().iterator();
- assertEquals( "verbatim", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "verbatim_", ( it.next() ).getName() );
+ assertEquals( "verbatim", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "verbatim_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -318,15 +318,15 @@ public class XhtmlBaseParserTest
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "verbatim", ( it.next() ).getName() );
- assertEquals( "link", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "link_", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "link", ( it.next() ).getName() );
- assertEquals( "text", ( it.next() ).getName() );
- assertEquals( "link_", ( it.next() ).getName() );
- assertEquals( "verbatim_", ( it.next() ).getName() );
+ assertEquals( "verbatim", it.next().getName() );
+ assertEquals( "link", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "link_", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "link", it.next().getName() );
+ assertEquals( "text", it.next().getName() );
+ assertEquals( "link_", it.next().getName() );
+ assertEquals( "verbatim_", it.next().getName() );
}
/** @throws Exception */
@@ -382,8 +382,8 @@ public class XhtmlBaseParserTest
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "section1", ( it.next() ).getName() );
- assertEquals( "sectionTitle1", ( it.next() ).getName() );
+ assertEquals( "section1", it.next().getName() );
+ assertEquals( "sectionTitle1", it.next().getName() );
SinkEventElement textEvt = it.next();
assertEquals( "text", textEvt.getName() );
@@ -405,8 +405,8 @@ public class XhtmlBaseParserTest
assertEquals( "text", textEvt.getName() );
assertEquals( "\uD835\uDFED", textEvt.getArgs()[0] );
- assertEquals( "sectionTitle1_", ( it.next() ).getName() );
- assertEquals( "paragraph", ( it.next() ).getName() );
+ assertEquals( "sectionTitle1_", it.next().getName() );
+ assertEquals( "paragraph", it.next().getName() );
textEvt = it.next();
assertEquals( "text", textEvt.getName() );
@@ -432,7 +432,7 @@ public class XhtmlBaseParserTest
assertEquals( "text", textEvt.getName() );
assertEquals( "A", textEvt.getArgs()[0] );
- assertEquals( "paragraph_", ( it.next() ).getName() );
+ assertEquals( "paragraph_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -447,8 +447,8 @@ public class XhtmlBaseParserTest
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "section1", ( it.next() ).getName() );
- assertEquals( "sectionTitle1", ( it.next() ).getName() );
+ assertEquals( "section1", it.next().getName() );
+ assertEquals( "sectionTitle1", it.next().getName() );
// Couple symbols from Latin-1:
// http://www.w3.org/TR/xhtml1/dtds.html#a_dtd_Latin-1_characters
@@ -461,8 +461,8 @@ public class XhtmlBaseParserTest
assertEquals( "text", textEvt.getName() );
assertEquals( "\u00AE", textEvt.getArgs()[0] );
- assertEquals( "sectionTitle1_", ( it.next() ).getName() );
- assertEquals( "paragraph", ( it.next() ).getName() );
+ assertEquals( "sectionTitle1_", it.next().getName() );
+ assertEquals( "paragraph", it.next().getName() );
// Couple symbols from Special characters:
// http://www.w3.org/TR/xhtml1/dtds.html#a_dtd_Special_characters
@@ -486,7 +486,7 @@ public class XhtmlBaseParserTest
assertEquals( "text", textEvt.getName() );
assertEquals( "\u2190", textEvt.getArgs()[0] );
- assertEquals( "paragraph_", ( it.next() ).getName() );
+ assertEquals( "paragraph_", it.next().getName() );
assertFalse( it.hasNext() );
}
@@ -534,24 +534,24 @@ public class XhtmlBaseParserTest
parser.parse( text, sink );
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "list", ( it.next() ).getName() );
- assertEquals( "listItem", ( it.next() ).getName() );
- assertEquals( "listItem_", ( it.next() ).getName() );
- assertEquals( "list_", ( it.next() ).getName() );
-
- assertEquals( "numberedList", ( it.next() ).getName() );
- assertEquals( "numberedListItem", ( it.next() ).getName() );
- assertEquals( "numberedListItem_", ( it.next() ).getName() );
- assertEquals( "numberedList_", ( it.next() ).getName() );
-
- assertEquals( "definitionList", ( it.next() ).getName() );
- assertEquals( "definitionListItem", ( it.next() ).getName() );
- assertEquals( "definedTerm", ( it.next() ).getName() );
- assertEquals( "definedTerm_", ( it.next() ).getName() );
- assertEquals( "definition", ( it.next() ).getName() );
- assertEquals( "definition_", ( it.next() ).getName() );
- assertEquals( "definitionListItem_", ( it.next() ).getName() );
- assertEquals( "definitionList_", ( it.next() ).getName() );
+ assertEquals( "list", it.next().getName() );
+ assertEquals( "listItem", it.next().getName() );
+ assertEquals( "listItem_", it.next().getName() );
+ assertEquals( "list_", it.next().getName() );
+
+ assertEquals( "numberedList", it.next().getName() );
+ assertEquals( "numberedListItem", it.next().getName() );
+ assertEquals( "numberedListItem_", it.next().getName() );
+ assertEquals( "numberedList_", it.next().getName() );
+
+ assertEquals( "definitionList", it.next().getName() );
+ assertEquals( "definitionListItem", it.next().getName() );
+ assertEquals( "definedTerm", it.next().getName() );
+ assertEquals( "definedTerm_", it.next().getName() );
+ assertEquals( "definition", it.next().getName() );
+ assertEquals( "definition_", it.next().getName() );
+ assertEquals( "definitionListItem_", it.next().getName() );
+ assertEquals( "definitionList_", it.next().getName() );
}
/** @throws Exception */
@@ -562,22 +562,22 @@ public class XhtmlBaseParserTest
parser.parse( text, sink );
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "bold", ( it.next() ).getName() );
- assertEquals( "bold_", ( it.next() ).getName() );
- assertEquals( "bold", ( it.next() ).getName() );
- assertEquals( "bold_", ( it.next() ).getName() );
-
- assertEquals( "italic", ( it.next() ).getName() );
- assertEquals( "italic_", ( it.next() ).getName() );
- assertEquals( "italic", ( it.next() ).getName() );
- assertEquals( "italic_", ( it.next() ).getName() );
-
- assertEquals( "monospaced", ( it.next() ).getName() );
- assertEquals( "monospaced_", ( it.next() ).getName() );
- assertEquals( "monospaced", ( it.next() ).getName() );
- assertEquals( "monospaced_", ( it.next() ).getName() );
- assertEquals( "monospaced", ( it.next() ).getName() );
- assertEquals( "monospaced_", ( it.next() ).getName() );
+ assertEquals( "bold", it.next().getName() );
+ assertEquals( "bold_", it.next().getName() );
+ assertEquals( "bold", it.next().getName() );
+ assertEquals( "bold_", it.next().getName() );
+
+ assertEquals( "italic", it.next().getName() );
+ assertEquals( "italic_", it.next().getName() );
+ assertEquals( "italic", it.next().getName() );
+ assertEquals( "italic_", it.next().getName() );
+
+ assertEquals( "monospaced", it.next().getName() );
+ assertEquals( "monospaced_", it.next().getName() );
+ assertEquals( "monospaced", it.next().getName() );
+ assertEquals( "monospaced_", it.next().getName() );
+ assertEquals( "monospaced", it.next().getName() );
+ assertEquals( "monospaced_", it.next().getName() );
}
/** @throws Exception */
@@ -588,9 +588,9 @@ public class XhtmlBaseParserTest
parser.parse( text, sink );
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "lineBreak", ( it.next() ).getName() );
- assertEquals( "horizontalRule", ( it.next() ).getName() );
- assertEquals( "figureGraphics", ( it.next() ).getName() );
+ assertEquals( "lineBreak", it.next().getName() );
+ assertEquals( "horizontalRule", it.next().getName() );
+ assertEquals( "figureGraphics", it.next().getName() );
}
/** @throws Exception */
@@ -601,13 +601,13 @@ public class XhtmlBaseParserTest
parser.parse( text, sink );
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "paragraph", ( it.next() ).getName() );
- assertEquals( "comment", ( it.next() ).getName() );
- assertEquals( "pageBreak", ( it.next() ).getName() );
- assertEquals( "nonBreakingSpace", ( it.next() ).getName() );
- assertEquals( "nonBreakingSpace", ( it.next() ).getName() );
+ assertEquals( "paragraph", it.next().getName() );
+ assertEquals( "comment", it.next().getName() );
+ assertEquals( "pageBreak", it.next().getName() );
+ assertEquals( "nonBreakingSpace", it.next().getName() );
+ assertEquals( "nonBreakingSpace", it.next().getName() );
// unknown events are not reported by the base parser
- assertEquals( "paragraph_", ( it.next() ).getName() );
+ assertEquals( "paragraph_", it.next().getName() );
}
/** @throws Exception */
@@ -618,25 +618,25 @@ public class XhtmlBaseParserTest
parser.parse( text, sink );
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "table", ( it.next() ).getName() );
+ assertEquals( "table", it.next().getName() );
// DOXIA-374
SinkEventElement el = it.next();
assertEquals( "tableRows", el.getName() );
assertFalse( ( (Boolean) el.getArgs()[1] ).booleanValue() );
- assertEquals( "tableCaption", ( it.next() ).getName() );
- assertEquals( "tableCaption_", ( it.next() ).getName() );
- assertEquals( "tableRow", ( it.next() ).getName() );
- assertEquals( "tableHeaderCell", ( it.next() ).getName() );
- assertEquals( "tableHeaderCell_", ( it.next() ).getName() );
- assertEquals( "tableRow_", ( it.next() ).getName() );
- assertEquals( "tableRow", ( it.next() ).getName() );
- assertEquals( "tableCell", ( it.next() ).getName() );
- assertEquals( "tableCell_", ( it.next() ).getName() );
- assertEquals( "tableRow_", ( it.next() ).getName() );
- assertEquals( "tableRows_", ( it.next() ).getName() );
- assertEquals( "table_", ( it.next() ).getName() );
+ assertEquals( "tableCaption", it.next().getName() );
+ assertEquals( "tableCaption_", it.next().getName() );
+ assertEquals( "tableRow", it.next().getName() );
+ assertEquals( "tableHeaderCell", it.next().getName() );
+ assertEquals( "tableHeaderCell_", it.next().getName() );
+ assertEquals( "tableRow_", it.next().getName() );
+ assertEquals( "tableRow", it.next().getName() );
+ assertEquals( "tableCell", it.next().getName() );
+ assertEquals( "tableCell_", it.next().getName() );
+ assertEquals( "tableRow_", it.next().getName() );
+ assertEquals( "tableRows_", it.next().getName() );
+ assertEquals( "table_", it.next().getName() );
}
/** @throws Exception */
@@ -647,11 +647,11 @@ public class XhtmlBaseParserTest
parser.parse( text, sink );
Iterator<SinkEventElement> it = sink.getEventList().iterator();
- assertEquals( "figure", ( it.next() ).getName() );
- assertEquals( "figureGraphics", ( it.next() ).getName() );
- assertEquals( "figureCaption", ( it.next() ).getName() );
- assertEquals( "figureCaption_", ( it.next() ).getName() );
- assertEquals( "figure_", ( it.next() ).getName() );
+ assertEquals( "figure", it.next().getName() );
+ assertEquals( "figureGraphics", it.next().getName() );
+ assertEquals( "figureCaption", it.next().getName() );
+ assertEquals( "figureCaption_", it.next().getName() );
+ assertEquals( "figure_", it.next().getName() );
}
/** @throws Exception */
@@ -672,37 +672,37 @@ public class XhtmlBaseParserTest
SinkEventElement element = it.next();
assertEquals( "link", element.getName() );
assertEquals( "", element.getArgs()[0] );
- assertEquals( "link_", ( it.next() ).getName() );
+ assertEquals( "link_", it.next().getName() );
element = it.next();
assertEquals( "link", element.getName() );
assertEquals( "valid", element.getArgs()[0] );
- assertEquals( "link_", ( it.next() ).getName() );
+ assertEquals( "link_", it.next().getName() );
element = it.next();
assertEquals( "link", element.getName() );
assertEquals( "#a1invalid", element.getArgs()[0] );
- assertEquals( "link_", ( it.next() ).getName() );
+ assertEquals( "link_", it.next().getName() );
element = it.next();
assertEquals( "link", element.getName() );
assertEquals( "http://www.fo.com/index.html#1invalid", element.getArgs()[0] );
- assertEquals( "link_", ( it.next() ).getName() );
+ assertEquals( "link_", it.next().getName() );
element = it.next();
assertEquals( "anchor", element.getName() );
assertEquals( "valid", element.getArgs()[0] );
- assertEquals( "anchor_", ( it.next() ).getName() );
+ assertEquals( "anchor_", it.next().getName() );
element = it.next();
assertEquals( "anchor", element.getName() );
assertEquals( "a1invalid", element.getArgs()[0] );
- assertEquals( "anchor_", ( it.next() ).getName() );
+ assertEquals( "anchor_", it.next().getName() );
element = it.next();
assertEquals( "anchor", element.getName() );
assertEquals( "a1invalid", element.getArgs()[0] );
- assertEquals( "anchor_", ( it.next() ).getName() );
+ assertEquals( "anchor_", it.next().getName() );
}
/**
@@ -726,7 +726,7 @@ public class XhtmlBaseParserTest
SinkEventAttributeSet attribs = (SinkEventAttributeSet) event.getArgs()[2];
// ampersand should be un-escaped
assertEquals( "http://ex.com/ex.js?v=l&l=e", attribs.getAttribute( "src" ) );
- assertEquals( "unknown", ( it.next() ).getName() );
+ assertEquals( "unknown", it.next().getName() );
assertFalse( it.hasNext() );
sink.reset();