You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by hb...@apache.org on 2012/10/02 02:12:02 UTC
svn commit: r1392698 - in
/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc:
JavadocJarTest.java JavadocReportTest.java
Author: hboutemy
Date: Tue Oct 2 00:12:02 2012
New Revision: 1392698
URL: http://svn.apache.org/viewvc?rev=1392698&view=rev
Log:
updated tests checking content generated by javadoc to support JDK 7 output (new image resources, reworked HTML)
Modified:
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java
maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java?rev=1392698&r1=1392697&r2=1392698&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocJarTest.java Tue Oct 2 00:12:02 2012
@@ -63,7 +63,7 @@ public class JavadocJarTest
}
assertTrue( set.contains( "stylesheet.css" ) );
- assertTrue( set.contains( "resources/inherit.gif" ) );
+ assertTrue( set.contains( "resources/inherit.gif" ) || set.contains( "resources/background.gif" ) /* JDK7 */ );
assertTrue( set.contains( "javadocjar/def/package-use.html" ) );
assertTrue( set.contains( "javadocjar/def/package-tree.html" ) );
assertTrue( set.contains( "javadocjar/def/package-summary.html" ) );
Modified: maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java?rev=1392698&r1=1392697&r2=1392698&view=diff
==============================================================================
--- maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java (original)
+++ maven/plugins/trunk/maven-javadoc-plugin/src/test/java/org/apache/maven/plugin/javadoc/JavadocReportTest.java Tue Oct 2 00:12:02 2012
@@ -625,25 +625,18 @@ public class JavadocReportTest
// Test overview
File overviewSummary = new File( apidocs, "overview-summary.html" );
assertTrue( overviewSummary.exists() );
- String readed = readFile( overviewSummary );
- assertTrue( readed.contains( "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + LINE_SEPARATOR
- + "<TD WIDTH=\"20%\"><B><A HREF=\"resources/test/package-summary.html\">resources.test</A></B></TD>"
- + LINE_SEPARATOR + "<TD>blabla</TD>" + LINE_SEPARATOR + "</TR>" ) );
- assertTrue( readed.contains( "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + LINE_SEPARATOR
- + "<TD WIDTH=\"20%\"><B><A HREF=\"resources/test2/package-summary.html\">resources.test2</A></B></TD>"
- + LINE_SEPARATOR + "<TD> </TD>" + LINE_SEPARATOR + "</TR>" ) );
- assertTrue( readed.contains( "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + LINE_SEPARATOR
- + "<TD WIDTH=\"20%\"><B><A HREF=\"resources2/test/package-summary.html\">resources2.test</A></B></TD>"
- + LINE_SEPARATOR + "<TD>blabla</TD>" + LINE_SEPARATOR + "</TR>" ) );
- assertTrue( readed.contains( "<TR BGCOLOR=\"white\" CLASS=\"TableRowColor\">" + LINE_SEPARATOR
- + "<TD WIDTH=\"20%\"><B><A HREF=\"resources2/test2/package-summary.html\">resources2.test2</A></B></TD>"
- + LINE_SEPARATOR + "<TD> </TD>" + LINE_SEPARATOR + "</TR>" ) );
+ String overview = readFile( overviewSummary ).toLowerCase();
+ assertTrue( overview.contains( "<a href=\"resources/test/package-summary.html\">resources.test</a>" ) );
+ assertTrue( overview.contains( ">blabla</" ) );
+ assertTrue( overview.contains( "<a href=\"resources/test2/package-summary.html\">resources.test2</a>" ) );
+ assertTrue( overview.contains( "<a href=\"resources2/test/package-summary.html\">resources2.test</a>" ) );
+ assertTrue( overview.contains( "<a href=\"resources2/test2/package-summary.html\">resources2.test2</a>" ) );
// Test doc-files
File app = new File( apidocs, "resources/test/App.html" );
assertTrue( app.exists() );
- readed = readFile( app );
- assertTrue( readed.contains( "<img src=\"doc-files/maven-feather.png\" alt=\"Maven\"/>" ) );
+ overview = readFile( app );
+ assertTrue( overview.contains( "<img src=\"doc-files/maven-feather.png\" alt=\"Maven\"/>" ) );
assertTrue( new File( apidocs, "resources/test/doc-files/maven-feather.png" ).exists() );
}
@@ -677,11 +670,10 @@ public class JavadocReportTest
File app = new File( getBasedir(), "target/test/unit/tag-test/target/site/apidocs/tag/test/App.html" );
assertTrue( FileUtils.fileExists( app.getAbsolutePath() ) );
String readed = readFile( app );
- assertTrue( readed.contains( "<B>To do something:</B>" ) );
- assertTrue( readed.contains( "<B>Generator Class:</B>" ) );
- assertTrue( readed.contains( "<B>Version:</B>" ) );
- assertTrue( readed.contains( "<DT><B>Version:</B></DT>" + LINE_SEPARATOR + " <DD>1.0</DD>" + LINE_SEPARATOR
- + "</DL>" ) );
+ assertTrue( readed.contains( ">To do something:</" ) );
+ assertTrue( readed.contains( ">Generator Class:</" ) );
+ assertTrue( readed.contains( ">Version:</" ) );
+ assertTrue( readed.toLowerCase().contains( "</dt>" + LINE_SEPARATOR + " <dd>1.0</dd>" ) );
}
/**