svn commit: r1349988 - /tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/render/PublisherRendererTest.java

[mck]

Author: mck
Date: Wed Jun 13 18:37:58 2012
New Revision: 1349988

URL: http://svn.apache.org/viewvc?rev=1349988&view=rev
Log:
TILES-549 - Improve code quality (post 3.0 release) 

Added:
    
tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/render/PublisherRendererTest.java
      - copied, changed from r1334692, 
tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/render/StringRendererTest.java

Copied: 
tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/render/PublisherRendererTest.java
 (from r1334692, 
tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/render/StringRendererTest.java)
URL: 
http://svn.apache.org/viewvc/tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/render/PublisherRendererTest.java?p2=tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/render/PublisherRendererTest.java&p1=tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/render/StringRendererTest.java&r1=1334692&r2=1349988&rev=1349988&view=diff
==============================================================================
--- 
tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/render/StringRendererTest.java
 (original)
+++ 
tiles/request/trunk/tiles-request-api/src/test/java/org/apache/tiles/request/render/PublisherRendererTest.java
 Wed Jun 13 18:37:58 2012
@@ -27,30 +27,32 @@ import java.io.IOException;
 import java.io.StringWriter;
 
 import org.apache.tiles.request.Request;
+import org.apache.tiles.request.render.PublisherRenderer.RendererListener;
 import org.junit.Before;
 import org.junit.Test;
 
 /**
- * Tests {@link StringRenderer}.
+ * Tests {@link PublisherRenderer}.
  *
  * @version $Rev$ $Date$
  */
-public class StringRendererTest {
+public class PublisherRendererTest {
 
     /**
      * The renderer.
      */
-    private StringRenderer renderer;
+    private PublisherRenderer renderer;
+    private StringRenderer internalRenderer;
 
-    /** {@inheritDoc} */
     @Before
     public void setUp() {
-        renderer = new StringRenderer();
+        internalRenderer = new StringRenderer();
+        renderer = new PublisherRenderer(internalRenderer);
     }
 
     /**
      * Tests
-     * {@link StringRenderer#render(String, Request)}.
+     * {@link PublisherRenderer#render(String, Request)}.
      *
      * @throws IOException If something goes wrong during rendition.
      */
@@ -58,22 +60,30 @@ public class StringRendererTest {
     public void testWrite() throws IOException {
         StringWriter writer = new StringWriter();
         Request requestContext = createMock(Request.class);
+        RendererListener listener = createMock(RendererListener.class);
+
+        listener.start("Result", requestContext);
         expect(requestContext.getWriter()).andReturn(writer);
+        listener.end("Result", requestContext);
         replay(requestContext);
+
+        renderer.addListener(listener);
         renderer.render("Result", requestContext);
         writer.close();
-        assertEquals("Not written 'Result'", "Result", writer.toString());
+        writer.toString();
         verify(requestContext);
     }
 
     /**
      * Tests
-     * {@link StringRenderer#isRenderable(String, Request)}.
+     * {@link PublisherRenderer#isRenderable(String, Request)}.
      */
     @Test
     public void testIsRenderable() {
         Request requestContext = createMock(Request.class);
+        RendererListener listener = createMock(RendererListener.class);
         replay(requestContext);
+        renderer.addListener(listener);
         assertTrue(renderer.isRenderable("Result", requestContext));
         verify(requestContext);
     }