garrettmills/commafeed
1
0
Fork 0
forked from Archives/Athou_commafeed
Code Pull Requests Activity

avoid modifying the admin user because it impacts the test in UserIT

Browse Source
This commit is contained in:
Athou
2023-12-24 09:55:02 +01:00
parent 818d847607
commit d09cabb8c6
1 changed files with 26 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
commafeed-server/src/test/java/com/commafeed/integration/rest/AdminIT.java
View File

@@ -26,41 +26,47 @@ class AdminIT extends BaseIT {
@Nested @Nested
class Users { class Users {
@Test @Test
void saveThenDeleteNewUser() { void saveModifyAndDeleteNewUser() {
List<UserModel> existingUsers = getAllUsers(); List<UserModel> existingUsers = getAllUsers();
createUser();
Assertions.assertEquals(existingUsers.size() + 1, getAllUsers().size());
modifyUser();
Assertions.assertEquals(existingUsers.size() + 1, getAllUsers().size());
deleteUser();
Assertions.assertEquals(existingUsers.size(), getAllUsers().size());
}
private void createUser() {
User user = new User(); User user = new User();
user.setName("test"); user.setName("test");
user.setPassword("test".getBytes()); user.setPassword("test".getBytes());
user.setEmail("test@test.com"); user.setEmail("test@test.com");
getClient().target(getApiBaseUrl() + "admin/user/save").request().post(Entity.json(user), Void.TYPE); getClient().target(getApiBaseUrl() + "admin/user/save").request().post(Entity.json(user), Void.TYPE);
}
List<UserModel> newUsers = getAllUsers(); private void modifyUser() {
Assertions.assertEquals(existingUsers.size() + 1, newUsers.size()); List<UserModel> existingUsers = getAllUsers();
UserModel user = existingUsers.stream()
UserModel newUser = newUsers.stream() .filter(u -> u.getName().equals("test"))
.findFirst()
.orElseThrow(() -> new NullPointerException("User not found"));
user.setEmail("new-email@provider.com");
getClient().target(getApiBaseUrl() + "admin/user/save").request().post(Entity.json(user), Void.TYPE);
}
private void deleteUser() {
List<UserModel> existingUsers = getAllUsers();
UserModel user = existingUsers.stream()
.filter(u -> u.getName().equals("test")) .filter(u -> u.getName().equals("test"))
.findFirst() .findFirst()
.orElseThrow(() -> new NullPointerException("User not found")); .orElseThrow(() -> new NullPointerException("User not found"));
user.setId(newUser.getId());
IDRequest req = new IDRequest(); IDRequest req = new IDRequest();
req.setId(user.getId()); req.setId(user.getId());
getClient().target(getApiBaseUrl() + "admin/user/delete").request().post(Entity.json(req), Void.TYPE); getClient().target(getApiBaseUrl() + "admin/user/delete").request().post(Entity.json(req), Void.TYPE);
Assertions.assertEquals(existingUsers.size(), getAllUsers().size());
}
@Test
void editExistingUser() {
List<UserModel> existingUsers = getAllUsers();
UserModel user = existingUsers.stream()
.filter(u -> u.getName().equals("admin"))
.findFirst()
.orElseThrow(() -> new NullPointerException("User not found"));
user.setEmail("new-email@provider.com");
getClient().target(getApiBaseUrl() + "admin/user/save").request().post(Entity.json(user), Void.TYPE);
Assertions.assertEquals(existingUsers.size(), getAllUsers().size());
} }
private List<UserModel> getAllUsers() { private List<UserModel> getAllUsers() {