[Openutils-svn] SF.net SVN: openutils:[1667] trunk/openutils-elfunctions

[<fg...@us...>]

Revision: 1667
          http://openutils.svn.sourceforge.net/openutils/?rev=1667&view=rev
Author:   fgiust
Date:     2010-01-18 14:08:33 +0000 (Mon, 18 Jan 2010)

Log Message:
-----------
reworked test framework

Modified Paths:
--------------
    trunk/openutils-elfunctions/pom.xml
    trunk/openutils-elfunctions/src/test/java/net/sourceforge/openutils/elfunctions/JspTest.java

Added Paths:
-----------
    trunk/openutils-elfunctions/src/test/resources/jsps/capitaliseAllWords.txt

Modified: trunk/openutils-elfunctions/pom.xml
===================================================================
--- trunk/openutils-elfunctions/pom.xml	2010-01-18 13:46:35 UTC (rev 1666)
+++ trunk/openutils-elfunctions/pom.xml	2010-01-18 14:08:33 UTC (rev 1667)
@@ -123,6 +123,12 @@
       <scope>test</scope>
     </dependency>
     <dependency>
+      <groupId>commons-io</groupId>
+      <artifactId>commons-io</artifactId>
+      <version>1.4</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
       <groupId>org.testng</groupId>
       <artifactId>testng</artifactId>
       <classifier>jdk15</classifier>

Modified: trunk/openutils-elfunctions/src/test/java/net/sourceforge/openutils/elfunctions/JspTest.java
===================================================================
--- trunk/openutils-elfunctions/src/test/java/net/sourceforge/openutils/elfunctions/JspTest.java	2010-01-18 13:46:35 UTC (rev 1666)
+++ trunk/openutils-elfunctions/src/test/java/net/sourceforge/openutils/elfunctions/JspTest.java	2010-01-18 14:08:33 UTC (rev 1667)
@@ -18,6 +18,10 @@
 
 package net.sourceforge.openutils.elfunctions;
 
+import java.io.InputStream;
+
+import org.apache.commons.io.IOUtils;
+import org.apache.commons.lang.StringUtils;
 import org.testng.Assert;
 import org.testng.annotations.Test;
 
@@ -33,12 +37,10 @@
 public class JspTest extends BaseJspTestngEmbeddedTest
 {
 
-    @Test
-    public void capitaliseAllWordsTest() throws Exception
+    protected void checkJspWithExpectedTxt(String jspname) throws Exception
     {
+        WebRequest request = new GetMethodWebRequest(getJspUrl(jspname));
 
-        WebRequest request = new GetMethodWebRequest(getJspUrl("capitaliseAllWords.jsp"));
-
         WebResponse response = runner.getResponse(request);
 
         if (log.isDebugEnabled())
@@ -48,6 +50,18 @@
 
         String responseText = response.getText();
 
-        Assert.assertEquals(responseText, "Test One Two");
+        String expectedFileName = StringUtils.replace(jspname, ".jsp", ".txt");
+
+        InputStream stream = getClass().getResourceAsStream("/jsps/" + expectedFileName);
+        String expected = IOUtils.toString(stream);
+        IOUtils.closeQuietly(stream);
+
+        Assert.assertEquals(responseText, expected);
     }
+
+    @Test
+    public void capitaliseAllWordsTest() throws Exception
+    {
+        checkJspWithExpectedTxt("capitaliseAllWords.jsp");
+    }
 }

Added: trunk/openutils-elfunctions/src/test/resources/jsps/capitaliseAllWords.txt
===================================================================
--- trunk/openutils-elfunctions/src/test/resources/jsps/capitaliseAllWords.txt	                        (rev 0)
+++ trunk/openutils-elfunctions/src/test/resources/jsps/capitaliseAllWords.txt	2010-01-18 14:08:33 UTC (rev 1667)
@@ -0,0 +1 @@
+Test One Two
\ No newline at end of file


Property changes on: trunk/openutils-elfunctions/src/test/resources/jsps/capitaliseAllWords.txt
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Author Date Id Revision
Added: svn:eol-style
   + native


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.