Temp workaround to fix the failing integration tests

This commit is contained in:
Tuna Aksoy
2016-10-05 23:58:05 +01:00
parent 8356cc1824
commit 1928e120da

View File

@@ -106,6 +106,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
return new String[]
{
"classpath:alfresco/application-context.xml",
"classpath:alfresco/web-scripts-application-context.xml",
"classpath:test-context.xml"
};
}
@@ -424,7 +425,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
public Object execute() throws Throwable
{
// Do the tear down
AuthenticationUtil.runAsSystem(() ->
AuthenticationUtil.runAsSystem(() ->
{
tearDownImpl();
return null;
@@ -603,20 +604,20 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
protected void setupTestUsers(final NodeRef filePlan)
{
AuthenticationUtil.runAs(() ->
AuthenticationUtil.runAs(() ->
{
retryingTransactionHelper.doInTransaction(new RetryingTransactionCallback<Object>()
{
@Override
public Object execute() throws Throwable
{
{
setupTestUsersImpl(filePlan);
return null;
return null;
}
});
return null;
},
},
AuthenticationUtil.getAdminUserName());
}
@@ -703,7 +704,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
{
// Do setup
setupMultiHierarchyTestDataImpl();
return null;
});
}
@@ -781,7 +782,7 @@ public abstract class BaseRMTestCase extends RetryingTransactionHelperTestCase
dmConsumer = GUID.generate();
dmConsumerNodeRef = createPerson(dmConsumer);
siteService.setMembership(collabSiteId, dmConsumer, SiteModel.SITE_CONSUMER);
dmContributor = GUID.generate();
dmContributorNodeRef = createPerson(dmContributor);
siteService.setMembership(collabSiteId, dmContributor, SiteModel.SITE_CONTRIBUTOR);