Author: ltheussl
Date: Tue Mar 23 20:52:37 2010
New Revision: 926772
URL: http://svn.apache.org/viewvc?rev=926772&view=rev
Log:
[DOXIA-385] Fix tests after r926049.
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java?rev=926772&r1=926771&r2=926772&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/main/java/org/apache/maven/doxia/module/xdoc/XdocSink.java
Tue Mar 23 20:52:37 2010
@@ -455,11 +455,6 @@ public class XdocSink
MutableAttributeSet att = new SinkEventAttributeSet();
- if ( !tableAttributes.isDefined( Attribute.ALIGN.toString() ) )
- {
- att.addAttribute( Attribute.ALIGN, "center" );
- }
-
if ( !tableAttributes.isDefined( Attribute.BORDER.toString() ) )
{
att.addAttribute( Attribute.BORDER, ( grid ? "1" : "0" ) );
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java?rev=926772&r1=926771&r2=926772&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XdocSinkTest.java
Tue Mar 23 20:52:37 2010
@@ -150,8 +150,8 @@ public class XdocSinkTest
/** {...@inheritdoc} */
protected String getTableBlock( String cell, String caption )
{
- return "<table align=\"center\" border=\"0\"><caption>" + caption
- + "</caption><tr valign=\"top\"><td align=\"center\">" + cell
+ "</td></tr></table>";
+ return "<table border=\"0\"><caption>" + caption
+ + "</caption><tr valign=\"top\"><td>" + cell +
"</td></tr></table>";
}
/** {...@inheritdoc} */
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSinkTest.java?rev=926772&r1=926771&r2=926772&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xdoc/src/test/java/org/apache/maven/doxia/module/xdoc/XmlWriterXdocSinkTest.java
Tue Mar 23 20:52:37 2010
@@ -85,10 +85,10 @@ public class XmlWriterXdocSinkTest
/** {...@inheritdoc} */
protected String getTableBlock( String cell, String caption )
{
- return "<table align=\"center\" border=\"0\">" +
XmlUtil.DEFAULT_LINE_SEPARATOR + DEFAULT_INDENT
+ return "<table border=\"0\">" + XmlUtil.DEFAULT_LINE_SEPARATOR +
DEFAULT_INDENT
+ "<caption>" + caption + "</caption>" +
XmlUtil.DEFAULT_LINE_SEPARATOR + DEFAULT_INDENT
+ "<tr valign=\"top\">" + XmlUtil.DEFAULT_LINE_SEPARATOR +
DEFAULT_INDENT + DEFAULT_INDENT
- + "<td align=\"center\">" + cell + "</td>" +
XmlUtil.DEFAULT_LINE_SEPARATOR + DEFAULT_INDENT + "</tr>"
+ + "<td>" + cell + "</td>" + XmlUtil.DEFAULT_LINE_SEPARATOR +
DEFAULT_INDENT + "</tr>"
+ XmlUtil.DEFAULT_LINE_SEPARATOR + "</table>";
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java?rev=926772&r1=926771&r2=926772&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Tue Mar 23 20:52:37 2010
@@ -182,8 +182,8 @@ public class XhtmlSinkTest
/** {...@inheritdoc} */
protected String getTableBlock( String cell, String caption )
{
- return "<table border=\"0\" class=\"bodyTable\" align=\"center\">"
- + "<caption>Table caption</caption><tr class=\"a\"><td
align=\"center\">cell</td></tr>"
+ return "<table border=\"0\" class=\"bodyTable\">"
+ + "<caption>Table caption</caption><tr
class=\"a\"><td>cell</td></tr>"
+ "</table>";
}