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

Added getCommonAncestor to AVMService + test. Added to console test app.

Browse Source 
Changed createSnapshot flavors to return version ids just created instead of void.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/WCM-DEV2/root@3270 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Britt Park
2006-06-30 18:14:06 +00:00
parent 106273bde8
commit d859972f4c
12 changed files with 191 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
source/java/org/alfresco/repo/avm/AVMServiceTest.java
View File

@@ -1851,13 +1851,13 @@ public class AVMServiceTest extends AVMServiceTestBase
loader.setAvmService(fService);
loader.recursiveLoad("source/java/org/alfresco/repo/avm", "main:/");
times.add(System.currentTimeMillis());
fService.createSnapshot("main");
assertEquals(1, fService.createSnapshot("main"));
loader.recursiveLoad("source/java/org/alfresco/repo/action", "main:/");
times.add(System.currentTimeMillis());
fService.createSnapshot("main");
assertEquals(2, fService.createSnapshot("main"));
loader.recursiveLoad("source/java/org/alfresco/repo/audit", "main:/");
times.add(System.currentTimeMillis());
fService.createSnapshot("main");
assertEquals(3, fService.createSnapshot("main"));
assertEquals(1, fService.getRepositoryVersions("main", null, new Date(times.get(0))).size());
assertEquals(3, fService.getRepositoryVersions("main", new Date(times.get(0)), null).size());
assertEquals(2, fService.getRepositoryVersions("main", new Date(times.get(1)),
@@ -1948,4 +1948,30 @@ public class AVMServiceTest extends AVMServiceTestBase
fail();
}
}
/**
* Test common ancestor.
*/
public void testCommonAncestor()
{
try
{
setupBasicTree();
fService.createBranch(-1, "main:/a", "main:/", "branch");
fService.createSnapshot("main");
AVMNodeDescriptor ancestor = fService.lookup(-1, "main:/a/b/c/foo");
fService.getFileOutputStream("main:/a/b/c/foo").close();
fService.getFileOutputStream("main:/branch/b/c/foo").close();
fService.createSnapshot("main");
AVMNodeDescriptor main = fService.lookup(-1, "main:/a/b/c/foo");
AVMNodeDescriptor branch = fService.lookup(-1, "main:/branch/b/c/foo");
AVMNodeDescriptor ca = fService.getCommonAncestor(main, branch);
assertEquals(ancestor, ca);
}
catch (Exception e)
{
e.printStackTrace(System.err);
fail();
}
}
}