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

Update REST-API assertion of "equals" to "is"

Browse Source
This commit is contained in:
Valentin Popa
2017-03-13 12:02:15 +02:00
parent 2174dc9cc6
commit dd44737711
6 changed files with 28 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
e2e-test/java/org/alfresco/rest/favorites/GetFavoriteCoreTests.java
+2 -4
View File
@@ -73,8 +73,6 @@ public class GetFavoriteCoreTests extends RestTest {
.statusCodeIs(HttpStatus.BAD_REQUEST);
}
@TestRail(section = { TestGroup.REST_API,
TestGroup.FAVORITES }, executionType = ExecutionType.REGRESSION, description = "Verify get favorite site when favorite id does't exist")
@Test(groups = { TestGroup.REST_API, TestGroup.FAVORITES, TestGroup.CORE })
@@ -115,7 +113,7 @@ public class GetFavoriteCoreTests extends RestTest {
RestPersonFavoritesModel favoriteSite = restClient.withCoreAPI().usingMe().getFavorite(siteModel.getGuid());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteSite.assertThat().field("targetGuid").equals(siteModel.getGuid());
favoriteSite.assertThat().field("targetGuid").is(siteModel.getGuid());
}
@TestRail(section = { TestGroup.REST_API,
@@ -127,6 +125,6 @@ public class GetFavoriteCoreTests extends RestTest {
RestPersonFavoritesModel favoriteFile = restClient.withCoreAPI().usingMe().getFavorite(fileModel.getNodeRefWithoutVersion());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteFile.assertThat().field("targetGuid").equals(fileModel.getNodeRef());
favoriteFile.assertThat().field("targetGuid").is(fileModel.getNodeRefWithoutVersion());
}
}
e2e-test/java/org/alfresco/rest/favorites/GetFavoriteFullTests.java
+3 -4
View File
@@ -42,7 +42,6 @@ public class GetFavoriteFullTests extends RestTest {
usersWithRoles = dataUser.addUsersWithRolesToSite(siteModel, UserRole.SiteManager, UserRole.SiteCollaborator,
UserRole.SiteConsumer, UserRole.SiteContributor);
}
@Bug(id = "MNT-16904")
@TestRail(section = { TestGroup.REST_API,
@@ -93,9 +92,9 @@ public class GetFavoriteFullTests extends RestTest {
RestPersonFavoritesModel favoriteSite = restClient.withCoreAPI().usingUser(adminUserModel).getFavorite(siteModel.getGuid());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteSite.assertThat().field("targetGuid").equals(siteModel.getGuid());
favoriteSite.assertThat().field("targetGuid").is(siteModel.getGuid());
favoriteSite.getTarget().getSite()
.assertThat().field("guid").equals(siteModel.getGuid());
.assertThat().field("guid").is(siteModel.getGuid());
}
@@ -111,7 +110,7 @@ public class GetFavoriteFullTests extends RestTest {
RestPersonFavoritesModel favoriteSite = restClient.authenticateUser(manager).withParams("properties=targetGuid")
.withCoreAPI().usingAuthUser().getFavorite(siteModel.getGuid());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteSite.assertThat().field("targetGuid").equals(siteModel.getGuid());
favoriteSite.assertThat().field("targetGuid").is(siteModel.getGuid());
favoriteSite.assertThat().fieldsCount().is(1);
}
e2e-test/java/org/alfresco/rest/favorites/GetFavoriteSanityTests.java
+16 -16
View File
@@ -49,7 +49,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favoriteSite = restClient.withCoreAPI().usingUser(adminUserModel).getFavorite(siteModel.getGuid());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteSite.assertThat().field("targetGuid").equals(siteModel.getGuid());
favoriteSite.assertThat().field("targetGuid").is(siteModel.getGuid());
}
@TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY,
@@ -61,7 +61,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favoriteFolder = restClient.withCoreAPI().usingUser(adminUserModel).getFavorite(folderModel.getNodeRef());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteFolder.assertThat().field("targetGuid").equals(folderModel.getNodeRef());
favoriteFolder.assertThat().field("targetGuid").is(folderModel.getNodeRef());
}
@TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY,
@@ -73,7 +73,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favoriteFile = restClient.withCoreAPI().usingUser(adminUserModel).getFavorite(fileModel.getNodeRefWithoutVersion());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteFile.assertThat().field("targetGuid").equals(fileModel.getNodeRef());
favoriteFile.assertThat().field("targetGuid").is(fileModel.getNodeRefWithoutVersion());
}
@TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY,
@@ -86,7 +86,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favSite = restClient.withCoreAPI().usingAuthUser().getFavorite(siteModel.getGuid());
restClient.assertStatusCodeIs(HttpStatus.OK);
favSite.assertThat().field("targetGuid").equals(siteModel.getGuid());
favSite.assertThat().field("targetGuid").is(siteModel.getGuid());
}
@@ -100,7 +100,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favoriteFolder = restClient.withCoreAPI().usingAuthUser().getFavorite(folderModel.getNodeRef());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteFolder.assertThat().field("targetGuid").equals(folderModel.getNodeRef());
favoriteFolder.assertThat().field("targetGuid").is(folderModel.getNodeRef());
}
@@ -114,7 +114,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favoriteFile = restClient.withCoreAPI().usingAuthUser().getFavorite(fileModel.getNodeRefWithoutVersion());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteFile.assertThat().field("targetGuid").equals(fileModel.getNodeRef());
favoriteFile.assertThat().field("targetGuid").is(fileModel.getNodeRefWithoutVersion());
}
@@ -128,7 +128,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favSite = restClient.withCoreAPI().usingAuthUser().getFavorite(siteModel.getGuid());
restClient.assertStatusCodeIs(HttpStatus.OK);
favSite.assertThat().field("targetGuid").equals(siteModel.getGuid());
favSite.assertThat().field("targetGuid").is(siteModel.getGuid());
}
@TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY,
@@ -141,7 +141,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favoriteFolder = restClient.withCoreAPI().usingAuthUser().getFavorite(folderModel.getNodeRef());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteFolder.assertThat().field("targetGuid").equals(folderModel.getNodeRef());
favoriteFolder.assertThat().field("targetGuid").is(folderModel.getNodeRef());
}
@@ -155,7 +155,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favoriteFile = restClient.withCoreAPI().usingAuthUser().getFavorite(fileModel.getNodeRefWithoutVersion());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteFile.assertThat().field("targetGuid").equals(fileModel.getNodeRef());
favoriteFile.assertThat().field("targetGuid").is(fileModel.getNodeRefWithoutVersion());
}
@@ -169,7 +169,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favSite = restClient.withCoreAPI().usingAuthUser().getFavorite(siteModel.getGuid());
restClient.assertStatusCodeIs(HttpStatus.OK);
favSite.assertThat().field("targetGuid").equals(siteModel.getGuid()); ;
favSite.assertThat().field("targetGuid").is(siteModel.getGuid()); ;
}
@TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY,
@@ -182,7 +182,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favoriteFolder = restClient.withCoreAPI().usingAuthUser().getFavorite(folderModel.getNodeRef());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteFolder.assertThat().field("targetGuid").equals(folderModel.getNodeRef());
favoriteFolder.assertThat().field("targetGuid").is(folderModel.getNodeRef());
}
@@ -196,7 +196,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favoriteFile = restClient.withCoreAPI().usingAuthUser().getFavorite(fileModel.getNodeRefWithoutVersion());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteFile.assertThat().field("targetGuid").equals(fileModel.getNodeRef());
favoriteFile.assertThat().field("targetGuid").is(fileModel.getNodeRefWithoutVersion());
}
@@ -210,7 +210,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favSite = restClient.withCoreAPI().usingAuthUser().getFavorite(siteModel.getGuid());
restClient.assertStatusCodeIs(HttpStatus.OK);
favSite.assertThat().field("targetGuid").equals(siteModel.getGuid());
favSite.assertThat().field("targetGuid").is(siteModel.getGuid());
}
@TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY,
@@ -223,7 +223,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favoriteFolder = restClient.withCoreAPI().usingAuthUser().getFavorite(folderModel.getNodeRef());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteFolder.assertThat().field("targetGuid").equals(folderModel.getNodeRef());
favoriteFolder.assertThat().field("targetGuid").is(folderModel.getNodeRef());
}
@@ -237,7 +237,7 @@ public class GetFavoriteSanityTests extends RestTest
RestPersonFavoritesModel favoriteFile = restClient.withCoreAPI().usingAuthUser().getFavorite(fileModel.getNodeRefWithoutVersion());
restClient.assertStatusCodeIs(HttpStatus.OK);
favoriteFile.assertThat().field("targetGuid").equals(fileModel.getNodeRef());
favoriteFile.assertThat().field("targetGuid").is(fileModel.getNodeRefWithoutVersion());
}
@TestRail(section = { TestGroup.REST_API, TestGroup.FAVORITES }, executionType = ExecutionType.SANITY,
@@ -290,4 +290,4 @@ public class GetFavoriteSanityTests extends RestTest
restClient.assertStatusCodeIs(HttpStatus.UNAUTHORIZED)
.assertLastError().containsSummary(RestErrorModel.AUTHENTICATION_FAILED);
}
}
}
e2e-test/java/org/alfresco/rest/nodes/NodesChildrenTests.java
+5 -6
View File
@@ -75,7 +75,7 @@ public class NodesChildrenTests extends RestTest
.folder("F3")
.file("f1")
.file("f2")
.file("f2");
.file("f3");
RestNodeModelsCollection returnedFiles = restClient.withParams("maxItems=2",
"skipCount=1",
@@ -84,12 +84,11 @@ public class NodesChildrenTests extends RestTest
restClient.assertStatusCodeIs(HttpStatus.OK);
/*
* Then I receive file2 and file3
*
*/
* Then I receive file2 and file3
*/
returnedFiles.assertThat().entriesListCountIs(2);
returnedFiles.getEntries().get(0).onModel().assertThat().field("id").equals(nodesBuilder.getNode("F2").getId());
returnedFiles.getEntries().get(1).onModel().assertThat().field("id").equals(nodesBuilder.getNode("F3").getId());
returnedFiles.getEntries().get(0).onModel().assertThat().field("id").is(nodesBuilder.getNode("f2").getId());
returnedFiles.getEntries().get(1).onModel().assertThat().field("id").is(nodesBuilder.getNode("f3").getId());
}
}
e2e-test/java/org/alfresco/rest/nodes/NodesTests.java
+1 -1
View File
@@ -51,6 +51,6 @@ public class NodesTests extends RestTest
* - destinationFolder
* - file
*/
response.assertThat().field("parentId").equals(destinationFolder.getId());
response.assertThat().field("parentId").is(destinationFolder.getId());
}
}
e2e-test/java/org/alfresco/rest/workflow/deployments/GetDeploymentSanityTests.java
+1 -1
View File
@@ -42,7 +42,7 @@ public class GetDeploymentSanityTests extends RestTest
restClient.assertStatusCodeIs(HttpStatus.OK);
actualDeployment.assertThat().field("deployedAt").isNotEmpty()
.and().field("name").is(expectedDeployment.getName())
.and().field("id").equals(expectedDeployment.getId());
.and().field("id").is(expectedDeployment.getId());
}
@TestRail(section = { TestGroup.REST_API, TestGroup.WORKFLOW, TestGroup.DEPLOYMENTS },