From 4cf02b592f1083857ba05d9820829073bf8dd9fc Mon Sep 17 00:00:00 2001
From: Sascha Herzinger <sascha.herzinger@uni.lu>
Date: Tue, 25 Jun 2019 08:51:00 +0200
Subject: [PATCH] Fixed some syntax errors
---
.../java/lcsb/mapviewer/model/user/ObjectPrivilegeTest.java | 2 +-
.../java/lcsb/mapviewer/api/files/FileRestImplTest.java | 6 +++---
.../mapviewer/web/ProjectControllerIntegrationTest.java | 5 +++--
3 files changed, 7 insertions(+), 6 deletions(-)
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 078ecf2326..dbee6d8e6b 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 9afb8d7652..c282688096 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 fd47ca77d8..abe038b090 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);
}
}
--
GitLab