From 8d9abeed9f46a68df04ba440c480016bdbb973e6 Mon Sep 17 00:00:00 2001 From: ltheussl Date: Sun, 6 Aug 2006 21:49:31 +0000 Subject: [PATCH] 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). git-svn-id: https://svn.apache.org/repos/asf/maven/maven-1/plugins/trunk@429200 13f79535-47bb-0310-9956-ffa450edef68 --- xdoc/src/plugin-test/maven.xml | 10 ++- .../test01/xdocs-replacement/test.xml | 2 +- xdoc/src/plugin-test/test02/maven.xml | 3 +- xdoc/src/plugin-test/test03/maven.xml | 76 ------------------ .../src/plugin-test/test03/project.properties | 23 ------ xdoc/src/plugin-test/test03/project.xml | 36 --------- .../xdocs/images/apache-maven-project.png | Bin 22088 -> 0 bytes .../plugin-test/test03/xdocs/images/maven.gif | Bin 1757 -> 0 bytes .../plugin-test/test03/xdocs/myfile_i18n.xml | 36 --------- .../test03/xdocs/navigation-pdf.xml | 36 --------- .../plugin-test/test03/xdocs/navigation.xml | 39 --------- .../xdocs/subdir/subdir2/testjsltosite.xml | 36 --------- .../xdocs/subdir/subdir2/testjsltosite2.xml | 36 --------- .../test03/xdocs/subdir/testjsltosite.xml | 38 --------- .../plugin-test/test03/xdocs/xdocs.properties | 21 ----- .../test03/xdocs/xdocs_fr.properties | 21 ----- xdoc/src/plugin-test/test04/maven.xml | 33 +++++--- .../testDependenciesComment/maven.xml | 8 +- .../testDependenciesComment/project.xml | 1 + 19 files changed, 36 insertions(+), 419 deletions(-) delete mode 100644 xdoc/src/plugin-test/test03/maven.xml delete mode 100644 xdoc/src/plugin-test/test03/project.properties delete mode 100644 xdoc/src/plugin-test/test03/project.xml delete mode 100644 xdoc/src/plugin-test/test03/xdocs/images/apache-maven-project.png delete mode 100644 xdoc/src/plugin-test/test03/xdocs/images/maven.gif delete mode 100644 xdoc/src/plugin-test/test03/xdocs/myfile_i18n.xml delete mode 100644 xdoc/src/plugin-test/test03/xdocs/navigation-pdf.xml delete mode 100644 xdoc/src/plugin-test/test03/xdocs/navigation.xml delete mode 100644 xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite.xml delete mode 100644 xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite2.xml delete mode 100644 xdoc/src/plugin-test/test03/xdocs/subdir/testjsltosite.xml delete mode 100644 xdoc/src/plugin-test/test03/xdocs/xdocs.properties delete mode 100644 xdoc/src/plugin-test/test03/xdocs/xdocs_fr.properties diff --git a/xdoc/src/plugin-test/maven.xml b/xdoc/src/plugin-test/maven.xml index 40934bab..a64563dc 100644 --- a/xdoc/src/plugin-test/maven.xml +++ b/xdoc/src/plugin-test/maven.xml @@ -17,11 +17,13 @@ --> - - + + + - - + + + diff --git a/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml b/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml index f3fbe029..4e3be1a7 100644 --- a/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml +++ b/xdoc/src/plugin-test/test01/xdocs-replacement/test.xml @@ -19,7 +19,7 @@ + %common-links; ]> diff --git a/xdoc/src/plugin-test/test02/maven.xml b/xdoc/src/plugin-test/test02/maven.xml index b375724a..bb88b157 100644 --- a/xdoc/src/plugin-test/test02/maven.xml +++ b/xdoc/src/plugin-test/test02/maven.xml @@ -16,7 +16,8 @@ */ --> - + + diff --git a/xdoc/src/plugin-test/test03/maven.xml b/xdoc/src/plugin-test/test03/maven.xml deleted file mode 100644 index d32b1155..00000000 --- a/xdoc/src/plugin-test/test03/maven.xml +++ /dev/null @@ -1,76 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/xdoc/src/plugin-test/test03/project.properties b/xdoc/src/plugin-test/test03/project.properties deleted file mode 100644 index 601859a6..00000000 --- a/xdoc/src/plugin-test/test03/project.properties +++ /dev/null @@ -1,23 +0,0 @@ -# ------------------------------------------------------------------- -# Copyright 2001-2004 The Apache Software Foundation. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# ------------------------------------------------------------------- - -maven.xdoc.locale.default=en -maven.xdoc.locale.supported=en_CA, fr_CA - -# Presentation Properties -maven.xdoc.date=left -maven.xdoc.date.format=dd MMMM yyyy HH:mm z -maven.xdoc.date.locale=en diff --git a/xdoc/src/plugin-test/test03/project.xml b/xdoc/src/plugin-test/test03/project.xml deleted file mode 100644 index 5921a885..00000000 --- a/xdoc/src/plugin-test/test03/project.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - 3 - http://jira.codehaus.org/browse/MAVEN - test-maven-xdoc-plugin-03 - MPXDOC-128 - maven - 1.0 - - Apache Software Foundation - /project-info.html - /images/apache-maven-project.png - - /images/maven.gif - Test for MPXDOC-128 - Test for MPXDOC-128 - /project-info.html - - diff --git a/xdoc/src/plugin-test/test03/xdocs/images/apache-maven-project.png b/xdoc/src/plugin-test/test03/xdocs/images/apache-maven-project.png deleted file mode 100644 index 81f80d810fe5444f4ea91541998879859303d1ed..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 22088 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%0A<;ozSYEC5631@yG(8B)4XzjuIIVN+ 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 Df_zh8 diff --git a/xdoc/src/plugin-test/test03/xdocs/images/maven.gif b/xdoc/src/plugin-test/test03/xdocs/images/maven.gif deleted file mode 100644 index 0b92a2d12847f8cfb54d22e7873473405a5d13a6..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 1757 zcma)#`Crlp1AxCEDwl%gHKvK0as*CI9i9U$HFJ$wubS73%%zzJra3cPkU|P-pc`sl ze-%r3$kKJ3Ac(OiO){(k4#3oH-r!D1ntmm)m6;gHx33GX*`SfV2Ps8N(?9iLh zowGM`9{fA+SB*S3%%x^x^g|sQP#7z%y9rvg*+6@2g&DwxZDC^ zp#cRfE-Wp}5{V%cV+jhV&JswBD2CF;rc7xe+zZ;#ej`KJ#;fy$-R@=!2YE8 z>Q4Tr++u$=)u_i9iiPBJ*8f?}a|ksfqMMWsQHam`8CYtqEd=a*#!P_&K&5^Z{k%6} z+V}u;2kFUq*EUJu2^ozHDxgpvG=kpoa|1Y2O;s!#f7#)K1(2^0ppX@oG8~u;AyLqq zT#(Ff+8>=D)(AnuY;xF@Mv!~t?wb1C!?##_>m1P`g)vNLVHPqNk3LllipPvRp%r-? zGrUWevoS1RtB!Vq()U5SkBzNza|39MOK)Qwr7Mocy~iz)%&LisIU7(_7i>;Kws+X6 zxP!QJ@>`OkZsCpKVCfz!9Av;KGkOfwZCxew(phZH*p4_#eZj`(+8ea7_$FYAp<* z=X~1enGjKL0<$TcTSdck!OzshJn{jn7N*cu@uFDBJ^{x24q3x4dQ|-mh0V}fFJ2C8 z`3#N%QnD`Apqh(RF&;ZBEhS!!%tIi0z2dn^cbs)B+*nLdk^PwzdkE`UGq}!8plPkx z$HYsWavEJ0dhmWGmab6DvYMS@oc@y$mg zVQo6Oi0Aaz458A!j=Cs!0fLq)g<%U|J%6xY&d9>=>V|d+%PWS#&$f$Jq3yfEWw7*k z0=*W+82}G1yX34PSnBq)Bfpf-6MyaTcPs!effV&ZTonNaKUJq$LmaAC{DDBMF3^MC z1nE+I-on9b1R}q8v4+4*PJ{h%mstIEWcQoXw`MTmYaHl=rs>GDa$tSbanSQNH-nty zCbkWfx{f-NJltb@$B=>dyap}s;v+%V+#vxIYcHlPhd)xKs}9-A(+@o3UJmi2##J%C zZb5XPwW0HPxB)Y2#Lblb)K;EYMC@c=YR>oTBolFr2` zF5*4<=*NGkVQ(z$sd%l^uQU||xXp*p0k_+hQY@Kp6JOJD$(2s@^ZJ1J(#`w+wLfM) zbbtB!rknpB*vB)b!C)U)cRM?^>tyHIPSntCImJX#iG5;c>`zqDy9C&X56&J9QmsS4 zTR+{*`}Ff$Ny_z|>SgGoybb4E+vIH>D!~8j);`cOlonuf?3=I;HQa4oWpnnZ@T}G# zY%0u^+U(tW#(^?oa6#Q?XTv@Z`$@@-z)JePOTV!{7OPK|(EDwhT`U&uV5%4X>OK^= ztw}ljNsSB)oAmkZ@I3sG*0S58^Z3i+1(<4U7?ZEfCFg_0U7H;-xhr3^AH9kSw17DZ zG+F4C=h->xA^q;gGIV^R^~Z3zr{^uKFmY;j@Qox$A(s6Z+yqHCb|Z+C z8cT&4IGc!t2w25FzmHKK7sKto)7-Z)`PMMub_aNNOU!s69VNUk!rJWW;yNiyQ*CtFb-ghzgO?GI`*gXblR7G zAbShg-4k0Sshm(Gl1&InuzV{ZTyI7<^nu&@G`NbvR?nsHzl?MRFsx!)WXft=h71vs zbnbi8By{~F$dqA**v2udpnAP{%`ib&X<|<8UHpqtOIl3Qn(kD#Fy2+1N>wYNnH>IP zG~6f{F>dlpIYvs+{InH~Gk1btGQ>W{FHAXETVl%~B&Q5)X3>!!#va%2Y+R$7$QYMG sXBsh^*F(ORg;$QvwEAqeF-m2}u7#>)(VMcUhq8#CF?GiY2MFN%Uwzg3z5oCK diff --git a/xdoc/src/plugin-test/test03/xdocs/myfile_i18n.xml b/xdoc/src/plugin-test/test03/xdocs/myfile_i18n.xml deleted file mode 100644 index ae658e21..00000000 --- a/xdoc/src/plugin-test/test03/xdocs/myfile_i18n.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - Vincent Siveton - - </properties> - - <body> - <section key="myfile_i18n.section1.title"> - <p> - <message key="myfile_i18n.section1.description1"/> - </p> - <p> - <message key="myfile_i18n.section1.description2"/> - </p> - </section> - </body> -</document> \ No newline at end of file diff --git a/xdoc/src/plugin-test/test03/xdocs/navigation-pdf.xml b/xdoc/src/plugin-test/test03/xdocs/navigation-pdf.xml deleted file mode 100644 index 49b5f7da..00000000 --- a/xdoc/src/plugin-test/test03/xdocs/navigation-pdf.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0" encoding="ISO-8859-1"?> -<!-- -/* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<project name="Nanuq" - xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" - xsi:noNamespaceSchemaLocation="MAVEN_HOME/maven-navigation-1.0.xsd"> - - <title>MPXDOC128 - - - - - - - - - diff --git a/xdoc/src/plugin-test/test03/xdocs/navigation.xml b/xdoc/src/plugin-test/test03/xdocs/navigation.xml deleted file mode 100644 index 3977445c..00000000 --- a/xdoc/src/plugin-test/test03/xdocs/navigation.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - <body> - <breadcrumbs> - <item name="Maven" href="http://maven.apache.org"/> - <item name="Maven Plugins" href="http://maven.apache.org/maven-1.x/plugins/index.html"/> - </breadcrumbs> - <links> - <!-- - <item name="PDF Documentation" href="app.pdf" - img="images/pdf.gif"/> ---> - </links> - <!-- project overview --> - <menu key="navigation.menu1.title"> - <item key="navigation.menu1.item1" href="/myfile_i18n.html"/> - <item key="navigation.menu1.item2" href="/subdir/testjsltosite.html"/> - <item key="navigation.menu1.item3" href="/subdir/subdir2/testjsltosite2.html"/> - </menu> - </body> -</project> diff --git a/xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite.xml b/xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite.xml deleted file mode 100644 index 4a5dc2d2..00000000 --- a/xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!-- -/* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<document> - <properties> - <author email="vincent.siveton@gmail.com">Vincent Siveton</author> - <title key="testjstltosite.title"/> - </properties> - - <body> - <section key="testjstltosite.section1.title"> - <p> - <message key="testjstltosite.section1.description1"/> - </p> - <p> - <message key="testjstltosite.section1.description2"/> - </p> - </section> - </body> -</document> \ No newline at end of file diff --git a/xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite2.xml b/xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite2.xml deleted file mode 100644 index 4a5dc2d2..00000000 --- a/xdoc/src/plugin-test/test03/xdocs/subdir/subdir2/testjsltosite2.xml +++ /dev/null @@ -1,36 +0,0 @@ -<?xml version="1.0"?> -<!-- -/* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<document> - <properties> - <author email="vincent.siveton@gmail.com">Vincent Siveton</author> - <title key="testjstltosite.title"/> - </properties> - - <body> - <section key="testjstltosite.section1.title"> - <p> - <message key="testjstltosite.section1.description1"/> - </p> - <p> - <message key="testjstltosite.section1.description2"/> - </p> - </section> - </body> -</document> \ No newline at end of file diff --git a/xdoc/src/plugin-test/test03/xdocs/subdir/testjsltosite.xml b/xdoc/src/plugin-test/test03/xdocs/subdir/testjsltosite.xml deleted file mode 100644 index 25dbee7c..00000000 --- a/xdoc/src/plugin-test/test03/xdocs/subdir/testjsltosite.xml +++ /dev/null @@ -1,38 +0,0 @@ -<?xml version="1.0"?> -<!-- -/* - * Copyright 2001-2004 The Apache Software Foundation. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - --> - -<document> - <properties> - <author email="vincent.siveton@gmail.com">Vincent Siveton</author> - <title key="testjstltosite.title"/> - </properties> - - <body> - <section key="testjstltosite.section1.title"> - <subsection key="testjstltosite.section1.title"> - <p> - <message key="testjstltosite.section1.description1"/> - </p> - <p> - <message key="testjstltosite.section1.description2"/> - </p> - </subsection> - </section> - </body> -</document> \ No newline at end of file diff --git a/xdoc/src/plugin-test/test03/xdocs/xdocs.properties b/xdoc/src/plugin-test/test03/xdocs/xdocs.properties deleted file mode 100644 index 62d52eb3..00000000 --- a/xdoc/src/plugin-test/test03/xdocs/xdocs.properties +++ /dev/null @@ -1,21 +0,0 @@ -# From navigation.xml -navigation.title=MPXDOC-128 -navigation.menu1.title=General Project Information -navigation.menu1.item1=myfile_i18n -navigation.menu1.item2=testjsltosite -navigation.menu1.item3=testjsltosite2 - -# From myfile_i18n.xml -myfile_i18n.title=Xdoc test Document -myfile_i18n.section1.title=Title 1 -myfile_i18n.section1.description1=empty document -myfile_i18n.section1.description2=This document is generated separately from other xdoc documents but should retain the site stylesheet and navigation. - -# From testjstltosite.xml -testjstltosite.title=test jslToSite tag -testjstltosite.section1.title=Title 1 -testjstltosite.section1.description1=empty document -testjstltosite.section1.description2=This document is generated separately from other xdoc documents but should retain the site stylesheet and navigation. - -testlinks.mysite1=http://mysite1.com -testlinks.mysite2=http://mysite2.com diff --git a/xdoc/src/plugin-test/test03/xdocs/xdocs_fr.properties b/xdoc/src/plugin-test/test03/xdocs/xdocs_fr.properties deleted file mode 100644 index 2b784963..00000000 --- a/xdoc/src/plugin-test/test03/xdocs/xdocs_fr.properties +++ /dev/null @@ -1,21 +0,0 @@ -# From navigation.xml -navigation.title=MPXDOC-128 -navigation.menu1.title=Information générale sur le projet -navigation.menu1.item1=myfile_i18n -navigation.menu1.item2=testjsltosite -navigation.menu1.item3=testjsltosite2 - -# From myfile_i18n.xml -myfile_i18n.title=Document Xdoc test -myfile_i18n.section1.title=Titre 1 -myfile_i18n.section1.description1=document vide -myfile_i18n.section1.description2=Ce document est produit séparément des autres documents XDOC mais devrait maintenir le stylesheet et la navigation d'emplacement. - -# From testjstltosite.xml -testjstltosite.title=test jslToSite tag -testjstltosite.section1.title=Titre 1 -testjstltosite.section1.description1=document vide -testjstltosite.section1.description2=Ce document est produit séparément des autres documents XDOC mais devrait maintenir le stylesheet et la navigation d'emplacement. - -testlinks.mysite1=http://mysite1.fr -testlinks.mysite2=http://mysite2.fr diff --git a/xdoc/src/plugin-test/test04/maven.xml b/xdoc/src/plugin-test/test04/maven.xml index 4d48b104..981a3dc1 100644 --- a/xdoc/src/plugin-test/test04/maven.xml +++ b/xdoc/src/plugin-test/test04/maven.xml @@ -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> diff --git a/xdoc/src/plugin-test/testDependenciesComment/maven.xml b/xdoc/src/plugin-test/testDependenciesComment/maven.xml index 000174df..901d3a70 100644 --- a/xdoc/src/plugin-test/testDependenciesComment/maven.xml +++ b/xdoc/src/plugin-test/testDependenciesComment/maven.xml @@ -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> diff --git a/xdoc/src/plugin-test/testDependenciesComment/project.xml b/xdoc/src/plugin-test/testDependenciesComment/project.xml index b414f482..788adf32 100644 --- a/xdoc/src/plugin-test/testDependenciesComment/project.xml +++ b/xdoc/src/plugin-test/testDependenciesComment/project.xml @@ -33,6 +33,7 @@ <version>1.4-dev-8</version> <properties> <comment>Simple comment</comment> + <scope>test</scope> </properties> </dependency>