svn commit: r1038300 - /wicket/trunk/wicket/src/test/java/org/apache/wicket/ResourceTest.java

[pedro]

Author: pedro
Date: Tue Nov 23 19:49:20 2010
New Revision: 1038300

URL: http://svn.apache.org/viewvc?rev=1038300&view=rev
Log:
test preventing the NPE requesting an StringResourceStream binded to the 
application as an resource
Issue: WICKET-3187

Modified:
    wicket/trunk/wicket/src/test/java/org/apache/wicket/ResourceTest.java

Modified: wicket/trunk/wicket/src/test/java/org/apache/wicket/ResourceTest.java
URL: 
http://svn.apache.org/viewvc/wicket/trunk/wicket/src/test/java/org/apache/wicket/ResourceTest.java?rev=1038300&r1=1038299&r2=1038300&view=diff
==============================================================================
--- wicket/trunk/wicket/src/test/java/org/apache/wicket/ResourceTest.java 
(original)
+++ wicket/trunk/wicket/src/test/java/org/apache/wicket/ResourceTest.java Tue 
Nov 23 19:49:20 2010
@@ -25,6 +25,8 @@ import org.apache.wicket.protocol.http.m
 import org.apache.wicket.request.resource.IResource;
 import org.apache.wicket.request.resource.ResourceStreamResource;
 import org.apache.wicket.util.resource.FileResourceStream;
+import org.apache.wicket.util.resource.IResourceStream;
+import org.apache.wicket.util.resource.StringResourceStream;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
@@ -40,7 +42,7 @@ public class ResourceTest extends Wicket
        /**
         * tests a resource that is not cacheable.
         */
-       public void testResource()
+       public void testFileResourceStream()
        {
                final File testFile;
                try
@@ -54,19 +56,29 @@ public class ResourceTest extends Wicket
                {
                        throw new RuntimeException(e);
                }
-
-               IResource file = new ResourceStreamResource(new 
FileResourceStream(
+               bindToApplicationAsResourceAndRequestIt(new FileResourceStream(
                        new org.apache.wicket.util.file.File(testFile)));
-               tester.getApplication().getSharedResources().add("file", file);
+               
assertEquals(MockHttpServletResponse.formatDate(testFile.lastModified()),
+                       tester.getLastModifiedFromResponseHeader());
+               assertEquals(TEST_STRING.length(), 
tester.getContentLengthFromResponseHeader());
+       }
+
+       public void testStringResourceStream()
+       {
+               StringResourceStream resourceStream = new 
StringResourceStream(TEST_STRING);
+               bindToApplicationAsResourceAndRequestIt(resourceStream);
+               assertEquals(TEST_STRING.length(), 
tester.getContentLengthFromResponseHeader());
+       }
+
+       private void bindToApplicationAsResourceAndRequestIt(IResourceStream 
iResourceStream)
+       {
+               IResource resource = new 
ResourceStreamResource(iResourceStream);
+               tester.getApplication().getSharedResources().add("resource", 
resource);
                tester.getRequest().setUrl(
                        tester.getRequestCycle().mapUrlFor(
                                tester.getApplication()
                                        .getSharedResources()
-                                       .get(Application.class, "file", null, 
null, null, true), null));
+                                       .get(Application.class, "resource", 
null, null, null, true), null));
                tester.processRequest();
-
-               
assertEquals(MockHttpServletResponse.formatDate(testFile.lastModified()),
-                       tester.getLastModifiedFromResponseHeader());
-               assertEquals(TEST_STRING.length(), 
tester.getContentLengthFromResponseHeader());
        }
 }