[jboss-cvs] jboss-seam/src/main/org/jboss/seam/mock ...

[Gavin King]

  User: gavin   
  Date: 07/02/12 09:19:27

  Modified:    src/main/org/jboss/seam/mock  MockHttpServletRequest.java
  Log:
  oops, fix npe in tests
  
  Revision  Changes    Path
  1.13      +17 -19    jboss-seam/src/main/org/jboss/seam/mock/MockHttpServletRequest.java
  
  (In the diff below, changes in quantity of whitespace are not shown.)
  
  Index: MockHttpServletRequest.java
  ===================================================================
  RCS file: /cvsroot/jboss/jboss-seam/src/main/org/jboss/seam/mock/MockHttpServletRequest.java,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -b -r1.12 -r1.13
  --- MockHttpServletRequest.java	9 Feb 2007 05:31:47 -0000	1.12
  +++ MockHttpServletRequest.java	12 Feb 2007 14:19:27 -0000	1.13
  @@ -13,6 +13,7 @@
   import java.util.Arrays;
   import java.util.Enumeration;
   import java.util.HashMap;
  +import java.util.HashSet;
   import java.util.Locale;
   import java.util.Map;
   import java.util.Set;
  @@ -26,7 +27,7 @@
   /**
    * @author Gavin King
    * @author <a href="mailto:theute at jboss.org">Thomas Heute</a>
  - * @version $Revision: 1.12 $
  + * @version $Revision: 1.13 $
    */
   public class MockHttpServletRequest implements HttpServletRequest
   {
  @@ -41,14 +42,12 @@
      
      public MockHttpServletRequest(HttpSession session)
      {
  -      this.session = session;
  +      this(session, null, new HashSet<String>());
      }
   
      public MockHttpServletRequest(HttpSession session, String principalName, Set<String> principalRoles)
      {
  -      this.session = session;
  -      this.principalName = principalName;
  -      this.principalRoles = principalRoles;
  +      this(session, principalName, principalRoles, new Cookie[] {});
      }
   
      public MockHttpServletRequest(HttpSession session, String principalName, Set<String> principalRoles, Cookie[] cookies)
  @@ -56,6 +55,7 @@
         this.session = session;
         this.principalName = principalName;
         this.principalRoles = principalRoles;
  +      this.cookies = cookies;
      }
   
      public Map<String, String[]> getParameters()
  @@ -147,7 +147,9 @@
   
      public Principal getUserPrincipal()
      {
  -      return new Principal() {
  +      return principalName==null ? null : 
  +         new Principal() 
  +         {
            public String getName()
            {
               return principalName;
  @@ -190,25 +192,21 @@
   
      public boolean isRequestedSessionIdValid()
      {
  -      //TODO
  -      return false;
  +      return true;
      }
   
      public boolean isRequestedSessionIdFromCookie()
      {
  -      //TODO
  -      return false;
  +      return true;
      }
   
      public boolean isRequestedSessionIdFromURL()
      {
  -      //TODO
         return false;
      }
   
      public boolean isRequestedSessionIdFromUrl()
      {
  -      //TODO
         return false;
      }
   
  @@ -228,7 +226,7 @@
         return null;
      }
   
  -   public void setCharacterEncoding(String arg0)
  +   public void setCharacterEncoding(String enc)
            throws UnsupportedEncodingException
      {
         //TODO
  @@ -344,13 +342,13 @@
         return false;
      }
   
  -   public RequestDispatcher getRequestDispatcher(String arg0)
  +   public RequestDispatcher getRequestDispatcher(String path)
      {
         //TODO
         return null;
      }
   
  -   public String getRealPath(String arg0)
  +   public String getRealPath(String path)
      {
         //TODO
         return null;