From 4ade4ddb20b85f03e56cbcf5d113d8bb4de54c44 Mon Sep 17 00:00:00 2001 From: Andreea Nechifor Date: Thu, 5 Apr 2018 11:14:45 +0300 Subject: [PATCH] REPO-3280: refactor test authenticate as admit for "type":"cm:dictionaryModel" --- src/test/java/org/alfresco/opencmis/BaseCMISTest.java | 4 +++- .../org/alfresco/repo/dictionary/DictionaryModelTypeTest.java | 2 +- src/test/java/org/alfresco/repo/usage/UserUsageTest.java | 2 +- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/test/java/org/alfresco/opencmis/BaseCMISTest.java b/src/test/java/org/alfresco/opencmis/BaseCMISTest.java index e4264ed80e..ad881e6a65 100644 --- a/src/test/java/org/alfresco/opencmis/BaseCMISTest.java +++ b/src/test/java/org/alfresco/opencmis/BaseCMISTest.java @@ -36,6 +36,7 @@ import org.alfresco.opencmis.search.CMISQueryService; import org.alfresco.repo.dictionary.DictionaryDAO; import org.alfresco.repo.dictionary.NamespaceDAO; import org.alfresco.repo.security.authentication.AuthenticationComponent; +import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.MutableAuthenticationDao; import org.alfresco.repo.security.permissions.impl.ModelDAO; import org.alfresco.service.ServiceRegistry; @@ -156,7 +157,8 @@ public abstract class BaseCMISTest extends TestCase testTX = transactionService.getUserTransaction(); testTX.begin(); - this.authenticationComponent.setSystemUserAsCurrentUser(); + // Authenticate as the admin user + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); String storeName = "CMISTest-" + getStoreName() + "-" + (new Date().getTime()); this.storeRef = nodeService.createStore(StoreRef.PROTOCOL_WORKSPACE, storeName); diff --git a/src/test/java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java b/src/test/java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java index 25384b6944..821deb9638 100644 --- a/src/test/java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java +++ b/src/test/java/org/alfresco/repo/dictionary/DictionaryModelTypeTest.java @@ -394,7 +394,7 @@ public class DictionaryModelTypeTest extends BaseSpringTest this.actionService = (ActionService)this.applicationContext.getBean("actionService"); this.transactionService = (TransactionService)this.applicationContext.getBean("transactionComponent"); - // Authenticate as the system user + // Authenticate as the admin user AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); diff --git a/src/test/java/org/alfresco/repo/usage/UserUsageTest.java b/src/test/java/org/alfresco/repo/usage/UserUsageTest.java index 8779379918..7e682aa259 100644 --- a/src/test/java/org/alfresco/repo/usage/UserUsageTest.java +++ b/src/test/java/org/alfresco/repo/usage/UserUsageTest.java @@ -132,7 +132,7 @@ public class UserUsageTest extends TestCase testTX = transactionService.getUserTransaction(); testTX.begin(); - this.authenticationComponent.setSystemUserAsCurrentUser(); + AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); // get default store (as configured for content usage service) StoreRef storeRef = new StoreRef(StoreRef.PROTOCOL_WORKSPACE, "SpacesStore");