inteligr8/SearchServices
1
0
Fork 0
mirror of https://github.com/Alfresco/SearchServices.git synced 2026-09-16 18:12:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

remove duplicate method

Browse Source
This commit is contained in:
Paul Brodner
2016-10-17 18:53:32 +03:00
parent 004589a0d9
commit 871b8299f1
14 changed files with 33 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/java/org/alfresco/rest/demo/RestDemoTests.java
+2 -2
View File
@@ -78,14 +78,14 @@ public class RestDemoTests extends RestTest
// add new comment
RestCommentModel commentEntry = commentsAPI.addComment(fileModel, "This is a new comment");
commentsAPI.getNodeComments(fileModel)
.assertResponseIsNotEmpty()
.assertEntriesListIsNotEmpty()
.assertCommentWithIdExists(commentEntry);
// update comment
commentEntry = commentsAPI.updateComment(fileModel, commentEntry, "This is the updated comment with Collaborator user");
commentsAPI.getNodeComments(fileModel)
.assertResponseIsNotEmpty()
.assertEntriesListIsNotEmpty()
.assertCommentWithIdExists(commentEntry)
.assertCommentWithContentExists("This is the updated comment");
}
e2e-test/java/org/alfresco/rest/demo/SampleSitesTests.java
+1 -1
View File
@@ -54,7 +54,7 @@ public class SampleSitesTests extends RestTest
public void adminShouldAccessSites() throws JsonToModelConversionException, Exception
{
siteAPI.getSites()
.assertResponseIsNotEmpty();
.assertEntriesListIsNotEmpty();
}
@TestRail(section={"demo", "sample-section"}, executionType= ExecutionType.SANITY,
e2e-test/java/org/alfresco/rest/people/GetFavoriteSitesSanityTests.java
+1 -1
View File
@@ -95,7 +95,7 @@ public class GetFavoriteSitesSanityTests extends RestTest
dataSite.usingUser(anotherUser).usingSite(siteModel).addSiteToFavorites();
restClient.authenticateUser(adminUser);
peopleApi.getFavoriteSites(anotherUser).assertResponseIsNotEmpty();
peopleApi.getFavoriteSites(anotherUser).assertEntriesListIsNotEmpty();
peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
e2e-test/java/org/alfresco/rest/people/GetPeopleActivitiesSanityTests.java
+5 -5
View File
@@ -48,7 +48,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest
dataContent.usingUser(managerUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN);
restClient.authenticateUser(managerUser);
peopleApi.getPersonActivities(managerUser).assertResponseIsNotEmpty();
peopleApi.getPersonActivities(managerUser).assertEntriesListIsNotEmpty();
peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -60,7 +60,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest
dataContent.usingUser(collaboratorUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN);
restClient.authenticateUser(collaboratorUser);
peopleApi.getPersonActivities(collaboratorUser).assertResponseIsNotEmpty();
peopleApi.getPersonActivities(collaboratorUser).assertEntriesListIsNotEmpty();
peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -72,7 +72,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest
dataContent.usingUser(contributorUser).usingSite(siteModel).createContent(DocumentType.TEXT_PLAIN);
restClient.authenticateUser(contributorUser);
peopleApi.getPersonActivities(contributorUser).assertResponseIsNotEmpty();
peopleApi.getPersonActivities(contributorUser).assertEntriesListIsNotEmpty();
peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -83,7 +83,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest
dataUser.usingUser(userModel).addUserToSite(consumerUser, siteModel, UserRole.SiteConsumer);
restClient.authenticateUser(consumerUser);
peopleApi.getPersonActivities(consumerUser).assertResponseIsNotEmpty();
peopleApi.getPersonActivities(consumerUser).assertEntriesListIsNotEmpty();
peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -91,7 +91,7 @@ public class GetPeopleActivitiesSanityTests extends RestTest
public void adminUserShouldGetPeopleActivitiesList() throws Exception
{
restClient.authenticateUser(dataUser.getAdminUser());
peopleApi.getPersonActivities(userModel).assertResponseIsNotEmpty();
peopleApi.getPersonActivities(userModel).assertEntriesListIsNotEmpty();
peopleApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
e2e-test/java/org/alfresco/rest/sites/GetSiteContainerSanityTests.java
+6 -6
View File
@@ -45,7 +45,7 @@ public class GetSiteContainerSanityTests extends RestTest
public void getSiteContainerWithManagerRole() throws Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteManager));
siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneEntry();
siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneRandomEntry();
siteAPI.getSiteContainer(siteModel, siteContainerModel);
siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -55,7 +55,7 @@ public class GetSiteContainerSanityTests extends RestTest
public void getSiteContainerWithCollaboratorRole() throws Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteCollaborator));
siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneEntry();
siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneRandomEntry();
siteAPI.getSiteContainer(siteModel, siteContainerModel);
siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -65,7 +65,7 @@ public class GetSiteContainerSanityTests extends RestTest
public void getSiteContainerWithContributorRole() throws Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteContributor));
siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneEntry();
siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneRandomEntry();
siteAPI.getSiteContainer(siteModel, siteContainerModel);
siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -75,7 +75,7 @@ public class GetSiteContainerSanityTests extends RestTest
public void getSiteContainerWithConsumerRole() throws Exception
{
restClient.authenticateUser(usersWithRoles.getOneUserWithRole(UserRole.SiteConsumer));
siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneEntry();
siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneRandomEntry();
siteAPI.getSiteContainer(siteModel, siteContainerModel);
siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -85,7 +85,7 @@ public class GetSiteContainerSanityTests extends RestTest
public void getSiteContainerWithAdminUser() throws Exception
{
restClient.authenticateUser(adminUserModel);
siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneEntry();
siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneRandomEntry();
siteAPI.getSiteContainer(siteModel, siteContainerModel);
siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -101,7 +101,7 @@ public class GetSiteContainerSanityTests extends RestTest
userModel.setPassword("user wrong password");
dataUser.addUserToSite(userModel, siteModel, UserRole.SiteManager);
restClient.authenticateUser(userModel);
siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneEntry();
siteContainerModel = siteAPI.getSiteContainers(siteModel).getOneRandomEntry();
siteAPI.getSiteContainer(siteModel, siteContainerModel);
siteAPI.usingRestWrapper().assertStatusCodeIs(HttpStatus.UNAUTHORIZED);
}
e2e-test/java/org/alfresco/rest/workflow/deployments/GetDeploymentsSanityTests.java
+2 -2
View File
@@ -43,7 +43,7 @@ public class GetDeploymentsSanityTests extends RestWorkflowTest
public void getNonNetworkDeploymentsWithAdmin() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(adminUserModel);
deploymentsApi.getDeployments().assertResponseIsNotEmpty();
deploymentsApi.getDeployments().assertEntriesListIsNotEmpty();
deploymentsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -57,7 +57,7 @@ public class GetDeploymentsSanityTests extends RestWorkflowTest
tenantApi.useRestClient(restClient);
tenantApi.createTenant(adminTenantUser);
restClient.authenticateUser(adminTenantUser);
deploymentsApi.getDeployments().assertResponseIsNotEmpty();
deploymentsApi.getDeployments().assertEntriesListIsNotEmpty();
deploymentsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
}
e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionImageSanityTests.java
+1 -1
View File
@@ -32,7 +32,7 @@ public class GetProcessDefinitionImageSanityTests extends RestWorkflowTest
testUser = dataUser.createRandomTestUser();
processDefinitionsApi.useRestClient(restClient);
restClient.authenticateUser(dataUser.getAdminUser());
randomProcessDefinition = processDefinitionsApi.getProcessDefinitions().getOneEntry();
randomProcessDefinition = processDefinitionsApi.getProcessDefinitions().getOneRandomEntry();
}
@TestRail(section = { "rest-api", "process-definitions" },
e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionSanityTests.java
+1 -2
View File
@@ -2,7 +2,6 @@ package org.alfresco.rest.workflow.processDefinitions;
import org.alfresco.rest.RestWorkflowTest;
import org.alfresco.rest.model.RestProcessDefinitionModel;
import org.alfresco.rest.model.RestProcessDefinitionModelsCollection;
import org.alfresco.rest.requests.RestProcessDefinitionsApi;
import org.alfresco.utility.data.DataUser;
import org.alfresco.utility.model.UserModel;
@@ -33,7 +32,7 @@ public class GetProcessDefinitionSanityTests extends RestWorkflowTest
testUser = dataUser.createRandomTestUser();
processDefinitionsApi.useRestClient(restClient);
restClient.authenticateUser(dataUser.getAdminUser());
randomProcessDefinition = processDefinitionsApi.getProcessDefinitions().getOneEntry();
randomProcessDefinition = processDefinitionsApi.getProcessDefinitions().getOneRandomEntry();
}
@TestRail(section = { "rest-api", "process-definitions" },
e2e-test/java/org/alfresco/rest/workflow/processDefinitions/GetProcessDefinitionsSanityTests.java
+2 -2
View File
@@ -42,7 +42,7 @@ public class GetProcessDefinitionsSanityTests extends RestWorkflowTest
public void nonNetworkAdminGetsProcessDefinitions() throws Exception
{
restClient.authenticateUser(adminUserModel);
processDefinitionsApi.getProcessDefinitions().assertResponseIsNotEmpty();
processDefinitionsApi.getProcessDefinitions().assertEntriesListIsNotEmpty();
processDefinitionsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -56,7 +56,7 @@ public class GetProcessDefinitionsSanityTests extends RestWorkflowTest
tenantApi.useRestClient(restClient);
tenantApi.createTenant(adminTenantUser);
restClient.authenticateUser(adminTenantUser);
processDefinitionsApi.getProcessDefinitions().assertResponseIsNotEmpty();
processDefinitionsApi.getProcessDefinitions().assertEntriesListIsNotEmpty();
processDefinitionsApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
}
e2e-test/java/org/alfresco/rest/workflow/processes/AddProcessVariableSanityTests.java
+4 -4
View File
@@ -58,7 +58,7 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest
{
restClient.authenticateUser(userWhoStartsTask);
RestProcessVariableModel variableModel = RestProcessVariableModel.getRandomProcessVariableModel("d:text");
processModel = processesApi.getProcesses().getOneEntry();
processModel = processesApi.getProcesses().getOneRandomEntry();
processesApi.addProcessVariable(processModel, variableModel);
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
}
@@ -69,7 +69,7 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest
{
restClient.authenticateUser(userWhoStartsTask);
RestProcessVariableModel variableModel = RestProcessVariableModel.getRandomProcessVariableModel("d:text");
processModel = processesApi.getProcesses().getOneEntry();
processModel = processesApi.getProcesses().getOneRandomEntry();
processesApi.addProcessVariable(processModel, variableModel);
variableModel.setValue(RandomData.getRandomName("newValue"));
processesApi.addProcessVariable(processModel, variableModel);
@@ -95,7 +95,7 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest
dataWorkflow.usingUser(tenantUser).usingSite(siteModel).usingResource(document).createNewTaskAndAssignTo(tenantUserAssignee);
RestProcessVariableModel variableModel = RestProcessVariableModel.getRandomProcessVariableModel("d:text");
processModel = processesApi.getProcesses().getOneEntry();
processModel = processesApi.getProcesses().getOneRandomEntry();
processesApi.addProcessVariable(processModel, variableModel);
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.CREATED);
}
@@ -106,7 +106,7 @@ public class AddProcessVariableSanityTests extends RestWorkflowTest
{
restClient.authenticateUser(adminUser);
RestProcessVariableModel variableModel = RestProcessVariableModel.getRandomProcessVariableModel("incorrect type");
processModel = processesApi.getProcesses().getOneEntry();
processModel = processesApi.getProcesses().getOneRandomEntry();
processesApi.addProcessVariable(processModel, variableModel);
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.BAD_REQUEST);
}
e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessItemsSanityTests.java
+3 -3
View File
@@ -56,7 +56,7 @@ public class GetProcessItemsSanityTests extends RestWorkflowTest
public void getProcessItemsUsingTheUserWhoStartedProcess() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(userWhoStartsTask);
processModel = processesApi.getProcesses().getOneEntry();
processModel = processesApi.getProcesses().getOneRandomEntry();
processesApi.getProcessesItems(processModel);
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -66,7 +66,7 @@ public class GetProcessItemsSanityTests extends RestWorkflowTest
public void getProcessItemsUsingUserInvolvedInProcess() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(assignee);
processModel = processesApi.getProcesses().getOneEntry();
processModel = processesApi.getProcesses().getOneRandomEntry();
processesApi.getProcessesItems(processModel);
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -89,7 +89,7 @@ public class GetProcessItemsSanityTests extends RestWorkflowTest
siteModel = dataSite.usingUser(adminTenantUser).createPublicRandomSite();
dataWorkflow.usingUser(tenantUser).usingSite(siteModel).usingResource(document).createNewTaskAndAssignTo(tenantUserAssignee);
processModel = processesApi.getProcesses().getOneEntry();
processModel = processesApi.getProcesses().getOneRandomEntry();
processesApi.getProcessesItems(processModel);
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessTasksSanityTests.java
-2
View File
@@ -5,10 +5,8 @@ import org.alfresco.rest.RestWorkflowTest;
import org.alfresco.rest.exception.JsonToModelConversionException;
import org.alfresco.rest.requests.RestProcessesApi;
import org.alfresco.utility.model.FileModel;
import org.alfresco.utility.model.GroupModel;
import org.alfresco.utility.model.ProcessModel;
import org.alfresco.utility.model.SiteModel;
import org.alfresco.utility.model.TaskModel;
import org.alfresco.utility.model.UserModel;
import org.alfresco.utility.testrail.ExecutionType;
import org.alfresco.utility.testrail.annotation.TestRail;
e2e-test/java/org/alfresco/rest/workflow/processes/GetProcessesVariablesSanityTests.java
+2 -2
View File
@@ -49,7 +49,7 @@ public class GetProcessesVariablesSanityTests extends RestWorkflowTest
public void getProcessVariablesUsingTheUserWhoStartedProcess() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(userWhoStartsTask);
processModel = processesApi.getProcesses().getOneEntry();
processModel = processesApi.getProcesses().getOneRandomEntry();
processesApi.getProcessesVariables(processModel);
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
@@ -59,7 +59,7 @@ public class GetProcessesVariablesSanityTests extends RestWorkflowTest
public void getProcessVariablesUsingUserInvolvedInProcess() throws JsonToModelConversionException, Exception
{
restClient.authenticateUser(assignee);
processModel = processesApi.getProcesses().getOneEntry();
processModel = processesApi.getProcesses().getOneRandomEntry();
processesApi.getProcessesVariables(processModel);
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.OK);
}
e2e-test/java/org/alfresco/rest/workflow/processes/RemoveProcessVariableSanityTests.java
+3 -3
View File
@@ -53,7 +53,7 @@ public class RemoveProcessVariableSanityTests extends RestWorkflowTest
{
restClient.authenticateUser(adminUser);
RestProcessVariableModel variableModel = RestProcessVariableModel.getRandomProcessVariableModel("d:text");
processModel = processesApi.getProcesses().getOneEntry();
processModel = processesApi.getProcesses().getOneRandomEntry();
processesApi.addProcessVariable(processModel, variableModel);
processesApi.deleteProcessVariable(processModel, variableModel);
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.NO_CONTENT);
@@ -65,9 +65,9 @@ public class RemoveProcessVariableSanityTests extends RestWorkflowTest
{
restClient.authenticateUser(adminUser);
RestProcessVariableModel variableModel = RestProcessVariableModel.getRandomProcessVariableModel("d:text");
processModel = processesApi.getProcesses().getOneEntry();
processModel = processesApi.getProcesses().getOneRandomEntry();
processesApi.addProcessVariable(processModel, variableModel);
processModel = processesApi.getProcesses().getOneEntry();
processModel = processesApi.getProcesses().getOneRandomEntry();
processesApi.deleteProcessVariable(processModel, variableModel);
processesApi.usingRestWrapper().assertStatusCodeIs(HttpStatus.NOT_FOUND);
}