[jboss-cvs] JBossAS SVN: r90182 - in projects/spider/trunk/deployers: src/test/java/org/jboss/spider/deployers/test/common and 1 other directories.

[jboss-cvs-commits at lists.jboss.org]

Author: wolfc
Date: 2009-06-15 06:13:09 -0400 (Mon, 15 Jun 2009)
New Revision: 90182

Modified:
   projects/spider/trunk/deployers/pom.xml
   projects/spider/trunk/deployers/src/test/java/org/jboss/spider/deployers/test/common/AbstractWebTestCase.java
   projects/spider/trunk/deployers/src/test/java/org/jboss/spider/deployers/test/servlet/unit/BasicServletTestCase.java
Log:
JBAS-7001: fixed the unit test by adding javac compiler

Modified: projects/spider/trunk/deployers/pom.xml
===================================================================
--- projects/spider/trunk/deployers/pom.xml	2009-06-15 09:46:36 UTC (rev 90181)
+++ projects/spider/trunk/deployers/pom.xml	2009-06-15 10:13:09 UTC (rev 90182)
@@ -27,7 +27,16 @@
 
   <!-- Dependencies -->
   <dependencies>
+    <!-- we need a javac compiler for JSP pages -->
     <dependency>
+      <groupId>com.sun</groupId>
+      <artifactId>tools</artifactId>
+      <version>1.5.0</version>
+      <scope>system</scope>
+      <systemPath>${java.home}/../lib/tools.jar</systemPath>
+    </dependency>
+
+    <dependency>
       <groupId>jboss.jbossts</groupId>
       <artifactId>jbossjta-integration</artifactId>
       <version>4.4.0.GA</version>
@@ -86,7 +95,6 @@
       <groupId>org.jboss.bootstrap</groupId>
       <artifactId>jboss-bootstrap-impl-mc</artifactId>
       <version>0.1.2</version>
-      <scope>test</scope>
     </dependency>
 
     <!-- TODO: the real goal is to get rid of this dependency -->

Modified: projects/spider/trunk/deployers/src/test/java/org/jboss/spider/deployers/test/common/AbstractWebTestCase.java
===================================================================
--- projects/spider/trunk/deployers/src/test/java/org/jboss/spider/deployers/test/common/AbstractWebTestCase.java	2009-06-15 09:46:36 UTC (rev 90181)
+++ projects/spider/trunk/deployers/src/test/java/org/jboss/spider/deployers/test/common/AbstractWebTestCase.java	2009-06-15 10:13:09 UTC (rev 90182)
@@ -58,7 +58,7 @@
  * @author <a href="mailto:cdewolf at redhat.com">Carlo de Wolf</a>
  * @version $Revision: $
  */
-public class AbstractWebTestCase
+public abstract class AbstractWebTestCase
 {
    private static final Logger log = Logger.getLogger(BasicServletTestCase.class);
    
@@ -86,6 +86,11 @@
       // StandardContext.engineBase at 4803
       System.setProperty("catalina.base", serverHomeDir.getAbsolutePath());
       
+      // The created work directory must appear in the target directory.
+      // StandardContext.workBase at 4810
+      File targetDir = new File("target");
+      System.setProperty("catalina.work", targetDir.getAbsolutePath());
+      
       // See server.xml
       System.setProperty("jboss.bind.address", "localhost");
       

Modified: projects/spider/trunk/deployers/src/test/java/org/jboss/spider/deployers/test/servlet/unit/BasicServletTestCase.java
===================================================================
--- projects/spider/trunk/deployers/src/test/java/org/jboss/spider/deployers/test/servlet/unit/BasicServletTestCase.java	2009-06-15 09:46:36 UTC (rev 90181)
+++ projects/spider/trunk/deployers/src/test/java/org/jboss/spider/deployers/test/servlet/unit/BasicServletTestCase.java	2009-06-15 10:13:09 UTC (rev 90182)
@@ -72,8 +72,11 @@
       
       HttpClient client = new HttpClient();
       GetMethod method = new GetMethod("http://localhost:8080/dummy/dummy.jsp?visitor=me");
-      client.setTimeout(1000);
+      client.setTimeout(5000);
       int responseCode = client.executeMethod(method);
       assertEquals(HttpStatus.SC_OK, responseCode);
+      
+      String result = method.getResponseBodyAsString();
+      assertEquals("Hello, me", result);
    }
 }