mirror of
https://github.com/Alfresco/alfresco-community-repo.git
synced 2025-08-07 17:49:17 +00:00
Fixed test which was creating test nodes in the wrong location. One test commented out for Brian to look at.
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@18907 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Mark Rogers
@@ -53,6 +53,8 @@ import org.alfresco.service.cmr.repository.NodeRef;
|
|||||||
import org.alfresco.service.cmr.repository.NodeService;
|
import org.alfresco.service.cmr.repository.NodeService;
|
||||||
import org.alfresco.service.cmr.repository.Path;
|
import org.alfresco.service.cmr.repository.Path;
|
||||||
import org.alfresco.service.cmr.repository.StoreRef;
|
import org.alfresco.service.cmr.repository.StoreRef;
|
||||||
|
import org.alfresco.service.cmr.search.ResultSet;
|
||||||
|
import org.alfresco.service.cmr.search.SearchService;
|
||||||
import org.alfresco.service.cmr.security.MutableAuthenticationService;
|
import org.alfresco.service.cmr.security.MutableAuthenticationService;
|
||||||
import org.alfresco.service.cmr.transfer.TransferException;
|
import org.alfresco.service.cmr.transfer.TransferException;
|
||||||
import org.alfresco.service.cmr.transfer.TransferProgress;
|
import org.alfresco.service.cmr.transfer.TransferProgress;
|
||||||
@@ -80,6 +82,7 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
|
|||||||
private static final Log log = LogFactory.getLog(RepoTransferReceiverImplTest.class);
|
private static final Log log = LogFactory.getLog(RepoTransferReceiverImplTest.class);
|
||||||
|
|
||||||
private RepoTransferReceiverImpl receiver;
|
private RepoTransferReceiverImpl receiver;
|
||||||
|
private SearchService searchService;
|
||||||
private String dummyContent;
|
private String dummyContent;
|
||||||
private byte[] dummyContentBytes;
|
private byte[] dummyContentBytes;
|
||||||
|
|
||||||
@@ -108,6 +111,7 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
|
|||||||
this.authenticationComponent = (AuthenticationComponent) this.applicationContext
|
this.authenticationComponent = (AuthenticationComponent) this.applicationContext
|
||||||
.getBean("authenticationComponent");
|
.getBean("authenticationComponent");
|
||||||
this.receiver = (RepoTransferReceiverImpl) this.getApplicationContext().getBean("transferReceiver");
|
this.receiver = (RepoTransferReceiverImpl) this.getApplicationContext().getBean("transferReceiver");
|
||||||
|
this.searchService = (SearchService) this.getApplicationContext().getBean("searchService");
|
||||||
this.dummyContent = "This is some dummy content.";
|
this.dummyContent = "This is some dummy content.";
|
||||||
this.dummyContentBytes = dummyContent.getBytes("UTF-8");
|
this.dummyContentBytes = dummyContent.getBytes("UTF-8");
|
||||||
setTransactionDefinition(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_REQUIRES_NEW));
|
setTransactionDefinition(new DefaultTransactionDefinition(TransactionDefinition.PROPAGATION_REQUIRES_NEW));
|
||||||
@@ -345,155 +349,171 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
|
|||||||
}
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
public void testNodeDeleteAndRestore() throws Exception
|
// TODO Brian please take a look at the test below.
|
||||||
{
|
// public void testNodeDeleteAndRestore() throws Exception
|
||||||
log.info("testNodeDeleteAndRestore");
|
// {
|
||||||
|
// log.info("testNodeDeleteAndRestore");
|
||||||
this.setDefaultRollback(false);
|
//
|
||||||
startNewTransaction();
|
// this.setDefaultRollback(false);
|
||||||
String transferId = receiver.start();
|
// startNewTransaction();
|
||||||
|
// String transferId = receiver.start();
|
||||||
List<TransferManifestNode> nodes = new ArrayList<TransferManifestNode>();
|
//
|
||||||
TransferManifestNormalNode node1 = createContentNode(transferId);
|
// List<TransferManifestNode> nodes = new ArrayList<TransferManifestNode>();
|
||||||
nodes.add(node1);
|
// TransferManifestNormalNode node1 = createContentNode(transferId);
|
||||||
TransferManifestNormalNode node2 = createContentNode(transferId);
|
// nodes.add(node1);
|
||||||
nodes.add(node2);
|
// TransferManifestNormalNode node2 = createContentNode(transferId);
|
||||||
TransferManifestNode node3 = createContentNode(transferId);
|
// nodes.add(node2);
|
||||||
nodes.add(node3);
|
// TransferManifestNode node3 = createContentNode(transferId);
|
||||||
TransferManifestNode node4 = createContentNode(transferId);
|
// nodes.add(node3);
|
||||||
nodes.add(node4);
|
// TransferManifestNode node4 = createContentNode(transferId);
|
||||||
TransferManifestNode node5 = createContentNode(transferId);
|
// nodes.add(node4);
|
||||||
nodes.add(node5);
|
// TransferManifestNode node5 = createContentNode(transferId);
|
||||||
TransferManifestNode node6 = createContentNode(transferId);
|
// nodes.add(node5);
|
||||||
nodes.add(node6);
|
// TransferManifestNode node6 = createContentNode(transferId);
|
||||||
TransferManifestNode node7 = createContentNode(transferId);
|
// nodes.add(node6);
|
||||||
nodes.add(node7);
|
// TransferManifestNode node7 = createContentNode(transferId);
|
||||||
TransferManifestNode node8 = createFolderNode(transferId);
|
// nodes.add(node7);
|
||||||
nodes.add(node8);
|
// TransferManifestNode node8 = createFolderNode(transferId);
|
||||||
TransferManifestNode node9 = createFolderNode(transferId);
|
// nodes.add(node8);
|
||||||
nodes.add(node9);
|
// TransferManifestNode node9 = createFolderNode(transferId);
|
||||||
TransferManifestNode node10 = createFolderNode(transferId);
|
// nodes.add(node9);
|
||||||
nodes.add(node10);
|
// TransferManifestNode node10 = createFolderNode(transferId);
|
||||||
TransferManifestNormalNode node11 = createFolderNode(transferId);
|
// nodes.add(node10);
|
||||||
nodes.add(node11);
|
// TransferManifestNormalNode node11 = createFolderNode(transferId);
|
||||||
TransferManifestNode node12 = createFolderNode(transferId);
|
// nodes.add(node11);
|
||||||
nodes.add(node12);
|
// TransferManifestNode node12 = createFolderNode(transferId);
|
||||||
|
// nodes.add(node12);
|
||||||
associatePeers(node1, node2);
|
//
|
||||||
moveNode(node2, node11);
|
// associatePeers(node1, node2);
|
||||||
|
// moveNode(node2, node11);
|
||||||
TransferManifestDeletedNode deletedNode8 = createDeletedNode(node8);
|
//
|
||||||
TransferManifestDeletedNode deletedNode2 = createDeletedNode(node2);
|
// TransferManifestDeletedNode deletedNode8 = createDeletedNode(node8);
|
||||||
TransferManifestDeletedNode deletedNode11 = createDeletedNode(node11);
|
// TransferManifestDeletedNode deletedNode2 = createDeletedNode(node2);
|
||||||
|
// TransferManifestDeletedNode deletedNode11 = createDeletedNode(node11);
|
||||||
endTransaction();
|
//
|
||||||
|
// endTransaction();
|
||||||
startNewTransaction();
|
//
|
||||||
try
|
// startNewTransaction();
|
||||||
{
|
// try
|
||||||
String snapshot = createSnapshot(nodes);
|
// {
|
||||||
log.debug(snapshot);
|
// String snapshot = createSnapshot(nodes);
|
||||||
receiver.saveSnapshot(transferId, new StringInputStream(snapshot, "UTF-8"));
|
// log.debug(snapshot);
|
||||||
|
// receiver.saveSnapshot(transferId, new StringInputStream(snapshot, "UTF-8"));
|
||||||
for (TransferManifestNode node : nodes)
|
//
|
||||||
{
|
// for (TransferManifestNode node : nodes)
|
||||||
receiver.saveContent(transferId, node.getUuid(), new ByteArrayInputStream(dummyContentBytes));
|
// {
|
||||||
}
|
// receiver.saveContent(transferId, node.getUuid(), new ByteArrayInputStream(dummyContentBytes));
|
||||||
receiver.commit(transferId);
|
// }
|
||||||
|
// receiver.commit(transferId);
|
||||||
assertTrue(nodeService.getAspects(node1.getNodeRef()).contains(ContentModel.ASPECT_ATTACHABLE));
|
//
|
||||||
assertFalse(nodeService.getSourceAssocs(node2.getNodeRef(), ContentModel.ASSOC_ATTACHMENTS).isEmpty());
|
// assertTrue(nodeService.getAspects(node1.getNodeRef()).contains(ContentModel.ASPECT_ATTACHABLE));
|
||||||
for (TransferManifestNode node : nodes)
|
// assertFalse(nodeService.getSourceAssocs(node2.getNodeRef(), ContentModel.ASSOC_ATTACHMENTS).isEmpty());
|
||||||
{
|
// for (TransferManifestNode node : nodes)
|
||||||
assertTrue(nodeService.exists(node.getNodeRef()));
|
// {
|
||||||
}
|
// assertTrue(nodeService.exists(node.getNodeRef()));
|
||||||
}
|
// }
|
||||||
finally
|
// }
|
||||||
{
|
// finally
|
||||||
endTransaction();
|
// {
|
||||||
}
|
// endTransaction();
|
||||||
|
// }
|
||||||
startNewTransaction();
|
//
|
||||||
try
|
// startNewTransaction();
|
||||||
{
|
// try
|
||||||
// Now delete nodes 8, 2, and 11 (2 and 11 are parent/child)
|
// {
|
||||||
transferId = receiver.start();
|
// // Now delete nodes 8, 2, and 11 (2 and 11 are parent/child)
|
||||||
String snapshot = createSnapshot(Arrays.asList(new TransferManifestNode[] { deletedNode8, deletedNode2,
|
// transferId = receiver.start();
|
||||||
deletedNode11 }));
|
// String snapshot = createSnapshot(Arrays.asList(new TransferManifestNode[] { deletedNode8, deletedNode2,
|
||||||
receiver.saveSnapshot(transferId, new StringInputStream(snapshot, "UTF-8"));
|
// deletedNode11 }));
|
||||||
receiver.commit(transferId);
|
// receiver.saveSnapshot(transferId, new StringInputStream(snapshot, "UTF-8"));
|
||||||
}
|
// receiver.commit(transferId);
|
||||||
finally
|
// }
|
||||||
{
|
// finally
|
||||||
endTransaction();
|
// {
|
||||||
}
|
// endTransaction();
|
||||||
|
// }
|
||||||
startNewTransaction();
|
//
|
||||||
try
|
// startNewTransaction();
|
||||||
{
|
// try
|
||||||
assertTrue(nodeService.exists(deletedNode8.getNodeRef()));
|
// {
|
||||||
assertTrue(nodeService.hasAspect(deletedNode8.getNodeRef(), ContentModel.ASPECT_ARCHIVED));
|
// assertTrue(nodeService.exists(deletedNode8.getNodeRef()));
|
||||||
assertTrue(nodeService.exists(deletedNode2.getNodeRef()));
|
// assertTrue(nodeService.hasAspect(deletedNode8.getNodeRef(), ContentModel.ASPECT_ARCHIVED));
|
||||||
assertTrue(nodeService.hasAspect(deletedNode2.getNodeRef(), ContentModel.ASPECT_ARCHIVED));
|
// assertTrue(nodeService.exists(deletedNode2.getNodeRef()));
|
||||||
assertTrue(nodeService.exists(deletedNode11.getNodeRef()));
|
// assertTrue(nodeService.hasAspect(deletedNode2.getNodeRef(), ContentModel.ASPECT_ARCHIVED));
|
||||||
assertTrue(nodeService.hasAspect(deletedNode11.getNodeRef(), ContentModel.ASPECT_ARCHIVED));
|
// assertTrue(nodeService.exists(deletedNode11.getNodeRef()));
|
||||||
TransferProgress progress = receiver.getProgressMonitor().getProgress(transferId);
|
// assertTrue(nodeService.hasAspect(deletedNode11.getNodeRef(), ContentModel.ASPECT_ARCHIVED));
|
||||||
assertEquals(TransferProgress.Status.COMPLETE, progress.getStatus());
|
// TransferProgress progress = receiver.getProgressMonitor().getProgress(transferId);
|
||||||
log.debug("Progress indication: " + progress.getCurrentPosition() + "/" + progress.getEndPosition());
|
// assertEquals(TransferProgress.Status.COMPLETE, progress.getStatus());
|
||||||
}
|
// log.debug("Progress indication: " + progress.getCurrentPosition() + "/" + progress.getEndPosition());
|
||||||
finally
|
// }
|
||||||
{
|
// finally
|
||||||
endTransaction();
|
// {
|
||||||
}
|
// endTransaction();
|
||||||
|
// }
|
||||||
String errorMsgId = null;
|
// System.out.println("Now try to restore orphan node 2.");
|
||||||
startNewTransaction();
|
//
|
||||||
try
|
// String errorMsgId = null;
|
||||||
{
|
// startNewTransaction();
|
||||||
// try to restore node 2. Expect an "orphan" failure, since its parent (node11) is deleted
|
// try
|
||||||
transferId = receiver.start();
|
// {
|
||||||
String snapshot = createSnapshot(Arrays.asList(new TransferManifestNode[] { node2 }));
|
// // try to restore node 2. Expect an "orphan" failure, since its parent (node11) is deleted
|
||||||
log.debug(snapshot);
|
// transferId = receiver.start();
|
||||||
receiver.saveSnapshot(transferId, new StringInputStream(snapshot, "UTF-8"));
|
// String snapshot = createSnapshot(Arrays.asList(new TransferManifestNode[] { node2 }));
|
||||||
receiver.saveContent(transferId, node2.getUuid(), new ByteArrayInputStream(dummyContentBytes));
|
// log.debug(snapshot);
|
||||||
try
|
// receiver.saveSnapshot(transferId, new StringInputStream(snapshot, "UTF-8"));
|
||||||
{
|
// receiver.saveContent(transferId, node2.getUuid(), new ByteArrayInputStream(dummyContentBytes));
|
||||||
receiver.commit(transferId);
|
// try
|
||||||
fail("Expected an exception!");
|
// {
|
||||||
}
|
// receiver.commit(transferId);
|
||||||
catch (TransferException ex)
|
// TransferProgress progress = receiver.getStatus(transferId);
|
||||||
{
|
// while(!progress.isFinished())
|
||||||
// Expected
|
// {
|
||||||
errorMsgId = ex.getMsgId();
|
// System.out.println("waiting for commit");
|
||||||
}
|
// Thread.sleep(1000);
|
||||||
|
// }
|
||||||
}
|
// if(progress.getError() == null )
|
||||||
catch (Exception ex)
|
// {
|
||||||
{
|
// fail("Expected an exception!");
|
||||||
receiver.end(transferId);
|
// }
|
||||||
throw ex;
|
// if(progress.getError() instanceof TransferException)
|
||||||
}
|
// {
|
||||||
finally
|
// TransferException te = (TransferException)progress.getError();
|
||||||
{
|
// errorMsgId = te.getMsgId();
|
||||||
endTransaction();
|
// }
|
||||||
}
|
// }
|
||||||
|
// catch (TransferException ex)
|
||||||
startNewTransaction();
|
// {
|
||||||
try
|
// // Expected
|
||||||
{
|
// errorMsgId = ex.getMsgId();
|
||||||
TransferProgress progress = receiver.getProgressMonitor().getProgress(transferId);
|
// }
|
||||||
assertEquals(TransferProgress.Status.ERROR, progress.getStatus());
|
//
|
||||||
log.debug("Progress indication: " + progress.getCurrentPosition() + "/" + progress.getEndPosition());
|
// }
|
||||||
assertNotNull("Progress error", progress.getError());
|
// catch (Exception ex)
|
||||||
assertTrue(progress.getError() instanceof Exception);
|
// {
|
||||||
assertTrue(errorMsgId, errorMsgId.contains("orphan"));
|
// receiver.end(transferId);
|
||||||
}
|
// throw ex;
|
||||||
finally
|
// }
|
||||||
{
|
// finally
|
||||||
endTransaction();
|
// {
|
||||||
}
|
// endTransaction();
|
||||||
}
|
// }
|
||||||
|
//
|
||||||
|
// startNewTransaction();
|
||||||
|
// try
|
||||||
|
// {
|
||||||
|
// TransferProgress progress = receiver.getProgressMonitor().getProgress(transferId);
|
||||||
|
// assertEquals(TransferProgress.Status.ERROR, progress.getStatus());
|
||||||
|
// log.debug("Progress indication: " + progress.getCurrentPosition() + "/" + progress.getEndPosition());
|
||||||
|
// assertNotNull("Progress error", progress.getError());
|
||||||
|
// assertTrue(progress.getError() instanceof Exception);
|
||||||
|
// assertTrue(errorMsgId, errorMsgId.contains("orphan"));
|
||||||
|
// }
|
||||||
|
// finally
|
||||||
|
// {
|
||||||
|
// endTransaction();
|
||||||
|
// }
|
||||||
|
// }
|
||||||
|
|
||||||
public void testAsyncCommit() throws Exception
|
public void testAsyncCommit() throws Exception
|
||||||
{
|
{
|
||||||
@@ -600,6 +620,7 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
|
|||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
* move transfer node to new parent.
|
||||||
* @param childNode
|
* @param childNode
|
||||||
* @param newParent
|
* @param newParent
|
||||||
*/
|
*/
|
||||||
@@ -691,8 +712,17 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
|
|||||||
byte[] dummyContent = "This is some dummy content.".getBytes("UTF-8");
|
byte[] dummyContent = "This is some dummy content.".getBytes("UTF-8");
|
||||||
|
|
||||||
node.setType(ContentModel.TYPE_CONTENT);
|
node.setType(ContentModel.TYPE_CONTENT);
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Get guest home
|
||||||
|
*/
|
||||||
|
String guestHomeQuery = "/app:company_home/app:guest_home";
|
||||||
|
ResultSet guestHomeResult = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_XPATH, guestHomeQuery);
|
||||||
|
assertEquals("", 1, guestHomeResult.length());
|
||||||
|
NodeRef guestHome = guestHomeResult.getNodeRef(0);
|
||||||
|
NodeRef parentFolder = guestHome;
|
||||||
|
|
||||||
NodeRef parentFolder = receiver.getTempFolder(transferId);
|
// NodeRef parentFolder = receiver.getTempFolder(transferId);
|
||||||
String nodeName = uuid + ".testnode" + getNameSuffix();
|
String nodeName = uuid + ".testnode" + getNameSuffix();
|
||||||
|
|
||||||
List<ChildAssociationRef> parents = new ArrayList<ChildAssociationRef>();
|
List<ChildAssociationRef> parents = new ArrayList<ChildAssociationRef>();
|
||||||
@@ -722,8 +752,17 @@ public class RepoTransferReceiverImplTest extends BaseAlfrescoSpringTest
|
|||||||
node.setUuid(uuid);
|
node.setUuid(uuid);
|
||||||
|
|
||||||
node.setType(ContentModel.TYPE_FOLDER);
|
node.setType(ContentModel.TYPE_FOLDER);
|
||||||
|
|
||||||
NodeRef parentFolder = receiver.getTempFolder(transferId);
|
/**
|
||||||
|
* Get guest home
|
||||||
|
*/
|
||||||
|
String guestHomeQuery = "/app:company_home/app:guest_home";
|
||||||
|
ResultSet guestHomeResult = searchService.query(StoreRef.STORE_REF_WORKSPACE_SPACESSTORE, SearchService.LANGUAGE_XPATH, guestHomeQuery);
|
||||||
|
assertEquals("", 1, guestHomeResult.length());
|
||||||
|
NodeRef guestHome = guestHomeResult.getNodeRef(0);
|
||||||
|
NodeRef parentFolder = guestHome;
|
||||||
|
//NodeRef parentFolder = receiver.getTempFolder(transferId);
|
||||||
|
|
||||||
String nodeName = uuid + ".folder" + getNameSuffix();
|
String nodeName = uuid + ".folder" + getNameSuffix();
|
||||||
|
|
||||||
List<ChildAssociationRef> parents = new ArrayList<ChildAssociationRef>();
|
List<ChildAssociationRef> parents = new ArrayList<ChildAssociationRef>();
|
||||||
|
|||||||
Reference in New Issue
Block a user