mirror of
https://github.com/eclipse-sailing-analytics/sailing-analytics.git
synced 2026-11-08 03:52:18 +00:00
Explicitly loading users (not loaded automatically anymore) in several
test cases to fix test failures
This commit is contained in:
1 parent
ddda0835d7
commit
b246f872ad
2 files changed
+10
-3
No files matched your search
@@ -87,7 +87,7 @@ public class LoginTest {
|
||||
RoleDefinition testRoleDefinition = userStore.createRoleDefinition(UUID.randomUUID(), "testRole", Collections.emptySet());
|
||||
final Role testRole = new Role(testRoleDefinition);
|
||||
userStore.addRoleForUser("me", testRole);
|
||||
UserStoreImpl store2 = new UserStoreImpl(DEFAULT_TENANT_NAME);
|
||||
UserStoreImpl store2 = createAndLoadUserStore();
|
||||
assertTrue(Util.contains(store2.getUserByName("me").getRoles(), testRole));
|
||||
}
|
||||
|
||||
@@ -98,7 +98,7 @@ public class LoginTest {
|
||||
RoleDefinition testRoleDefinition = userStore.createRoleDefinition(UUID.randomUUID(), "testRole", Collections.emptySet());
|
||||
final Role testRole = new Role(testRoleDefinition, userDefaultTenant, meUser);
|
||||
userStore.addRoleForUser("me", testRole);
|
||||
UserStoreImpl store2 = new UserStoreImpl(DEFAULT_TENANT_NAME);
|
||||
UserStoreImpl store2 = createAndLoadUserStore();
|
||||
assertTrue(Util.contains(store2.getUserByName("me").getRoles(), testRole));
|
||||
Role role2 = store2.getUserByName("me").getRoles().iterator().next();
|
||||
assertSame(store2.getUserGroupByName("me-tenant"), role2.getQualifiedForTenant());
|
||||
@@ -109,10 +109,16 @@ public class LoginTest {
|
||||
public void permissionsTest() throws UserManagementException, UserGroupManagementException {
|
||||
userStore.createUser("me", "me@sap.com", new UserGroupImpl(UUID.randomUUID(), "me-tenant"));
|
||||
userStore.addPermissionForUser("me", new WildcardPermission("a:b:c"));
|
||||
UserStoreImpl store2 = new UserStoreImpl(DEFAULT_TENANT_NAME);
|
||||
UserStoreImpl store2 = createAndLoadUserStore();
|
||||
User allUser = userStore.getUserByName(SecurityService.ALL_USERNAME);
|
||||
User user = store2.getUserByName("me");
|
||||
assertTrue(PermissionChecker.isPermitted(new WildcardPermission("a:b:c"), user, allUser, null, null));
|
||||
}
|
||||
|
||||
private UserStoreImpl createAndLoadUserStore() throws UserGroupManagementException, UserManagementException {
|
||||
final UserStoreImpl store = new UserStoreImpl(DEFAULT_TENANT_NAME);
|
||||
store.loadAndMigrateUsers();
|
||||
return store;
|
||||
}
|
||||
|
||||
}
|
||||
+1
@@ -80,6 +80,7 @@ public class UserStoreWithPersistenceTest {
|
||||
store = new UserStoreImpl("TestDefaultTenant");
|
||||
store.ensureDefaultRolesExist();
|
||||
store.ensureDefaultTenantExists();
|
||||
store.loadAndMigrateUsers();
|
||||
} catch (UserGroupManagementException | UserManagementException e) {
|
||||
throw new RuntimeException(e);
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user