mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-14 17:58:59 +00:00
Wrap part of the setup in a retrying transaction, to avoid intermittent build issues
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@30139 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
@@ -120,20 +120,27 @@ public class DiscussionRestApiTest extends BaseWebScriptTest
|
|||||||
siteInfo = this.siteService.createSite("DiscussionSitePreset", SITE_SHORT_NAME_DISCUSSION,
|
siteInfo = this.siteService.createSite("DiscussionSitePreset", SITE_SHORT_NAME_DISCUSSION,
|
||||||
"DiscussionSiteTitle", "DiscussionSiteDescription", SiteVisibility.PUBLIC);
|
"DiscussionSiteTitle", "DiscussionSiteDescription", SiteVisibility.PUBLIC);
|
||||||
}
|
}
|
||||||
|
final NodeRef siteNodeRef = siteInfo.getNodeRef();
|
||||||
|
|
||||||
// Create the forum
|
// Create the forum
|
||||||
String forumNodeName = "TestForum";
|
final String forumNodeName = "TestForum";
|
||||||
FORUM_NODE = nodeService.getChildByName(siteInfo.getNodeRef(), ContentModel.ASSOC_CONTAINS, forumNodeName);
|
FORUM_NODE = nodeService.getChildByName(siteInfo.getNodeRef(), ContentModel.ASSOC_CONTAINS, forumNodeName);
|
||||||
if (FORUM_NODE == null)
|
if (FORUM_NODE == null)
|
||||||
{
|
{
|
||||||
|
FORUM_NODE = transactionService.getRetryingTransactionHelper().doInTransaction(new RetryingTransactionCallback<NodeRef>() {
|
||||||
|
@Override
|
||||||
|
public NodeRef execute() throws Throwable {
|
||||||
Map<QName, Serializable> props = new HashMap<QName, Serializable>(5);
|
Map<QName, Serializable> props = new HashMap<QName, Serializable>(5);
|
||||||
props.put(ContentModel.PROP_NAME, forumNodeName);
|
props.put(ContentModel.PROP_NAME, forumNodeName);
|
||||||
props.put(ContentModel.PROP_TITLE, forumNodeName);
|
props.put(ContentModel.PROP_TITLE, forumNodeName);
|
||||||
FORUM_NODE = nodeService.createNode(
|
|
||||||
siteInfo.getNodeRef(), ContentModel.ASSOC_CONTAINS,
|
return nodeService.createNode(
|
||||||
QName.createQName(forumNodeName), ForumModel.TYPE_FORUM
|
siteNodeRef, ContentModel.ASSOC_CONTAINS,
|
||||||
|
QName.createQName(forumNodeName), ForumModel.TYPE_FORUM, props
|
||||||
).getChildRef();
|
).getChildRef();
|
||||||
}
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
// Create users
|
// Create users
|
||||||
createUser(USER_ONE, SiteModel.SITE_COLLABORATOR);
|
createUser(USER_ONE, SiteModel.SITE_COLLABORATOR);
|
||||||
|
Reference in New Issue
Block a user