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

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

Browse Source 
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
This commit is contained in:
Alan Davis
2014-02-12 14:06:28 +00:00
parent 8b0d86a0b2
commit 63b4fe4fae
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/test-java/org/alfresco/repo/discussion/DiscussionServiceImplTest.java
View File

@@ -168,8 +168,8 @@ public class DiscussionServiceImplTest
assertNotNull(siteTopic.getNodeRef()); assertNotNull(siteTopic.getNodeRef());
assertNotNull(siteTopic.getSystemName()); assertNotNull(siteTopic.getSystemName());
NodeRef container = NODE_SERVICE.getPrimaryParent(siteTopic.getNodeRef()).getParentRef(); NodeRef container = PUBLIC_NODE_SERVICE.getPrimaryParent(siteTopic.getNodeRef()).getParentRef();
NodeRef site = NODE_SERVICE.getPrimaryParent(container).getParentRef(); NodeRef site = PUBLIC_NODE_SERVICE.getPrimaryParent(container).getParentRef();
assertEquals(DISCUSSION_SITE.getNodeRef(), site); assertEquals(DISCUSSION_SITE.getNodeRef(), site);
@@ -192,7 +192,7 @@ public class DiscussionServiceImplTest
assertNotNull(nodeTopic.getSystemName()); assertNotNull(nodeTopic.getSystemName());
// Check it went in the right place // 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 // Check the details
assertEquals("Node Title", nodeTopic.getTitle()); assertEquals("Node Title", nodeTopic.getTitle());
@@ -1686,7 +1686,7 @@ public class DiscussionServiceImplTest
String reply1Contents = "Reply Contents"; String reply1Contents = "Reply Contents";
reply = DISCUSSION_SERVICE.createReply(post, reply1Contents); reply = DISCUSSION_SERVICE.createReply(post, reply1Contents);
List<AssociationRef> assocs = NODE_SERVICE.getTargetAssocs(reply.getNodeRef(), ContentModel.ASSOC_REFERENCES); List<AssociationRef> assocs = PUBLIC_NODE_SERVICE.getTargetAssocs(reply.getNodeRef(), ContentModel.ASSOC_REFERENCES);
// check that reply has an association with original post // check that reply has an association with original post
assertNotNull(assocs); assertNotNull(assocs);
@@ -1697,10 +1697,10 @@ public class DiscussionServiceImplTest
DISCUSSION_SERVICE.deletePost(post); DISCUSSION_SERVICE.deletePost(post);
// check that post was deleted // 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 // 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); assertNotNull(assocs);
assertEquals(0, assocs.size()); assertEquals(0, assocs.size());
} }