Author: michaelo
Date: Sun Feb 7 15:02:36 2016
New Revision: 1728975
URL: http://svn.apache.org/viewvc?rev=1728975&view=rev
Log:
[DOXIASITETOOLS-93] request-scoped default Velocity Tools are not accessible
Extended given ToolManager testcases with $context output verification.
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.expected.txt
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.vm
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java?rev=1728975&r1=1728974&r2=1728975&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Sun Feb 7 15:02:36 2016
@@ -183,7 +183,7 @@ public class DefaultSiteRendererTest
//
----------------------------------------------------------------------
validatePages();
}
-
+
public void testExternalReport()
throws Exception
{
@@ -191,7 +191,7 @@ public class DefaultSiteRendererTest
when( docRenderer.isExternalReport() ).thenReturn( true );
when( docRenderer.getOutputName() ).thenReturn( "external/index" );
when( docRenderer.getRenderingContext() ).thenReturn( new
RenderingContext( new File( "" ), "index.html" ) );
-
+
SiteRenderingContext context = new SiteRenderingContext();
renderer.render( Collections.singletonList( docRenderer ), context,
new File( "target/output" ) );
@@ -206,6 +206,17 @@ public class DefaultSiteRendererTest
SiteRenderingContext siteRenderingContext = new SiteRenderingContext();
siteRenderingContext.setDecoration( new DecorationModel() );
+
+ Map<String, Object> attributes = new HashMap<String, Object>();
+
+ /*
+ * We need to add doxiaSiteRendererVersion manually because version
property from pom.properties
+ * is not available at test time in some cases.
+ */
+ attributes.put( "doxiaSiteRendererVersion", "1.7-bogus" );
+
+ siteRenderingContext.setTemplateProperties( attributes );
+
siteRenderingContext.setTemplateName(
"org/apache/maven/doxia/siterenderer/velocity-toolmanager.vm" );
RenderingContext context = new RenderingContext( new File( "" ),
"document.html" );
SiteRendererSink sink = new SiteRendererSink( context );
@@ -223,7 +234,13 @@ public class DefaultSiteRendererTest
File templateFile =
new File( getBasedir(),
"target/test-classes/org/apache/maven/doxia/siterenderer/velocity-toolmanager.vm"
);
- Map<String, ?> attributes = Collections.emptyMap();
+ Map<String, Object> attributes = new HashMap<String, Object>();
+
+ /*
+ * We need to add doxiaSiteRendererVersion manually because version
property from pom.properties
+ * is not available at test time in some cases.
+ */
+ attributes.put( "doxiaSiteRendererVersion", "1.7-bogus" );
SiteRenderingContext siteRenderingContext =
renderer.createContextForTemplate( templateFile, attributes, new
DecorationModel(),
@@ -243,7 +260,15 @@ public class DefaultSiteRendererTest
StringWriter writer = new StringWriter();
File skinFile = skinJar;
- Map<String, ?> attributes = Collections.emptyMap();
+
+ Map<String, Object> attributes = new HashMap<String, Object>();
+
+ /*
+ * We need to add doxiaSiteRendererVersion manually because version
property from pom.properties
+ * is not available at test time in some cases.
+ */
+ attributes.put( "doxiaSiteRendererVersion", "1.7-bogus" );
+
SiteRenderingContext siteRenderingContext =
renderer.createContextForSkin( skinFile, attributes, new
DecorationModel(), "defaultWindowTitle",
Locale.ENGLISH );
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.expected.txt
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.expected.txt?rev=1728975&r1=1728974&r2=1728975&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.expected.txt
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.expected.txt
Sun Feb 7 15:02:36 2016
@@ -1,2 +1,41 @@
Maven 2 & 3
This is...
+
+We have the following keys in the context:
+ 1. FileUtils
+ 2. PathTool
+ 3. StringUtils
+ 4. alignedFileName
+ 5. alternator
+ 6. authors
+ 7. bodyContent
+ 8. class
+ 9. context
+ 10. convert
+ 11. currentDate
+ 12. currentFileName
+ 13. date
+ 14. dateFormat
+ 15. dateRevision
+ 16. decoration
+ 17. display
+ 18. doxiaSiteRendererVersion
+ 19. esc
+ 20. field
+ 21. headContent
+ 22. i18n
+ 23. link
+ 24. locale
+ 25. loop
+ 26. math
+ 27. number
+ 28. plexus
+ 29. publishDate
+ 30. relativePath
+ 31. render
+ 32. shortTitle
+ 33. sorter
+ 34. supportedLocales
+ 35. text
+ 36. title
+ 37. xml
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.vm
URL:
http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.vm?rev=1728975&r1=1728974&r2=1728975&view=diff
==============================================================================
---
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.vm
(original)
+++
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/org/apache/maven/doxia/siterenderer/velocity-toolmanager.vm
Sun Feb 7 15:02:36 2016
@@ -1,2 +1,7 @@
$esc.html('Maven 2 & 3')
$display.truncate("This is a long string.", 10)
+
+We have the following keys in the context:
+#foreach( $key in $sorter.sort( $context.keys ) )
+ $display.printf( "%2s", ${foreach.count} ). $key
+#end
