You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@helix.apache.org by hu...@apache.org on 2019/05/22 23:41:33 UTC
[helix] 08/14: Apply the JerseyTestUriRequestBuilder to the
TestInstanceAccessor
This is an automated email from the ASF dual-hosted git repository.
hulee pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/helix.git
commit 271eb07c121c842ba02f350fcd18de47cf5e5721
Author: ywang4 <yw...@linkedin.com>
AuthorDate: Mon Feb 25 15:04:50 2019 -0800
Apply the JerseyTestUriRequestBuilder to the TestInstanceAccessor
RB=1575013
G=helix-reviewers
A=jxue
Signed-off-by: Hunter Lee <hu...@linkedin.com>
---
.../helix/rest/server/TestInstanceAccessor.java | 141 +++++++++++----------
.../rest/server/util/JerseyUriRequestBuilder.java | 94 ++++++++++----
2 files changed, 147 insertions(+), 88 deletions(-)
diff --git a/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstanceAccessor.java b/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstanceAccessor.java
index 172c848..858ea89 100644
--- a/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstanceAccessor.java
+++ b/helix-rest/src/test/java/org/apache/helix/rest/server/TestInstanceAccessor.java
@@ -22,7 +22,6 @@ package org.apache.helix.rest.server;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Arrays;
-import java.util.Collections;
import java.util.HashSet;
import java.util.List;
import java.util.Set;
@@ -66,10 +65,11 @@ public class TestInstanceAccessor extends AbstractTestClass {
message.setTgtName("localhost_3");
message.setTgtSessionId("session_3");
HelixDataAccessor helixDataAccessor = new ZKHelixDataAccessor(CLUSTER_NAME, _baseAccessor);
- helixDataAccessor.setProperty(helixDataAccessor.keyBuilder().message(INSTANCE_NAME, messageId), message);
+ helixDataAccessor.setProperty(helixDataAccessor.keyBuilder().message(INSTANCE_NAME, messageId),
+ message);
String body = new JerseyUriRequestBuilder("clusters/{}/instances/{}/messages")
- .format(CLUSTER_NAME, INSTANCE_NAME).get(this);
+ .isBodyReturnExpected(true).format(CLUSTER_NAME, INSTANCE_NAME).get(this);
JsonNode node = OBJECT_MAPPER.readTree(body);
int newMessageCount =
node.get(InstanceAccessor.InstanceProperties.total_message_count.name()).getIntValue();
@@ -77,7 +77,7 @@ public class TestInstanceAccessor extends AbstractTestClass {
Assert.assertEquals(newMessageCount, 1);
}
- @Test (dependsOnMethods = "testGetAllMessages")
+ @Test(dependsOnMethods = "testGetAllMessages")
public void testGetMessagesByStateModelDef() throws IOException {
System.out.println("Start test :" + TestHelper.getTestMethodName());
@@ -91,19 +91,21 @@ public class TestInstanceAccessor extends AbstractTestClass {
message.setTgtName("localhost_3");
message.setTgtSessionId("session_3");
HelixDataAccessor helixDataAccessor = new ZKHelixDataAccessor(CLUSTER_NAME, _baseAccessor);
- helixDataAccessor.setProperty(helixDataAccessor.keyBuilder().message(INSTANCE_NAME, messageId), message);
+ helixDataAccessor.setProperty(helixDataAccessor.keyBuilder().message(INSTANCE_NAME, messageId),
+ message);
- String body = get("clusters/" + CLUSTER_NAME + "/instances/" + INSTANCE_NAME + "/messages",
- ImmutableMap.of("stateModelDef", "MasterSlave"), Response.Status.OK.getStatusCode(), true);
+ String body =
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}/messages?stateModelDef=MasterSlave")
+ .isBodyReturnExpected(true).format(CLUSTER_NAME, INSTANCE_NAME).get(this);
JsonNode node = OBJECT_MAPPER.readTree(body);
int newMessageCount =
node.get(InstanceAccessor.InstanceProperties.total_message_count.name()).getIntValue();
Assert.assertEquals(newMessageCount, 1);
- body = get("clusters/" + CLUSTER_NAME + "/instances/" + INSTANCE_NAME + "/messages",
- ImmutableMap.of("stateModelDef", "LeaderStandBy"), Response.Status.OK.getStatusCode(),
- true);
+ body =
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}/messages?stateModelDef=LeaderStandBy")
+ .isBodyReturnExpected(true).format(CLUSTER_NAME, INSTANCE_NAME).get(this);
node = OBJECT_MAPPER.readTree(body);
newMessageCount =
node.get(InstanceAccessor.InstanceProperties.total_message_count.name()).getIntValue();
@@ -111,32 +113,29 @@ public class TestInstanceAccessor extends AbstractTestClass {
Assert.assertEquals(newMessageCount, 0);
}
- @Test (dependsOnMethods = "testGetMessagesByStateModelDef")
+ @Test(dependsOnMethods = "testGetMessagesByStateModelDef")
public void testGetInstances() throws IOException {
System.out.println("Start test :" + TestHelper.getTestMethodName());
- String body =
- get("clusters/" + CLUSTER_NAME + "/instances", null, Response.Status.OK.getStatusCode(), true);
+ String body = new JerseyUriRequestBuilder("clusters/{}/instances").isBodyReturnExpected(true)
+ .format(CLUSTER_NAME).get(this);
JsonNode node = OBJECT_MAPPER.readTree(body);
- String instancesStr =
- node.get(InstanceAccessor.InstanceProperties.instances.name()).toString();
+ String instancesStr = node.get(InstanceAccessor.InstanceProperties.instances.name()).toString();
Assert.assertNotNull(instancesStr);
Set<String> instances = OBJECT_MAPPER.readValue(instancesStr,
OBJECT_MAPPER.getTypeFactory().constructCollectionType(Set.class, String.class));
- Assert.assertEquals(instances, _instancesMap.get(CLUSTER_NAME),
- "Instances from response: " + instances + " vs instances actually: " + _instancesMap
- .get(CLUSTER_NAME));
+ Assert.assertEquals(instances, _instancesMap.get(CLUSTER_NAME), "Instances from response: "
+ + instances + " vs instances actually: " + _instancesMap.get(CLUSTER_NAME));
}
@Test(dependsOnMethods = "testGetInstances")
public void testGetInstance() throws IOException {
System.out.println("Start test :" + TestHelper.getTestMethodName());
- String body = get("clusters/" + CLUSTER_NAME + "/instances/" + INSTANCE_NAME, null,
- Response.Status.OK.getStatusCode(), true);
+ String body = new JerseyUriRequestBuilder("clusters/{}/instances/{}").isBodyReturnExpected(true)
+ .format(CLUSTER_NAME, INSTANCE_NAME).get(this);
JsonNode node = OBJECT_MAPPER.readTree(body);
- String instancesCfg =
- node.get(InstanceAccessor.InstanceProperties.config.name()).toString();
+ String instancesCfg = node.get(InstanceAccessor.InstanceProperties.config.name()).toString();
Assert.assertNotNull(instancesCfg);
InstanceConfig instanceConfig = new InstanceConfig(toZNRecord(instancesCfg));
@@ -150,8 +149,10 @@ public class TestInstanceAccessor extends AbstractTestClass {
InstanceConfig instanceConfig = new InstanceConfig(INSTANCE_NAME + "TEST");
Entity entity = Entity.entity(OBJECT_MAPPER.writeValueAsString(instanceConfig.getRecord()),
MediaType.APPLICATION_JSON_TYPE);
- put("clusters/" + CLUSTER_NAME + "/instances/" + INSTANCE_NAME, null, entity,
- Response.Status.OK.getStatusCode());
+
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}").format(CLUSTER_NAME, INSTANCE_NAME)
+ .put(this, entity);
+
Assert.assertEquals(instanceConfig,
_configAccessor.getInstanceConfig(CLUSTER_NAME, INSTANCE_NAME + "TEST"));
}
@@ -169,38 +170,44 @@ public class TestInstanceAccessor extends AbstractTestClass {
System.out.println("Start test :" + TestHelper.getTestMethodName());
// Disable instance
Entity entity = Entity.entity("", MediaType.APPLICATION_JSON_TYPE);
- post("clusters/" + CLUSTER_NAME + "/instances/" + INSTANCE_NAME,
- ImmutableMap.of("command", "disable"), entity, Response.Status.OK.getStatusCode());
+
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}?command=disable")
+ .format(CLUSTER_NAME, INSTANCE_NAME).post(this, entity);
+
Assert.assertFalse(
_configAccessor.getInstanceConfig(CLUSTER_NAME, INSTANCE_NAME).getInstanceEnabled());
// Enable instance
- post("clusters/" + CLUSTER_NAME + "/instances/" + INSTANCE_NAME,
- ImmutableMap.of("command", "enable"), entity, Response.Status.OK.getStatusCode());
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}?command=enable")
+ .format(CLUSTER_NAME, INSTANCE_NAME).post(this, entity);
+
Assert.assertTrue(
_configAccessor.getInstanceConfig(CLUSTER_NAME, INSTANCE_NAME).getInstanceEnabled());
// AddTags
List<String> tagList = ImmutableList.of("tag3", "tag1", "tag2");
- entity = Entity.entity(OBJECT_MAPPER.writeValueAsString(ImmutableMap
- .of(AbstractResource.Properties.id.name(), INSTANCE_NAME,
- InstanceAccessor.InstanceProperties.instanceTags.name(), tagList)),
+ entity = Entity.entity(
+ OBJECT_MAPPER.writeValueAsString(ImmutableMap.of(AbstractResource.Properties.id.name(),
+ INSTANCE_NAME, InstanceAccessor.InstanceProperties.instanceTags.name(), tagList)),
MediaType.APPLICATION_JSON_TYPE);
- post("clusters/" + CLUSTER_NAME + "/instances/" + INSTANCE_NAME,
- ImmutableMap.of("command", "addInstanceTag"), entity, Response.Status.OK.getStatusCode());
+
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}?command=addInstanceTag")
+ .format(CLUSTER_NAME, INSTANCE_NAME).post(this, entity);
+
Assert.assertEquals(_configAccessor.getInstanceConfig(CLUSTER_NAME, INSTANCE_NAME).getTags(),
tagList);
// RemoveTags
List<String> removeList = new ArrayList<>(tagList);
removeList.remove("tag2");
- entity = Entity.entity(OBJECT_MAPPER.writeValueAsString(ImmutableMap
- .of(AbstractResource.Properties.id.name(), INSTANCE_NAME,
- InstanceAccessor.InstanceProperties.instanceTags.name(), removeList)),
+ entity = Entity.entity(
+ OBJECT_MAPPER.writeValueAsString(ImmutableMap.of(AbstractResource.Properties.id.name(),
+ INSTANCE_NAME, InstanceAccessor.InstanceProperties.instanceTags.name(), removeList)),
MediaType.APPLICATION_JSON_TYPE);
- post("clusters/" + CLUSTER_NAME + "/instances/" + INSTANCE_NAME,
- ImmutableMap.of("command", "removeInstanceTag"), entity,
- Response.Status.OK.getStatusCode());
+
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}?command=removeInstanceTag")
+ .format(CLUSTER_NAME, INSTANCE_NAME).post(this, entity);
+
Assert.assertEquals(_configAccessor.getInstanceConfig(CLUSTER_NAME, INSTANCE_NAME).getTags(),
ImmutableList.of("tag2"));
@@ -235,20 +242,22 @@ public class TestInstanceAccessor extends AbstractTestClass {
// Test enable disable partitions
String dbName = "_db_0_";
- List<String> partitionsToDisable = Arrays.asList(
- CLUSTER_NAME + dbName + "0", CLUSTER_NAME + dbName + "1", CLUSTER_NAME + dbName + "3");
+ List<String> partitionsToDisable = Arrays.asList(CLUSTER_NAME + dbName + "0",
+ CLUSTER_NAME + dbName + "1", CLUSTER_NAME + dbName + "3");
- entity = Entity.entity(OBJECT_MAPPER.writeValueAsString(ImmutableMap
- .of(AbstractResource.Properties.id.name(), INSTANCE_NAME,
- InstanceAccessor.InstanceProperties.resource.name(),
- CLUSTER_NAME + dbName.substring(0, dbName.length() - 1),
- InstanceAccessor.InstanceProperties.partitions.name(), partitionsToDisable)),
+ entity = Entity.entity(
+ OBJECT_MAPPER.writeValueAsString(ImmutableMap.of(AbstractResource.Properties.id.name(),
+ INSTANCE_NAME, InstanceAccessor.InstanceProperties.resource.name(),
+ CLUSTER_NAME + dbName.substring(0, dbName.length() - 1),
+ InstanceAccessor.InstanceProperties.partitions.name(), partitionsToDisable)),
MediaType.APPLICATION_JSON_TYPE);
- post("clusters/" + CLUSTER_NAME + "/instances/" + INSTANCE_NAME,
- ImmutableMap.of("command", "disablePartitions"), entity,
- Response.Status.OK.getStatusCode());
+
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}?command=disablePartitions")
+ .format(CLUSTER_NAME, INSTANCE_NAME).post(this, entity);
+
InstanceConfig instanceConfig = _configAccessor.getInstanceConfig(CLUSTER_NAME, INSTANCE_NAME);
- Assert.assertEquals(new HashSet<>(instanceConfig.getDisabledPartitionsMap()
+ Assert.assertEquals(
+ new HashSet<>(instanceConfig.getDisabledPartitionsMap()
.get(CLUSTER_NAME + dbName.substring(0, dbName.length() - 1))),
new HashSet<>(partitionsToDisable));
entity = Entity.entity(OBJECT_MAPPER.writeValueAsString(ImmutableMap
@@ -258,8 +267,9 @@ public class TestInstanceAccessor extends AbstractTestClass {
InstanceAccessor.InstanceProperties.partitions.name(),
ImmutableList.of(CLUSTER_NAME + dbName + "1"))), MediaType.APPLICATION_JSON_TYPE);
- post("clusters/" + CLUSTER_NAME + "/instances/" + INSTANCE_NAME,
- ImmutableMap.of("command", "enablePartitions"), entity, Response.Status.OK.getStatusCode());
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}?command=enablePartitions")
+ .format(CLUSTER_NAME, INSTANCE_NAME).post(this, entity);
+
instanceConfig = _configAccessor.getInstanceConfig(CLUSTER_NAME, INSTANCE_NAME);
Assert.assertEquals(new HashSet<>(instanceConfig.getDisabledPartitionsMap()
.get(CLUSTER_NAME + dbName.substring(0, dbName.length() - 1))),
@@ -289,13 +299,12 @@ public class TestInstanceAccessor extends AbstractTestClass {
// 1. Add these fields by way of "update"
Entity entity =
Entity.entity(OBJECT_MAPPER.writeValueAsString(record), MediaType.APPLICATION_JSON_TYPE);
- post("clusters/" + CLUSTER_NAME + "/instances/" + instanceName + "/configs",
- Collections.singletonMap("command", "update"), entity, Response.Status.OK.getStatusCode());
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}/configs?command=update")
+ .format(CLUSTER_NAME, INSTANCE_NAME).post(this, entity);
// Check that the fields have been added
- Assert.assertEquals(record.getSimpleFields(),
- _configAccessor.getInstanceConfig(CLUSTER_NAME, instanceName).getRecord()
- .getSimpleFields());
+ Assert.assertEquals(record.getSimpleFields(), _configAccessor
+ .getInstanceConfig(CLUSTER_NAME, instanceName).getRecord().getSimpleFields());
Assert.assertEquals(record.getListFields(),
_configAccessor.getInstanceConfig(CLUSTER_NAME, instanceName).getRecord().getListFields());
Assert.assertEquals(record.getMapFields(),
@@ -312,13 +321,12 @@ public class TestInstanceAccessor extends AbstractTestClass {
entity =
Entity.entity(OBJECT_MAPPER.writeValueAsString(record), MediaType.APPLICATION_JSON_TYPE);
- post("clusters/" + CLUSTER_NAME + "/instances/" + instanceName + "/configs",
- Collections.singletonMap("command", "update"), entity, Response.Status.OK.getStatusCode());
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}/configs?command=update")
+ .format(CLUSTER_NAME, INSTANCE_NAME).post(this, entity);
// Check that the fields have been modified
- Assert.assertEquals(record.getSimpleFields(),
- _configAccessor.getInstanceConfig(CLUSTER_NAME, instanceName).getRecord()
- .getSimpleFields());
+ Assert.assertEquals(record.getSimpleFields(), _configAccessor
+ .getInstanceConfig(CLUSTER_NAME, instanceName).getRecord().getSimpleFields());
Assert.assertEquals(record.getListFields(),
_configAccessor.getInstanceConfig(CLUSTER_NAME, instanceName).getRecord().getListFields());
Assert.assertEquals(record.getMapFields(),
@@ -347,8 +355,8 @@ public class TestInstanceAccessor extends AbstractTestClass {
// First, add these fields by way of "update"
Entity entity =
Entity.entity(OBJECT_MAPPER.writeValueAsString(record), MediaType.APPLICATION_JSON_TYPE);
- post("clusters/" + CLUSTER_NAME + "/instances/" + instanceName + "/configs",
- Collections.singletonMap("command", "delete"), entity, Response.Status.OK.getStatusCode());
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}/configs?command=delete")
+ .format(CLUSTER_NAME, INSTANCE_NAME).post(this, entity);
// Check that the keys k1 and k2 have been deleted, and k0 remains
for (int i = 0; i < 4; i++) {
@@ -388,7 +396,8 @@ public class TestInstanceAccessor extends AbstractTestClass {
Entity entity =
Entity.entity(OBJECT_MAPPER.writeValueAsString(record), MediaType.APPLICATION_JSON_TYPE);
- post("clusters/" + CLUSTER_NAME + "/instances/" + instanceName + "/configs", null, entity,
- Response.Status.NOT_FOUND.getStatusCode());
+ new JerseyUriRequestBuilder("clusters/{}/instances/{}/configs")
+ .expectedReturnStatusCode(Response.Status.NOT_FOUND.getStatusCode())
+ .format(CLUSTER_NAME, instanceName).post(this, entity);
}
}
diff --git a/helix-rest/src/test/java/org/apache/helix/rest/server/util/JerseyUriRequestBuilder.java b/helix-rest/src/test/java/org/apache/helix/rest/server/util/JerseyUriRequestBuilder.java
index b1d91ef..a8fde73 100644
--- a/helix-rest/src/test/java/org/apache/helix/rest/server/util/JerseyUriRequestBuilder.java
+++ b/helix-rest/src/test/java/org/apache/helix/rest/server/util/JerseyUriRequestBuilder.java
@@ -3,6 +3,7 @@ package org.apache.helix.rest.server.util;
import java.util.HashMap;
import java.util.Map;
+import javax.ws.rs.client.Entity;
import javax.ws.rs.client.WebTarget;
import javax.ws.rs.core.Response;
@@ -15,22 +16,32 @@ import com.google.common.base.Preconditions;
import com.google.common.base.Splitter;
+/**
+ * Simplify the REST URI construction for Jersey Test Framework
+ * Example usage:
+ * new JerseyUriRequestBuilder("clusters/{}/instances/{}?command=disable")
+ * .format(CLUSTER_NAME, INSTANCE_NAME)
+ * .post(...);
+ */
public class JerseyUriRequestBuilder {
private static final String PLACE_HOLDER = "{}";
private final StringBuilder _uriBuilder;
private final Map<String, String> _queryParams;
private final int _requiredParameters;
- private final String _query;
+ private final String _rawQuery;
+ // default expected status code and if body returned
+ private int _expectedStatusCode = Response.Status.OK.getStatusCode();
+ private boolean _isBodyReturnExpected = false;
public JerseyUriRequestBuilder(String uri) {
String[] uris = uri.split("\\?");
if (uris.length > 1) {
_queryParams = Splitter.on('&').trimResults().withKeyValueSeparator("=").split(uris[1]);
- _query = uris[1];
+ _rawQuery = uris[1];
} else {
_queryParams = new HashMap<>();
- _query = "";
+ _rawQuery = "";
}
_uriBuilder = new StringBuilder(uris[0]);
_requiredParameters = StringUtils.countMatches(uris[0], PLACE_HOLDER);
@@ -46,55 +57,94 @@ public class JerseyUriRequestBuilder {
return this;
}
- private WebTarget buildWebTarget(JerseyTestNg.ContainerPerClassTest container) {
- WebTarget webTarget = container.target(_uriBuilder.toString());
- for (Map.Entry<String, String> entry : _queryParams.entrySet()) {
- webTarget = webTarget.queryParam(entry.getKey(), entry.getValue());
- }
+ public JerseyUriRequestBuilder expectedReturnStatusCode(int expectedStatusCode) {
+ _expectedStatusCode = expectedStatusCode;
+ return this;
+ }
- return webTarget;
+ public JerseyUriRequestBuilder isBodyReturnExpected(boolean isBodyReturnExpected) {
+ _isBodyReturnExpected = isBodyReturnExpected;
+ return this;
}
- public String get(JerseyTestNg.ContainerPerClassTest container, int expectedReturnStatus, boolean expectBodyReturned) {
+ /**
+ * Execute get request
+ * @param container
+ * @return
+ */
+ public String get(JerseyTestNg.ContainerPerClassTest container) {
final Response response = buildWebTarget(container).request().get();
- Assert.assertEquals(response.getStatus(), expectedReturnStatus);
+ Assert.assertEquals(response.getStatus(), _expectedStatusCode);
// NOT_FOUND will throw text based html
- if (expectedReturnStatus != Response.Status.NOT_FOUND.getStatusCode()) {
+ if (_expectedStatusCode != Response.Status.NOT_FOUND.getStatusCode()) {
Assert.assertEquals(response.getMediaType().getType(), "application");
} else {
Assert.assertEquals(response.getMediaType().getType(), "text");
}
String body = response.readEntity(String.class);
- if (expectBodyReturned) {
+ if (_isBodyReturnExpected) {
Assert.assertNotNull(body);
}
return body;
}
- public String get(JerseyTestNg.ContainerPerClassTest container) {
- final Response response = buildWebTarget(container).request().get();
+ /**
+ * Execute put request
+ * @param container
+ * @param entity
+ */
+ public void put(JerseyTestNg.ContainerPerClassTest container, Entity entity) {
+ final Response response = buildWebTarget(container).request().put(entity);
+ Assert.assertEquals(response.getStatus(), _expectedStatusCode);
+ }
+
+ /**
+ * Execute post request
+ * @param container
+ * @param entity
+ */
+ public void post(JerseyTestNg.ContainerPerClassTest container, Entity entity) {
+ final Response response = buildWebTarget(container).request().post(entity);
+ Assert.assertEquals(response.getStatus(), _expectedStatusCode);
+ }
+
+ /**
+ * Execute delete request
+ * @param container
+ */
+ public void delete(JerseyTestNg.ContainerPerClassTest container) {
+ final Response response = buildWebTarget(container).request().delete();
+ Assert.assertEquals(response.getStatus(), _expectedStatusCode);
+ }
+
+ private WebTarget buildWebTarget(JerseyTestNg.ContainerPerClassTest container) {
+ WebTarget webTarget = container.target(_uriBuilder.toString());
+ for (Map.Entry<String, String> entry : _queryParams.entrySet()) {
+ webTarget = webTarget.queryParam(entry.getKey(), entry.getValue());
+ }
- return response.readEntity(String.class);
+ return webTarget;
}
- public String getPath() {
- if (StringUtils.isEmpty(_query)) {
+ private String getPath() {
+ if (StringUtils.isEmpty(_rawQuery)) {
return _uriBuilder.toString();
} else {
- return _uriBuilder.toString() + "?" + _query;
+ return _uriBuilder.toString() + "?" + _rawQuery;
}
}
@Test
public void testUriBuilderGetPath() {
- JerseyUriRequestBuilder uriBuilder = new JerseyUriRequestBuilder("clusters/{}/instances/{}/messages?stateModelDef=MasterSlave")
+ JerseyUriRequestBuilder uriBuilder = new JerseyUriRequestBuilder("clusters/{}/instances/{}?command=disable")
.format("TEST-CLUSTER", "instance1");
String path = uriBuilder.getPath();
- Assert.assertEquals(path, "clusters/TEST-CLUSTER/instances/instance1/messages?stateModelDef=MasterSlave");
- Assert.assertEquals(uriBuilder._queryParams.get("stateModelDef"), "MasterSlave");
+ Assert.assertEquals(uriBuilder._uriBuilder.toString(), "clusters/TEST-CLUSTER/instances/instance1");
+ Assert.assertEquals(path, "clusters/TEST-CLUSTER/instances/instance1?command=disable");
+ Assert.assertEquals(uriBuilder._queryParams.get("command"), "disable");
}
}