Author: vsiveton
Date: Sun Oct 26 05:37:49 2008
New Revision: 707983
URL: http://svn.apache.org/viewvc?rev=707983&view=rev
Log:
o used the correct writer (ie XML or not) in testTestDocument()
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.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-xhtml/src/test/java/org/apache/maven/doxia/module/xhtml/XhtmlSinkTest.java
Modified:
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java?rev=707983&r1=707982&r2=707983&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-core/src/test/java/org/apache/maven/doxia/sink/AbstractSinkTest.java
Sun Oct 26 05:37:49 2008
@@ -56,13 +56,20 @@
// ----------------------------------------------------------------------
/**
- * Tests that the current sink is able to render the common test document.
+ * Tests that the current sink is able to render the common test document.
If the sink is an Xml sink defined
+ * by [EMAIL PROTECTED] #isXmlSink()}, it uses an Xml Writer defined by
[EMAIL PROTECTED] #getXmlTestWriter(String)}. If not, it uses
+ * the Writer defined by [EMAIL PROTECTED] #getTestWriter(String)}.
+ *
* @see SinkTestDocument
* @throws IOException If the target test document could not be generated.
+ * @see #isXmlSink()
+ * @see #getTestWriter(String)
+ * @see #getXmlTestWriter(String)
*/
public final void testTestDocument() throws IOException
{
- Sink testSink = createSink( getTestWriter( "testDocument" ) );
+ Writer writer = ( isXmlSink() ? getXmlTestWriter( "testDocument" ) :
getTestWriter( "testDocument" ) );
+ Sink testSink = createSink( writer );
SinkTestDocument.generate( testSink );
@@ -687,12 +694,19 @@
return "sink/";
}
-
// ----------------------------------------------------------------------
// Abstract methods the individual SinkTests must provide
// ----------------------------------------------------------------------
/**
+ * This method allows to use the correct Writer in [EMAIL PROTECTED]
#testTestDocument()}.
+ *
+ * @return <code>true</code> if the Sink is an XML one, <code>false</code>
otherwise.
+ * @see #testTestDocument()
+ */
+ protected abstract boolean isXmlSink();
+
+ /**
* Return a new instance of the sink that is being tested.
* @param writer The writer for the sink.
* @return A new sink.
@@ -930,5 +944,4 @@
* @see #testRawText()
*/
protected abstract String getRawTextBlock( String text );
-
}
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java?rev=707983&r1=707982&r2=707983&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-apt/src/test/java/org/apache/maven/doxia/module/apt/AptSinkTest.java
Sun Oct 26 05:37:49 2008
@@ -46,6 +46,12 @@
}
/** [EMAIL PROTECTED] */
+ protected boolean isXmlSink()
+ {
+ return false;
+ }
+
+ /** [EMAIL PROTECTED] */
protected String getTitleBlock( String title )
{
return title;
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java?rev=707983&r1=707982&r2=707983&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-confluence/src/test/java/org/apache/maven/doxia/module/confluence/ConfluenceSinkTest.java
Sun Oct 26 05:37:49 2008
@@ -47,6 +47,12 @@
return ConfluenceMarkup.ANCHOR_START_MARKUP + anchor +
ConfluenceMarkup.ANCHOR_END_MARKUP + anchor;
}
+ /** [EMAIL PROTECTED] */
+ protected boolean isXmlSink()
+ {
+ return false;
+ }
+
/** Not used.
* [EMAIL PROTECTED] */
protected String getAuthorBlock( String author )
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java?rev=707983&r1=707982&r2=707983&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-docbook-simple/src/test/java/org/apache/maven/doxia/module/docbook/DocBookSinkTest.java
Sun Oct 26 05:37:49 2008
@@ -43,6 +43,12 @@
}
/** [EMAIL PROTECTED] */
+ protected boolean isXmlSink()
+ {
+ return true;
+ }
+
+ /** [EMAIL PROTECTED] */
protected String getTitleBlock( String title )
{
return "<articleinfo><title>" + title + "</title>";
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java?rev=707983&r1=707982&r2=707983&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-fo/src/test/java/org/apache/maven/doxia/module/fo/FoSinkTest.java
Sun Oct 26 05:37:49 2008
@@ -140,6 +140,12 @@
}
/** [EMAIL PROTECTED] */
+ protected boolean isXmlSink()
+ {
+ return true;
+ }
+
+ /** [EMAIL PROTECTED] */
protected String getTitleBlock( String title )
{
String attribs = getConfig().getAttributeString( "doc.header.title" );
@@ -381,7 +387,7 @@
}
// ----------------------------------------------------------------------
- // Auxiliary methods
+ // Auxiliary methods
// ----------------------------------------------------------------------
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java?rev=707983&r1=707982&r2=707983&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/main/java/org/apache/maven/doxia/module/itext/ITextSink.java
Sun Oct 26 05:37:49 2008
@@ -55,6 +55,8 @@
* See
http://sourceforge.net/tracker/index.php?func=detail&aid=786427&group_id=15255&atid=115255.</li>
* <li>Images could be on another page and next text on the last one.</li>
* </ul>
+ * <br/>
+ * <b>Note</b>: The encoding used is UTF-8.
*
* @see <a
href="http://www.lowagie.com/iText/tutorial/ch07.html";>http://www.lowagie.com/iText/tutorial/ch07.html</a>
*
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java?rev=707983&r1=707982&r2=707983&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.java
Sun Oct 26 05:37:49 2008
@@ -44,6 +44,12 @@
}
/** [EMAIL PROTECTED] */
+ protected boolean isXmlSink()
+ {
+ return false;
+ }
+
+ /** [EMAIL PROTECTED] */
protected String getTitleBlock( String title )
{
return "\\title{" + LatexSink.escaped( title ) + "}" + EOL;
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java?rev=707983&r1=707982&r2=707983&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-rtf/src/test/java/org/apache/maven/doxia/module/rtf/RtfSinkTest.java
Sun Oct 26 05:37:49 2008
@@ -37,16 +37,25 @@
public class RtfSinkTest
extends AbstractSinkTestCase
{
+ /** [EMAIL PROTECTED] */
protected String outputExtension()
{
return "rtf";
}
+ /** [EMAIL PROTECTED] */
protected Parser createParser()
{
return new AptParser();
}
+ /** [EMAIL PROTECTED] */
+ protected boolean isXmlSink()
+ {
+ return false;
+ }
+
+ /** [EMAIL PROTECTED] */
protected Sink createSink()
throws Exception
{
@@ -55,6 +64,7 @@
return new RtfSink( new FileOutputStream( outputFile ) );
}
+ /** [EMAIL PROTECTED] */
protected Reader getTestReader()
throws Exception
{
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java?rev=707983&r1=707982&r2=707983&view=diff
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-twiki/src/test/java/org/apache/maven/doxia/module/twiki/TWikiSinkTest.java
Sun Oct 26 05:37:49 2008
@@ -43,6 +43,12 @@
}
/** [EMAIL PROTECTED] */
+ protected boolean isXmlSink()
+ {
+ return false;
+ }
+
+ /** [EMAIL PROTECTED] */
protected String getAnchorBlock( String anchor )
{
return EOL + "#" + anchor + anchor;
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=707983&r1=707982&r2=707983&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
Sun Oct 26 05:37:49 2008
@@ -46,6 +46,12 @@
}
/** [EMAIL PROTECTED] */
+ protected boolean isXmlSink()
+ {
+ return true;
+ }
+
+ /** [EMAIL PROTECTED] */
protected String getTitleBlock( String title )
{
return "<title>" + title + "</title>";
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=707983&r1=707982&r2=707983&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
Sun Oct 26 05:37:49 2008
@@ -44,10 +44,16 @@
return new XhtmlSink( writer );
}
+ /** [EMAIL PROTECTED] */
+ protected boolean isXmlSink()
+ {
+ return true;
+ }
+
public void testLinks()
throws Exception
{
- Writer writer = getTestWriter( "links" );
+ Writer writer = getXmlTestWriter( "links" );
XhtmlSink sink = (XhtmlSink) createSink( writer );
sink.link( "http:/www.xdoc.com" );
sink.link_();
