Author: ltheussl
Date: Fri Aug 17 05:22:42 2007
New Revision: 567040
URL: http://svn.apache.org/viewvc?view=rev&rev=567040
Log:
Use new test classes, decouple from apt and xdoc modules (DOXIA-100).
Conversion of a full model to pdf fails for some reason, to be investigated.
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/images/figure
(with props)
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/itext/
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/itext/itext.xml
(with props)
Removed:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/apt/
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/xdoc/
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
Modified: maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml?view=diff&rev=567040&r1=567039&r2=567040
==============================================================================
--- maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml (original)
+++ maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/pom.xml Fri Aug 17
05:22:42 2007
@@ -53,18 +53,6 @@
<artifactId>xpp3</artifactId>
<version>1.1.3.4-RC3</version>
</dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-apt</artifactId>
- <version>${projectVersion}</version>
- <scope>test</scope>
- </dependency>
- <dependency>
- <groupId>org.apache.maven.doxia</groupId>
- <artifactId>doxia-module-xdoc</artifactId>
- <version>${projectVersion}</version>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
Modified:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java?view=diff&rev=567040&r1=567039&r2=567040
==============================================================================
---
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
(original)
+++
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/java/org/apache/maven/doxia/module/itext/ITextSinkTestCase.java
Fri Aug 17 05:22:42 2007
@@ -26,13 +26,14 @@
import java.io.InputStream;
import java.io.InputStreamReader;
import java.io.Reader;
+import java.io.Writer;
+
import java.net.URL;
import java.net.URLClassLoader;
-import org.apache.maven.doxia.module.apt.AptParser;
-import org.apache.maven.doxia.module.xdoc.XdocParser;
+import org.apache.maven.doxia.AbstractModuleTest;
import org.apache.maven.doxia.sink.Sink;
-import org.codehaus.plexus.PlexusTestCase;
+import org.apache.maven.doxia.sink.SinkTestDocument;
/**
* <code>iText Sink</code> Test case.
@@ -41,8 +42,24 @@
* @version $Id$
*/
public class ITextSinkTestCase
- extends PlexusTestCase
+ extends AbstractModuleTest
{
+
+ /** [EMAIL PROTECTED] */
+ protected String outputExtension()
+ {
+ return "xml";
+ }
+
+ /**
+ * Returns the directory where all sink test output will go.
+ * @return The test output directory.
+ */
+ protected String getOutputDir()
+ {
+ return "sink/";
+ }
+
/**
* Convenience method
*
@@ -52,135 +69,55 @@
*/
protected File getGeneratedFile( String prefix, String suffix )
{
- File outputDirectory = new File( getBasedir(), "target/output" );
+ File outputDirectory = new File( getBasedir(), outputBaseDir() +
getOutputDir() );
if ( !outputDirectory.exists() )
{
outputDirectory.mkdirs();
}
- return new File( outputDirectory, prefix + suffix );
+ return new File( outputDirectory, prefix + "." + suffix );
}
- /**
- * Create an <code>iTextSink</code> with a given classLoader (images dir)
- *
- * @param prefix
- * @param suffix
- * @return an iTextSink
- * @throws Exception if any
- */
- protected Sink createSink( String prefix, String suffix )
- throws Exception
+ /** [EMAIL PROTECTED] */
+ protected Sink createSink( Writer writer )
{
- ITextSink sink = new ITextSink( new FileWriter( getGeneratedFile(
prefix, suffix ) ) );
+ ITextSink sink = new ITextSink( writer );
- sink.setClassLoader( new URLClassLoader( new URL[] {
ITextSinkTestCase.class.getResource( "/images/" ) } ) );
+ sink.setClassLoader( new URLClassLoader(
+ new URL[] { ITextSinkTestCase.class.getResource( "/images/" ) } )
);
return sink;
}
- /**
- * @param path
- * @return a reader from an <code>apt</code> file.
- * @throws Exception if any
- */
- protected Reader getAptReader( String path )
- throws Exception
- {
- InputStream is =
Thread.currentThread().getContextClassLoader().getResourceAsStream( path );
-
- InputStreamReader reader = new InputStreamReader( is );
-
- return reader;
- }
-
- /**
- * @param path
- * @return a reader from an <code>xdoc</code> file.
- * @throws Exception if any
- */
- protected Reader getXdocReader( String path )
- throws Exception
- {
- InputStream is =
Thread.currentThread().getContextClassLoader().getResourceAsStream( path );
-
- InputStreamReader reader = new InputStreamReader( is );
-
- return reader;
- }
public void testGeneratingPDFFromITextXml()
throws Exception
{
- File f = new File( getBasedir(), "src/test/resources/apt/itext.xml" );
+ File f = new File( getBasedir(), "src/test/resources/itext/itext.xml"
);
ITextUtil.writePdf( new FileInputStream( f ),
- new FileOutputStream( getGeneratedFile(
"test_itext_apt", ".pdf" ) ) );
- }
-
- /**
- * Generate a pdf and a rtf from an <code>apt</code> file
- *
- * @throws Exception if any
- */
- public void testApt()
- throws Exception
- {
- Sink sink = createSink( "test_apt", ".xml" );
-
- AptParser parser = new AptParser();
-
- parser.parse( getAptReader( "apt/test.apt" ), sink );
-
- sink.close();
-
- ITextUtil.writePdf( new FileInputStream( getGeneratedFile( "test_apt",
".xml" ) ),
- new FileOutputStream( getGeneratedFile(
"test_apt", ".pdf" ) ) );
+ new FileOutputStream( getGeneratedFile(
"test_itext", "pdf" ) ) );
}
/**
- * Generate a pdf and a rtf from an <code>apt</code> file
+ * Generate a pdf and a rtf from the standart test model.
*
* @throws Exception if any
*/
- public void xtestApt2()
+ public void testModel()
throws Exception
{
- Sink sink = createSink( "guide-ide-netbeans_apt", ".xml" );
+ Sink sink = createSink( getTestWriter( "test_model", "xml" ) );
- AptParser parser = new AptParser();
+ SinkTestDocument.generate( sink );
- parser.parse( getAptReader( "apt/guide-ide-netbeans.apt" ), sink );
-
- sink.close();
-
- ITextUtil.writePdf( new FileInputStream( getGeneratedFile(
"guide-ide-netbeans_apt", ".xml" ) ),
- new FileOutputStream( getGeneratedFile(
"guide-ide-netbeans_apt", ".pdf" ) ) );
-
- ITextUtil.writeRtf( new FileInputStream( getGeneratedFile(
"guide-ide-netbeans_apt", ".xml" ) ),
- new FileOutputStream( getGeneratedFile(
"guide-ide-netbeans_apt", ".rtf" ) ) );
+ // TODO: doesn't work, FIXME
+ /*
+ ITextUtil.writePdf( new FileInputStream( getGeneratedFile(
"test_model", "xml" ) ),
+ new FileOutputStream( getGeneratedFile(
"test_model", "pdf" ) ) );
+ ITextUtil.writeRtf( new FileInputStream( getGeneratedFile( "test_apt",
"xml" ) ),
+ new FileOutputStream( getGeneratedFile(
"test_apt", "rtf" ) ) );
+ */
}
- /**
- * Generate a pdf and a rtf from an <code>xdoc</code> file
- *
- * @throws Exception if any
- */
- public void xtestXdoc()
- throws Exception
- {
- Sink sink = createSink( "test_xdoc", ".xml" );
-
- XdocParser parser = new XdocParser();
-
- parser.parse( getXdocReader( "xdoc/test.xml" ), sink );
-
- sink.close();
-
- ITextUtil.writePdf( new FileInputStream( getGeneratedFile(
"test_xdoc", ".xml" ) ),
- new FileOutputStream( getGeneratedFile(
"test_xdoc", ".pdf" ) ) );
-
- ITextUtil.writeRtf( new FileInputStream( getGeneratedFile(
"test_xdoc", ".xml" ) ),
- new FileOutputStream( getGeneratedFile(
"test_xdoc", ".rtf" ) ) );
- }
}
Added:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/images/figure
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/images/figure?view=auto&rev=567040
==============================================================================
Binary file - no diff available.
Propchange:
maven/doxia/doxia/trunk/doxia-modules/doxia-module-itext/src/test/resources/images/figure
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
