From 63b4fe4fae3f0b46b3239710721f16118dd459ac Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 12 Feb 2014 14:06:28 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 60591: Merged V4.2-BUG-FIX (4.2.2) to HEAD-BUG-FIX (Cloud/4.3) 60358: Merged DEV to V4.2-BUG-FIX (4.2.2) 58064: Fixed use of 'nodeService' vs 'NodeService' in DiscussionServiceImplTest (MNT-9806) 58069: Fixed use of CheckOutCheckInService in StoreSelectorAspectContentStoreTest (MNT-9806) - Fixed formatting as well 58071: Fixed transaction use around various services in SyncChangeMonitorTest (MNT-9806) 58102: Remove unused code and other warnings from SyncChangeMonitorTest 58103: Fixed transaction use around various services in SyncTrackerComponentTest (MNT-9806) git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@62321 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../repo/discussion/DiscussionServiceImplTest.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/source/test-java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java b/source/test-java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java index e61b5cc78d..745f3a47ad 100644 --- a/source/test-java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java +++ b/source/test-java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java @@ -168,8 +168,8 @@ public class DiscussionServiceImplTest assertNotNull(siteTopic.getNodeRef()); assertNotNull(siteTopic.getSystemName()); - NodeRef container = NODE_SERVICE.getPrimaryParent(siteTopic.getNodeRef()).getParentRef(); - NodeRef site = NODE_SERVICE.getPrimaryParent(container).getParentRef(); + NodeRef container = PUBLIC_NODE_SERVICE.getPrimaryParent(siteTopic.getNodeRef()).getParentRef(); + NodeRef site = PUBLIC_NODE_SERVICE.getPrimaryParent(container).getParentRef(); assertEquals(DISCUSSION_SITE.getNodeRef(), site); @@ -192,7 +192,7 @@ public class DiscussionServiceImplTest assertNotNull(nodeTopic.getSystemName()); // Check it went in the right place - assertEquals(FORUM_NODE, NODE_SERVICE.getPrimaryParent(nodeTopic.getNodeRef()).getParentRef()); + assertEquals(FORUM_NODE, PUBLIC_NODE_SERVICE.getPrimaryParent(nodeTopic.getNodeRef()).getParentRef()); // Check the details assertEquals("Node Title", nodeTopic.getTitle()); @@ -1686,7 +1686,7 @@ public class DiscussionServiceImplTest String reply1Contents = "Reply Contents"; reply = DISCUSSION_SERVICE.createReply(post, reply1Contents); - List assocs = NODE_SERVICE.getTargetAssocs(reply.getNodeRef(), ContentModel.ASSOC_REFERENCES); + List assocs = PUBLIC_NODE_SERVICE.getTargetAssocs(reply.getNodeRef(), ContentModel.ASSOC_REFERENCES); // check that reply has an association with original post assertNotNull(assocs); @@ -1697,10 +1697,10 @@ public class DiscussionServiceImplTest DISCUSSION_SERVICE.deletePost(post); // check that post was deleted - assertFalse(NODE_SERVICE.exists(post.getNodeRef())); + assertFalse(PUBLIC_NODE_SERVICE.exists(post.getNodeRef())); // check that associations to the original post was also deleted - assocs = NODE_SERVICE.getTargetAssocs(reply.getNodeRef(), ContentModel.ASSOC_REFERENCES); + assocs = PUBLIC_NODE_SERVICE.getTargetAssocs(reply.getNodeRef(), ContentModel.ASSOC_REFERENCES); assertNotNull(assocs); assertEquals(0, assocs.size()); }