maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From hbout...@apache.org
Subject svn commit: r1762567 - in /maven/plugins/trunk/maven-site-plugin/src/it/doxia-formats: src/site/apt/velocity-context.apt.vm verify.groovy
Date Tue, 27 Sep 2016 21:24:43 GMT
Author: hboutemy
Date: Tue Sep 27 21:24:43 2016
New Revision: 1762567

URL: http://svn.apache.org/viewvc?rev=1762567&view=rev
Log:
fixed ineffective test...

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=1762567&r1=1762566&r2=1762567&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 21:24:43 2016
@@ -50,7 +50,7 @@ Doxia Site Renderer Velocity Context
 *-----------------------+-------------------------------------------------------+
 | <<<alignedFileName>>> | = <<<$alignedFileName>>>
 *-----------------------+-------------------------------------------------------+
-| <<<decoration>>>      | <<<decoration.name>>> = <<<$decoration.name>>>
+| <<<decoration>>>      | <<<decoration.name>>> = <<<
$decoration.name>>>
 *-----------------------+-------------------------------------------------------+
 | <<<currentDate>>>     | = <<<$currentDate>>> \
 |                       | <<<dateFormat.format(currentDate)>>> = <<<$dateFormat.format($currentDate)>>>
@@ -65,7 +65,7 @@ Doxia Site Renderer Velocity Context
 *-----------------------+-------------------------------------------------------+
 | <<<locale>>>          | = <<<$locale>>>
 *-----------------------+-------------------------------------------------------+
-| <<<publishDate>>>     | = <<<$publishDate>>>
+| <<<publishDate>>>     | = <<< $publishDate>>>
 *-----------------------+-------------------------------------------------------+
 | <<<relativePath>>>    | = <<<$relativePath>>>
 *-----------------------+-------------------------------------------------------+
@@ -130,7 +130,7 @@ Doxia Site Renderer Velocity Context
 *-----------------------+-------------------------------------------------------+
 | <<<loop>>>            | = <<<$loop>>>
 *-----------------------+-------------------------------------------------------+
-| <<<link>>>            | = <<<$link.relative('MyPage.vm')>>>
+| <<<link>>>            | = <<< \$link.relative('MyPage.vm') =
>>><<<$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=1762567&r1=1762566&r2=1762567&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 21:24:43
2016
@@ -36,8 +36,8 @@ content = velocity.text;
 
 assert content.contains( '= <<<val1>>>' ); // MSITE-550
 
-assert new File( basedir, 'target/site/markdown2.html' ).exists(); // DOXIA-535
+assert !content.replace('<<<$value', '').contains( '<<<$' );
 
-assert !content.replace('<tt>$link', '').contains( '<tt>$' ); // MSITE-550
+assert new File( basedir, 'target/site/markdown2.html' ).exists(); // DOXIA-535
 
 return true;
\ No newline at end of file



Mime
View raw message