diff --git a/model/src/test/java/lcsb/mapviewer/model/user/ObjectPrivilegeTest.java b/model/src/test/java/lcsb/mapviewer/model/user/ObjectPrivilegeTest.java index 078ecf2326074af21b22d27cbf0a98311ccc2870..dbee6d8e6b9e7377b2b686c82095f809e42b4aed 100644 --- a/model/src/test/java/lcsb/mapviewer/model/user/ObjectPrivilegeTest.java +++ b/model/src/test/java/lcsb/mapviewer/model/user/ObjectPrivilegeTest.java @@ -41,7 +41,7 @@ public class ObjectPrivilegeTest { Integer id = 12; Project project = new Project(); project.setId(id); - ObjectPrivilege privilege = new ObjectPrivilege(project.getId(), PrivilegeType.PROJECT_DOMAIN, AccessType.READ); + ObjectPrivilege privilege = new ObjectPrivilege(PrivilegeType.READ_PROJECT, project.getId()); assertEquals(id, privilege.getObjectId()); } catch (Exception e) { e.printStackTrace(); diff --git a/rest-api/src/test/java/lcsb/mapviewer/api/files/FileRestImplTest.java b/rest-api/src/test/java/lcsb/mapviewer/api/files/FileRestImplTest.java index 9afb8d7652e524b4bf0f8087b923b60debcd9924..c282688096b2423a62233a73ac700e96b7012884 100644 --- a/rest-api/src/test/java/lcsb/mapviewer/api/files/FileRestImplTest.java +++ b/rest-api/src/test/java/lcsb/mapviewer/api/files/FileRestImplTest.java @@ -48,14 +48,14 @@ public class FileRestImplTest extends RestTestFunctions { byte[] dataChunkMerged = ArrayUtils.addAll(dataChunk, dataChunk2); Map<String, Object> result = fileRestImpl.createFile("test.txt", "100", user); int id = (Integer) result.get("id"); - fileRestImpl.uploadContent(id + "", dataChunk, user); + fileRestImpl.uploadContent(id + "", dataChunk); UploadedFileEntry file = uploadedFileEntryDao.getById(id); assertEquals(100, file.getLength()); assertEquals(2, file.getFileContent().length); assertArrayEquals(dataChunk, file.getFileContent()); - fileRestImpl.uploadContent(id + "", dataChunk2, user); + fileRestImpl.uploadContent(id + "", dataChunk2); assertEquals(100, file.getLength()); assertEquals(4, file.getFileContent().length); @@ -72,7 +72,7 @@ public class FileRestImplTest extends RestTestFunctions { int id = (Integer) result.get("id"); try { - fileRestImpl.uploadContent(id + "", dataChunk, user); + fileRestImpl.uploadContent(id + "", dataChunk); } finally { uploadedFileEntryDao.getById(id); UploadedFileEntry file = uploadedFileEntryDao.getById(id); diff --git a/web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTest.java b/web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTest.java index fd47ca77d80bb0844d31a0e7ef307dbdef73e597..abe038b090cd03ba54ea891ca595cabe932b4be3 100644 --- a/web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTest.java +++ b/web/src/test/java/lcsb/mapviewer/web/ProjectControllerIntegrationTest.java @@ -2,7 +2,7 @@ package lcsb.mapviewer.web; import lcsb.mapviewer.model.cache.UploadedFileEntry; import lcsb.mapviewer.model.security.AccessType; -import lcsb.mapviewer.model.security.AuthorityDomain; +import lcsb.mapviewer.model.security.PrivilegeType; import lcsb.mapviewer.model.security.Privilege; import lcsb.mapviewer.model.user.User; import lcsb.mapviewer.persist.dao.cache.UploadedFileEntryDao; @@ -48,7 +48,7 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest user.setLogin("test_user"); user.setCryptedPassword(passwordEncoder.encode("test_pass")); userService.addUser(user); - userService.grantUserPrivilege(user, new Privilege(AuthorityDomain.PROJECTS_DOMAIN, AccessType.CREATE)); + userService.grantUserPrivilege(user, new Privilege(PrivilegeType.IS_CURATOR)); } @Test @@ -73,6 +73,7 @@ public class ProjectControllerIntegrationTest extends ControllerIntegrationTest .session(createSession("test_user", "test_pass")); mockMvc.perform(request).andExpect(status().is2xxSuccessful()); + Thread.sleep(5000); } }