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 V4.0-BUG-FIX to HEAD

Browse Source 
34397: ALF-13064: Updated document lib WebScript to protect against access errors dealing with permissions of locked documents
   34406: ALF-13069: Fix flash upload file selection page title corruption
   34434: ALF-13066: Fix for intermittent failure (testConcurrentLinkToDeletedNode)
   34439: Merged BRANCHES/V4.0 to BRANCHES/DEV/V4.0-BUG-FIX
      34438: Fix to issue where new Hazelcast based Share clustering was broken by a recent SpringSurf change to ServletRequestContextFactory bean config in libs rev 1028 or higher.
   34443: ALF-11433: IE8 specific fix to ensure that document-picker panel is hidden before documents selected event is fired and for TinyMCE to set focus on editor so that content is added correctly
   34457: Merged V3.4-BUG-FIX to V4.0-BUG-FIX
      34354: ALF-12995 - IMAP: File is modified when received as a message in IMAP account
      34444: ALF-12169: Guest/guest/gUest username is now normalized to corresponding person's user ID during authentication, solving problems with synchronization with Active Directory's Guest account
      34454: Java 1.6.0_31 for 3.4.9 and 4.0.2
   34458: Merged V3.4-BUG-FIX to V4.0-BUG-FIX (RECORD ONLY)
      34392: ALF-13146: Merged V4.0-BUG-FIX to V3.4-BUG-FIX
         33813: ALF-12736: Stack specific: 'Getting updates failed' notification appears when non-admin user creats DWS
            - From Pavel: "Some users from ldap don't have lastName. That is why NPE occurs."
   34459: Merged V4.0 to V4.0-BUG-FIX
      34391: Merged DEV to V4.0 (with corrections)
         34390: ALF-13013 : It's impossible to change Activities Feed properties on Websphere
            Now the Schedule subtree in JMX is set to the correct MBeanServer.
      34407: Merged HEAD-2011_12_06 to V4.0 (4.0.1)
         Updated copyrights 
         32813: ALF-4098: WCM: Assets in in-flight worflow are allowed to be edited.
         Ability of editing assets submitted to 'in-flight' workflow has been removed:
         - .AVMSyncService. service interface was expanded with new method .List<AVMDifference> compare(int srcVersion, String srcPath, int dstVersion, String dstPath, NameMatcher excluder, boolean expandDirs). to introduce ability of collecting all created/modified items in created/modified folder;
         - all .AVMSyncService. implementations were expanded in accordance with changes in interface;
         - new tests for newly created items, items in modified folder and for deleted items in modified folder were added
      34414: ALF-11607: Bootstrap fails against database 'DB2/LINUXX8664'
      - Patched hibernate jar to recognize DB2 64 bit Linux
      34416: ALF-12992: Updated weblogic DD for SOLR


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@34460 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Dave Ward
2012-03-06 19:50:32 +00:00
parent 55fbe62f91
commit 8521d6e2dc
15 changed files with 2545 additions and 2110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2005-2011 Alfresco Software Limited.
* Copyright (C) 2005-2012 Alfresco Software Limited.
*
* This file is part of Alfresco
*
@@ -163,7 +163,202 @@ public class AVMServiceTest extends AVMServiceTestBase
}
}
private enum DiffActionEnum
{
CREATION, MODIFICATION, DELETION, DELETION_AND_MODIFICATION
}
/**
* Test is related to ALF-4098
*
* @throws Exception
*/
public void testDiffOfNewItems() throws Exception
{
try
{
performeDiffTesting(DiffActionEnum.CREATION);
}
finally
{
fService.purgeStore("testStore");
fService.purgeStore("submitStore");
}
}
/**
* Test is related to ALF-4098
*
* @throws Exception
*/
public void testDiffOfModifiedItems() throws Exception
{
try
{
performeDiffTesting(DiffActionEnum.MODIFICATION);
}
finally
{
fService.purgeStore("testStore");
fService.purgeStore("submitStore");
}
}
/**
* Test is related to ALF-4098
*
* @throws Exception
*/
public void testDiffOfDeletedItems() throws Exception
{
try
{
performeDiffTesting(DiffActionEnum.DELETION);
}
finally
{
fService.purgeStore("testStore");
fService.purgeStore("submitStore");
}
}
public void testDiffOfDeletedItemsInModifiedDirectory() throws Exception
{
try
{
performeDiffTesting(DiffActionEnum.DELETION_AND_MODIFICATION);
}
finally
{
fService.purgeStore("testStore");
fService.purgeStore("submitStore");
}
}
private void performeDiffTesting(DiffActionEnum action) throws IOException
{
fService.createStore("testStore");
fService.createStore("submitStore");
fService.createDirectory("submitStore:/", "root");
fService.createLayeredDirectory("submitStore:/root", "testStore:/", "root");
fService.createSnapshot("testStore", null, null);
fService.createDirectory("testStore:/root", "test");
for (int i = 0; i < 10; i++)
{
fService.createFile("testStore:/root/test", ("testFileN" + i + ".txt")).close();
}
List<AVMDifference> diffs = fSyncService.compare(-1, "testStore:/root/", -1, "submitStore:/root/", null);
if (DiffActionEnum.CREATION != action)
{
fSyncService.update(diffs, null, true, true, false, true, null, null);
fSyncService.flatten("testStore:/root/", "submitStore:/root/");
diffs = fSyncService.compare(-1, "testStore:/root/", -1, "submitStore:/root/", null);
}
List<AVMDifference> actual = fSyncService.compare(-1, "testStore:/root/", -1, "submitStore:/root/", null, true);
if (DiffActionEnum.CREATION == action)
{
assertEquals(11, actual.size());
assertEquals(1, diffs.size());
List<AVMDifference> newDiff = fSyncService.compare(-1, "testStore:/root/", -1, "submitStore:/root/", null, false);
assertEquals(diffs.toString(), newDiff.toString());
}
else
{
assertEquals(0, actual.size());
assertEquals(0, diffs.size());
}
String parentPath = "testStore:/root/test/";
if (DiffActionEnum.CREATION == action)
{
fService.createDirectory(parentPath, "inner");
parentPath += "inner/";
}
int start = (DiffActionEnum.DELETION == action) ? (1) : (0);
int incrementingStep = start + 1;
for (int i = start; i < 10; i += incrementingStep)
{
String name = "testFileN" + i + ".txt";
String path = parentPath + name;
switch (action)
{
case CREATION:
{
fService.createFile(parentPath, name).close();
break;
}
case MODIFICATION:
{
fService.setNodeProperty(path, WCMModel.PROP_REVERTED_ID, new PropertyValue(WCMModel.PROP_REVERTED_ID, null));
break;
}
default:
{
fService.removeNode(path);
}
}
}
int actualModificationsCount = (DiffActionEnum.DELETION == action) ? (5) : ((DiffActionEnum.CREATION == action) ? (22) : (10));
int diffModificationsCount = (DiffActionEnum.DELETION == action) ? (5) : ((DiffActionEnum.CREATION == action) ? (1) : (10));
actual = fSyncService.compare(-1, "testStore:/root", -1, "submitStore:/root", null, true);
diffs = fSyncService.compare(-1, "testStore:/root", -1, "submitStore:/root", null);
assertEquals(actualModificationsCount, actual.size());
assertEquals(diffModificationsCount, diffs.size());
if (DiffActionEnum.CREATION != action)
{
assertDiffsList(AVMDifference.NEWER, diffs);
assertEquals(diffs.toString(), actual.toString());
}
if (DiffActionEnum.CREATION != action)
{
if (DiffActionEnum.DELETION == action)
{
fService.removeNode("testStore:/root/test");
}
else
{
fService.setNodeProperty("testStore:/root/test", WCMModel.PROP_REVERTED_ID, new PropertyValue(WCMModel.PROP_REVERTED_ID, null));
}
actual = fSyncService.compare(-1, "testStore:/root/", -1, "submitStore:/root/", null, true);
diffs = fSyncService.compare(-1, "testStore:/root/", -1, "submitStore:/root/", null);
actualModificationsCount = (DiffActionEnum.DELETION == action) ? (1) : (actualModificationsCount + 1);
assertEquals(actualModificationsCount, actual.size());
assertEquals(1, diffs.size());
assertDiffsList(AVMDifference.NEWER, actual);
assertDiffsList(AVMDifference.NEWER, diffs);
}
}
private void assertDiffsList(int expectedCode, List<AVMDifference> actual)
{
for (AVMDifference diff : actual)
{
assertNotNull(diff);
assertTrue(diff.isValid());
assertEquals(expectedCode, diff.getDifferenceCode());
}
}
public void test_ETWOTWO_570() throws Exception
{
// Check that read-write methods are properly intercepted