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 2012/06/03 13:08:56 UTC
svn commit: r1345650 -
/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
Author: hboutemy
Date: Sun Jun 3 11:08:55 2012
New Revision: 1345650
URL: http://svn.apache.org/viewvc?rev=1345650&view=rev
Log:
avoid delete output directory: deleting content from the only test writing in it, not from setup
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/test/java/org/apache/maven/doxia/siterenderer/DefaultSiteRendererTest.java
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=1345650&r1=1345649&r2=1345650&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 Jun 3 11:08:55 2012
@@ -115,9 +115,6 @@ public class DefaultSiteRendererTest
IOUtil.close( jarOS );
}
- // Safety
- FileUtils.deleteDirectory( getTestFile( OUTPUT ) );
-
oldLocale = Locale.getDefault();
Locale.setDefault( Locale.ENGLISH );
}
@@ -142,14 +139,16 @@ public class DefaultSiteRendererTest
public void testRender()
throws Exception
{
+ // Safety
+ FileUtils.deleteDirectory( getTestFile( OUTPUT ) );
+
// ----------------------------------------------------------------------
- // Render the site
+ // Render the site from src/test/resources/site to OUTPUT
// ----------------------------------------------------------------------
DecorationModel decoration = new DecorationXpp3Reader()
.read( new FileReader( getTestFile( "src/test/resources/site/site.xml" ) ) );
- SiteRenderingContext ctxt = getSiteRenderingContext(
- decoration, "src/test/resources/site", false );
+ SiteRenderingContext ctxt = getSiteRenderingContext( decoration, "src/test/resources/site", false );
renderer.render( renderer.locateDocumentFiles( ctxt ).values(), ctxt, getTestFile( OUTPUT ) );
ctxt = getSiteRenderingContext( decoration, "src/test/resources/site-validate", true );