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/08/06 23:49:32 UTC
svn commit: r429200 - in /maven/maven-1/plugins/trunk/xdoc/src/plugin-test:
maven.xml test01/xdocs-replacement/test.xml test02/maven.xml test03/
test04/maven.xml testDependenciesComment/maven.xml
testDependenciesComment/project.xml
Author: ltheussl
Date: Sun Aug 6 14:49:31 2006
New Revision: 429200
URL: http://svn.apache.org/viewvc?rev=429200&view=rev
Log:
Fix plugin tests, they were not even executed before. Remove test03 which is duplicated by test04. Speed up the testing by skipping the reports (should be done in the site plugin).
Removed:
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test03/
Modified:
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/maven.xml
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test02/maven.xml
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/maven.xml
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/maven.xml
maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/project.xml
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-test/maven.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/maven.xml?rev=429200&r1=429199&r2=429200&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-test/maven.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-test/maven.xml Sun Aug 6 14:49:31 2006
@@ -17,11 +17,13 @@
-->
<project xmlns:util="jelly:util" xmlns:maven="jelly:maven" xmlns:j="jelly:core" xmlns:assert="assert" xmlns:ant="jelly:ant">
<goal name="testPlugin">
- <maven:set plugin="maven-multiproject-plugin" property="goal" value="testPlugin"/>
- <attainGoal name="multiproject:site"/>
+ <!--<maven:set plugin="maven-multiproject-plugin" property="goal" value="testPlugin"/>-->
+ <j:set var="goal" value="testPlugin"/>
+ <attainGoal name="multiproject:goal"/>
</goal>
<goal name="multixdoc">
- <maven:set plugin="maven-multiproject-plugin" property="goal" value="xdoc"/>
- <attainGoal name="multiproject:site"/>
+ <!--<maven:set plugin="maven-multiproject-plugin" property="goal" value="xdoc"/>-->
+ <j:set var="goal" value="xdoc"/>
+ <attainGoal name="multiproject:goal"/>
</goal>
</project>
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml?rev=429200&r1=429199&r2=429200&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml Sun Aug 6 14:49:31 2006
@@ -19,7 +19,7 @@
<!-- $Id$ -->
<!DOCTYPE document [
- <!ENTITY % common-links SYSTEM "common/links.xml">
+ <!ENTITY % common-links SYSTEM "../common/links.xml">
%common-links;
]>
<document>
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test02/maven.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test02/maven.xml?rev=429200&r1=429199&r2=429200&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test02/maven.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test02/maven.xml Sun Aug 6 14:49:31 2006
@@ -16,7 +16,8 @@
*/
-->
<project xmlns:util="jelly:util" xmlns:j="jelly:core" xmlns:assert="assert" xmlns:doc="doc" xmlns:x="jelly:xml">
- <goal name="testPlugin" prereqs="clean,xdoc">
+ <goal name="testPlugin" prereqs="clean,maven-linkcheck-plugin:report,xdoc">
+ <!-- Shouldn't this be done in the linkcheck plugin? -->
<j:set var="linkcheck" value="${maven.build.dir}/linkcheck/linkcheck-results.xml"/>
<assert:assertFileExists file="${linkcheck}"/>
<util:file var="linkcheckFile" name="${linkcheck}"/>
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/maven.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/maven.xml?rev=429200&r1=429199&r2=429200&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/maven.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-test/test04/maven.xml Sun Aug 6 14:49:31 2006
@@ -22,20 +22,12 @@
xmlns:x="jelly:xml">
<goal name="testPlugin" prereqs="clean,xdoc">
- <j:set var="linkcheck" value="${maven.build.dir}/linkcheck/linkcheck-results.xml"/>
- <assert:assertFileExists file="${linkcheck}"/>
- <util:file var="linkcheckFile" name="${linkcheck}"/>
- <x:parse var="linkcheckDoc" xml="${linkcheckFile.toURL()}"/>
- <x:set var="countLogo" select="count($linkcheckDoc/linkcheck/file/result[contains(child::target,'apache-maven-project.png')][contains(child::status,'NOT FOUND')])"/>
- <assert:assertEquals expected="0" value="${countLogo.intValue().toString()}" msg="Logo not found."/>
- <x:set var="countUrl" select="count($linkcheckDoc/linkcheck/file/result[contains(child::target,'project-info.html')][contains(child::status,'NOT FOUND')])"/>
- <assert:assertEquals expected="0" value="${countUrl.intValue().toString()}" msg="Url not found."/>
- <assert:assertFileExists file="velocity.log"/>
<!-- Test the output according the project.properties file -->
- <!-- maven.xdoc.locale.list=en_CA, fr_CA -->
+ <!-- maven.xdoc.locale.supported=en_CA, fr_CA, de_DE -->
+
<!-- Test Default language -->
- <assert:assertFileExists file="${maven.docs.dest}/cvs-usage.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/scm-usage.html"/>
<assert:assertFileExists file="${maven.docs.dest}/mail-lists.html"/>
<assert:assertFileExists file="${maven.docs.dest}/dependencies.html"/>
<assert:assertFileExists file="${maven.docs.dest}/maven-reports.html"/>
@@ -46,8 +38,9 @@
<assert:assertFileExists file="${maven.docs.dest}/issue-tracking.html"/>
<assert:assertFileExists file="${maven.docs.dest}/project-info.html"/>
<assert:assertFileExists file="${maven.docs.dest}/subdir/testjsltosite.html"/>
+
<!-- Test en_CA language -->
- <assert:assertFileExists file="${maven.docs.dest}/en_CA/cvs-usage.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/en_CA/scm-usage.html"/>
<assert:assertFileExists file="${maven.docs.dest}/en_CA/mail-lists.html"/>
<assert:assertFileExists file="${maven.docs.dest}/en_CA/dependencies.html"/>
<assert:assertFileExists file="${maven.docs.dest}/en_CA/maven-reports.html"/>
@@ -60,7 +53,7 @@
<assert:assertFileExists file="${maven.docs.dest}/en_CA/subdir/testjsltosite.html"/>
<!-- Test fr_CA language -->
- <assert:assertFileExists file="${maven.docs.dest}/fr_CA/cvs-usage.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/fr_CA/scm-usage.html"/>
<assert:assertFileExists file="${maven.docs.dest}/fr_CA/mail-lists.html"/>
<assert:assertFileExists file="${maven.docs.dest}/fr_CA/dependencies.html"/>
<assert:assertFileExists file="${maven.docs.dest}/fr_CA/maven-reports.html"/>
@@ -71,6 +64,20 @@
<assert:assertFileExists file="${maven.docs.dest}/fr_CA/issue-tracking.html"/>
<assert:assertFileExists file="${maven.docs.dest}/fr_CA/project-info.html"/>
<assert:assertFileExists file="${maven.docs.dest}/fr_CA/subdir/testjsltosite.html"/>
+
+ <!-- Test de_DE language -->
+ <assert:assertFileExists file="${maven.docs.dest}/de_DE/scm-usage.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/de_DE/mail-lists.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/de_DE/dependencies.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/de_DE/maven-reports.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/de_DE/team-list.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/de_DE/downloads.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/de_DE/index.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/de_DE/myfile_i18n.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/de_DE/issue-tracking.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/de_DE/project-info.html"/>
+ <assert:assertFileExists file="${maven.docs.dest}/de_DE/subdir/testjsltosite.html"/>
+
</goal>
</project>
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/maven.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/maven.xml?rev=429200&r1=429199&r2=429200&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/maven.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/maven.xml Sun Aug 6 14:49:31 2006
@@ -22,14 +22,18 @@
<assert:assertFileExists file="${depXmlPath}"/>
<util:file var="depXmlFile" name="${depXmlPath}"/>
<x:parse var="depXmlDom" xml="${depXmlFile}"/>
- <x:set var="headerComment" select="string($depXmlDom/document/body/section[@name='Dependencies']/table/thead/tr/th[5])"/>
+ <!-- This has been internationalized...
+ <x:set var="headerComment" select="string($depXmlDom/document/body/section[@name='Dependencies']/table/thead/tr/th[6])"/>
<assert:assertEquals expected="Comment" value="${headerComment}"/>
+ -->
<x:forEach var="tr" select="$depXmlDom/document/body/section[@name='Dependencies']/table/tbody/*">
<x:set var="depName" select="string($tr/td[1])"/>
- <x:set var="comment" select="string($tr/td[5])"/>
+ <x:set var="scope" select="string($tr/td[4])"/>
+ <x:set var="comment" select="string($tr/td[6])"/>
<j:if test="${depName=='dom4j'}">
<echo>Checking comment for dependency dom4j</echo>
<assert:assertEquals expected="Simple comment" value="${comment.trim()}"/>
+ <assert:assertEquals expected="test" value="${scope.trim()}"/>
</j:if>
<j:if test="${depName=='commons-jelly'}">
<echo>Checking comment for dependency commons-jelly</echo>
Modified: maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/project.xml
URL: http://svn.apache.org/viewvc/maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/project.xml?rev=429200&r1=429199&r2=429200&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/project.xml (original)
+++ maven/maven-1/plugins/trunk/xdoc/src/plugin-test/testDependenciesComment/project.xml Sun Aug 6 14:49:31 2006
@@ -33,6 +33,7 @@
<version>1.4-dev-8</version>
<properties>
<comment>Simple comment</comment>
+ <scope>test</scope>
</properties>
</dependency>