Skip to content
Snippets Groups Projects
Commit e96a4170 authored by Piotr Gawron's avatar Piotr Gawron
Browse files

Merge branch '643-database-corrupted-by-unit-tests' into 'master'

Resolve "Database corrupted by unit tests"

Closes #643

See merge request !584
parents 2c97f2b2 60f6b953
No related branches found
No related tags found
2 merge requests!630WIP: Resolve "The privileges of a new user are not saved in some cases",!584Resolve "Database corrupted by unit tests"
Pipeline #8361 passed
...@@ -150,12 +150,19 @@ public class ProjectServiceTest extends ServiceTestFunctions { ...@@ -150,12 +150,19 @@ public class ProjectServiceTest extends ServiceTestFunctions {
@Test @Test
public void testUserPrivilegeChangeDuringUpload() throws Exception { public void testUserPrivilegeChangeDuringUpload() throws Exception {
try { try {
String project_id = "test_id";
String project_id2 = "test_id2";
projectService
.createProject(createProjectParams("testFiles/centeredAnchorInModifier.xml").analyzeAnnotations(true).projectId(project_id2));
Project defaultProject = projectService.getProjectByProjectId(project_id2, adminToken);
User admin = userService.getUserByToken(adminToken); User admin = userService.getUserByToken(adminToken);
Project defaultProject = projectService.getAllProjects().get(0);
userService.setUserPrivilege(admin, userService.setUserPrivilege(admin,
new ObjectPrivilege(defaultProject, 1, PrivilegeType.EDIT_COMMENTS_PROJECT, admin)); new ObjectPrivilege(defaultProject, 1, PrivilegeType.EDIT_COMMENTS_PROJECT, admin));
userService.setUserPrivilege(admin,
new ObjectPrivilege(defaultProject, 1, PrivilegeType.VIEW_PROJECT, admin));
admin = userService.getUserByToken(adminToken); admin = userService.getUserByToken(adminToken);
String project_id = "test_id";
Thread addProjectThread = new Thread(new Runnable() { Thread addProjectThread = new Thread(new Runnable() {
@Override @Override
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment