You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by lt...@apache.org on 2006/04/26 20:12:12 UTC
svn commit: r397265 - in /maven/maven-1/plugins/trunk/html2xdoc: project.xml
src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java
Author: ltheussl
Date: Wed Apr 26 11:12:09 2006
New Revision: 397265
URL: http://svn.apache.org/viewcvs?rev=397265&view=rev
Log:
Activate tests
Modified:
maven/maven-1/plugins/trunk/html2xdoc/project.xml
maven/maven-1/plugins/trunk/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java
Modified: maven/maven-1/plugins/trunk/html2xdoc/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/html2xdoc/project.xml?rev=397265&r1=397264&r2=397265&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/html2xdoc/project.xml (original)
+++ maven/maven-1/plugins/trunk/html2xdoc/project.xml Wed Apr 26 11:12:09 2006
@@ -97,6 +97,11 @@
<url>http://www.dom4j.org/</url>
</dependency>
<dependency>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ <version>1.1-beta-8</version>
+ </dependency>
+ <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.3.03</version>
@@ -124,4 +129,21 @@
</properties>
</dependency>
</dependencies>
+ <build>
+ <unitTest>
+ <resources>
+ <resource>
+ <targetPath>org/apache/maven/html2xdoc</targetPath>
+ <directory>src/test/org/apache/maven/html2xdoc/</directory>
+ <includes>
+ <include>**/*.html</include>
+ <include>**/*.xml</include>
+ </includes>
+ </resource>
+ </resources>
+ <includes>
+ <include>**/*Test*.java</include>
+ </includes>
+ </unitTest>
+ </build>
</project>
Modified: maven/maven-1/plugins/trunk/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java?rev=397265&r1=397264&r2=397265&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java (original)
+++ maven/maven-1/plugins/trunk/html2xdoc/src/test/org/apache/maven/html2xdoc/TestHtml2Xdoc.java Wed Apr 26 11:12:09 2006
@@ -93,17 +93,17 @@
public static void main( String[] args )
{
- TestRunner.run( suite( ) );
+ TestRunner.run( suite() );
}
- public static Test suite( )
+ public static Test suite()
{
return new TestSuite( TestHtml2Xdoc.class );
}
// Test cases
//-------------------------------------------------------------------------
- public void testOne( ) throws Exception
+ public void testOne() throws Exception
{
assertConversion( "missingParaBug.html", "missingParaBug.xml" );
assertConversion( "linkInHeading.html", "linkInHeading.xml" );
@@ -122,7 +122,7 @@
protected void assertConversion( String input, String output )
throws Exception
{
- Html2XdocBean converter = createConverter( );
+ Html2XdocBean converter = createConverter();
Document inputDoc = parseHtml( input );
Document expectedDoc = parse( output );
@@ -132,10 +132,10 @@
if ( verbose )
{
System.out.println( "Comparing: " + input + " to: " + output );
- System.out.println( "Parsed: " + inputDoc.asXML( ) );
- System.out.println( "Generated: " + actualDoc.asXML( ) );
- System.out.println( );
- System.out.println( );
+ System.out.println( "Parsed: " + inputDoc.asXML() );
+ System.out.println( "Generated: " + actualDoc.asXML() );
+ System.out.println();
+ System.out.println();
}
assertEqual( "Output for: " + input + " does not match: " + output,
@@ -171,14 +171,15 @@
protected String getPrettyPrintText( Document doc )
throws IOException
{
- OutputFormat format = OutputFormat.createPrettyPrint( );
- StringWriter buffer = new StringWriter( );
+ OutputFormat format = OutputFormat.createPrettyPrint();
+ format.setPadText( false );
+ StringWriter buffer = new StringWriter();
XMLWriter writer = new XMLWriter( buffer, format );
writer.write( doc );
- writer.close( );
+ writer.close();
- return buffer.toString( );
+ return buffer.toString();
}
/**
@@ -191,7 +192,9 @@
throws Exception
{
URL url = getClassURL( input );
- SAXReader saxReader = new SAXReader( );
+ SAXReader saxReader = new SAXReader();
+ saxReader.setMergeAdjacentText( true );
+ saxReader.setStripWhitespaceText( true );
return saxReader.read( url );
}
@@ -207,7 +210,7 @@
throws Exception
{
URL url = getClassURL( input );
- SAXParser htmlParser = new SAXParser( );
+ SAXParser htmlParser = new SAXParser();
htmlParser.setProperty( "http://cyberneko.org/html/properties/names/elems",
"lower" );
@@ -222,7 +225,7 @@
protected URL getClassURL( String input )
throws Exception
{
- URL url = getClass( ).getResource( input );
+ URL url = getClass().getResource( input );
assertTrue( "Could not find resource on classpath for: " + input,
url != null );
@@ -230,8 +233,8 @@
return url;
}
- protected Html2XdocBean createConverter( )
+ protected Html2XdocBean createConverter()
{
- return new Html2XdocBean( );
+ return new Html2XdocBean();
}
}