Merged HEAD-BUG-FIX (5.0/Cloud) to HEAD (5.0/Cloud)

80701: Merged WAT1 (5.0/Cloud) to HEAD-BUG-FIX (5.0/Cloud)
      78593: First attempt at fixing FacetRestApiTest to run in bamboo.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@82999 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Will Abson
2014-09-03 16:31:22 +00:00
parent dcb3bc2934
commit cde57422fc

View File

@@ -77,6 +77,7 @@ public class FacetRestApiTest extends BaseWebScriptTest
personService = getServer().getApplicationContext().getBean("PersonService", PersonService.class); personService = getServer().getApplicationContext().getBean("PersonService", PersonService.class);
transactionHelper = getServer().getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class); transactionHelper = getServer().getApplicationContext().getBean("retryingTransactionHelper", RetryingTransactionHelper.class);
AuthenticationUtil.clearCurrentSecurityContext();
// Create test users. TODO Create these users @BeforeClass or at a testsuite scope. // Create test users. TODO Create these users @BeforeClass or at a testsuite scope.
AuthenticationUtil.runAsSystem(new RunAsWork<Void>() AuthenticationUtil.runAsSystem(new RunAsWork<Void>()
{ {
@@ -128,6 +129,7 @@ public class FacetRestApiTest extends BaseWebScriptTest
return null; return null;
} }
}); });
AuthenticationUtil.clearCurrentSecurityContext();
} }
public void testNonSearchAdminUserCannotCreateUpdateSolrFacets() throws Exception public void testNonSearchAdminUserCannotCreateUpdateSolrFacets() throws Exception