From 6b09b095f00a77eb3787e2d0a6f5163fe98c9753 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kai=20B=C3=B6rnert?= Date: Thu, 17 Jan 2019 12:12:36 +0100 Subject: [PATCH] adjusted non Selenium Tests to userStore startup changes --- .../replication/test/AbstractSecurityReplicationTest.java | 4 ++++ .../SecurityReplicationLeadingToEmailReplicationTest.java | 2 ++ .../replication/test/SecurityServiceInitialLoadTest.java | 2 ++ .../com/sap/sse/security/jaxrs/api/SecurityResourceTest.java | 2 ++ .../src/com/sap/sse/security/test/LoginTest.java | 2 ++ .../src/com/sap/sse/security/test/PermissionCheckerTest.java | 2 ++ .../sap/sse/security/test/UserStoreWithPersistenceTest.java | 2 ++ 7 files changed, 16 insertions(+) diff --git a/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/AbstractSecurityReplicationTest.java b/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/AbstractSecurityReplicationTest.java index 87b2ef7ff88..896ebf84a56 100755 --- a/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/AbstractSecurityReplicationTest.java +++ b/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/AbstractSecurityReplicationTest.java @@ -35,6 +35,8 @@ public abstract class AbstractSecurityReplicationTest extends AbstractServerWith protected SecurityServiceImpl createNewMaster() throws MalformedURLException, IOException, InterruptedException, UserManagementException, MailException, UserGroupManagementException { final UserStoreImpl userStore = new UserStoreImpl("TestDefaultTenant"); + userStore.ensureDefaultRolesExist(); + userStore.loadAndMigrateUsers(); final AccessControlStore accessControlStore = new AccessControlStoreImpl(userStore); SecurityServiceImpl result = new SecurityServiceImpl(userStore, accessControlStore); return result; @@ -43,6 +45,8 @@ public abstract class AbstractSecurityReplicationTest extends AbstractServerWith @Override protected SecurityServiceImpl createNewReplica() throws UserGroupManagementException, UserManagementException, MalformedURLException, IOException, InterruptedException { final UserStoreImpl userStore = new UserStoreImpl("TestDefaultTenant"); + userStore.ensureDefaultRolesExist(); + userStore.loadAndMigrateUsers(); final AccessControlStore accessControlStore = new AccessControlStoreImpl(userStore); return new SecurityServiceImpl(userStore, accessControlStore); } diff --git a/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SecurityReplicationLeadingToEmailReplicationTest.java b/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SecurityReplicationLeadingToEmailReplicationTest.java index 9cfdb261073..c912288d09b 100644 --- a/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SecurityReplicationLeadingToEmailReplicationTest.java +++ b/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SecurityReplicationLeadingToEmailReplicationTest.java @@ -56,6 +56,8 @@ public class SecurityReplicationLeadingToEmailReplicationTest extends AbstractSe ServiceTracker trackerMock = mock(ServiceTracker.class); doReturn(masterMailService).when(trackerMock).getService(); final UserStoreImpl userStore = new UserStoreImpl("TestDefaultTenant"); + userStore.ensureDefaultRolesExist(); + userStore.loadAndMigrateUsers(); final AccessControlStore accessControlStore = new AccessControlStoreImpl(userStore); SecurityServiceImpl result = new SecurityServiceImpl(trackerMock, userStore, accessControlStore); return result; diff --git a/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SecurityServiceInitialLoadTest.java b/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SecurityServiceInitialLoadTest.java index 822db743aa6..35d997595e2 100755 --- a/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SecurityServiceInitialLoadTest.java +++ b/java/com.sap.sse.security.replication.test/src/com/sap/sse/security/replication/test/SecurityServiceInitialLoadTest.java @@ -35,6 +35,8 @@ public class SecurityServiceInitialLoadTest extends AbstractServerWithSingleServ throws MalformedURLException, IOException, InterruptedException, UserManagementException, MailException, UserGroupManagementException { final UserStore userStore = new UserStoreImpl(PersistenceFactory.INSTANCE.getDefaultDomainObjectFactory(), PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory(), "TestDefaultTenant"); + userStore.ensureDefaultRolesExist(); + userStore.loadAndMigrateUsers(); final AccessControlStore accessControlStore = new AccessControlStoreImpl(PersistenceFactory.INSTANCE.getDefaultDomainObjectFactory(), PersistenceFactory.INSTANCE.getDefaultMongoObjectFactory(), userStore); final SecurityServiceImpl newMaster = new SecurityServiceImpl(userStore, accessControlStore); diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java index fec5afd05b0..75f0d06da20 100755 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/jaxrs/api/SecurityResourceTest.java @@ -51,6 +51,8 @@ public class SecurityResourceTest { Thread.currentThread().setContextClassLoader(getClass().getClassLoader()); try { store = new UserStoreImpl("TestDefaultTenant"); + store.ensureDefaultRolesExist(); + store.loadAndMigrateUsers(); accessControlStore = new AccessControlStoreImpl(store); Activator.setTestStores(store, accessControlStore); service = new SecurityServiceImpl(/* mailServiceTracker */ null, diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java index 2511e3a5a5c..b65ebc56e0e 100755 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/LoginTest.java @@ -51,6 +51,8 @@ public class LoginTest { db.getCollection(CollectionNames.SETTINGS.name()).drop(); db.getCollection(CollectionNames.PREFERENCES.name()).drop(); userStore = new UserStoreImpl(DEFAULT_TENANT_NAME); + userStore.ensureDefaultRolesExist(); + userStore.loadAndMigrateUsers(); accessControlStore = new AccessControlStoreImpl(userStore); Activator.setTestStores(userStore, accessControlStore); diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PermissionCheckerTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PermissionCheckerTest.java index 85123f86fd6..83fd6f55249 100755 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PermissionCheckerTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/PermissionCheckerTest.java @@ -67,6 +67,8 @@ public class PermissionCheckerTest { public void setUp() throws UserGroupManagementException, UserManagementException { final String adminTenantName = "admin-tenant"; userStore = new UserStoreImpl(adminTenantName); + userStore.ensureDefaultRolesExist(); + userStore.loadAndMigrateUsers(); accessControlStore = new AccessControlStoreImpl(userStore); AbstractCompositeAuthorizingRealm.setTestStores(userStore, accessControlStore); realm = new UsernamePasswordRealm(); diff --git a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java index aad7152fa32..b749ca8130e 100644 --- a/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java +++ b/java/com.sap.sse.security.test/src/com/sap/sse/security/test/UserStoreWithPersistenceTest.java @@ -78,6 +78,8 @@ public class UserStoreWithPersistenceTest { private void newStore() { try { store = new UserStoreImpl("TestDefaultTenant"); + store.ensureDefaultRolesExist(); + store.loadAndMigrateUsers(); } catch (UserGroupManagementException | UserManagementException e) { throw new RuntimeException(e); }