svn commit: r1569898 - in /wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests: conformance/AbstractFunctionalConformanceTest.java helpers/WidgetUploader.java

[sc...@apache.org]

Author: scottbw
Date: Wed Feb 19 20:12:22 2014
New Revision: 1569898

URL: http://svn.apache.org/r1569898
Log:
Use Request class for signed requests in test framework used for conformance testing

Modified:
    wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/conformance/AbstractFunctionalConformanceTest.java
    wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/helpers/WidgetUploader.java

Modified: wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/conformance/AbstractFunctionalConformanceTest.java
URL: http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/conformance/AbstractFunctionalConformanceTest.java?rev=1569898&r1=1569897&r2=1569898&view=diff
==============================================================================
--- wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/conformance/AbstractFunctionalConformanceTest.java (original)
+++ wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/conformance/AbstractFunctionalConformanceTest.java Wed Feb 19 20:12:22 2014
@@ -23,6 +23,7 @@ import org.apache.commons.httpclient.Htt
 import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.io.IOUtils;
 import org.apache.wookie.tests.functional.AbstractControllerTest;
+import org.apache.wookie.tests.helpers.Request;
 import org.apache.wookie.tests.helpers.WidgetUploader;
 import org.jdom.Document;
 import org.jdom.Element;
@@ -121,12 +122,13 @@ AbstractControllerTest {
 		// instantiate widget and parse results
 		//
 		try {
-			HttpClient client = new HttpClient();
-			PostMethod post = new PostMethod(TEST_INSTANCES_SERVICE_URL_VALID);
-			post.setQueryString("api_key="+API_KEY_VALID+"&widgetid="+identifier+"&userid=test&shareddatakey=test");
-			client.executeMethod(post);
+			Request post = new Request("POST", TEST_INSTANCES_SERVICE_URL_VALID);
+			post.addParameter("api_key", API_KEY_VALID);
+			post.addParameter("widgetid", identifier);
+			post.addParameter("userid", "test");
+			post.addParameter("shareddatakey", "test");
+			post.execute(true, false);
 			response = IOUtils.toString(post.getResponseBodyAsStream());
-			post.releaseConnection();
 		}
 		catch (Exception e) {
 			fail("failed to instantiate widget");

Modified: wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/helpers/WidgetUploader.java
URL: http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/helpers/WidgetUploader.java?rev=1569898&r1=1569897&r2=1569898&view=diff
==============================================================================
--- wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/helpers/WidgetUploader.java (original)
+++ wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/helpers/WidgetUploader.java Wed Feb 19 20:12:22 2014
@@ -23,10 +23,7 @@ import java.io.StringReader;
 import java.util.List;
 
 import org.apache.commons.httpclient.HttpClient;
-import org.apache.commons.httpclient.UsernamePasswordCredentials;
-import org.apache.commons.httpclient.auth.AuthScope;
 import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
 import org.apache.commons.httpclient.methods.multipart.FilePart;
 import org.apache.commons.httpclient.methods.multipart.MultipartRequestEntity;
 import org.apache.commons.httpclient.methods.multipart.Part;
@@ -80,18 +77,12 @@ public class WidgetUploader {
 	 * @throws IOException
 	 */
 	public static String uploadWidget(File file) throws IOException{
-		HttpClient httpclient = new HttpClient();
-		httpclient.getState().setCredentials(
-				 new AuthScope("localhost", 8080, AuthScope.ANY_REALM),
-				 new UsernamePasswordCredentials("java", "java")
-				 );
-		PostMethod post = new PostMethod(SERVICE_URL);
+		Request post = new Request("POST", SERVICE_URL);
 		Part[] parts = { new FilePart(file.getName(), file) };
-		post.setRequestEntity(new MultipartRequestEntity(parts, post
+		post.setRequestEntity(new MultipartRequestEntity(parts, post.getClient()
 				.getParams()));
-		httpclient.executeMethod(post);
+		post.execute(true, false);
 		String response = IOUtils.toString(post.getResponseBodyAsStream());
-		post.releaseConnection();
 		return response;
 	}