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 2016/09/27 18:29:15 UTC
svn commit: r1762532 - in /maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats: src/site/apt/velocity-context.apt.vm verify.groovy

Author: hboutemy
Date: Tue Sep 27 18:29:15 2016
New Revision: 1762532

URL: http://svn.apache.org/viewvc?rev=1762532&view=rev
Log:
improve IT: check that every tool works (with special $link case)

Modified:
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm
    maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy

Modified: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm?rev=1762532&r1=1762531&r2=1762532&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/src/site/apt/velocity-context.apt.vm Tue Sep 27 18:29:15 2016
@@ -120,7 +120,7 @@ Doxia Site Renderer Velocity Context
 | <<<convert>>>         | = <<<$convert>>>
 *-----------------------+-------------------------------------------------------+
 | <<<date>>>            | = <<<$date>>> \
-|                       | <<<\$date.format('yyyy-MM-dd', \$currentDate) = $date.format('yyyy-MM-dd', $currentDate)>>>
+|                       | <<< \$date.format('yyyy-MM-dd', \$currentDate) = $date.format('yyyy-MM-dd', $currentDate)>>>
 *-----------------------+-------------------------------------------------------+
 | <<<display>>>         | = <<<$display>>>
 *-----------------------+-------------------------------------------------------+
@@ -130,7 +130,7 @@ Doxia Site Renderer Velocity Context
 *-----------------------+-------------------------------------------------------+
 | <<<loop>>>            | = <<<$loop>>>
 *-----------------------+-------------------------------------------------------+
-| <<<link>>>            | = <<<$link>>>
+| <<<link>>>            | = <<<$link.relative('MyPage.vm')>>>
 *-----------------------+-------------------------------------------------------+
 | <<<math>>>            | = <<<$math>>>
 *-----------------------+-------------------------------------------------------+

Modified: maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy
URL: http://svn.apache.org/viewvc/maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy?rev=1762532&r1=1762531&r2=1762532&view=diff
==============================================================================
--- maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy (original)
+++ maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats/verify.groovy Tue Sep 27 18:29:15 2016
@@ -38,4 +38,6 @@ assert content.contains( '= <<<val1>>>'
 
 assert new File( basedir, 'target/site/markdown2.html' ).exists(); // DOXIA-535
 
+assert !content.replace('<tt>$link', '').contains( '<tt>$' ); // MSITE-550
+
 return true;
\ No newline at end of file