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

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

Browse Source 
68537: Merged V4.2-BUG-FIX (4.2.3) to HEAD-BUG-FIX (4.3/Cloud)
      68315: Merged V4.1-BUG-FIX (4.1.9) to V4.2-BUG-FIX (4.2.3)
         68280: MNT-11348: Merged V4.1.1 (4.1.1.28) to V4.1-BUG-FIX (4.1.9)
            Try to fix build error - Mark did a refactor in Oct 2012 r42384+r42430


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@70419 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2014-05-16 16:36:53 +00:00
parent 6a0ead3dc1
commit da9ce86dfe
1 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java
View File

@@ -1309,9 +1309,9 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
String transferIdA1 = receiver.start("transferFromRepoA1", true, receiver.getVersion()); String transferIdA1 = receiver.start("transferFromRepoA1", true, receiver.getVersion());
TransferManifestNormalNode folder1A1 = createFolderNode(transferIdA1, folder1Name); TransferManifestNormalNode folder1A1 = createFolderNode(folder1Name);
TransferManifestNormalNode folder2A1 = createFolderNode(transferIdA1, folder2Name); TransferManifestNormalNode folder2A1 = createFolderNode(folder2Name);
TransferManifestNormalNode folder3A1 = createFolderNode(transferIdA1, folder3Name); TransferManifestNormalNode folder3A1 = createFolderNode(folder3Name);
moveNode(folder2A1, folder1A1); moveNode(folder2A1, folder1A1);
List<TransferManifestNode> nodesA1 = new ArrayList<TransferManifestNode>(); List<TransferManifestNode> nodesA1 = new ArrayList<TransferManifestNode>();
@@ -1352,8 +1352,8 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
String transferIdB1 = receiver.start("transferFromRepoB1", true, receiver.getVersion()); String transferIdB1 = receiver.start("transferFromRepoB1", true, receiver.getVersion());
TransferManifestNormalNode folder1B1 = createFolderNode(transferIdB1, folder1Name); TransferManifestNormalNode folder1B1 = createFolderNode(folder1Name);
TransferManifestNormalNode folder3B1 = createFolderNode(transferIdB1, folder3Name); TransferManifestNormalNode folder3B1 = createFolderNode(folder3Name);
moveNode(folder3B1, folder1B1); moveNode(folder3B1, folder1B1);
List<TransferManifestNode> nodesB1 = new ArrayList<TransferManifestNode>(); List<TransferManifestNode> nodesB1 = new ArrayList<TransferManifestNode>();
@@ -1665,12 +1665,12 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
return node; return node;
} }
private TransferManifestNormalNode createFolderNode(/*String transferId*/) throws Exception private TransferManifestNormalNode createFolderNode() throws Exception
{ {
return createFolderNode(transferId, null); return createFolderNode(null);
} }
private TransferManifestNormalNode createFolderNode(String transferId, String folderName) throws Exception private TransferManifestNormalNode createFolderNode(String folderName) throws Exception
{ {
TransferManifestNormalNode node = new TransferManifestNormalNode(); TransferManifestNormalNode node = new TransferManifestNormalNode();
String uuid = GUID.generate(); String uuid = GUID.generate();