You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by lq...@apache.org on 2016/06/23 15:17:23 UTC
svn commit: r1749919 [2/2] - in /qpid/java/trunk:
broker-core/src/main/java/org/apache/qpid/server/model/preferences/
broker-core/src/test/java/org/apache/qpid/server/model/testmodels/singleton/
broker-plugins/management-http/src/main/java/org/apache/q...
Modified: qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java
URL: http://svn.apache.org/viewvc/qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java?rev=1749919&r1=1749918&r2=1749919&view=diff
==============================================================================
--- qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java (original)
+++ qpid/java/trunk/systests/src/test/java/org/apache/qpid/systest/rest/UserPreferencesRestTest.java Thu Jun 23 15:17:23 2016
@@ -28,6 +28,9 @@ import java.util.Set;
import javax.servlet.http.HttpServletResponse;
+import org.apache.qpid.server.management.plugin.preferences.QueryPreferenceValue;
+import org.apache.qpid.server.model.preferences.Preference;
+
public class UserPreferencesRestTest extends QpidRestTestCase
{
@@ -38,22 +41,66 @@ public class UserPreferencesRestTest ext
final String prefType = "X-testtype";
Map<String, Object> prefAttributes = new HashMap<>();
- prefAttributes.put("description", prefDescription);
+ prefAttributes.put(Preference.DESCRIPTION_ATTRIBUTE, prefDescription);
Map<String, Object> prefValueAttributes = new HashMap<>();
prefValueAttributes.put("valueAttrName", "valueAttrValue");
- prefAttributes.put("value", prefValueAttributes);
+ prefAttributes.put(Preference.VALUE_ATTRIBUTE, prefValueAttributes);
String fullUrl = String.format("broker/userpreferences/%s/%s", prefType, prefName);
getRestTestHelper().submitRequest(fullUrl, "PUT", prefAttributes, HttpServletResponse.SC_CREATED);
Map<String, Object> prefDetails = getRestTestHelper().getJsonAsMap(fullUrl);
- assertEquals("Unexpected pref name", prefName, prefDetails.get("name"));
- assertEquals("Unexpected pref description", prefDescription, prefDetails.get("description"));
- assertEquals("Unexpected pref type", prefType, prefDetails.get("type"));
- assertEquals("Unexpected pref value", prefValueAttributes, prefDetails.get("value"));
- assertEquals("Unexpected pref owner", RestTestHelper.DEFAULT_USERNAME, prefDetails.get("owner"));
+ assertEquals("Unexpected pref name", prefName, prefDetails.get(Preference.NAME_ATTRIBUTE));
+ assertEquals("Unexpected pref description", prefDescription, prefDetails.get(Preference.DESCRIPTION_ATTRIBUTE));
+ assertEquals("Unexpected pref type", prefType, prefDetails.get(Preference.TYPE_ATTRIBUTE));
+ assertEquals("Unexpected pref value", prefValueAttributes, prefDetails.get(Preference.VALUE_ATTRIBUTE));
+ assertEquals("Unexpected pref owner", RestTestHelper.DEFAULT_USERNAME, prefDetails.get(Preference.OWNER_ATTRIBUTE));
+
+ String typeUrl = String.format("broker/userpreferences/%s", prefType);
+ assertEquals("Unexpected preference returned from type url",
+ prefDetails,
+ getRestTestHelper().getJsonAsSingletonList(typeUrl));
+
+ String allUrl = "broker/userpreferences";
+ final Map<String, Object> allMap = getRestTestHelper().getJsonAsMap(allUrl);
+ assertEquals("Unexpected number of types in all url response", 1, allMap.size());
+ assertTrue("Expected type not found in all url response. Found : " + allMap.keySet(),
+ allMap.containsKey(prefType));
+ List<Map<String, Object>> prefs = (List<Map<String, Object>>) allMap.get(prefType);
+ assertEquals("Unexpected number of preferences", 1, prefs.size());
+
+ assertEquals("Unexpected preference returned from all url", prefDetails, prefs.get(0));
+ }
+
+ public void testPutQueryPreferenceRoundTrip() throws Exception
+ {
+ final String prefName = "myquery";
+ final String prefDescription = "myquerydesc";
+ final String prefType = "query";
+
+ Map<String, Object> prefAttributes = new HashMap<>();
+ prefAttributes.put(Preference.DESCRIPTION_ATTRIBUTE, prefDescription);
+
+ Map<String, Object> prefValueAttributes = new HashMap<>();
+ prefValueAttributes.put(QueryPreferenceValue.SCOPE_ATTRIBUTE, "");
+ prefValueAttributes.put(QueryPreferenceValue.CATEGORY_ATTRIBUTE, "queue");
+ prefValueAttributes.put(QueryPreferenceValue.SELECT_ATTRIBUTE, "id,name,queueDepthMessages");
+ prefValueAttributes.put(QueryPreferenceValue.CURRENT_PAGE_ATTRIBUTE, 7);
+ prefValueAttributes.put(QueryPreferenceValue.REFRESH_INTERVAL_ATTRIBUTE, 1000);
+ prefAttributes.put(Preference.VALUE_ATTRIBUTE, prefValueAttributes);
+
+ String fullUrl = String.format("broker/userpreferences/%s/%s", prefType, prefName);
+ getRestTestHelper().submitRequest(fullUrl, "PUT", prefAttributes, HttpServletResponse.SC_CREATED);
+
+ Map<String, Object> prefDetails = getRestTestHelper().getJsonAsMap(fullUrl);
+
+ assertEquals("Unexpected pref name", prefName, prefDetails.get(Preference.NAME_ATTRIBUTE));
+ assertEquals("Unexpected pref description", prefDescription, prefDetails.get(Preference.DESCRIPTION_ATTRIBUTE));
+ assertEquals("Unexpected pref type", prefType, prefDetails.get(Preference.TYPE_ATTRIBUTE));
+ assertEquals("Unexpected pref value", prefValueAttributes, prefDetails.get(Preference.VALUE_ATTRIBUTE));
+ assertEquals("Unexpected pref owner", RestTestHelper.DEFAULT_USERNAME, prefDetails.get(Preference.OWNER_ATTRIBUTE));
String typeUrl = String.format("broker/userpreferences/%s", prefType);
assertEquals("Unexpected preference returned from type url",
@@ -79,13 +126,13 @@ public class UserPreferencesRestTest ext
final String prefType = "X-testtype";
Map<String, Object> prefAttributes = new HashMap<>();
- prefAttributes.put("name", prefName);
- prefAttributes.put("type", prefType);
- prefAttributes.put("description", prefDescription);
+ prefAttributes.put(Preference.NAME_ATTRIBUTE, prefName);
+ prefAttributes.put(Preference.TYPE_ATTRIBUTE, prefType);
+ prefAttributes.put(Preference.DESCRIPTION_ATTRIBUTE, prefDescription);
Map<String, Object> prefValueAttributes = new HashMap<>();
prefValueAttributes.put("valueAttrName", "valueAttrValue");
- prefAttributes.put("value", prefValueAttributes);
+ prefAttributes.put(Preference.VALUE_ATTRIBUTE, prefValueAttributes);
String rootUrl = "broker/userpreferences";
Map<String, List<Map<String, Object>>> payload =
@@ -95,11 +142,11 @@ public class UserPreferencesRestTest ext
Map<String, List<Map<String, Object>>> allPrefs = (Map<String, List<Map<String, Object>>>) getRestTestHelper().getJson(rootUrl, Object.class);
Map<String, Object> prefDetails = allPrefs.get(prefType).get(0);
- assertEquals("Unexpected pref name", prefName, prefDetails.get("name"));
- assertEquals("Unexpected pref description", prefDescription, prefDetails.get("description"));
- assertEquals("Unexpected pref type", prefType, prefDetails.get("type"));
- assertEquals("Unexpected pref value", prefValueAttributes, prefDetails.get("value"));
- assertEquals("Unexpected pref owner", RestTestHelper.DEFAULT_USERNAME, prefDetails.get("owner"));
+ assertEquals("Unexpected pref name", prefName, prefDetails.get(Preference.NAME_ATTRIBUTE));
+ assertEquals("Unexpected pref description", prefDescription, prefDetails.get(Preference.DESCRIPTION_ATTRIBUTE));
+ assertEquals("Unexpected pref type", prefType, prefDetails.get(Preference.TYPE_ATTRIBUTE));
+ assertEquals("Unexpected pref value", prefValueAttributes, prefDetails.get(Preference.VALUE_ATTRIBUTE));
+ assertEquals("Unexpected pref owner", RestTestHelper.DEFAULT_USERNAME, prefDetails.get(Preference.OWNER_ATTRIBUTE));
String typeUrl = String.format("broker/userpreferences/%s", prefType);
assertEquals("Unexpected preference returned from type url",
@@ -126,14 +173,14 @@ public class UserPreferencesRestTest ext
final String prefType2 = "X-prefType2";
Map<String, Object> pref1Attributes = new HashMap<>();
- pref1Attributes.put("name", pref1Name);
- pref1Attributes.put("type", prefType1);
- pref1Attributes.put("value", Collections.emptyMap());
+ pref1Attributes.put(Preference.NAME_ATTRIBUTE, pref1Name);
+ pref1Attributes.put(Preference.TYPE_ATTRIBUTE, prefType1);
+ pref1Attributes.put(Preference.VALUE_ATTRIBUTE, Collections.emptyMap());
Map<String, Object> pref2Attributes = new HashMap<>();
- pref2Attributes.put("name", pref2Name);
- pref2Attributes.put("type", prefType2);
- pref2Attributes.put("value", Collections.emptyMap());
+ pref2Attributes.put(Preference.NAME_ATTRIBUTE, pref2Name);
+ pref2Attributes.put(Preference.TYPE_ATTRIBUTE, prefType2);
+ pref2Attributes.put(Preference.VALUE_ATTRIBUTE, Collections.emptyMap());
Map<String, Object> payload = new HashMap<>();
payload.put(prefType1, Collections.singletonList(pref1Attributes));
@@ -142,9 +189,9 @@ public class UserPreferencesRestTest ext
getRestTestHelper().submitRequest(url, "POST", payload, HttpServletResponse.SC_OK);
Map<String, Object> pref3Attributes = new HashMap<>();
- pref3Attributes.put("name", pref3Name);
- pref3Attributes.put("type", prefType2);
- pref3Attributes.put("value", Collections.emptyMap());
+ pref3Attributes.put(Preference.NAME_ATTRIBUTE, pref3Name);
+ pref3Attributes.put(Preference.TYPE_ATTRIBUTE, prefType2);
+ pref3Attributes.put(Preference.VALUE_ATTRIBUTE, Collections.emptyMap());
String url2 = String.format("broker/userpreferences/%s", prefType2);
getRestTestHelper().submitRequest(url2,
@@ -162,12 +209,12 @@ public class UserPreferencesRestTest ext
List<Map<String, Object>> pref2s = (List<Map<String, Object>>) allMap.get(prefType2);
assertEquals("Unexpected number of preferences", 2, pref2s.size());
- assertEquals("Unexpected preference returned from all url for type1. Found : " + pref1s.get(0).get("name"),
+ assertEquals("Unexpected preference returned from all url for type1. Found : " + pref1s.get(0).get(Preference.NAME_ATTRIBUTE),
pref1Name,
- pref1s.get(0).get("name"));
+ pref1s.get(0).get(Preference.NAME_ATTRIBUTE));
Set<String> pref2Names = new HashSet<>();
- pref2Names.add((String) pref2s.get(0).get("name"));
- pref2Names.add((String) pref2s.get(1).get("name"));
+ pref2Names.add((String) pref2s.get(0).get(Preference.NAME_ATTRIBUTE));
+ pref2Names.add((String) pref2s.get(1).get(Preference.NAME_ATTRIBUTE));
assertTrue("Unexpected preference returned from all url for type2. Found : " + pref2Names,
pref2Names.contains(pref2Name) && pref2Names.contains(pref3Name));
}
@@ -179,7 +226,7 @@ public class UserPreferencesRestTest ext
final String prefType = "X-testtype";
Map<String, Object> prefAttributes = new HashMap<>();
- prefAttributes.put("description", prefDescription);
+ prefAttributes.put(Preference.DESCRIPTION_ATTRIBUTE, prefDescription);
prefAttributes.put("value", Collections.emptyMap());
String fullUrl = String.format("broker/userpreferences/%s/%s", prefType, prefName);
@@ -187,17 +234,17 @@ public class UserPreferencesRestTest ext
Map<String, Object> storedPreference = getRestTestHelper().getJsonAsMap(fullUrl);
- assertEquals("Unexpected pref name", prefName, storedPreference.get("name"));
- assertEquals("Unexpected pref description", prefDescription, storedPreference.get("description"));
+ assertEquals("Unexpected pref name", prefName, storedPreference.get(Preference.NAME_ATTRIBUTE));
+ assertEquals("Unexpected pref description", prefDescription, storedPreference.get(Preference.DESCRIPTION_ATTRIBUTE));
Map<String, Object> updatePreference = new HashMap<>(storedPreference);
- updatePreference.put("description", "new description");
+ updatePreference.put(Preference.DESCRIPTION_ATTRIBUTE, "new description");
getRestTestHelper().submitRequest(fullUrl, "PUT", updatePreference, HttpServletResponse.SC_OK);
Map<String, Object> rereadPrefDetails = getRestTestHelper().getJsonAsMap(fullUrl);
- assertEquals("Unexpected id on updated pref", storedPreference.get("id"), rereadPrefDetails.get("id"));
- assertEquals("Unexpected description on updated pref", "new description", rereadPrefDetails.get("description"));
+ assertEquals("Unexpected id on updated pref", storedPreference.get(Preference.ID_ATTRIBUTE), rereadPrefDetails.get(Preference.ID_ATTRIBUTE));
+ assertEquals("Unexpected description on updated pref", "new description", rereadPrefDetails.get(Preference.DESCRIPTION_ATTRIBUTE));
}
public void testPostUpdate() throws Exception
@@ -211,35 +258,35 @@ public class UserPreferencesRestTest ext
String rootUrl = "broker/userpreferences";
Map<String, Object> prefAttributes = new HashMap<>();
- prefAttributes.put("name", prefName);
- prefAttributes.put("description", prefDescription);
- prefAttributes.put("value", Collections.emptyMap());
+ prefAttributes.put(Preference.NAME_ATTRIBUTE, prefName);
+ prefAttributes.put(Preference.DESCRIPTION_ATTRIBUTE, prefDescription);
+ prefAttributes.put(Preference.VALUE_ATTRIBUTE, Collections.emptyMap());
final List<Map<String, Object>> payloadCreate = Collections.singletonList(prefAttributes);
getRestTestHelper().submitRequest(typeUrl, "POST", payloadCreate, HttpServletResponse.SC_OK);
Map<String, Object> storedPreference = getRestTestHelper().getJsonAsMap(fullUrl);
- assertEquals("Unexpected pref name", prefName, storedPreference.get("name"));
- assertEquals("Unexpected pref description", prefDescription, storedPreference.get("description"));
+ assertEquals("Unexpected pref name", prefName, storedPreference.get(Preference.NAME_ATTRIBUTE));
+ assertEquals("Unexpected pref description", prefDescription, storedPreference.get(Preference.DESCRIPTION_ATTRIBUTE));
// Update via url to type
Map<String, Object> updatePreference = new HashMap<>(storedPreference);
- updatePreference.put("description", "update 1");
+ updatePreference.put(Preference.DESCRIPTION_ATTRIBUTE, "update 1");
final List<Map<String, Object>> payloadUpdate1 = Collections.singletonList(updatePreference);
getRestTestHelper().submitRequest(typeUrl, "POST", payloadUpdate1, HttpServletResponse.SC_OK);
Map<String, Object> rereadPrefDetails = getRestTestHelper().getJsonAsMap(fullUrl);
assertEquals("Unexpected id on updated pref, update 1",
- storedPreference.get("id"),
- rereadPrefDetails.get("id"));
+ storedPreference.get(Preference.ID_ATTRIBUTE),
+ rereadPrefDetails.get(Preference.ID_ATTRIBUTE));
assertEquals("Unexpected description on updated pref, update 1",
"update 1",
- rereadPrefDetails.get("description"));
+ rereadPrefDetails.get(Preference.DESCRIPTION_ATTRIBUTE));
// Update via url to root
updatePreference = new HashMap<>(rereadPrefDetails);
- updatePreference.put("description", "update 2");
+ updatePreference.put(Preference.DESCRIPTION_ATTRIBUTE, "update 2");
Map<String, List<Map<String, Object>>> payloadUpdate2 =
Collections.singletonMap(prefType, Collections.singletonList(updatePreference));
getRestTestHelper().submitRequest(rootUrl, "POST", payloadUpdate2, HttpServletResponse.SC_OK);
@@ -248,7 +295,7 @@ public class UserPreferencesRestTest ext
assertEquals("Unexpected description on updated pref, update 2",
"update 2",
- rereadPrefDetails.get("description"));
+ rereadPrefDetails.get(Preference.DESCRIPTION_ATTRIBUTE));
}
public void testDelete() throws Exception
@@ -258,8 +305,8 @@ public class UserPreferencesRestTest ext
final String prefType = "X-testtype";
Map<String, Object> prefAttributes = new HashMap<>();
- prefAttributes.put("description", prefDescription);
- prefAttributes.put("value", Collections.emptyMap());
+ prefAttributes.put(Preference.DESCRIPTION_ATTRIBUTE, prefDescription);
+ prefAttributes.put(Preference.VALUE_ATTRIBUTE, Collections.emptyMap());
String fullUrl = String.format("broker/userpreferences/%s/%s", prefType, prefName);
getRestTestHelper().submitRequest(fullUrl, "PUT", prefAttributes, HttpServletResponse.SC_CREATED);
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org