Author: orudyy
Date: Wed Feb 25 14:29:31 2015
New Revision: 1662225
URL: http://svn.apache.org/r1662225
Log:
NO-JIRA: Fix path encoding in rest system tests#
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
Modified:
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java?rev=1662225&r1=1662224&r2=1662225&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
(original)
+++
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/RestTestHelper.java
Wed Feb 25 14:29:31 2015
@@ -35,7 +35,6 @@ import java.io.UnsupportedEncodingExcept
import java.net.HttpURLConnection;
import java.net.MalformedURLException;
import java.net.URL;
-import java.net.URLDecoder;
import java.net.URLEncoder;
import java.security.GeneralSecurityException;
import java.security.KeyStore;
@@ -305,7 +304,7 @@ public class RestTestHelper
public void createNewGroupMember(String groupProviderName, String
groupName, String memberName, int responseCode) throws IOException
{
HttpURLConnection connection = openManagementConnection(
- "groupmember/" + URLDecoder.decode(groupProviderName, "UTF-8")
+ "/"+ URLDecoder.decode(groupName, "UTF-8") + "/" +
URLDecoder.decode(memberName, "UTF-8"),
+ "groupmember/" + encodeAsUTF(groupProviderName) + "/"+
encodeAsUTF(groupName) + "/" + encodeAsUTF(memberName),
"PUT");
Map<String, Object> groupMemberData = new HashMap<String, Object>();
@@ -325,7 +324,7 @@ public class RestTestHelper
public void removeMemberFromGroup(String groupProviderName, String
groupName, String memberName, int responseCode) throws IOException
{
HttpURLConnection connection = openManagementConnection(
- "groupmember/" + URLDecoder.decode(groupProviderName, "UTF-8")
+ "/"+ URLDecoder.decode(groupName, "UTF-8") + "/" +
URLDecoder.decode(memberName, "UTF-8"),
+ "groupmember/" + encodeAsUTF(groupProviderName) + "/"+
encodeAsUTF(groupName) + "/" + encodeAsUTF(memberName),
"DELETE");
Assert.assertEquals("Unexpected response code", responseCode,
connection.getResponseCode());
@@ -358,7 +357,7 @@ public class RestTestHelper
public void createGroup(String groupName, String groupProviderName, int
responseCode) throws IOException
{
HttpURLConnection connection = openManagementConnection(
- "group/" + URLDecoder.decode(groupProviderName, "UTF-8") +
"/"+ URLDecoder.decode(groupName, "UTF-8"),
+ "group/" + encodeAsUTF(groupProviderName) + "/"+
encodeAsUTF(groupName),
"PUT");
Map<String, Object> groupData = new HashMap<String, Object>();
@@ -391,7 +390,7 @@ public class RestTestHelper
public void removeGroup(String groupName, String groupProviderName, int
responseCode) throws IOException
{
HttpURLConnection connection = openManagementConnection(
- "group/" + URLDecoder.decode(groupProviderName, "UTF-8") +
"/"+ URLDecoder.decode(groupName, "UTF-8"),
+ "group/" + encodeAsUTF(groupProviderName) + "/"+
encodeAsUTF(groupName),
"DELETE");
Assert.assertEquals("Unexpected response code", responseCode,
connection.getResponseCode());
Modified:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ExchangeRestTest.java?rev=1662225&r1=1662224&r2=1662225&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/ExchangeRestTest.java
Wed Feb 25 14:29:31 2015
@@ -20,7 +20,6 @@
*/
package org.apache.qpid.systest.rest;
-import java.net.URLDecoder;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -65,7 +64,7 @@ public class ExchangeRestTest extends Qp
for (String exchangeName : EXPECTED_EXCHANGES)
{
Map<String, Object> exchange =
getRestTestHelper().getJsonAsSingletonList("exchange/test/test/"
- + URLDecoder.decode(exchangeName, "UTF-8"));
+ + getRestTestHelper().encodeAsUTF(exchangeName));
assertExchange(exchangeName, exchange);
}
}
Modified:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java?rev=1662225&r1=1662224&r2=1662225&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/PortRestTest.java
Wed Feb 25 14:29:31 2015
@@ -21,7 +21,6 @@
package org.apache.qpid.systest.rest;
import java.net.ServerSocket;
-import java.net.URLDecoder;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
@@ -71,7 +70,7 @@ public class PortRestTest extends QpidRe
{
String portName = (String) portMap.get(Port.NAME);
assertNotNull("Port name attribute is not found", portName);
- Map<String, Object> portData =
getRestTestHelper().getJsonAsSingletonList("port/" +
URLDecoder.decode(portName, "UTF-8"));
+ Map<String, Object> portData =
getRestTestHelper().getJsonAsSingletonList("port/" +
getRestTestHelper().encodeAsUTF(portName));
assertNotNull("Port " + portName + " is not found", portData);
Asserts.assertPortAttributes(portData);
}
@@ -335,14 +334,14 @@ public class PortRestTest extends QpidRe
getRestTestHelper().setUsernameAndPassword(BrokerOptions.MANAGEMENT_MODE_USER_NAME,
MANAGEMENT_MODE_PASSWORD);
String ampqPortName = TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT;
- Map<String, Object> portData =
getRestTestHelper().getJsonAsSingletonList("port/" +
URLDecoder.decode(ampqPortName, "UTF-8"));
+ Map<String, Object> portData =
getRestTestHelper().getJsonAsSingletonList("port/" +
getRestTestHelper().encodeAsUTF(ampqPortName));
Asserts.assertPortAttributes(portData, State.QUIESCED);
}
public void testNewPortErroredIfPortNumberInUse() throws Exception
{
String ampqPortName = TestBrokerConfiguration.ENTRY_NAME_AMQP_PORT;
- Map<String, Object> portData =
getRestTestHelper().getJsonAsSingletonList("port/" +
URLDecoder.decode(ampqPortName, "UTF-8"));
+ Map<String, Object> portData =
getRestTestHelper().getJsonAsSingletonList("port/" +
getRestTestHelper().encodeAsUTF(ampqPortName));
int amqpPort = (Integer)portData.get(Port.PORT);
ServerSocket socket = new ServerSocket(0);
@@ -360,7 +359,7 @@ public class PortRestTest extends QpidRe
int responseCode = getRestTestHelper().submitRequest("port/" +
newPortName, "PUT", attributes);
assertEquals("Unexpected response code for port creation", 409,
responseCode);
- List<Map<String,Object>> ports =
getRestTestHelper().getJsonAsList("port/" + URLDecoder.decode(newPortName,
"UTF-8"));
+ List<Map<String,Object>> ports =
getRestTestHelper().getJsonAsList("port/" +
getRestTestHelper().encodeAsUTF(newPortName));
assertTrue("Port should not be created", ports.isEmpty());
}
}
Modified:
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
URL:
http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java?rev=1662225&r1=1662224&r2=1662225&view=diff
==============================================================================
---
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
(original)
+++
qpid/trunk/qpid/java/systests/src/test/java/org/apache/qpid/systest/rest/QueueRestTest.java
Wed Feb 25 14:29:31 2015
@@ -21,7 +21,6 @@
package org.apache.qpid.systest.rest;
import java.io.IOException;
-import java.net.URLDecoder;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -197,7 +196,7 @@ public class QueueRestTest extends QpidR
bindingData.put(Binding.EXCHANGE, exchangeName);
bindingData.put(Binding.QUEUE, queueName);
- String url = "binding/test/test/" + URLDecoder.decode(exchangeName,
"UTF-8") + "/" + queueName + "/" + bindingName;
+ String url = "binding/test/test/" +
getRestTestHelper().encodeAsUTF(exchangeName) + "/" + queueName + "/" +
bindingName;
int responseCode = getRestTestHelper().submitRequest(url, "PUT",
bindingData);
assertEquals("Unexpected response code", 201, responseCode);
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
