[exo-jcr-commits] exo-jcr SVN: r167 - ws/trunk/testframework/src/main/java/org/exoplatform/testframework.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Sep 10 09:14:45 EDT 2009
Author: max_shaposhnik
Date: 2009-09-10 09:14:45 -0400 (Thu, 10 Sep 2009)
New Revision: 167
Modified:
ws/trunk/testframework/src/main/java/org/exoplatform/testframework/CaseInsensetiveMap.java
ws/trunk/testframework/src/main/java/org/exoplatform/testframework/CaseInsensitiveMultivaluedMap.java
ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpServletRequest.java
ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpServletResponse.java
ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpSession.java
ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockServletContext.java
Log:
EXOJCR-152 :
Modified: ws/trunk/testframework/src/main/java/org/exoplatform/testframework/CaseInsensetiveMap.java
===================================================================
--- ws/trunk/testframework/src/main/java/org/exoplatform/testframework/CaseInsensetiveMap.java 2009-09-10 11:21:37 UTC (rev 166)
+++ ws/trunk/testframework/src/main/java/org/exoplatform/testframework/CaseInsensetiveMap.java 2009-09-10 13:14:45 UTC (rev 167)
@@ -1,18 +1,20 @@
/*
- * Copyright (C) 2003-2008 eXo Platform SAS.
+ * Copyright (C) 2009 eXo Platform SAS.
*
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU Affero General Public License
- * as published by the Free Software Foundation; either version 3
- * of the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, see<http://www.gnu.org/licenses/>.
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
*/
package org.exoplatform.testframework;
Modified: ws/trunk/testframework/src/main/java/org/exoplatform/testframework/CaseInsensitiveMultivaluedMap.java
===================================================================
--- ws/trunk/testframework/src/main/java/org/exoplatform/testframework/CaseInsensitiveMultivaluedMap.java 2009-09-10 11:21:37 UTC (rev 166)
+++ ws/trunk/testframework/src/main/java/org/exoplatform/testframework/CaseInsensitiveMultivaluedMap.java 2009-09-10 13:14:45 UTC (rev 167)
@@ -78,7 +78,7 @@
private List<T> getList(String key)
{
- List<T> l = super.get(key);
+ List<T> l = super.get(getKey(key));
if (l == null)
l = new ArrayList<T>();
put(key, l);
Modified: ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpServletRequest.java
===================================================================
--- ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpServletRequest.java 2009-09-10 11:21:37 UTC (rev 166)
+++ ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpServletRequest.java 2009-09-10 13:14:45 UTC (rev 167)
@@ -65,7 +65,7 @@
private InputStream data;
/** Headers. */
- private Map<String, List<String>> headers = new CaseInsensitiveMultivaluedMap<String>();
+ private CaseInsensitiveMultivaluedMap<String> headers = new CaseInsensitiveMultivaluedMap<String>();
/** The parameters. */
private Map<String, List<String>> parameters = new HashMap<String, List<String>>();
@@ -172,9 +172,7 @@
*/
public String getContentType()
{
- if (headers.get("content-type") != null)
- return headers.get("content-type").get(0);
- return (null);
+ return headers.getFirst("content-type");
}
/**
@@ -202,7 +200,7 @@
public long getDateHeader(String name)
{
if (headers.get(name) != null)
- return Long.valueOf(headers.get(name).get(0));
+ return Long.valueOf(headers.getFirst(name));
return -1L;
}
@@ -211,9 +209,7 @@
*/
public String getHeader(String name)
{
- if (headers.get(name) != null)
- return headers.get(name).get(0);
- return (null);
+ return headers.getFirst(name);
}
/**
@@ -229,21 +225,10 @@
*/
public Enumeration getHeaders(String name)
{
- // return new EnumerationImpl(headers.get(name).iterator());
- synchronized (headers)
- {
- Iterator<String> it = headers.keySet().iterator();
- while (it.hasNext())
- {
- String key = it.next();
- if (key.equalsIgnoreCase(name))
- {
- ArrayList values = (ArrayList)headers.get(key);
- if (values != null)
- return new EnumerationImpl(values.iterator());
- }
- }
- }
+ ArrayList values = (ArrayList)headers.get(name);
+ if (values.size() > 0)
+ return new EnumerationImpl(values.iterator());
+
return new EnumerationImpl(Collections.EMPTY_LIST.iterator());
}
@@ -260,8 +245,8 @@
*/
public int getIntHeader(String name)
{
- if (headers.get(name) != null)
- return Integer.parseInt(headers.get(name).get(0));
+ if (headers.get(name).size() > 0)
+ return Integer.parseInt(headers.getFirst(name));
return -1;
}
@@ -324,18 +309,15 @@
*/
public String getParameter(String name)
{
- synchronized (parameters)
+ Iterator<String> it = parameters.keySet().iterator();
+ while (it.hasNext())
{
- Iterator<String> it = parameters.keySet().iterator();
- while (it.hasNext())
+ String key = it.next();
+ if (key.equalsIgnoreCase(name))
{
- String key = it.next();
- if (key.equalsIgnoreCase(name))
- {
- ArrayList values = (ArrayList)parameters.get(key);
- if (values != null)
- return (String)values.get(0);
- }
+ ArrayList values = (ArrayList)parameters.get(key);
+ if (values != null)
+ return (String)values.get(0);
}
}
return (null);
@@ -362,8 +344,6 @@
*/
public String[] getParameterValues(String name)
{
- // List<String> values = parameters.get(name);
- // return values.toArray(new String[values.size()]);
ArrayList<String> arr = new ArrayList<String>();
Iterator it = parameters.keySet().iterator();
while (it.hasNext())
Modified: ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpServletResponse.java
===================================================================
--- ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpServletResponse.java 2009-09-10 11:21:37 UTC (rev 166)
+++ ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpServletResponse.java 2009-09-10 13:14:45 UTC (rev 167)
@@ -34,7 +34,6 @@
import javax.servlet.http.Cookie;
import javax.servlet.http.HttpServletResponse;
-
/**
* The Class MockHttpServletResponse.
*
@@ -184,11 +183,7 @@
*/
public void addCookie(Cookie cookie)
{
- synchronized (cookies)
- {
cookies.add(cookie);
- }
-
}
/**
@@ -204,24 +199,23 @@
*/
public void addHeader(String name, String value)
{
- synchronized (headers) {
Iterator it = headers.keySet().iterator();
- while (it.hasNext()){
+ while (it.hasNext())
+ {
String key = (String)it.next();
- if (key.equals(name)){
- ArrayList values = (ArrayList) headers.get(key);
- if (values != null){
- values = new ArrayList();
- headers.put(name, values);
+ if (key.equals(name))
+ {
+ List<String> values = (ArrayList<String>)headers.get(key);
+ if (values != null)
+ {
+ values = new ArrayList<String>();
+ headers.put(name, values);
}
- values.add(value);
+ values.add(value);
}
}
- }
}
-
-
/**
* {@inheritDoc}
*/
@@ -235,10 +229,7 @@
*/
public boolean containsHeader(String name)
{
- synchronized (headers)
- {
return (headers.get(name) != null);
- }
}
/**
@@ -322,25 +313,15 @@
*/
public void setHeader(String name, String value)
{
- ArrayList values = new ArrayList();
+ List<String> values = new ArrayList<String>();
values.add(value);
- synchronized (headers)
- {
- headers.put(name, values);
- }
+ headers.put(name, values);
String match = name.toLowerCase();
if (match.equals("content-length"))
{
int contentLength = -1;
- try
- {
- contentLength = Integer.parseInt(value);
- }
- catch (NumberFormatException e)
- {
- ;
- }
+ contentLength = Integer.parseInt(value);
if (contentLength >= 0)
setContentLength(contentLength);
}
@@ -437,14 +418,15 @@
*/
private static class ByteArrayServletOutputStream extends ServletOutputStream
{
-
+
/** The baos. */
ByteArrayOutputStream baos;
/**
* Instantiates a new byte array servlet output stream.
*
- * @param baos the baos
+ * @param baos
+ * the baos
*/
public ByteArrayServletOutputStream(ByteArrayOutputStream baos)
{
Modified: ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpSession.java
===================================================================
--- ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpSession.java 2009-09-10 11:21:37 UTC (rev 166)
+++ ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockHttpSession.java 2009-09-10 13:14:45 UTC (rev 167)
@@ -38,7 +38,7 @@
{
/** The attributes map. */
- private Map attributes = new HashMap();
+ private Map<String, Object> attributes = new HashMap<String, Object>();
/** The servlet context. */
private ServletContext servletContext;
@@ -131,7 +131,7 @@
{
throw new IllegalStateException("Cannot call getAttribute() on invalidated session");
}
- return new Vector(attributes.keySet()).elements();
+ return new Vector<String>(attributes.keySet()).elements();
}
/**
Modified: ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockServletContext.java
===================================================================
--- ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockServletContext.java 2009-09-10 11:21:37 UTC (rev 166)
+++ ws/trunk/testframework/src/main/java/org/exoplatform/testframework/MockServletContext.java 2009-09-10 13:14:45 UTC (rev 167)
@@ -44,17 +44,17 @@
public class MockServletContext implements ServletContext
{
- /** The name_. */
- private String name_;
+ /** The name. */
+ private String name;
/** The init params. */
- private HashMap initParams_;
+ private HashMap<String, String> initParams;
/** The attributes. */
- private HashMap attributes_;
+ private HashMap<String, Object> attributes;
/** The context path. */
- private String contextPath_;
+ private String contextPath;
/** The log buffer. */
private StringBuffer logBuffer = new StringBuffer();
@@ -74,9 +74,9 @@
*/
public MockServletContext(String name)
{
- name_ = name;
- initParams_ = new HashMap();
- attributes_ = new HashMap();
+ this.name = name;
+ this.initParams = new HashMap<String, String>();
+ this.attributes = new HashMap<String, Object>();
}
/**
@@ -88,8 +88,8 @@
public MockServletContext(String name, String path)
{
this(name);
- contextPath_ = path;
- attributes_.put("javax.servlet.context.tempdir", path);
+ contextPath = path;
+ attributes.put("javax.servlet.context.tempdir", path);
}
/**
@@ -99,7 +99,7 @@
*/
public void setName(String name)
{
- name_ = name;
+ this.name = name;
}
/**
@@ -160,7 +160,7 @@
if (!s.endsWith("/"))
s = s + "/";
- Set set = new HashSet<String>();
+ Set<String> set = new HashSet<String>();
set.add("/WEB-INF/");
try
@@ -191,7 +191,7 @@
*/
public URL getResource(String s) throws MalformedURLException
{
- String path = "file:" + contextPath_ + s;
+ String path = "file:" + contextPath + s;
URL url = new URL(path);
return url;
}
@@ -287,7 +287,7 @@
*/
public void setContextPath(String s)
{
- contextPath_ = s;
+ contextPath = s;
}
/**
@@ -295,7 +295,7 @@
*/
public String getRealPath(String s)
{
- return contextPath_ + s;
+ return contextPath + s;
}
/**
@@ -314,7 +314,7 @@
*/
public void setInitParameter(String name, String value)
{
- initParams_.put(name, value);
+ initParams.put(name, value);
}
/**
@@ -322,7 +322,7 @@
*/
public String getInitParameter(String name)
{
- return (String)initParams_.get(name);
+ return (String)initParams.get(name);
}
/**
@@ -330,7 +330,7 @@
*/
public Enumeration getInitParameterNames()
{
- Vector keys = new Vector(initParams_.keySet());
+ Vector<String> keys = new Vector<String>(initParams.keySet());
return keys.elements();
}
@@ -339,7 +339,7 @@
*/
public Object getAttribute(String name)
{
- return attributes_.get(name);
+ return attributes.get(name);
}
/**
@@ -347,7 +347,7 @@
*/
public Enumeration getAttributeNames()
{
- Vector keys = new Vector(attributes_.keySet());
+ Vector<String> keys = new Vector<String>(attributes.keySet());
return keys.elements();
}
@@ -356,7 +356,7 @@
*/
public void setAttribute(String name, Object value)
{
- attributes_.put(name, value);
+ attributes.put(name, value);
}
/**
@@ -364,7 +364,7 @@
*/
public void removeAttribute(String name)
{
- attributes_.remove(name);
+ attributes.remove(name);
}
/**
@@ -372,7 +372,7 @@
*/
public String getServletContextName()
{
- return name_;
+ return name;
}
}
More information about the exo-jcr-commits
mailing list