You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by rf...@apache.org on 2015/08/01 17:34:50 UTC
svn commit: r1693718 - in
/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer: ./
src/main/java/org/apache/maven/doxia/siterenderer/
src/test/java/org/apache/maven/doxia/siterenderer/
Author: rfscholte
Date: Sat Aug 1 15:34:49 2015
New Revision: 1693718
URL: http://svn.apache.org/r1693718
Log:
[DOXIASITETOOLS-103] Don't create outputFile in case of an external report
Modified:
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java
maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java
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/pom.xml
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml?rev=1693718&r1=1693717&r2=1693718&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/pom.xml Sat Aug 1 15:34:49 2015
@@ -155,6 +155,12 @@ under the License.
<version>2.7</version>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.mockito</groupId>
+ <artifactId>mockito-core</artifactId>
+ <version>1.10.6</version>
+ <scope>test</scope>
+ </dependency>
</dependencies>
<profiles>
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java?rev=1693718&r1=1693717&r2=1693718&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DefaultSiteRenderer.java Sat Aug 1 15:34:49 2015
@@ -317,7 +317,10 @@ public class DefaultSiteRenderer
Writer writer = null;
try
{
- writer = WriterFactory.newWriter( outputFile, siteRenderingContext.getOutputEncoding() );
+ if ( !docRenderer.isExternalReport() )
+ {
+ writer = WriterFactory.newWriter( outputFile, siteRenderingContext.getOutputEncoding() );
+ }
docRenderer.renderDocument( writer, this, siteRenderingContext );
}
finally
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java?rev=1693718&r1=1693717&r2=1693718&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DocumentRenderer.java Sat Aug 1 15:34:49 2015
@@ -64,4 +64,12 @@ public interface DocumentRenderer
* @return whether to overwrite
*/
boolean isOverwrite();
+
+ /**
+ * Whether this document is an external report.
+ *
+ * @return {@code true} if report is external, otherwise {@code false}
+ * @since 1.7
+ */
+ boolean isExternalReport();
}
Modified: maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java
URL: http://svn.apache.org/viewvc/maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java?rev=1693718&r1=1693717&r2=1693718&view=diff
==============================================================================
--- maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java (original)
+++ maven/doxia/doxia-sitetools/trunk/doxia-site-renderer/src/main/java/org/apache/maven/doxia/siterenderer/DoxiaDocumentRenderer.java Sat Aug 1 15:34:49 2015
@@ -69,4 +69,9 @@ public class DoxiaDocumentRenderer
return false;
}
+ public boolean isExternalReport()
+ {
+ return false;
+ }
+
}
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=1693718&r1=1693717&r2=1693718&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 Sat Aug 1 15:34:49 2015
@@ -19,6 +19,12 @@ package org.apache.maven.doxia.siterende
* under the License.
*/
+import static org.mockito.Matchers.eq;
+import static org.mockito.Matchers.isNull;
+import static org.mockito.Mockito.mock;
+import static org.mockito.Mockito.verify;
+import static org.mockito.Mockito.when;
+
import java.io.File;
import java.io.FileOutputStream;
import java.io.FileReader;
@@ -27,6 +33,7 @@ import java.io.InputStream;
import java.io.OutputStream;
import java.io.Reader;
import java.io.StringWriter;
+import java.io.Writer;
import java.util.Collections;
import java.util.HashMap;
import java.util.List;
@@ -175,6 +182,21 @@ public class DefaultSiteRendererTest
// ----------------------------------------------------------------------
validatePages();
}
+
+ public void testExternalReport()
+ throws Exception
+ {
+ DocumentRenderer docRenderer = mock( DocumentRenderer.class );
+ 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" ) );
+
+ verify( docRenderer ).renderDocument( isNull( Writer.class ), eq( renderer ), eq( context ) );
+ }
public void testVelocityToolManager()
throws Exception