From 7a5693f675f2535f11841064ea20256202e69ffa Mon Sep 17 00:00:00 2001 From: Andrei Forascu Date: Wed, 14 Feb 2018 13:28:48 +0000 Subject: [PATCH] REPO-3206 - Rewrite Lucene-based Tests in TAS for LockServiceImplTest --- .../rest/favorites/GetFavoriteSiteTests.java | 13 ------------- .../rest/favorites/GetFavoriteSitesTests.java | 18 ------------------ .../rest/favorites/GetFavoritesTests.java | 13 ------------- .../org/alfresco/rest/groups/GroupsTests.java | 1 + .../alfresco/rest/nodes/NodesLockTests.java | 6 +++--- .../rest/people/GetPeopleFullTests.java | 16 ---------------- .../org/alfresco/rest/tags/GetTagTests.java | 1 + .../org/alfresco/rest/tags/GetTagsTests.java | 1 + .../org/alfresco/rest/tags/TagsDataPrep.java | 3 +++ .../org/alfresco/rest/tags/UpdateTagTests.java | 1 + .../alfresco/rest/tags/nodes/AddTagTests.java | 1 + .../alfresco/rest/tags/nodes/AddTagsTests.java | 1 + .../rest/tags/nodes/DeleteTagTests.java | 1 + .../rest/tags/nodes/GetNodeTagsTests.java | 1 + .../rest/trashcan/GetDeletedNodesTests.java | 12 +++++------- 15 files changed, 19 insertions(+), 70 deletions(-) diff --git a/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java b/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java index 4c5803c6d..4accab458 100644 --- a/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java +++ b/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSiteTests.java @@ -174,19 +174,6 @@ public class GetFavoriteSiteTests extends RestTest restClient.assertStatusCodeIs(HttpStatus.FORBIDDEN).assertLastError().containsSummary(RestErrorModel.PERMISSION_WAS_DENIED); } - @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION }) - @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, - description = "Verify invalid request returns status 404 when personId is invalid") - public void getFavoriteSiteWithInvalidPersonId() throws Exception - { - UserModel userSpecialChars = dataUser.usingAdmin().createUser(RandomStringUtils.randomAlphabetic(2) + "~!@#$%^&*()_+[]{}|;'d", "password"); - userSpecialChars.setUsername(RandomStringUtils.randomAlphabetic(2) + "~!%40%23%24%25%5E%26*()_%2B%5B%5D%7B%7D%7C%5C%3B%27%3A%22%2C.%2F%3C%3E"); - - restClient.authenticateUser(userModel).withCoreAPI().usingUser(userSpecialChars).getFavoriteSite(siteModel1); - restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError() - .containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, userSpecialChars.getUsername())); - } - @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION }) @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify request with empty site id") diff --git a/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSitesTests.java b/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSitesTests.java index bc9b0dda8..db6dd2f90 100644 --- a/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSitesTests.java +++ b/e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSitesTests.java @@ -287,24 +287,6 @@ public class GetFavoriteSitesTests extends RestTest .assertThat().paginationField("skipCount").is("999999999"); } - @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, - description = "Verify admin gets favorite sites for username with special chars with Rest API and response status is NOT_FOUND (404)") - @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION }) - public void getFavoriteSitesRequestForPersonIDWithSpecialCharacters() throws Exception - { - String randomData = RandomData.getRandomAlphanumeric(); - UserModel userSpecialChars = dataUser.usingAdmin().createUser(randomData + "~!@#$%^&[]{}|\\;':\",./<>", "password"); - //setting the encoded text for username - userSpecialChars.setUsername(randomData + "~!%40%23%24%25%5E%26%5B%5D%7B%7D%7C%5C%3B%27%3A%22%2C.%2F%3C%3E"); - - restClient.authenticateUser(dataUser.getAdminUser()).withCoreAPI().usingUser(userSpecialChars).getFavoriteSites(); - restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError() - .containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY) - .containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, randomData + "~!%40%23%24%25%5E%26%5B%5D%7B%7D%7C%5C%3B%27%3A%22%2C.%2F%3C%3E")) - .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER) - .stackTraceIs(RestErrorModel.STACKTRACE); - } - @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify that user can retrieve the last 2 favorite sites") @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION }) diff --git a/e2e-test/java/org/alfresco/rest/favorites/GetFavoritesTests.java b/e2e-test/java/org/alfresco/rest/favorites/GetFavoritesTests.java index 3009cc03c..f12845720 100644 --- a/e2e-test/java/org/alfresco/rest/favorites/GetFavoritesTests.java +++ b/e2e-test/java/org/alfresco/rest/favorites/GetFavoritesTests.java @@ -451,19 +451,6 @@ public class GetFavoritesTests extends RestTest restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND).assertLastError().containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, networkUserModel.getUsername())); } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, - description = "Verify get favorites using special chars in where parameter for request") - @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) - public void userIsNotAbleToGetFavoritesWhenUsingSpecialCharsInWhereParameter() throws Exception - { - userFavorites = restClient.withCoreAPI().usingAuthUser().where().invalidWhereParameter("~!%40%23%24%25%5E%26*()_%2B%5B%5D%7B%7D%7C%5C%3B%27%3A%22%2C.%2F%3C%3E").getFavorites(); - restClient.assertStatusCodeIs(HttpStatus.BAD_REQUEST) - .assertLastError().containsSummary(String.format(RestErrorModel.INVALID_ARGUMENT, "WHERE query")) - .containsErrorKey(RestErrorModel.INVALID_QUERY_ERRORKEY) - .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER) - .stackTraceIs(RestErrorModel.STACKTRACE); - } - @TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, description = "Verify get favorites using AND instead of OR in where parameter for request") @Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.REGRESSION }) diff --git a/e2e-test/java/org/alfresco/rest/groups/GroupsTests.java b/e2e-test/java/org/alfresco/rest/groups/GroupsTests.java index 95aecd3aa..5eb3fa562 100644 --- a/e2e-test/java/org/alfresco/rest/groups/GroupsTests.java +++ b/e2e-test/java/org/alfresco/rest/groups/GroupsTests.java @@ -16,6 +16,7 @@ import org.springframework.http.HttpStatus; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +@Test(groups = {TestGroup.REQUIRE_SOLR}) public class GroupsTests extends RestTest { private UserModel adminUser, userModel; diff --git a/e2e-test/java/org/alfresco/rest/nodes/NodesLockTests.java b/e2e-test/java/org/alfresco/rest/nodes/NodesLockTests.java index e02401e6f..ce19991f6 100644 --- a/e2e-test/java/org/alfresco/rest/nodes/NodesLockTests.java +++ b/e2e-test/java/org/alfresco/rest/nodes/NodesLockTests.java @@ -672,7 +672,7 @@ public class NodesLockTests extends RestTest .assertThat().field("properties").contains("lockType=READ_ONLY_LOCK"); } - @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION }) + @Test(groups = { TestGroup.REST_API, TestGroup.NODES, TestGroup.REGRESSION, TestGroup.REQUIRE_SOLR }) @TestRail(section = { TestGroup.REST_API, TestGroup.NODES }, executionType = ExecutionType.REGRESSION, description = "Verify that child nodes can be locked differently and unlocked") public void testLockUnlockParentChild() throws Exception @@ -728,7 +728,7 @@ public class NodesLockTests extends RestTest query.setIncludeRequest(false); // Allow indexing to complete. - Utility.sleep(1000, 180000, () -> + Utility.sleep(1000, 60000, () -> { SearchResponse response = query(query); restClient.assertStatusCodeIs(HttpStatus.OK); @@ -745,7 +745,7 @@ public class NodesLockTests extends RestTest STEP("7. Verify that childNode1 and childNode2 are not found in the query results."); // Allow indexing to complete. - Utility.sleep(1000, 180000, () -> + Utility.sleep(1000, 60000, () -> { SearchResponse response = query(query); restClient.assertStatusCodeIs(HttpStatus.OK); diff --git a/e2e-test/java/org/alfresco/rest/people/GetPeopleFullTests.java b/e2e-test/java/org/alfresco/rest/people/GetPeopleFullTests.java index b3e51ece1..ef080a29a 100644 --- a/e2e-test/java/org/alfresco/rest/people/GetPeopleFullTests.java +++ b/e2e-test/java/org/alfresco/rest/people/GetPeopleFullTests.java @@ -64,22 +64,6 @@ public class GetPeopleFullTests extends RestTest .and().field("emailNotificationsEnabled").is(newUser.getEmailNotificationsEnabled()); } - @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION }) - @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify user gets a person with special chars in username with Rest API and response is not found") - public void userChecksIfPersonWithSpecilCharsInUsernameIsNotFound() throws Exception - { - UserModel userSpecialChars = dataUser.usingAdmin().createUser(RandomStringUtils.randomAlphabetic(2) + "~!@#$%^&*()_+[]{}|\\;':\",./<>", "password"); - //setting the encoded text for username - userSpecialChars.setUsername(RandomStringUtils.randomAlphabetic(2) + "~!%40%23%24%25%5E%26*()_%2B%5B%5D%7B%7D%7C%5C%3B%27%3A%22%2C.%2F%3C%3E"); - - personModel = restClient.authenticateUser(managerUser).withCoreAPI().usingUser(userSpecialChars).getPerson(); - restClient.assertStatusCodeIs(HttpStatus.NOT_FOUND) - .assertLastError().containsErrorKey(RestErrorModel.ENTITY_NOT_FOUND_ERRORKEY) - .containsSummary(String.format(RestErrorModel.ENTITY_NOT_FOUND, userSpecialChars.getUsername())) - .descriptionURLIs(RestErrorModel.RESTAPIEXPLORER) - .stackTraceIs(RestErrorModel.STACKTRACE); - } - @Test(groups = { TestGroup.REST_API, TestGroup.PEOPLE, TestGroup.REGRESSION }) @TestRail(section = { TestGroup.REST_API, TestGroup.PEOPLE }, executionType = ExecutionType.REGRESSION, description = "Verify user gets a person with empty personId with Rest API and response is successful") public void userGetPersonWithEmptyPersonId() throws Exception diff --git a/e2e-test/java/org/alfresco/rest/tags/GetTagTests.java b/e2e-test/java/org/alfresco/rest/tags/GetTagTests.java index 90cc018ab..99bb12b8a 100644 --- a/e2e-test/java/org/alfresco/rest/tags/GetTagTests.java +++ b/e2e-test/java/org/alfresco/rest/tags/GetTagTests.java @@ -11,6 +11,7 @@ import org.springframework.http.HttpStatus; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +@Test(groups = {TestGroup.REQUIRE_SOLR}) public class GetTagTests extends TagsDataPrep { diff --git a/e2e-test/java/org/alfresco/rest/tags/GetTagsTests.java b/e2e-test/java/org/alfresco/rest/tags/GetTagsTests.java index 5dee733c6..5c3b49ff9 100644 --- a/e2e-test/java/org/alfresco/rest/tags/GetTagsTests.java +++ b/e2e-test/java/org/alfresco/rest/tags/GetTagsTests.java @@ -12,6 +12,7 @@ import org.springframework.http.HttpStatus; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +@Test(groups = {TestGroup.REQUIRE_SOLR}) public class GetTagsTests extends TagsDataPrep { diff --git a/e2e-test/java/org/alfresco/rest/tags/TagsDataPrep.java b/e2e-test/java/org/alfresco/rest/tags/TagsDataPrep.java index c5e2e49a1..a499ab15b 100644 --- a/e2e-test/java/org/alfresco/rest/tags/TagsDataPrep.java +++ b/e2e-test/java/org/alfresco/rest/tags/TagsDataPrep.java @@ -11,8 +11,11 @@ import org.alfresco.utility.data.RandomData; import org.alfresco.utility.model.FileModel; import org.alfresco.utility.model.FolderModel; import org.alfresco.utility.model.SiteModel; +import org.alfresco.utility.model.TestGroup; import org.alfresco.utility.model.UserModel; +import org.testng.annotations.Test; +@Test(groups = {TestGroup.REQUIRE_SOLR}) public class TagsDataPrep extends RestTest { diff --git a/e2e-test/java/org/alfresco/rest/tags/UpdateTagTests.java b/e2e-test/java/org/alfresco/rest/tags/UpdateTagTests.java index 923ee714e..2237314f1 100644 --- a/e2e-test/java/org/alfresco/rest/tags/UpdateTagTests.java +++ b/e2e-test/java/org/alfresco/rest/tags/UpdateTagTests.java @@ -19,6 +19,7 @@ import org.testng.annotations.Test; /** * Created by Claudia Agache on 10/4/2016. */ +@Test(groups = {TestGroup.REQUIRE_SOLR}) public class UpdateTagTests extends TagsDataPrep { private RestTagModel oldTag; diff --git a/e2e-test/java/org/alfresco/rest/tags/nodes/AddTagTests.java b/e2e-test/java/org/alfresco/rest/tags/nodes/AddTagTests.java index 288416e03..2100b3ab3 100644 --- a/e2e-test/java/org/alfresco/rest/tags/nodes/AddTagTests.java +++ b/e2e-test/java/org/alfresco/rest/tags/nodes/AddTagTests.java @@ -23,6 +23,7 @@ import org.testng.annotations.Test; /** * Created by Claudia Agache on 10/3/2016. */ +@Test(groups = {TestGroup.REQUIRE_SOLR}) public class AddTagTests extends TagsDataPrep { private String tagValue; diff --git a/e2e-test/java/org/alfresco/rest/tags/nodes/AddTagsTests.java b/e2e-test/java/org/alfresco/rest/tags/nodes/AddTagsTests.java index b1ebd8419..7b0d5fd8f 100644 --- a/e2e-test/java/org/alfresco/rest/tags/nodes/AddTagsTests.java +++ b/e2e-test/java/org/alfresco/rest/tags/nodes/AddTagsTests.java @@ -19,6 +19,7 @@ import org.testng.annotations.Test; /** * Created by Claudia Agache on 10/7/2016. */ +@Test(groups = {TestGroup.REQUIRE_SOLR}) public class AddTagsTests extends TagsDataPrep { private FileModel contributorDoc; diff --git a/e2e-test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java b/e2e-test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java index d90f289b7..28f42e67a 100644 --- a/e2e-test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java +++ b/e2e-test/java/org/alfresco/rest/tags/nodes/DeleteTagTests.java @@ -21,6 +21,7 @@ import org.testng.annotations.Test; /** * Created by Claudia Agache on 10/4/2016. */ +@Test(groups = {TestGroup.REQUIRE_SOLR}) public class DeleteTagTests extends TagsDataPrep { private RestTagModel tag; diff --git a/e2e-test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java b/e2e-test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java index f5a15f675..8cfd84379 100644 --- a/e2e-test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java +++ b/e2e-test/java/org/alfresco/rest/tags/nodes/GetNodeTagsTests.java @@ -16,6 +16,7 @@ import org.springframework.http.HttpStatus; import org.testng.annotations.BeforeClass; import org.testng.annotations.Test; +@Test(groups = {TestGroup.REQUIRE_SOLR}) public class GetNodeTagsTests extends TagsDataPrep { private String tagValue; diff --git a/e2e-test/java/org/alfresco/rest/trashcan/GetDeletedNodesTests.java b/e2e-test/java/org/alfresco/rest/trashcan/GetDeletedNodesTests.java index 9121ad647..5cf7a6759 100644 --- a/e2e-test/java/org/alfresco/rest/trashcan/GetDeletedNodesTests.java +++ b/e2e-test/java/org/alfresco/rest/trashcan/GetDeletedNodesTests.java @@ -180,7 +180,7 @@ public class GetDeletedNodesTests extends RestTest restClient.onResponse().getResponse().body().asString().contains("Sample text."); } - @TestRail(section = { TestGroup.REST_API, TestGroup.TRASHCAN }, executionType = ExecutionType.SANITY, + @TestRail(section = { TestGroup.REST_API, TestGroup.TRASHCAN, TestGroup.REQUIRE_SOLR }, executionType = ExecutionType.SANITY, description = "Sanity tests for GET /deleted-nodes/{nodeId}/renditions, GET /deleted-nodes/{nodeId}/renditions/{renditionId}, GET /deleted-nodes/{nodeId}/renditions/{renditionId}/content") @Test(groups = { TestGroup.REST_API, TestGroup.TRASHCAN, TestGroup.SANITY }) public void testGetDeletedNodesRenditions() throws Exception @@ -196,14 +196,12 @@ public class GetDeletedNodesTests extends RestTest // GET /deleted-nodes/{nodeId}/renditions Utility.sleep(1000, 30000, () -> { - nodeRenditionInfoCollection = restClient.authenticateUser(adminUserModel).withCoreAPI().usingTrashcan().usingParams("where=(status='CREATED')").getDeletedNodeRenditions(file3); + nodeRenditionInfoCollection = restClient.authenticateUser(adminUserModel).withCoreAPI().usingTrashcan().getDeletedNodeRenditions(file3); restClient.assertStatusCodeIs(HttpStatus.OK); - // All renditions, created or not are retrieved. List is ordered - nodeRenditionInfoCollection.assertThat().entriesListCountIs(2); - nodeRenditionInfoCollection.getEntryByIndex(0).assertThat().field("id").is("doclib").and() - .field("status").is("CREATED"); - nodeRenditionInfoCollection.getEntryByIndex(1).assertThat().field("id").is("pdf").and() + // Check if renditions are retrieved, created or not. Entries are ordered + nodeRenditionInfoCollection.assertThat().entriesListContains("id", "doclib"); + nodeRenditionInfoCollection.getEntryByIndex(5).assertThat().field("id").is("pdf").and() .field("status").is("CREATED"); });