[richfaces-svn-commits] JBoss Rich Faces SVN: r4713 - branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests.

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

Author: sergeyhalipov
Date: 2007-12-11 09:55:00 -0500 (Tue, 11 Dec 2007)
New Revision: 4713

Modified:
   branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests/MockExternalContext.java
Log:
Unimplemented methods in shale-tests added.

Modified: branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests/MockExternalContext.java
===================================================================
--- branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests/MockExternalContext.java	2007-12-11 14:52:25 UTC (rev 4712)
+++ branches/3.1.x/framework/test/src/main/java/org/ajax4jsf/tests/MockExternalContext.java	2007-12-11 14:55:00 UTC (rev 4713)
@@ -63,58 +63,90 @@
 	
 	public Map getRequestParameterValuesMap() {
 		if (null == requestParameterValuesMap) {
-			Map map = new HashMap();
+			requestParameterValuesMap = new HashMap();
 			HttpServletRequest request = (HttpServletRequest)getRequest();
 			for ( Enumeration e = request.getParameterNames(); e.hasMoreElements(); ) {
 				String name = (String) e.nextElement();
-				map.put(name, request.getParameterValues(name));
+				requestParameterValuesMap.put(name, request.getParameterValues(name));
 			}
-			requestParameterValuesMap =  Collections.unmodifiableMap(map);
 		}
-		return requestParameterValuesMap;
+		return Collections.unmodifiableMap(requestParameterValuesMap);
 	}
 	
 	public void dispatch(String requestURI) 
 		throws IOException, FacesException {
-		
+		//TODO hans, should be implemented
+		super.dispatch(requestURI);
 	}
 	
 	 public Map getRequestHeaderMap() {
 		 if (null == requestHeaderMap) {
-			 Map map = new TreeMap(CASE_INSENSITIVE_COMPARATOR);
+			 requestHeaderMap = new TreeMap(CASE_INSENSITIVE_COMPARATOR);
 			 
 			 HttpServletRequest request = (HttpServletRequest)getRequest();
 			 for ( Enumeration e = request.getHeaderNames(); e.hasMoreElements(); ) {
 				 String name = (String) e.nextElement();
-				 map.put(name, request.getHeader(name));
+				 requestHeaderMap.put(name, request.getHeader(name));
 			 }
-			 requestHeaderMap = Collections.unmodifiableMap(map);
 		 }
-		 return requestHeaderMap;
+		 return Collections.unmodifiableMap(requestHeaderMap);
 	 }
 	 
 	 public Map getRequestHeaderValuesMap() {
 		 if (null == requestHeaderValuesMap) {
-			 Map map = new TreeMap(CASE_INSENSITIVE_COMPARATOR);
+			 requestHeaderValuesMap = new TreeMap(CASE_INSENSITIVE_COMPARATOR);
 			 
 			 HttpServletRequest request = (HttpServletRequest)getRequest();
 			 for ( Enumeration e = request.getHeaderNames(); e.hasMoreElements(); ) {
 				 String name = (String) e.nextElement();
-				 map.put(name, EnumerationUtils.toList(request.getHeaders(name)).toArray());
+				 requestHeaderValuesMap.put(name, EnumerationUtils.toList(request.getHeaders(name)).toArray());
 			 }
-			 requestHeaderValuesMap = Collections.unmodifiableMap(map);
 		 }
-		 return requestHeaderValuesMap;
+		 return Collections.unmodifiableMap(requestHeaderValuesMap);
 	 }
 	 
 	 public Iterator getRequestParameterNames() {
 		 if (null == requestParameterNamesIterator) {
 			 HttpServletRequest request = (HttpServletRequest)getRequest();
-			 requestParameterNamesIterator = EnumerationUtils.toList(request.getParameterNames()).iterator();
+			 final Enumeration enumer = request.getParameterNames();
+			 
+			 requestParameterNamesIterator = new Iterator() {
+	            public boolean hasNext() {
+	                return enumer.hasMoreElements();
+	            }
+
+	            public Object next() {
+	                return enumer.nextElement();
+	            }
+
+	            public void remove() {
+	                throw new UnsupportedOperationException();
+	            }
+	        };
 		 }
 		 return requestParameterNamesIterator;
 	 }
 	 
+	 /**
+	 * <p>Add the specified request parameter for this request.</p>
+	 *
+	 * @param key Parameter name
+	 * @param value Parameter value
+	 */
+	public void addRequestParameterMap(String key, String value) {
+		super.addRequestParameterMap(key, value);
+		
+		String [] currentValue = (String[]) getRequestParameterValuesMap().get(key);
+		if (null == currentValue) {
+			requestParameterValuesMap.put(key, new String[] { value });
+		} else {
+			String [] newArray = new String [currentValue.length + 1];
+			System.arraycopy(currentValue, 0, newArray, 0, currentValue.length);
+			newArray[currentValue.length] = value;
+			requestParameterValuesMap.put(key, newArray);
+		}
+	}
+	 
 	 public Set getResourcePaths(String path) {
 		 // TODO hans, should be implemented
 		 if (null == resourcePathsSet) {