inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-07-31 17:39:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Temp workaround to fix the failing integration tests

Browse Source
This commit is contained in:
Tuna Aksoy
2016-10-05 23:58:05 +01:00
parent 8356cc1824
commit 1928e120da
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
rm-community/rm-community-repo/test/java/org/alfresco/module/org_alfresco_module_rm/test/util/BaseRMTestCase.java
View File

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