[jboss-svn-commits] JBoss Common SVN: r4272 - arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet.

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

Author: aslak
Date: 2010-04-20 11:13:07 -0400 (Tue, 20 Apr 2010)
New Revision: 4272

Modified:
   arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ServletMethodExecutor.java
   arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ServletTestRunner.java
Log:
ARQ-69 Removed execution mode, replaced with ContainerProfile


Modified: arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ServletMethodExecutor.java
===================================================================
--- arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ServletMethodExecutor.java	2010-04-20 15:10:07 UTC (rev 4271)
+++ arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ServletMethodExecutor.java	2010-04-20 15:13:07 UTC (rev 4272)
@@ -49,14 +49,17 @@
       }
       
       Class<?> testClass = testMethodExecutor.getInstance().getClass();
+//      String url = baseURL.toExternalForm() + "test/ArquillianServletRunner" +  
+//                        "?outputMode=serializedObject&className=" + testClass.getName() + 
+//                        "&methodName=" + testMethodExecutor.getMethod().getName();
+      
       String url = baseURL.toExternalForm() + "arquillian-protocol/" +  
-                        "?outputMode=serializedObject&className=" + testClass.getName() + 
-                        "&methodName=" + testMethodExecutor.getMethod().getName();
+                         "?outputMode=serializedObject&className=" + testClass.getName() + 
+                          "&methodName=" + testMethodExecutor.getMethod().getName();
       
       try 
       {
-         TestResult result = execute(url);
-         return result;
+         return execute(url);
       } 
       catch (Exception e) 
       {
@@ -89,17 +92,16 @@
                {
                   o = ois.readObject();
                }
-               catch (ClassNotFoundException e)
+               finally 
                {
-                  throw e;
+                  ois.close();   
                }
-               ois.close();
+               
                if (!(o instanceof TestResult))
                {
                   throw new IllegalStateException("Error reading test results - expected a TestResult but got " + o);
                }
-               TestResult result = (TestResult) o;
-               return result;
+               return (TestResult) o;
             }
             else if (httpConnection.getResponseCode() != HttpURLConnection.HTTP_NOT_FOUND)
             {

Modified: arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ServletTestRunner.java
===================================================================
--- arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ServletTestRunner.java	2010-04-20 15:10:07 UTC (rev 4271)
+++ arquillian/trunk/protocols/servlet/src/main/java/org/jboss/arquillian/protocol/servlet/ServletTestRunner.java	2010-04-20 15:13:07 UTC (rev 4272)
@@ -27,7 +27,6 @@
 
 import org.jboss.arquillian.spi.TestResult;
 import org.jboss.arquillian.spi.TestRunner;
-import org.jboss.arquillian.spi.TestRunner.ExecutionMode;
 import org.jboss.arquillian.spi.util.TestRunners;
 
 /**
@@ -66,11 +65,13 @@
          {
             outputMode = request.getParameter(PARA_OUTPUT_MODE);
          }
-         if ( ( className = request.getParameter(PARA_CLASS_NAME))  == null)
+         className = request.getParameter(PARA_CLASS_NAME);
+         if (className == null)
          {
             throw new IllegalArgumentException(PARA_CLASS_NAME + " must be specified");
          }
-         if ( (methodName = request.getParameter(PARA_METHOD_NAME) ) == null)
+         methodName = request.getParameter(PARA_METHOD_NAME);
+         if ( methodName == null)
          {
             throw new IllegalArgumentException(PARA_METHOD_NAME + " must be specified");
          }
@@ -78,7 +79,6 @@
          Class<?> testClass = SecurityActions.getThreadContextClassLoader().loadClass(className);
          
          TestRunner runner = TestRunners.getTestRunner();
-         runner.setExecutionMode(ExecutionMode.CONTAINER);
          
          TestResult testResult = runner.execute(testClass, methodName);