Author: rfscholte
Date: Fri Apr 12 14:51:42 2013
New Revision: 1467294
URL: http://svn.apache.org/r1467294
Log:
[DOXIA-361] Prepare tests
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-latex/src/test/java/org/apache/maven/doxia/module/latex/LatexSinkTest.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-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-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=1467294&r1=1467293&r2=1467294&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
Fri Apr 12 14:51:42 2013
@@ -424,6 +424,23 @@ public abstract class AbstractSinkTest
assertEquals( "Wrong figure!", expected, actual );
}
+
+ public void testFigureWithoutCaption()
+ {
+ String source = "figure.jpg";
+ sink.figure();
+ sink.figureGraphics( source );
+ sink.figure_();
+ sink.flush();
+ sink.close();
+
+ String actual = testWriter.toString();
+ String expected = getFigureBlock( source, null );
+
+ assertEquals( "Wrong figure!", expected, actual );
+
+ }
+
/**
* Checks that the sequence <code>[table(),
* tableRows( Sink.JUSTIFY_CENTER, false ), tableRow(), tableCell(),
@@ -892,7 +909,7 @@ public abstract class AbstractSinkTest
* @see #testFigure()
*/
protected abstract String getFigureBlock( String source, String caption );
-
+
/**
* Returns a Table block generated by this sink.
* @param cell A tabel cell to use.
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=1467294&r1=1467293&r2=1467294&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
Fri Apr 12 14:51:42 2013
@@ -148,8 +148,12 @@ public class AptSinkTest extends Abstrac
/** {@inheritDoc} */
protected String getFigureBlock( String source, String caption )
{
- return EOL + Markup.LEFT_SQUARE_BRACKET + source +
Markup.RIGHT_SQUARE_BRACKET
- + Markup.SPACE + caption + EOL;
+ String figureBlock = EOL + Markup.LEFT_SQUARE_BRACKET + source +
Markup.RIGHT_SQUARE_BRACKET + Markup.SPACE;
+ if( caption != null )
+ {
+ figureBlock += caption + EOL;
+ }
+ return figureBlock;
}
/** {@inheritDoc} */
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=1467294&r1=1467293&r2=1467294&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
Fri Apr 12 14:51:42 2013
@@ -90,7 +90,12 @@ public class ConfluenceSinkTest
/** {@inheritDoc} */
protected String getFigureBlock( String source, String caption )
{
- return EOL + ConfluenceMarkup.FIGURE_START_MARKUP + source +
ConfluenceMarkup.FIGURE_END_MARKUP + caption;
+ String figureBlock = EOL + ConfluenceMarkup.FIGURE_START_MARKUP +
source + ConfluenceMarkup.FIGURE_END_MARKUP;
+ if ( caption != null )
+ {
+ figureBlock += caption;
+ }
+ return figureBlock;
}
/** Not used.
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=1467294&r1=1467293&r2=1467294&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
Fri Apr 12 14:51:42 2013
@@ -150,10 +150,16 @@ public class DocBookSinkTest extends Abs
protected String getFigureBlock( String source, String caption )
{
String format = FileUtils.extension( source ).toUpperCase(
Locale.ENGLISH );
-
- return "<mediaobject><imageobject>"
+ String figureBlock = "<mediaobject><imageobject>"
+ "<imagedata fileref=\"" + source + "\" format=\"" + format +
"\" />"
- + "</imageobject><caption><para>" + caption +
"</para></caption></mediaobject>";
+ + "</imageobject>";
+ if ( caption != null )
+ {
+ figureBlock += "<caption><para>" + caption + "</para></caption>";
+ }
+ figureBlock += "</mediaobject>";
+
+ return figureBlock;
}
/** {@inheritDoc} */
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=1467294&r1=1467293&r2=1467294&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
Fri Apr 12 14:51:42 2013
@@ -32,6 +32,7 @@ import org.apache.maven.doxia.parser.Xht
import org.apache.maven.doxia.sink.Sink;
import org.apache.maven.doxia.sink.AbstractSinkTest;
import org.apache.maven.doxia.sink.SinkTestDocument;
+import org.codehaus.plexus.util.StringUtils;
/**
* <code>FO Sink</code> Test case.
@@ -284,8 +285,17 @@ public class FoSinkTest
String dlAtts = getConfig().getAttributeString( "figure.display" );
String dtAtts = getConfig().getAttributeString( "figure.graphics" );
String ddAtts = getConfig().getAttributeString( "figure.caption" );
- return EOL + EOL + "<fo:block" + dlAtts + "><fo:external-graphic" + "
src=\"" + source + "\"" + dtAtts
- + "/>" + EOL + EOL + "<fo:block" + ddAtts + ">" + caption +
"</fo:block>" + EOL + "</fo:block>" + EOL;
+
+ String figureBlock = EOL + EOL + "<fo:block" + dlAtts +
"><fo:external-graphic" + " src=\"" + source + "\"" + dtAtts
+ + "/>" + EOL;
+ if ( caption != null )
+ {
+ figureBlock += EOL + "<fo:block" + ddAtts + ">" + caption +
"</fo:block>" + EOL;
+ }
+ figureBlock += "</fo:block>" + EOL;
+
+
+ return figureBlock;
}
/** {@inheritDoc} */
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=1467294&r1=1467293&r2=1467294&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
Fri Apr 12 14:51:42 2013
@@ -141,8 +141,14 @@ public class LatexSinkTest
/** {@inheritDoc} */
protected String getFigureBlock( String source, String caption )
{
- return EOL + "\\begin{figure}[htb]" + EOL + "\\begin{center}" + EOL +
"\\includegraphics{" + source + "}" + EOL
- + "\\end{center}" + EOL + "\\caption{Figure\\_caption}" + EOL +
"\\end{figure}" + EOL;
+ String figureBlock = EOL + "\\begin{figure}[htb]" + EOL +
"\\begin{center}" + EOL + "\\includegraphics{" + source + "}" + EOL
+ + "\\end{center}" + EOL;
+ if (caption != null )
+ {
+ figureBlock += "\\caption{Figure\\_caption}" + EOL;
+ }
+ figureBlock += "\\end{figure}" + EOL;
+ return figureBlock;
}
/** {@inheritDoc} */
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=1467294&r1=1467293&r2=1467294&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
Fri Apr 12 14:51:42 2013
@@ -91,7 +91,13 @@ public class TWikiSinkTest
/** {@inheritDoc} */
protected String getFigureBlock( String source, String caption )
{
- return "<img src=\"" + source + "\" alt=\"" + caption + "\" />";
+ String figureBlock = "<img src=\"" + source + "\"";
+ if ( caption != null )
+ {
+ figureBlock += " alt=\"" + caption + "\"";
+ }
+ figureBlock += " />";
+ return figureBlock;
}
/** Not used.
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=1467294&r1=1467293&r2=1467294&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
Fri Apr 12 14:51:42 2013
@@ -144,7 +144,17 @@ public class XdocSinkTest
/** {@inheritDoc} */
protected String getFigureBlock( String source, String caption )
{
- return "<img src=\"" + source + "\" alt=\"" + caption + "\" />";
+ String figureBlock = "<img src=\"" + source + "\"";
+ if ( caption != null )
+ {
+ figureBlock += " alt=\"" + caption + "\"";
+ }
+ else //@todo fix DOXIA-361
+ {
+ figureBlock += " alt=\"\"";
+ }
+ figureBlock += " />";
+ return figureBlock;
}
/** {@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=1467294&r1=1467293&r2=1467294&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
Fri Apr 12 14:51:42 2013
@@ -79,7 +79,17 @@ public class XmlWriterXdocSinkTest
/** {@inheritDoc} */
protected String getFigureBlock( String source, String caption )
{
- return "<img src=\"" + source + "\" alt=\"" + caption + "\"/>";
+ String figureBlock = "<img src=\"" + source + "\"";
+ if ( caption != null )
+ {
+ figureBlock += " alt=\"" + caption + "\"";
+ }
+ else //@todo fix DOXIA-361
+ {
+ figureBlock += " alt=\"\"";
+ }
+ figureBlock += "/>";
+ return figureBlock;
}
/** {@inheritDoc} */
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=1467294&r1=1467293&r2=1467294&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
Fri Apr 12 14:51:42 2013
@@ -178,7 +178,17 @@ public class XhtmlSinkTest
/** {@inheritDoc} */
protected String getFigureBlock( String source, String caption )
{
- return "<img src=\"" + source + "\" alt=\"" + caption + "\" />";
+ String figureBlock = "<img src=\"" + source + "\"";
+ if( caption != null )
+ {
+ figureBlock += " alt=\"" + caption + "\"";
+ }
+ else //@todo fix DOXIA-361
+ {
+ figureBlock += " alt=\"\"";
+ }
+ figureBlock += " />";
+ return figureBlock;
}
/** {@inheritDoc} */
