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 V3.2 to HEAD

Browse Source 
18021: AVM - fix AVMNodeService.getChildByName
    18065: (record-only) 
    18254: WCM/AVM - ETHREEOH-2057 (Submitting WCM Content through WF JSF Error - due to AVM Sync issue)
    18442: ETHREEOH-4004 - rework test
    18467: ETHTREEOH-4004 - test fix (avoid conversion, replace UTF-16 with UTF-8)
    18835: (record-only) Merged V3.1 to V3.2 (record-only)
        18783: (record-only) MT: ensure group (EMAIL_CONTRIBUTORS) bootstraps tenant admin user (when creating tenant) - fixed by r14588
    19146: (record-only) Undo previous/unwanted commit (version.properties)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@19288 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2010-03-15 13:31:38 +00:00
parent a974734210
commit deb5fc9c08
4 changed files with 99 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

80
source/java/org/alfresco/repo/avm/AVMServiceLocalTest.java
View File

@@ -576,6 +576,86 @@ public class AVMServiceLocalTest extends TestCase
}
}
public void testSimpleUpdateLD6() throws Exception
{
try
{
logger.debug("created 2 stores: main, layer");
fService.createDirectory("main:/", "a");
fService.createDirectory("main:/a", "b");
logger.debug("created dirs: main:/a, main:/a/b");
fService.createLayeredDirectory("main:/", "layer:/", "layer");
logger.debug("created layered dir: layer:/layer -> main:/");
List<AVMDifference> diffs = fSyncService.compare(-1, "layer:/layer", -1, "main:/", null);
assertEquals(0, diffs.size());
fService.createDirectory("layer:/layer/a", "xyz");
fService.createFile("layer:/layer/a/xyz", "index.html").close();
logger.debug("created: layer:/layer/a/xyz, layer:/layer/a/xyz/index.html");
diffs = fSyncService.compare(-1, "layer:/layer", -1, "main:/", null);
assertEquals(1, diffs.size());
assertEquals("[layer:/layer/a/xyz[-1] > main:/a/xyz[-1]]", diffs.toString());
fService.createStore("main--workflow1");
logger.debug("created store: main--workflow1");
fService.createLayeredDirectory("main:/a", "main--workflow1:/", "a");
logger.debug("created layered dir: main--workflow1:/a -> main:/a");
diffs = fSyncService.compare(-1, "main--workflow1:/a", -1, "main:/a", null);
assertEquals(0, diffs.size());
diffs = new ArrayList<AVMDifference>(1);
diffs.add(new AVMDifference(-1, "layer:/layer/a/xyz/index.html", -1, "main--workflow1:/a/xyz/index.html", AVMDifference.NEWER));
diffs.add(new AVMDifference(-1, "layer:/layer/a/xyz", -1, "main--workflow1:/a/xyz", AVMDifference.NEWER));
// ETHREEOH-2057
fSyncService.update(diffs, null, false, false, false, false, "one", "one");
logger.debug("updated: added: main--workflow1:/a/xyz, main--workflow1:/a/xyz/index.html");
diffs = fSyncService.compare(-1, "layer:/layer/a", -1, "main:/a", null);
assertEquals(1, diffs.size());
assertEquals("[layer:/layer/a/xyz[-1] > main:/a/xyz[-1]]", diffs.toString());
diffs = fSyncService.compare(-1, "main--workflow1:/a", -1, "main:/a", null);
assertEquals(1, diffs.size());
assertEquals("[main--workflow1:/a/xyz[-1] > main:/a/xyz[-1]]", diffs.toString());
fSyncService.update(diffs, null, false, false, true, true, "two", "two");
fSyncService.flatten("main--workflow1:/a", "main:/a");
logger.debug("updated & flattened");
diffs = fSyncService.compare(-1, "main--workflow1:/a", -1, "main:/a", null);
assertEquals(0, diffs.size());
diffs = fSyncService.compare(-1, "main--workflow1:/a", -1, "layer:/layer/a", null);
assertEquals(0, diffs.size());
recursiveList("main");
recursiveList("layer");
}
catch (Exception e)
{
e.printStackTrace(System.err);
throw e;
}
finally
{
if (fService.getStore("main--workflow1") != null) { fService.purgeStore("main--workflow1"); }
}
}
public void testDeleteLD1() throws Exception
{
try