diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Node.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Node.java index b178bed8e3..7779133e5c 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Node.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/Node.java @@ -1018,7 +1018,7 @@ public class Node extends ModelRequest */ public RestRuleSetModelsCollection getListOfRuleSets() { - RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, RULE_SETS_URI + "?{parameters}", + RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, RULE_SETS_URI, repoModel.getNodeRef(), restWrapper.getParameters()); return restWrapper.processModels(RestRuleSetModelsCollection.class, request); } @@ -1031,7 +1031,7 @@ public class Node extends ModelRequest */ public RestRuleSetModel getRuleSet(String ruleSetId) { - RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, RULE_SET_BY_ID + "?{parameters}", + RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, RULE_SET_BY_ID, repoModel.getNodeRef(), ruleSetId, restWrapper.getParameters()); return restWrapper.processModel(RestRuleSetModel.class, request); } @@ -1043,7 +1043,7 @@ public class Node extends ModelRequest */ public RestRuleSetModel getDefaultRuleSet() { - RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, RULE_SET_BY_ID + "?{parameters}", + RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, RULE_SET_BY_ID, repoModel.getNodeRef(), "-default-", restWrapper.getParameters()); return restWrapper.processModel(RestRuleSetModel.class, request); } diff --git a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Sync.java b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Sync.java index a272179ce8..e8ecd607b7 100644 --- a/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Sync.java +++ b/packaging/tests/tas-restapi/src/main/java/org/alfresco/rest/requests/syncServiceAPI/Sync.java @@ -54,7 +54,6 @@ public class Sync extends ModelRequest RestSyncNodeSubscriptionModel subscription; String requestSyncURL = "subscribers/{deviceSubscriptionId}/subscriptions/{nodeSubscriptionId}/sync"; String syncSetURL = requestSyncURL + "/{syncId}"; - String params = "?{parameters}"; public Sync(RestSyncNodeSubscriptionModel subscription, RestWrapper restWrapper) { @@ -82,7 +81,7 @@ public class Sync extends ModelRequest String postBody = JsonBodyGenerator.defineJSON().add("changes", array.build()).add("clientVersion", clientVersion).build().toString(); - RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, requestSyncURL + params, this.subscriber, nodeSubscriptionModel.getId(), + RestRequest request = RestRequest.requestWithBody(HttpMethod.POST, postBody, requestSyncURL, this.subscriber, nodeSubscriptionModel.getId(), restWrapper.getParameters()); // This step is necessary for this request. Without it, empty json response is returned @@ -94,7 +93,7 @@ public class Sync extends ModelRequest public RestWrapper endSync(RestSyncNodeSubscriptionModel nodeSubscriptionModel, RestSyncSetRequestModel sync) { - RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, syncSetURL + params, this.subscriber, nodeSubscriptionModel.getId(), + RestRequest request = RestRequest.simpleRequest(HttpMethod.DELETE, syncSetURL, this.subscriber, nodeSubscriptionModel.getId(), sync.getSyncId(), restWrapper.getParameters()); restWrapper.processEmptyModel(request); @@ -111,7 +110,7 @@ public class Sync extends ModelRequest */ public RestSyncSetGetModel getSync(RestSyncNodeSubscriptionModel nodeSubscriptionModel, RestSyncSetRequestModel sync) { - RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, syncSetURL + params, this.subscriber, nodeSubscriptionModel.getId(), sync.getSyncId(), + RestRequest request = RestRequest.simpleRequest(HttpMethod.GET, syncSetURL, this.subscriber, nodeSubscriptionModel.getId(), sync.getSyncId(), restWrapper.getParameters()); RestSyncSetGetModel model = restWrapper.processModelWithoutEntryObject(RestSyncSetGetModel.class, request); diff --git a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/model/ModelAssertionTest.java b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/model/ModelAssertionTest.java index 76b6df3ced..4b11a27750 100644 --- a/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/model/ModelAssertionTest.java +++ b/packaging/tests/tas-restapi/src/test/java/org/alfresco/rest/model/ModelAssertionTest.java @@ -25,21 +25,22 @@ */ package org.alfresco.rest.model; -import com.google.common.collect.ImmutableMap; +import static com.google.common.collect.Sets.newHashSet; + +import static org.testng.Assert.assertTrue; +import static org.testng.Assert.fail; + import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; + +import com.google.common.collect.ImmutableMap; + import org.alfresco.rest.core.IRestModel; import org.alfresco.rest.core.assertion.ModelAssertion; -import org.alfresco.rest.model.RestPersonModel; -import org.junit.Ignore; import org.testng.annotations.Test; -import static com.google.common.collect.Sets.newHashSet; -import static org.testng.Assert.assertTrue; -import static org.testng.Assert.fail; - public class ModelAssertionTest { @Test(groups = "unit")