You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by kg...@apache.org on 2011/12/15 15:49:37 UTC
svn commit: r1214796 - in
/felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/test/java/org/apache/felix/httplite/osgi/test:
BasicTestingServlet.java cases/TestParameters.java
Author: kgilmer
Date: Thu Dec 15 14:49:37 2011
New Revision: 1214796
URL: http://svn.apache.org/viewvc?rev=1214796&view=rev
Log:
httplite: fix TestParameters tests.
Modified:
felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/test/java/org/apache/felix/httplite/osgi/test/BasicTestingServlet.java
felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestParameters.java
Modified: felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/test/java/org/apache/felix/httplite/osgi/test/BasicTestingServlet.java
URL: http://svn.apache.org/viewvc/felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/test/java/org/apache/felix/httplite/osgi/test/BasicTestingServlet.java?rev=1214796&r1=1214795&r2=1214796&view=diff
==============================================================================
--- felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/test/java/org/apache/felix/httplite/osgi/test/BasicTestingServlet.java (original)
+++ felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/test/java/org/apache/felix/httplite/osgi/test/BasicTestingServlet.java Thu Dec 15 14:49:37 2011
@@ -21,6 +21,7 @@ package org.apache.felix.httplite.osgi.t
import java.io.IOException;
import java.util.Collections;
+import java.util.Enumeration;
import java.util.HashMap;
import java.util.Map;
@@ -45,6 +46,7 @@ public class BasicTestingServlet extends
private Map m_requestParams;
private Map m_queryStringMap;
private String m_pathInfo;
+ private HttpServletRequest m_request;
/**
@@ -85,6 +87,7 @@ public class BasicTestingServlet extends
m_requestParams = req.getParameterMap();
m_queryStringMap = parseQueryStringMap( req.getQueryString() );
m_pathInfo = req.getPathInfo();
+ m_request = req;
if ( m_responseStringContent != null )
{
@@ -133,6 +136,7 @@ public class BasicTestingServlet extends
m_requestParams = req.getParameterMap();
m_queryStringMap = parseQueryStringMap( req.getQueryString() );
m_pathInfo = req.getPathInfo();
+ m_request = req;
}
@@ -142,6 +146,7 @@ public class BasicTestingServlet extends
m_requestParams = req.getParameterMap();
m_queryStringMap = parseQueryStringMap( req.getQueryString() );
m_pathInfo = req.getPathInfo();
+ m_request = req;
}
@@ -151,6 +156,7 @@ public class BasicTestingServlet extends
m_requestParams = req.getParameterMap();
m_queryStringMap = parseQueryStringMap( req.getQueryString() );
m_pathInfo = req.getPathInfo();
+ m_request = req;
}
@@ -194,4 +200,19 @@ public class BasicTestingServlet extends
{
return m_pathInfo;
}
+
+ public Enumeration getHeaderNames()
+ {
+ return m_request.getHeaderNames();
+ }
+
+ public String getHeader(String name)
+ {
+ return m_request.getHeader( name );
+ }
+
+ public Enumeration getHeaders(String name)
+ {
+ return m_request.getHeaders( name );
+ }
}
Modified: felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestParameters.java
URL: http://svn.apache.org/viewvc/felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestParameters.java?rev=1214796&r1=1214795&r2=1214796&view=diff
==============================================================================
--- felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestParameters.java (original)
+++ felix/sandbox/kgilmer/httplite-test-pojosr/httplite/src/test/java/org/apache/felix/httplite/osgi/test/cases/TestParameters.java Thu Dec 15 14:49:37 2011
@@ -21,9 +21,9 @@ package org.apache.felix.httplite.osgi.t
import java.io.IOException;
import java.net.HttpURLConnection;
-import java.util.Collection;
+import java.util.Enumeration;
+import java.util.HashMap;
import java.util.Map;
-import java.util.Set;
import javax.servlet.ServletException;
@@ -65,7 +65,17 @@ public class TestParameters extends Abst
}
client.connect();
assertTrue( client.getResponseCode() == 200 );
- assertTrue( testServlet.getRequestParameters().keySet().size() == parameterCount );
+
+ int headerCount = 0;
+ Enumeration enum = testServlet.getHeaderNames();
+ while (enum.hasMoreElements())
+ {
+ headerCount++;
+ System.out.println("header: " + enum.nextElement().toString());
+ }
+
+
+ assertTrue( headerCount >= parameterCount );
}
@@ -92,14 +102,18 @@ public class TestParameters extends Abst
}
client.connect();
assertTrue( client.getResponseCode() == 200 );
- Map rp = testServlet.getRequestParameters();
- Set pks = testServlet.getRequestParameters().keySet();
- Collection pvs = testServlet.getRequestParameters().values();
+ Map rp = new HashMap();
+
+ Enumeration e = testServlet.getHeaderNames();
+ while (e.hasMoreElements())
+ {
+ String key = e.nextElement().toString();
+ rp.put( key , testServlet.getHeader( key ) );
+ }
+
for ( int i = 0; i < parameterCount; ++i )
{
- assertTrue( pks.contains( "k" + i ) );
- assertTrue( pvs.contains( "v" + i ) );
- assertTrue( rp.get( "k" + i ).equals( "v" + i ) );
+ assertTrue( rp.get( "k" + i ).equals( "v" + i ) );
}
}
}