Skip to content
Snippets Groups Projects
Verified Commit c64407f0 authored by Martin Weise's avatar Martin Weise
Browse files

WIP 


Signed-off-by: Martin Weise's avatarMartin Weise <martin.weise@tuwien.ac.at>
parent 067140a3
No related branches found
No related tags found
1 merge request!371Hotfix the wrong user id, ref #480
Show whitespace changes
Inline Side-by-side
dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/DatabaseEndpointUnitTest.java
+ 39
− 22
View file @ c64407f0
...@@ -117,7 +117,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -117,7 +117,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
.setVirtualHostPermissions(USER_1); .setVirtualHostPermissions(USER_1);
when(keycloakGateway.findByUsername(USER_1_USERNAME)) when(keycloakGateway.findByUsername(USER_1_USERNAME))
.thenReturn(USER_1_KEYCLOAK_DTO); .thenReturn(USER_1_KEYCLOAK_DTO);
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
/* test */ /* test */
...@@ -136,7 +136,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -136,7 +136,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(containerService.find(CONTAINER_4_ID)) when(containerService.find(CONTAINER_4_ID))
.thenReturn(CONTAINER_4); .thenReturn(CONTAINER_4);
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
/* test */ /* test */
...@@ -174,7 +174,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -174,7 +174,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_1_ID)) when(databaseService.findById(DATABASE_1_ID))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(userService.findByUsername(USER_2_USERNAME)) when(userService.findById(USER_2_ID))
.thenReturn(USER_2); .thenReturn(USER_2);
when(databaseService.updateTableMetadata(any(Database.class))) when(databaseService.updateTableMetadata(any(Database.class)))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
...@@ -195,7 +195,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -195,7 +195,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_1_ID)) when(databaseService.findById(DATABASE_1_ID))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
when(databaseService.updateTableMetadata(any(Database.class))) when(databaseService.updateTableMetadata(any(Database.class)))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
...@@ -215,7 +215,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -215,7 +215,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_1_ID)) when(databaseService.findById(DATABASE_1_ID))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
when(databaseService.updateViewMetadata(any(Database.class))) when(databaseService.updateViewMetadata(any(Database.class)))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
...@@ -233,7 +233,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -233,7 +233,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_1_ID)) when(databaseService.findById(DATABASE_1_ID))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(userService.findByUsername(USER_2_USERNAME)) when(userService.findById(USER_2_ID))
.thenReturn(USER_2); .thenReturn(USER_2);
/* test */ /* test */
...@@ -249,7 +249,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -249,7 +249,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_1_ID)) when(databaseService.findById(DATABASE_1_ID))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
/* test */ /* test */
...@@ -265,7 +265,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -265,7 +265,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_1_ID)) when(databaseService.findById(DATABASE_1_ID))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
/* test */ /* test */
...@@ -348,7 +348,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -348,7 +348,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(keycloakGateway.findByUsername(USER_1_USERNAME)) when(keycloakGateway.findByUsername(USER_1_USERNAME))
.thenReturn(USER_1_KEYCLOAK_DTO); .thenReturn(USER_1_KEYCLOAK_DTO);
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
/* test */ /* test */
...@@ -376,7 +376,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -376,7 +376,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
.build(); .build();
/* mock */ /* mock */
when(userService.findByUsername(USER_2_USERNAME)) when(userService.findById(USER_2_ID))
.thenReturn(USER_2); .thenReturn(USER_2);
/* test */ /* test */
...@@ -408,7 +408,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -408,7 +408,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_3_ID)) when(databaseService.findById(DATABASE_3_ID))
.thenReturn(DATABASE_3); .thenReturn(DATABASE_3);
when(userService.findByUsername(USER_2_USERNAME)) when(userService.findById(USER_2_ID))
.thenReturn(USER_2); .thenReturn(USER_2);
/* test */ /* test */
...@@ -429,7 +429,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -429,7 +429,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_1_ID)) when(databaseService.findById(DATABASE_1_ID))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
when(storageService.getBytes(request.getKey())) when(storageService.getBytes(request.getKey()))
.thenReturn(new byte[]{1, 2, 3, 4, 5}); .thenReturn(new byte[]{1, 2, 3, 4, 5});
...@@ -450,7 +450,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -450,7 +450,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_1_ID)) when(databaseService.findById(DATABASE_1_ID))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
/* test */ /* test */
...@@ -480,7 +480,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -480,7 +480,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_1_ID)) when(databaseService.findById(DATABASE_1_ID))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(userService.findByUsername(USER_2_USERNAME)) when(userService.findById(USER_2_ID))
.thenReturn(USER_2); .thenReturn(USER_2);
when(userService.findById(USER_4_ID)) when(userService.findById(USER_4_ID))
.thenReturn(USER_4); .thenReturn(USER_4);
...@@ -505,7 +505,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -505,7 +505,7 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(keycloakGateway.findByUsername(USER_1_USERNAME)) when(keycloakGateway.findByUsername(USER_1_USERNAME))
.thenReturn(USER_1_KEYCLOAK_DTO); .thenReturn(USER_1_KEYCLOAK_DTO);
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
when(userService.findById(USER_4_ID)) when(userService.findById(USER_4_ID))
.thenReturn(USER_4); .thenReturn(USER_4);
...@@ -650,14 +650,31 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest { ...@@ -650,14 +650,31 @@ public class DatabaseEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findAll()) when(databaseService.findAll())
.thenReturn(databases); .thenReturn(databases);
if (principal != null) {
if (internalName != null) { if (internalName != null) {
if (!databases.isEmpty()) { if (databases.isEmpty()) {
when(databaseService.findAllPublicByInternalName(internalName)) when(databaseService.findAllPublicOrReadAccessByInternalName(any(UUID.class), eq(internalName)))
.thenReturn(List.of());
} else {
when(databaseService.findAllPublicOrReadAccessByInternalName(any(UUID.class), eq(internalName)))
.thenReturn(List.of(databases.get(0))); .thenReturn(List.of(databases.get(0)));
}
} else { } else {
doThrow(DatabaseNotFoundException.class) when(databaseService.findAllPublicOrReadAccess(any(UUID.class)))
.when(databaseService) .thenReturn(databases);
.findAllPublicByInternalName(internalName); }
} else {
if (internalName != null) {
if (databases.isEmpty()) {
when(databaseService.findAllPublicByInternalName(eq(internalName)))
.thenReturn(List.of());
} else {
when(databaseService.findAllPublicByInternalName(eq(internalName)))
.thenReturn(List.of(databases.get(0)));
}
} else {
when(databaseService.findAllPublicOrReadAccess(any(UUID.class)))
.thenReturn(databases);
} }
} }
......
dbrepo-metadata-service/rest-service/src/test/java/at/tuwien/endpoints/IdentifierEndpointUnitTest.java
+ 5
− 5
View file @ c64407f0
...@@ -1089,7 +1089,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest { ...@@ -1089,7 +1089,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
throws UserNotFoundException { throws UserNotFoundException {
/* mock */ /* mock */
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
/* test */ /* test */
...@@ -1163,7 +1163,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest { ...@@ -1163,7 +1163,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_1_ID)) when(databaseService.findById(DATABASE_1_ID))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
when(accessService.find(DATABASE_1, USER_1)) when(accessService.find(DATABASE_1, USER_1))
.thenReturn(DATABASE_1_USER_1_READ_ACCESS); .thenReturn(DATABASE_1_USER_1_READ_ACCESS);
...@@ -1185,7 +1185,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest { ...@@ -1185,7 +1185,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_1_ID)) when(databaseService.findById(DATABASE_1_ID))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(userService.findByUsername(USER_1_USERNAME)) when(userService.findById(USER_1_ID))
.thenReturn(USER_1); .thenReturn(USER_1);
doThrow(AccessNotFoundException.class) doThrow(AccessNotFoundException.class)
.when(accessService) .when(accessService)
...@@ -1209,7 +1209,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest { ...@@ -1209,7 +1209,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
/* mock */ /* mock */
when(databaseService.findById(DATABASE_1_ID)) when(databaseService.findById(DATABASE_1_ID))
.thenReturn(DATABASE_1); .thenReturn(DATABASE_1);
when(userService.findByUsername(USER_2_USERNAME)) when(userService.findById(USER_2_ID))
.thenReturn(USER_2); .thenReturn(USER_2);
doThrow(AccessNotFoundException.class) doThrow(AccessNotFoundException.class)
.when(accessService) .when(accessService)
...@@ -1270,7 +1270,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest { ...@@ -1270,7 +1270,7 @@ public class IdentifierEndpointUnitTest extends AbstractUnitTest {
} }
when(identifierService.find(identifier.getId())) when(identifierService.find(identifier.getId()))
.thenReturn(identifier); .thenReturn(identifier);
when(userService.findByUsername(principal.getName())) when(userService.findById(user.getId()))
.thenReturn(user); .thenReturn(user);
when(databaseService.findById(databaseId)) when(databaseService.findById(databaseId))
.thenReturn(database); .thenReturn(database);
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment