maven-doxia-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From vsive...@apache.org
Subject svn commit: r736293 - in /maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test: java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java resources/site/ resources/site/apt/apt.apt resources/site/xdoc/macro.xml site/
Date Wed, 21 Jan 2009 11:56:10 GMT
Author: vsiveton
Date: Wed Jan 21 03:56:09 2009
New Revision: 736293

URL: http://svn.apache.org/viewvc?rev=736293&view=rev
Log:
o moved src/test/site to src/test/resources/site

Added:
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/   (props
changed)
      - copied from r735297, maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/
Removed:
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/site/
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/site/apt/apt.apt
    maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml

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=736293&r1=736292&r2=736293&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
Wed Jan 21 03:56:09 2009
@@ -88,7 +88,7 @@
         // Render the site
         // ----------------------------------------------------------------------
         DecorationModel decoration = new DecorationXpp3Reader()
-            .read( new FileReader( getTestFile( "src/test/site/site.xml" ) ) );
+            .read( new FileReader( getTestFile( "src/test/resources/site/site.xml" ) ) );
 
         SiteRenderingContext ctxt = new SiteRenderingContext();
         ctxt.setTemplateName( "default-site.vm" );
@@ -98,7 +98,7 @@
         templateProp.put( "outputEncoding", "UTF-8" );
         ctxt.setTemplateProperties( templateProp );
         ctxt.setDecoration( decoration );
-        ctxt.addSiteDirectory( getTestFile( "src/test/site" ) );
+        ctxt.addSiteDirectory( getTestFile( "src/test/resources/site" ) );
 
         renderer.render( renderer.locateDocumentFiles( ctxt ).values(), ctxt, getTestFile(
OUTPUT ) );
 
@@ -187,7 +187,7 @@
      */
     public void verifyJavascriptPage()
         throws Exception
-    {        
+    {
         JavascriptVerifier verifier = new JavascriptVerifier();
         verifier.verify( "target/output/javascript.html" );
     }

Propchange: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/
------------------------------------------------------------------------------
    svn:mergeinfo = 

Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/apt/apt.apt
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/apt/apt.apt?rev=736293&r1=735297&r2=736293&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/apt/apt.apt
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/apt/apt.apt
Wed Jan 21 03:56:09 2009
@@ -13,7 +13,7 @@
   Link to {{Anchor}}.
   Link to anchor {{{Anchor}showing alternate text}}.
   {Anchor with space} and {{{Anchor_with_space}link to it}}.
-  Link to {{http://maven.apache.org/}}. 
+  Link to {{http://maven.apache.org/}}.
   Link to {{{http://maven.apache.org/}Maven home page}}.
   Link to {{{./cdc.html}other document}} and within {{{cdc.html}same document}}.
   Link to {{{/index.html}root document}}.
@@ -28,4 +28,4 @@
 
 Snippet Macro
 
-%{snippet|id=macrotest|file=src/test/site/site.xml}
+%{snippet|id=macrotest|file=src/test/resources/site/site.xml}

Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml?rev=736293&r1=735297&r2=736293&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml
(original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/resources/site/xdoc/macro.xml
Wed Jan 21 03:56:09 2009
@@ -41,7 +41,7 @@
     <section name="Snippet Macro">
       <macro name="snippet">
         <param name="id" value="macrotest"/>
-        <param name="file" value="src/test/site/site.xml"/>
+        <param name="file" value="src/test/resources/site/site.xml"/>
       </macro>
     </section>
 



Mime
View raw message