From da9ce86dfeb25d06811dcdbd1fe29e8e8f631b93 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Fri, 16 May 2014 16:36:53 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (4.3/Cloud) to HEAD (4.3/Cloud) 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 --- .../transfer/RepoTransferReceiverImplTest.java | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java b/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java index 92b2e6d7a0..180b2bfb29 100644 --- a/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java +++ b/source/test-java/org/alfresco/repo/transfer/RepoTransferReceiverImplTest.java @@ -1309,9 +1309,9 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest String transferIdA1 = receiver.start("transferFromRepoA1", true, receiver.getVersion()); - TransferManifestNormalNode folder1A1 = createFolderNode(transferIdA1, folder1Name); - TransferManifestNormalNode folder2A1 = createFolderNode(transferIdA1, folder2Name); - TransferManifestNormalNode folder3A1 = createFolderNode(transferIdA1, folder3Name); + TransferManifestNormalNode folder1A1 = createFolderNode(folder1Name); + TransferManifestNormalNode folder2A1 = createFolderNode(folder2Name); + TransferManifestNormalNode folder3A1 = createFolderNode(folder3Name); moveNode(folder2A1, folder1A1); List nodesA1 = new ArrayList(); @@ -1352,8 +1352,8 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest String transferIdB1 = receiver.start("transferFromRepoB1", true, receiver.getVersion()); - TransferManifestNormalNode folder1B1 = createFolderNode(transferIdB1, folder1Name); - TransferManifestNormalNode folder3B1 = createFolderNode(transferIdB1, folder3Name); + TransferManifestNormalNode folder1B1 = createFolderNode(folder1Name); + TransferManifestNormalNode folder3B1 = createFolderNode(folder3Name); moveNode(folder3B1, folder1B1); List nodesB1 = new ArrayList(); @@ -1665,12 +1665,12 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest 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(); String uuid = GUID.generate();