[Commits] (bcm) add tests for ui controller layer

[commits at osafoundation.org]

Commit by: bcm
Modified files:
server/slam/build.xml 1.5 1.6
server/slam/src/org/osaf/slam/web/SlamExceptionHandler.java 1.1 1.2
server/slam/src/org/osaf/slam/web/UserAction.java 1.1 1.2
server/slam/test/org/osaf/slam/web/BaseActionTestCase.java None 1.1
server/slam/test/org/osaf/slam/web/UserActionTest.java None 1.1
server/slam/web/WEB-INF/struts-config.xml 1.1 1.2

Log message:
add tests for ui controller layer


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/slam/build.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/server/slam/src/org/osaf/slam/web/SlamExceptionHandler.java.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/slam/src/org/osaf/slam/web/UserAction.java.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/slam/test/org/osaf/slam/web/BaseActionTestCase.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/slam/test/org/osaf/slam/web/UserActionTest.java?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/slam/web/WEB-INF/struts-config.xml.diff?r1=text&tr1=1.1&r2=text&tr2=1.2

Index: server/slam/src/org/osaf/slam/web/SlamExceptionHandler.java
diff -u server/slam/src/org/osaf/slam/web/SlamExceptionHandler.java:1.1 server/slam/src/org/osaf/slam/web/SlamExceptionHandler.java:1.2
--- server/slam/src/org/osaf/slam/web/SlamExceptionHandler.java:1.1	Fri Feb 11 17:01:06 2005
+++ server/slam/src/org/osaf/slam/web/SlamExceptionHandler.java	Fri Feb 11 17:40:40 2005
@@ -32,6 +32,9 @@
                                  HttpServletResponse response)
         throws ServletException {
         request.setAttribute(ATTR_EXCEPTION, e);
+        if (log.isDebugEnabled()) {
+            log.debug("caught exception from Struts", e);
+        }
         return mapping.findForward(WebConstants.FWD_ERROR);
     }
 }

Index: server/slam/build.xml
diff -u server/slam/build.xml:1.5 server/slam/build.xml:1.6
--- server/slam/build.xml:1.5	Fri Feb 11 17:01:05 2005
+++ server/slam/build.xml	Fri Feb 11 17:40:40 2005
@@ -60,6 +60,8 @@
             value="${slam.ext}/struts.jar"/>
   <property name="struts-el.jar"
             value="${slam.ext}/struts-el.jar"/>
+  <property name="strutstest.jar"
+            value="${slam.ext}/strutstest-2.1.3.jar"/>
 
   <!-- CLASSPATHS -->
 
@@ -74,6 +76,7 @@
     <pathelement location="${slide-webdavlib.jar}"/>
     <pathelement location="${spring.jar}"/>
     <pathelement location="${struts.jar}"/>
+    <pathelement location="${strutstest.jar}"/>
   </path>
 
   <!-- BUILD TARGETS -->
@@ -172,7 +175,7 @@
     </javac>
   </target>
 
-  <target name="test" depends="test-compile"
+  <target name="test" depends="all,test-compile"
           description="run JUnit tests">
     <copy todir="${slam.build}/testclasses">
       <fileset dir="${slam.test}/etc">
@@ -189,6 +192,8 @@
         <path refid="ext.classpath"/>
         <fileset dir="${slam.build}" includes="*.jar"/>
         <path location="${slam.build}/testclasses"/>
+        <path location="${slam.web}"/>
+        <fileset dir="${slam.web}/WEB-INF/lib" includes="*.jar"/>
       </classpath>
       <formatter type="xml"/>
       <formatter type="brief" usefile="false"/>

Index: server/slam/src/org/osaf/slam/web/UserAction.java
diff -u server/slam/src/org/osaf/slam/web/UserAction.java:1.1 server/slam/src/org/osaf/slam/web/UserAction.java:1.2
--- server/slam/src/org/osaf/slam/web/UserAction.java:1.1	Fri Feb 11 17:01:06 2005
+++ server/slam/src/org/osaf/slam/web/UserAction.java	Fri Feb 11 17:40:40 2005
@@ -20,8 +20,6 @@
  * Action for managing users.
  */
 public class UserAction extends BaseAction {
-    private static final String FORMATTR_USER = "user";
-    private static final String FORMATTR_PASSWORD = "password";
     private static final String MSG_CONFIRM_CREATE = "User.Created";
     private static final String MSG_CONFIRM_CHANGE_PASSWORD =
         "User.PasswordChanged";
@@ -43,6 +41,18 @@
      * Users:  <code>Users</code>
      */
     public static final String ATTR_USERS = "Users";
+    /**
+     * The form attribute in which this action places the identified
+     * User during a prepare step and expects to find it when
+     * handling a form submission: <code>user</code>
+     */
+    public static final String FORMATTR_USER = "user";
+    /**
+     * The form attribute in which this action expects to find the
+     * user's password when handling a form submission:
+     * <code>password</code>
+     */
+    public static final String FORMATTR_PASSWORD = "password";
 
     private ProvisioningManager mgr;
 
@@ -107,6 +117,7 @@
         throws Exception {
         DynaActionForm userForm = (DynaActionForm) form;
         User user = (User) userForm.get(FORMATTR_USER);
+        user.setPassword((String) userForm.get(FORMATTR_PASSWORD));
 
         if (log.isDebugEnabled()) {
             log.debug("creating user " + user.getUsername());

Index: server/slam/web/WEB-INF/struts-config.xml
diff -u server/slam/web/WEB-INF/struts-config.xml:1.1 server/slam/web/WEB-INF/struts-config.xml:1.2
--- server/slam/web/WEB-INF/struts-config.xml:1.1	Fri Feb 11 17:01:07 2005
+++ server/slam/web/WEB-INF/struts-config.xml	Fri Feb 11 17:40:41 2005
@@ -10,6 +10,7 @@
     <form-bean name="userForm"
                type="org.apache.struts.validator.DynaValidatorForm">
       <form-property name="user" type="org.osaf.slam.model.User"/>
+      <form-property name="password" type="java.lang.String"/>
     </form-bean>
   </form-beans>