Author: scottbw
Date: Fri Feb 21 22:21:45 2014
New Revision: 1570729
URL: http://svn.apache.org/r1570729
Log:
Updated more functional tests to use HMAC signed requests for accessing the
REST API
Modified:
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/ParticipantsControllerTest.java
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/ProxyTest.java
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/WidgetsControllerTest.java
Modified:
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/ParticipantsControllerTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/ParticipantsControllerTest.java?rev=1570729&r1=1570728&r2=1570729&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/ParticipantsControllerTest.java
(original)
+++
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/ParticipantsControllerTest.java
Fri Feb 21 22:21:45 2014
@@ -18,11 +18,8 @@ import static org.junit.Assert.*;
import java.io.IOException;
-import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpException;
-import org.apache.commons.httpclient.methods.GetMethod;
-import org.apache.commons.httpclient.methods.PostMethod;
-import org.apache.commons.httpclient.methods.DeleteMethod;
+import org.apache.wookie.tests.helpers.Request;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -41,28 +38,30 @@ public class ParticipantsControllerTest
*/
@BeforeClass
public static void setUp() throws Exception {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_VALID +
"&userid=test&shareddatakey=participantstest");
- client.executeMethod(post);
+ Request post = new Request("POST",
TEST_INSTANCES_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_VALID);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "participantstest");
+ post.execute(true, false);
+ int code = post.getStatusCode();
+ assertEquals(200, code);
String response = post.getResponseBodyAsString();
instance_id_key =
response.substring(response.indexOf("<identifier>") + 12,
response.indexOf("</identifier>"));
- post.releaseConnection();
}
@AfterClass
public static void tearDown() throws HttpException, IOException{
- HttpClient client = new HttpClient();
- DeleteMethod post = new
DeleteMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_VALID
- +
"&userid=test&shareddatakey=participantstest&participant_id=80");
- client.executeMethod(post);
- int code = post.getStatusCode();
+ Request delete = new Request("DELETE",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ delete.addParameter("api_key", API_KEY_VALID);
+ delete.addParameter("widgetid", WIDGET_ID_VALID);
+ delete.addParameter("userid", "test");
+ delete.addParameter("shareddatakey", "participantstest");
+ delete.addParameter("participant_id", "80");
+ delete.execute(true, false);
+ int code = delete.getStatusCode();
assertEquals(200, code);
- post.releaseConnection();
}
/**
@@ -77,33 +76,34 @@ public class ParticipantsControllerTest
//
// Create a new participant
//
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- post.setQueryString("api_key="
- + API_KEY_VALID
- + "&widgetid="
- + WIDGET_ID_VALID
- +
"&userid=test&shareddatakey=participantstest&participant_id=1&participant_display_name=bob&participant_thumbnail_url=http://www.test.org";);
- client.executeMethod(post);
+
+ Request post = new Request("POST",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_VALID);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "participantstest");
+ post.addParameter("participant_id", "1");
+ post.addParameter("participant_display_name", "bob");
+ post.addParameter("participant_thumbnail_url",
"http://www.test.org";);
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(201, code);
- post.releaseConnection();
+
//
// Now lets GET it to make sure it was added OK
//
- client = new HttpClient();
- GetMethod get = new
GetMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- get.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_VALID +
"&userid=test&shareddatakey=participantstest");
- client.executeMethod(get);
+ Request get = new Request("GET",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ get.addParameter("api_key", API_KEY_VALID);
+ get.addParameter("widgetid", WIDGET_ID_VALID);
+ get.addParameter("userid", "test");
+ get.addParameter("shareddatakey", "participantstest");
+ get.execute(true, false);
code = get.getStatusCode();
assertEquals(200, code);
String response = get.getResponseBodyAsString();
assertTrue(response
.contains("<participant id=\"1\"
display_name=\"bob\" thumbnail_url=\"http://www.test.org\"; />"));
- get.releaseConnection();
-
}
/**
@@ -114,17 +114,15 @@ public class ParticipantsControllerTest
*/
@Test
public void getParticipant_usingIdKey() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- GetMethod get = new
GetMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- get.setQueryString("api_key=" + API_KEY_VALID + "&idkey="
- + instance_id_key);
- client.executeMethod(get);
+ Request get = new Request("GET",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ get.addParameter("api_key", API_KEY_VALID);
+ get.addParameter("idkey", instance_id_key);
+ get.execute(true, false);
int code = get.getStatusCode();
assertEquals(200, code);
String response = get.getResponseBodyAsString();
assertTrue(response
.contains("<participant id=\"1\"
display_name=\"bob\" thumbnail_url=\"http://www.test.org\"; />"));
- get.releaseConnection();
}
/**
@@ -135,17 +133,17 @@ public class ParticipantsControllerTest
*/
@Test
public void addParticipant_AlreadyExists() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- post.setQueryString("api_key="
- + API_KEY_VALID
- + "&widgetid="
- + WIDGET_ID_VALID
- +
"&userid=test&shareddatakey=participantstest&participant_id=1&participant_display_name=bob&participants_thumbnail_url=http://www.test.org";);
- client.executeMethod(post);
+ Request post = new Request("POST",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_VALID);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "participantstest");
+ post.addParameter("participant_id", "1");
+ post.addParameter("participant_display_name", "bob");
+ post.addParameter("participant_thumbnail_url",
"http://www.test.org";);
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(200, code);
- post.releaseConnection();
}
/**
@@ -156,14 +154,17 @@ public class ParticipantsControllerTest
*/
@Test
public void addParticipant_InvalidAPIkey() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_INVALID + "&widgetid="
- + WIDGET_ID_VALID +
"&userid=test&shareddatakey=participantstest");
- client.executeMethod(post);
+ Request post = new Request("POST",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_INVALID);
+ post.addParameter("widgetid", WIDGET_ID_VALID);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "participantstest");
+ post.addParameter("participant_id", "1");
+ post.addParameter("participant_display_name", "bob");
+ post.addParameter("participant_thumbnail_url",
"http://www.test.org";);
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(403, code);
- post.releaseConnection();
}
/**
@@ -175,17 +176,17 @@ public class ParticipantsControllerTest
@Test
public void addParticipant_InvalidParticipant() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- post.setQueryString("api_key="
- + API_KEY_VALID
- + "&widgetid="
- + WIDGET_ID_VALID
- +
"&userid=test&shareddatakey=participantstest&participant_id=&participant_display_name=bob&participants_thumbnail_url=http://www.test.org";);
- client.executeMethod(post);
+ Request post = new Request("POST",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_VALID);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "participantstest");
+ post.addParameter("participant_id", "");
+ post.addParameter("participant_display_name", "bob");
+ post.addParameter("participant_thumbnail_url",
"http://www.test.org";);
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(400, code);
- post.releaseConnection();
}
/**
@@ -196,17 +197,17 @@ public class ParticipantsControllerTest
*/
@Test
public void addParticipant_InvalidWidget() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- post.setQueryString("api_key="
- + API_KEY_VALID
- + "&widgetid="
- + WIDGET_ID_INVALID
- +
"&userid=test&shareddatakey=participantstest&participant_id=1&participant_display_name=bob&participants_thumbnail_url=http://www.test.org";);
- client.executeMethod(post);
+ Request post = new Request("POST",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_INVALID);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "participantstest");
+ post.addParameter("participant_id", "1");
+ post.addParameter("participant_display_name", "bob");
+ post.addParameter("participant_thumbnail_url",
"http://www.test.org";);
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(400, code);
- post.releaseConnection();
}
/**
@@ -220,32 +221,30 @@ public class ParticipantsControllerTest
//
// Delete the participant
//
- HttpClient client = new HttpClient();
- DeleteMethod post = new
DeleteMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_VALID
- +
"&userid=test&shareddatakey=participantstest&participant_id=1");
- client.executeMethod(post);
- int code = post.getStatusCode();
+ Request delete = new Request("DELETE",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ delete.addParameter("api_key", API_KEY_VALID);
+ delete.addParameter("widgetid", WIDGET_ID_VALID);
+ delete.addParameter("userid", "test");
+ delete.addParameter("shareddatakey", "participantstest");
+ delete.addParameter("participant_id", "1");
+ delete.execute(true, false);
+ int code = delete.getStatusCode();
assertEquals(200, code);
- post.releaseConnection();
//
// Now lets GET it to make sure it was deleted
//
-
- client = new HttpClient();
- GetMethod get = new
GetMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- get.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_VALID +
"&userid=test&shareddatakey=participantstest");
- client.executeMethod(get);
+ Request get = new Request("GET",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ get.addParameter("api_key", API_KEY_VALID);
+ get.addParameter("widgetid", WIDGET_ID_VALID);
+ get.addParameter("userid", "test");
+ get.addParameter("shareddatakey", "participantstest");
+ get.execute(true, false);
code = get.getStatusCode();
assertEquals(200, code);
String response = get.getResponseBodyAsString();
assertFalse(response
.contains("<participant id=\"1\"
display_name=\"bob\" thumbnail_url=\"http://www.test.org\"; />"));
- get.releaseConnection();
-
}
/**
@@ -257,14 +256,15 @@ public class ParticipantsControllerTest
@Test
public void deleteParticipant_InvalidAPIKey() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- DeleteMethod post = new
DeleteMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_INVALID + "&widgetid="
- + WIDGET_ID_VALID +
"&userid=test&shareddatakey=participantstest");
- client.executeMethod(post);
- int code = post.getStatusCode();
+ Request delete = new Request("DELETE",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ delete.addParameter("api_key", API_KEY_INVALID);
+ delete.addParameter("widgetid", WIDGET_ID_VALID);
+ delete.addParameter("userid", "test");
+ delete.addParameter("shareddatakey", "participantstest");
+ delete.addParameter("participant_id", "99");
+ delete.execute(true, false);
+ int code = delete.getStatusCode();
assertEquals(403, code);
- post.releaseConnection();
}
/**
@@ -276,15 +276,15 @@ public class ParticipantsControllerTest
@Test
public void deleteParticipant_InvalidParticipant() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- DeleteMethod post = new
DeleteMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_VALID
- +
"&userid=test&shareddatakey=participantstest&participant_id=99");
- client.executeMethod(post);
- int code = post.getStatusCode();
+ Request delete = new Request("DELETE",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ delete.addParameter("api_key", API_KEY_VALID);
+ delete.addParameter("widgetid", WIDGET_ID_VALID);
+ delete.addParameter("userid", "test");
+ delete.addParameter("shareddatakey", "participantstest");
+ delete.addParameter("participant_id", "99");
+ delete.execute(true, false);
+ int code = delete.getStatusCode();
assertEquals(404, code);
- post.releaseConnection();
}
/**
@@ -296,17 +296,15 @@ public class ParticipantsControllerTest
@Test
public void deleteParticipant_InvalidInstance() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- DeleteMethod post = new
DeleteMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- post.setQueryString("api_key="
- + API_KEY_VALID
- + "&widgetid="
- + WIDGET_ID_VALID
- +
"&userid=test&shareddatakey=participantstestinvalidkey&participant_id=1");
- client.executeMethod(post);
- int code = post.getStatusCode();
+ Request delete = new Request("DELETE",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ delete.addParameter("api_key", API_KEY_VALID);
+ delete.addParameter("widgetid", WIDGET_ID_VALID);
+ delete.addParameter("userid", "test");
+ delete.addParameter("shareddatakey",
"participantstestinvalidkey");
+ delete.addParameter("participant_id", "1");
+ delete.execute(true, false);
+ int code = delete.getStatusCode();
assertEquals(404, code);
- post.releaseConnection();
}
/**
@@ -321,33 +319,33 @@ public class ParticipantsControllerTest
//
// Create a new participant
//
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- post.setQueryString("api_key="
- + API_KEY_VALID
- + "&widgetid="
- + WIDGET_ID_VALID
- +
"&userid=test&shareddatakey=participantstest&participant_id=80&participant_display_name=bob&participant_role=host&participant_thumbnail_url=http://www.test.org";);
- client.executeMethod(post);
+ Request post = new Request("POST",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_VALID);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "participantstest");
+ post.addParameter("participant_id", "80");
+ post.addParameter("participant_display_name", "bob");
+ post.addParameter("participant_role", "host");
+ post.addParameter("participant_thumbnail_url",
"http://www.test.org";);
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(201, code);
- post.releaseConnection();
//
// Now lets GET it to make sure it was added OK
//
- client = new HttpClient();
- GetMethod get = new
GetMethod(TEST_PARTICIPANTS_SERVICE_URL_VALID);
- get.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_VALID +
"&userid=test&shareddatakey=participantstest");
- client.executeMethod(get);
+ Request get = new Request("GET",
TEST_PARTICIPANTS_SERVICE_URL_VALID);
+ get.addParameter("api_key", API_KEY_VALID);
+ get.addParameter("widgetid", WIDGET_ID_VALID);
+ get.addParameter("userid", "test");
+ get.addParameter("shareddatakey", "participantstest");
+ get.execute(true, false);
code = get.getStatusCode();
assertEquals(200, code);
String response = get.getResponseBodyAsString();
assertTrue(response
.contains("<participant id=\"80\"
display_name=\"bob\" thumbnail_url=\"http://www.test.org\"; role=\"host\" />"));
- get.releaseConnection();
-
}
}
Modified:
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/ProxyTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/ProxyTest.java?rev=1570729&r1=1570728&r2=1570729&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/ProxyTest.java
(original)
+++
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/ProxyTest.java
Fri Feb 21 22:21:45 2014
@@ -131,10 +131,8 @@ public class ProxyTest extends AbstractC
//
// Remove policy
//
- HttpClient client = new HttpClient();
- setAuthenticationCredentials(client);
- DeleteMethod delete = new
DeleteMethod(TEST_POLICIES_SERVICE_URL_VALID + "/" + encodeString("*
http://localhost:8300 ALLOW"));
- client.executeMethod(delete);
+ Request delete = new Request("DELETE",
TEST_POLICIES_SERVICE_URL_VALID + "/" + encodeString("* http://localhost:8300
ALLOW"));
+ delete.execute(true, false);
assertEquals(200, delete.getStatusCode());
}
Modified:
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java?rev=1570729&r1=1570728&r2=1570729&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java
(original)
+++
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/WidgetInstancesControllerTest.java
Fri Feb 21 22:21:45 2014
@@ -100,12 +100,13 @@ public class WidgetInstancesControllerTe
*/
@Test
public void getLocalizedInstance() throws HttpException, IOException {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_LOCALIZED
- +
"&userid=localetest&shareddatakey=localetest&locale=fr");
- client.executeMethod(post);
+ Request post = new Request("POST",
TEST_INSTANCES_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_LOCALIZED);
+ post.addParameter("userid", "localetest");
+ post.addParameter("shareddatakey", "localetest");
+ post.addParameter("locale", "fr");
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(200, code);
assertTrue(post.getResponseBodyAsString().contains("locales/fr/index.htm"));
@@ -114,7 +115,6 @@ public class WidgetInstancesControllerTe
TEST_ID_KEY = post.getResponseBodyAsString().substring(
post.getResponseBodyAsString().indexOf("<identifier>") + 12,
post.getResponseBodyAsString().indexOf("</identifier>"));
- post.releaseConnection();
}
/**
@@ -127,12 +127,13 @@ public class WidgetInstancesControllerTe
@Test
public void getExistingInstanceByInstanceParams() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- GetMethod get = new GetMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- get.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_LOCALIZED
- +
"&userid=localetest&shareddatakey=localetest&locale=fr");
- client.executeMethod(get);
+ Request get = new Request("GET",
TEST_INSTANCES_SERVICE_URL_VALID);
+ get.addParameter("api_key", API_KEY_VALID);
+ get.addParameter("widgetid", WIDGET_ID_LOCALIZED);
+ get.addParameter("userid", "localetest");
+ get.addParameter("shareddatakey", "localetest");
+ get.addParameter("locale", "fr");
+ get.execute(true, false);
int code = get.getStatusCode();
assertEquals(200, code);
assertTrue(get.getResponseBodyAsString().contains("locales/fr/index.htm"));
@@ -148,10 +149,10 @@ public class WidgetInstancesControllerTe
*/
@Test
public void getExistingInstanceByIdKey() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- GetMethod get = new GetMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- get.setQueryString("api_key=" + API_KEY_VALID + "&idkey=" +
TEST_ID_KEY);
- client.executeMethod(get);
+ Request get = new Request("GET",
TEST_INSTANCES_SERVICE_URL_VALID);
+ get.addParameter("api_key", API_KEY_VALID);
+ get.addParameter("idkey", TEST_ID_KEY);
+ get.execute(true, false);
int code = get.getStatusCode();
assertEquals(200, code);
System.out.println(get.getResponseBodyAsString());
@@ -169,11 +170,10 @@ public class WidgetInstancesControllerTe
@Test
public void getExistingInstanceByIdResource() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- GetMethod get = new GetMethod(TEST_INSTANCES_SERVICE_URL_VALID
+ "/"
+ Request get = new Request("GET",
TEST_INSTANCES_SERVICE_URL_VALID + "/"
+ TEST_ID_KEY);
- get.setQueryString("api_key=" + API_KEY_VALID);
- client.executeMethod(get);
+ get.addParameter("api_key", API_KEY_VALID);
+ get.execute(true, false);
int code = get.getStatusCode();
assertEquals(200, code);
assertTrue(get.getResponseBodyAsString().contains("locales/fr/index.htm"));
@@ -190,19 +190,19 @@ public class WidgetInstancesControllerTe
*/
@Test
public void getGracefulLocalizedInstance() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_LOCALIZED
- +
"&userid=localetest1b&shareddatakey=localetest1b&locale=fr-1694acad");
- client.executeMethod(post);
+ Request post = new Request("POST",
TEST_INSTANCES_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_LOCALIZED);
+ post.addParameter("userid", "localetest");
+ post.addParameter("shareddatakey", "localetest1b");
+ post.addParameter("locale", "fr-1694acad");
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(200, code);
assertTrue(post.getResponseBodyAsString().contains("locales/fr/index.htm"));
assertFalse(post.getResponseBodyAsString().contains("locale
test"));
assertTrue(post.getResponseBodyAsString().contains(
"tester les paramètres régionaux"));
- post.releaseConnection();
}
/**
@@ -213,12 +213,13 @@ public class WidgetInstancesControllerTe
*/
@Test
public void getNonLocalizedInstance() throws IOException {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_LOCALIZED
- +
"&userid=localetest2&shareddatakey=localetest2&locale=bu");
- client.executeMethod(post);
+ Request post = new Request("POST",
TEST_INSTANCES_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_LOCALIZED);
+ post.addParameter("userid", "localetest");
+ post.addParameter("shareddatakey", "localetest2");
+ post.addParameter("locale", "bu");
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(200, code);
assertFalse(post.getResponseBodyAsString().contains("locales/fr/index.htm"));
@@ -227,7 +228,6 @@ public class WidgetInstancesControllerTe
assertTrue(post.getResponseBodyAsString().contains("locale
test"));
assertFalse(post.getResponseBodyAsString().contains(
"tester les paramètres régionaux"));
- post.releaseConnection();
}
/**
@@ -239,18 +239,18 @@ public class WidgetInstancesControllerTe
*/
@Test
public void getDefaultLocalizedInstance() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_LOCALIZED +
"&userid=localetest3&shareddatakey=localetest3");
- client.executeMethod(post);
+ Request post = new Request("POST",
TEST_INSTANCES_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_LOCALIZED);
+ post.addParameter("userid", "localetest3");
+ post.addParameter("shareddatakey", "localetest4");
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(200, code);
assertTrue(post.getResponseBodyAsString().contains("locales/en/index.htm"));
assertTrue(post.getResponseBodyAsString().contains("locale
test"));
assertFalse(post.getResponseBodyAsString().contains(
"tester les paramètres régionaux"));
- post.releaseConnection();
}
/**
@@ -262,14 +262,14 @@ public class WidgetInstancesControllerTe
*/
@Test
public void getInstanceById() throws HttpException, IOException {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_VALID +
"&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", WIDGET_ID_LOCALIZED);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "test");
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(200, code);
- post.releaseConnection();
}
/**
@@ -280,14 +280,14 @@ public class WidgetInstancesControllerTe
*/
@Test
public void getInstanceById_AlreadyExists() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_VALID +
"&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", WIDGET_ID_LOCALIZED);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "test");
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(200, code);
- post.releaseConnection();
}
/**
@@ -298,14 +298,14 @@ public class WidgetInstancesControllerTe
*/
@Test
public void getInstance_InvalidAPIkey() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_INVALID + "&widgetid="
- + WIDGET_ID_VALID +
"&userid=test&shareddatakey=test");
- client.executeMethod(post);
+ Request post = new Request("POST",
TEST_INSTANCES_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_INVALID);
+ post.addParameter("widgetid", WIDGET_ID_LOCALIZED);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "test");
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(403, code);
- post.releaseConnection();
}
/**
@@ -318,16 +318,16 @@ public class WidgetInstancesControllerTe
*/
@Test
public void getInstanceById_InvalidWidget() throws HttpException,
IOException {
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_INVALID +
"&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", WIDGET_ID_INVALID);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "test");
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(404, code); // but must return the "default widget"
assertTrue(post.getResponseBodyAsString().contains(
"Unsupported widget widget"));
- post.releaseConnection();
}
/**
@@ -361,71 +361,70 @@ public class WidgetInstancesControllerTe
//
// Create an instance using POST
//
- HttpClient client = new HttpClient();
- PostMethod post = new
PostMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_VALID +
"&userid=test&shareddatakey=clonetestsrc");
- client.executeMethod(post);
+ Request post = new Request("POST",
TEST_INSTANCES_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_VALID);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "clonetestsrc");
+ post.execute(true, false);
int code = post.getStatusCode();
assertEquals(200, code);
- post.releaseConnection();
//
// Set some shared data
//
- client = new HttpClient();
- post = new PostMethod(TEST_PROPERTIES_SERVICE_URL_VALID);
- post.setQueryString("api_key="
- + API_KEY_VALID
- + "&widgetid="
- + WIDGET_ID_VALID
- +
"&userid=test&is_public=true&shareddatakey=clonetestsrc&propertyname=cat&propertyvalue=garfield");
- client.executeMethod(post);
+ post = new Request("POST", TEST_PROPERTIES_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_VALID);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "clonetestsrc");
+ post.addParameter("propertyname", "cat");
+ post.addParameter("propertyvalue", "garfield");
+ post.addParameter("is_public", "true");
+ post.execute(true, false);
code = post.getStatusCode();
assertEquals(201, code);
- post.releaseConnection();
//
// Clone it using PUT
//
- client = new HttpClient();
- PutMethod put = new PutMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- put.setQueryString("api_key="
- + API_KEY_VALID
- + "&widgetid="
- + WIDGET_ID_VALID
- +
"&userid=test&shareddatakey=clonetestsrc&requestid=clone&cloneshareddatakey=clonetestsync");
- client.executeMethod(put);
+ Request put = new Request("PUT",
TEST_INSTANCES_SERVICE_URL_VALID);
+ put.addParameter("api_key", API_KEY_VALID);
+ put.addParameter("widgetid", WIDGET_ID_VALID);
+ put.addParameter("userid", "test");
+ put.addParameter("shareddatakey", "clonetestsrc");
+ put.addParameter("requestid", "clone");
+ put.addParameter("cloneshareddatakey", "clonetestsync");
+ put.execute(true, false);
code = put.getStatusCode();
assertEquals(200, code);
- put.releaseConnection();
//
// Create an instance for the clone
//
- client = new HttpClient();
- post = new PostMethod(TEST_INSTANCES_SERVICE_URL_VALID);
- post.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_VALID +
"&userid=test&shareddatakey=clonetestsync");
- client.executeMethod(post);
+ post = new Request("POST", TEST_INSTANCES_SERVICE_URL_VALID);
+ post.addParameter("api_key", API_KEY_VALID);
+ post.addParameter("widgetid", WIDGET_ID_VALID);
+ post.addParameter("userid", "test");
+ post.addParameter("shareddatakey", "clonetestsync");
+ post.execute(true, false);
code = post.getStatusCode();
assertEquals(200, code);
- post.releaseConnection();
//
// Get the data for the clone and check it is the same set for
the original
//
- client = new HttpClient();
- GetMethod get = new
GetMethod(TEST_PROPERTIES_SERVICE_URL_VALID);
- get.setQueryString("api_key=" + API_KEY_VALID + "&widgetid="
- + WIDGET_ID_VALID
- +
"&userid=test&shareddatakey=clonetestsync&propertyname=cat");
- client.executeMethod(get);
+ Request get = new Request("GET",
TEST_PROPERTIES_SERVICE_URL_VALID);
+ get.addParameter("api_key", API_KEY_VALID);
+ get.addParameter("widgetid", WIDGET_ID_VALID);
+ get.addParameter("userid", "test");
+ get.addParameter("shareddatakey", "clonetestsync");
+ get.addParameter("propertyname", "cat");
+ get.execute(true, false);
code = get.getStatusCode();
assertEquals(200, code);
String resp = get.getResponseBodyAsString();
assertEquals("garfield", resp);
- post.releaseConnection();
}
}
Modified:
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/WidgetsControllerTest.java
URL:
http://svn.apache.org/viewvc/wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/WidgetsControllerTest.java?rev=1570729&r1=1570728&r2=1570729&view=diff
==============================================================================
---
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/WidgetsControllerTest.java
(original)
+++
wookie/trunk/wookie-server/src/test/java/org/apache/wookie/tests/functional/WidgetsControllerTest.java
Fri Feb 21 22:21:45 2014
@@ -62,15 +62,14 @@ public class WidgetsControllerTest exten
public static void tearDown() throws HttpException, IOException{
HttpClient client = new HttpClient();
setAuthenticationCredentials(client);
- DeleteMethod delete = new
DeleteMethod(TEST_WIDGETS_SERVICE_URL_VALID + encodeString("/" +
WIDGET_ID_ACCESS_TEST));
- client.executeMethod(delete);
- delete = new DeleteMethod(TEST_WIDGETS_SERVICE_URL_VALID +
encodeString("/" + WIDGET_ID_UPLOAD_TEST));
- client.executeMethod(delete);
- delete = new DeleteMethod(TEST_WIDGETS_SERVICE_URL_VALID +
encodeString("/" + WIDGET_ID_UPLOAD_TEST_2));
- client.executeMethod(delete);
- delete = new DeleteMethod(TEST_WIDGETS_SERVICE_URL_VALID +
encodeString("/" + WIDGET_ID_UPLOAD_POLICIES_TEST));
- client.executeMethod(delete);
- }
+ Request delete = new
Request("DELETE",TEST_WIDGETS_SERVICE_URL_VALID + encodeString("/" +
WIDGET_ID_ACCESS_TEST));
+ delete.execute(true, false);
+ delete = new Request("DELETE",TEST_WIDGETS_SERVICE_URL_VALID +
encodeString("/" + WIDGET_ID_UPLOAD_TEST));
+ delete.execute(true, false);
+ delete = new Request("DELETE",TEST_WIDGETS_SERVICE_URL_VALID +
encodeString("/" + WIDGET_ID_UPLOAD_TEST_2));
+ delete.execute(true, false);
+ delete = new Request("DELETE",TEST_WIDGETS_SERVICE_URL_VALID +
encodeString("/" + WIDGET_ID_UPLOAD_POLICIES_TEST));
+ delete.execute(true, false); }
/*
* Utility method for creating a temp directory
