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

Merged V2.9 to HEAD

Browse Source 
9018: MT: system-wide jobs should run across all stores/indexes
   9204: Merged V2.2 to V2.9
      8633: Merged V2.1 to V2.2
         8629: Merged V2.1-A to V2.1
            8493: Fixed ADB-51: ImporterBootstrap doesn't use transaction retrying
            8494: EHCache and JGroup patches and upgrades
            8546: ACT-1650: performance optimization
            8550: Fixes to transactional cache handling
            8553: Fixed tests: MLText is a Map, but will always have at least one entry, even that entry is null.
            8583: ACT-954: IndexInfo files now reopen when they close (for whatever reason)
      8640: Merged V2.1 to V2.2
         8638: Used correct exception type for IO channel reopen logic
      9102: Unit test to check that transactional cache size overrun is handled
      9106: Merged V2.1 to V2.2
         9043: Fixed AR-2291: SchemaBootstrap lock is only required before first SQL execution
         9045: Fix AR-2291: SchemaBootstrap lock is only required before first SQL execution
         9047: Fixed AR-2305: Index tracking in AUTO mode doesn't report anything on bootstrap
         9048: Fixed AR-2300: Random-based GUID instead of time-based GUIDs
         9049: Fix patches to only run once
         9050 <Defered>: Changed getString() method to use the available buffer length rather than a hard coded value.
         9060: Fixed ETWOONE-109 and ETWOONE-128: RetryingTransactionHelper fixes and improvements
         9061: Fixed NodeRefPropertyMethodInterceptorTest
         9075 <Defered>: Added delete permission check when marking a file for delete on close. ETWOONE-141/ACT-2416.
         9080: Fixed EHCache source zip
         9081: Fixed ETWOONE-118: Tomcat failed bootstrap doesn't clean up EHCache cluster structures
         9085: Fixed ETWOONE-154: Added JSR107 Jar to WAR
      9115: Fixed test: TransactionalCache uses LRU so repeatedly checking if a entry is there keeps it in the cache.
   9206: Merged V2.2 to V2.9
      8857: Improvements to ACL performance for large ACLs
      8951: Always check permission entry changes are made at position 0
   9219 <No change>: Made NTLMLogonDetails class Serializable, port of r8973.
   9220: Added delete permission check when marking a file for delete on close. Port of r9075.
   9222: Merged V2.1 to V2.9
      8683: Early warning for nodes indexed in the wrong store (ACT-964)
      8684: Enhanced tests
      8685: Enhanced tests
      8686: Additional tests
   9223: Merged V2.2 to V2.9
      9120: Merged V2.1 to V2.2
         8740: Fix for AR-2173 - do no recheck case of the user name when validating tickets (it has been done)
      9122: Additional unit test from support case.
   9224: Merged V2.2 to V2.9
      9076: Fixed ETWOTWO-426: Upgrading alfresco from 2.1.1 to 2.2 throws errors with Mysql 5.0.51
      9104: Merged V2.1 to V2.2
         9025: Fixed AR-2314, AR-2299: Optimizations after profiling
      9105: Merged V2.1 to V2.2
         8745: Fix AR-2233 (regression introduced by fix for AR-2221)
      9121: Merged V2.1 to V2.2
         9017: Fix index back up failing due to background index merge/deletions (inlcudes back port of CHK-2588)
      9137: Incorporated additions from Will into AVM console (ETWOTWO-439)
   9225: Merged V2.1 to V2.9
      8641: Merged V2.1-A to V2.1
         7729: Fix to Repository Web Service (queryAssociated) to allow reverse association lookup (ie. given target, get the source)
      8673: Fix for AR-2098 - shorter URL form now has NTLM filter mapping example in web.xml
      8682: Fix for AR-2005
      8695: AR-2054.
      8696: Improved sort test to include prefix form of field name
   9226: Fix ALFCOM-994 (see also earlier change in r9223)


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@9233 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2008-05-22 12:40:46 +00:00
parent 86027f41f1
commit 6e225ce15d
60 changed files with 2359 additions and 1164 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
source/java/org/alfresco/repo/node/NodeRefPropertyMethodInterceptorTest.java
View File

@@ -236,21 +236,24 @@ public class NodeRefPropertyMethodInterceptorTest extends BaseSpringTest
assertNotNull(nodeService.getProperty(n1, aspectNoderefProp));
assertNotNull(nodeService.getProperty(n1, aspectNoderefsProp));
assertEquals(1, ((Collection) nodeService.getProperty(n1, aspectNoderefsProp)).size());
assertTrue(((Collection) nodeService.getProperty(n1, aspectNoderefsProp)).iterator().next() instanceof NodeRef);
assertNull(nodeService.getProperties(n1).get(aspectCategoryProp));
assertNotNull(nodeService.getProperties(n1).get(aspectCategoriesProp));
assertEquals(0, ((Collection) nodeService.getProperties(n1).get(aspectCategoriesProp)).size());
assertNotNull(nodeService.getProperties(n1).get(aspectNoderefProp));
assertNotNull(nodeService.getProperties(n1).get(aspectNoderefsProp));
assertEquals(1, ((Collection) nodeService.getProperties(n1).get(aspectNoderefsProp)).size());
assertTrue(((Collection) nodeService.getProperties(n1).get(aspectNoderefsProp)).iterator().next() instanceof NodeRef);
// Set valid cat
mlAwareNodeService.setProperty(n1, aspectCategoryProp, cat);
mlAwareNodeService.setProperty(n1, aspectCategoryProp, cat.toString());
mlAwareNodeService.setProperty(n1, aspectCategoriesProp, cat);
mlAwareNodeService.setProperty(n1, aspectNoderefProp, cat);
mlAwareNodeService.setProperty(n1, aspectNoderefsProp, cat);
assertNotNull(mlAwareNodeService.getProperty(n1, aspectCategoryProp));
assertTrue(nodeService.getProperty(n1, aspectCategoryProp) instanceof NodeRef);
assertNotNull(mlAwareNodeService.getProperty(n1, aspectCategoriesProp));
assertEquals(1, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertNotNull(mlAwareNodeService.getProperty(n1, aspectNoderefProp));
@@ -263,17 +266,22 @@ public class NodeRefPropertyMethodInterceptorTest extends BaseSpringTest
assertNotNull(mlAwareNodeService.getProperties(n1).get(aspectNoderefsProp));
assertEquals(1, ((Collection) mlAwareNodeService.getProperties(n1).get(aspectNoderefsProp)).size());
assertNotNull(nodeService.getProperty(n1, aspectCategoryProp));
assertTrue(nodeService.getProperty(n1, aspectCategoryProp) instanceof NodeRef);
assertNotNull(nodeService.getProperty(n1, aspectCategoriesProp));
assertEquals(1, ((Collection) nodeService.getProperty(n1, aspectCategoriesProp)).size());
assertTrue(((Collection) nodeService.getProperty(n1, aspectCategoriesProp)).iterator().next() instanceof NodeRef);
assertNotNull(nodeService.getProperty(n1, aspectNoderefProp));
assertNotNull(nodeService.getProperty(n1, aspectNoderefsProp));
assertEquals(1, ((Collection) nodeService.getProperty(n1, aspectNoderefsProp)).size());
assertTrue(((Collection) nodeService.getProperty(n1, aspectNoderefsProp)).iterator().next() instanceof NodeRef);
assertNotNull(nodeService.getProperties(n1).get(aspectCategoryProp));
assertNotNull(nodeService.getProperties(n1).get(aspectCategoriesProp));
assertEquals(1, ((Collection) nodeService.getProperties(n1).get(aspectCategoriesProp)).size());
assertTrue(((Collection) nodeService.getProperties(n1).get(aspectCategoriesProp)).iterator().next() instanceof NodeRef);
assertNotNull(nodeService.getProperties(n1).get(aspectNoderefProp));
assertNotNull(nodeService.getProperties(n1).get(aspectNoderefsProp));
assertEquals(1, ((Collection) nodeService.getProperties(n1).get(aspectNoderefsProp)).size());
assertTrue(((Collection) nodeService.getProperties(n1).get(aspectNoderefsProp)).iterator().next() instanceof NodeRef);
// Set empty list
@@ -340,10 +348,12 @@ public class NodeRefPropertyMethodInterceptorTest extends BaseSpringTest
assertEquals(0, ((Collection) nodeService.getProperty(n1, aspectCategoriesProp)).size());
assertNotNull(nodeService.getProperty(n1, aspectNoderefsProp));
assertEquals(1, ((Collection) nodeService.getProperty(n1, aspectNoderefsProp)).size());
assertTrue(((Collection) nodeService.getProperty(n1, aspectNoderefsProp)).iterator().next() instanceof NodeRef);
assertNotNull(nodeService.getProperties(n1).get(aspectCategoriesProp));
assertEquals(0, ((Collection) nodeService.getProperties(n1).get(aspectCategoriesProp)).size());
assertNotNull(nodeService.getProperties(n1).get(aspectNoderefsProp));
assertEquals(1, ((Collection) nodeService.getProperties(n1).get(aspectNoderefsProp)).size());
assertTrue(((Collection) nodeService.getProperties(n1).get(aspectNoderefsProp)).iterator().next() instanceof NodeRef);
// set valid cat in list
@@ -362,12 +372,16 @@ public class NodeRefPropertyMethodInterceptorTest extends BaseSpringTest
assertEquals(1, ((Collection) mlAwareNodeService.getProperties(n1).get(aspectNoderefsProp)).size());
assertNotNull(nodeService.getProperty(n1, aspectCategoriesProp));
assertEquals(1, ((Collection) nodeService.getProperty(n1, aspectCategoriesProp)).size());
assertTrue( ((Collection) nodeService.getProperty(n1, aspectCategoriesProp)).iterator().next() instanceof NodeRef);
assertNotNull(nodeService.getProperty(n1, aspectNoderefsProp));
assertEquals(1, ((Collection) nodeService.getProperty(n1, aspectNoderefsProp)).size());
assertTrue(((Collection) nodeService.getProperty(n1, aspectNoderefsProp)).iterator().next() instanceof NodeRef);
assertNotNull(nodeService.getProperties(n1).get(aspectCategoriesProp));
assertEquals(1, ((Collection) nodeService.getProperties(n1).get(aspectCategoriesProp)).size());
assertTrue(((Collection) nodeService.getProperties(n1).get(aspectCategoriesProp)).iterator().next() instanceof NodeRef);
assertNotNull(nodeService.getProperties(n1).get(aspectNoderefsProp));
assertEquals(1, ((Collection) nodeService.getProperties(n1).get(aspectNoderefsProp)).size());
assertTrue(((Collection) nodeService.getProperties(n1).get(aspectNoderefsProp)).iterator().next() instanceof NodeRef);
// Test list with invalid, noderef and cat
@@ -883,13 +897,13 @@ public class NodeRefPropertyMethodInterceptorTest extends BaseSpringTest
NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER, properties).getChildRef();
assertNull(mlAwareNodeService.getProperty(n1, aspectCategoryProp));
assertNotNull(mlAwareNodeService.getProperty(n1, aspectCategoryProp));
assertNotNull(mlAwareNodeService.getProperty(n1, aspectCategoriesProp));
assertNull(mlAwareNodeService.getProperty(n1, aspectNoderefProp));
assertNotNull(mlAwareNodeService.getProperty(n1, aspectNoderefProp));
assertNotNull(mlAwareNodeService.getProperty(n1, aspectNoderefsProp));
assertNull(mlAwareNodeService.getProperties(n1).get(aspectCategoryProp));
assertNotNull(mlAwareNodeService.getProperties(n1).get(aspectCategoryProp));
assertNotNull(mlAwareNodeService.getProperties(n1).get(aspectCategoriesProp));
assertNull(mlAwareNodeService.getProperties(n1).get(aspectNoderefProp));
assertNotNull(mlAwareNodeService.getProperties(n1).get(aspectNoderefProp));
assertNotNull(mlAwareNodeService.getProperties(n1).get(aspectNoderefsProp));
assertNull(nodeService.getProperty(n1, aspectCategoryProp));
assertNotNull(nodeService.getProperty(n1, aspectCategoriesProp));
@@ -914,11 +928,11 @@ public class NodeRefPropertyMethodInterceptorTest extends BaseSpringTest
NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER, properties).getChildRef();
assertNull(mlAwareNodeService.getProperty(n1, aspectCategoryProp));
assertNotNull(mlAwareNodeService.getProperty(n1, aspectCategoryProp));
assertNotNull(mlAwareNodeService.getProperty(n1, aspectCategoriesProp));
assertNotNull(mlAwareNodeService.getProperty(n1, aspectNoderefProp));
assertNotNull(mlAwareNodeService.getProperty(n1, aspectNoderefsProp));
assertNull(mlAwareNodeService.getProperties(n1).get(aspectCategoryProp));
assertNotNull(mlAwareNodeService.getProperties(n1).get(aspectCategoryProp));
assertNotNull(mlAwareNodeService.getProperties(n1).get(aspectCategoriesProp));
assertNotNull(mlAwareNodeService.getProperties(n1).get(aspectNoderefProp));
assertNotNull(mlAwareNodeService.getProperties(n1).get(aspectNoderefsProp));
@@ -1009,13 +1023,13 @@ public class NodeRefPropertyMethodInterceptorTest extends BaseSpringTest
NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER, properties).getChildRef();
assertNotNull(mlAwareNodeService.getProperty(n1, aspectCategoriesProp));
assertEquals(0, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertEquals(1, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertNotNull(mlAwareNodeService.getProperty(n1, aspectNoderefsProp));
assertEquals(0, ((Collection) mlAwareNodeService.getProperty(n1, aspectNoderefsProp)).size());
assertEquals(1, ((Collection) mlAwareNodeService.getProperty(n1, aspectNoderefsProp)).size());
assertNotNull(mlAwareNodeService.getProperty(n1, aspectCategoriesProp));
assertEquals(0, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertEquals(1, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertNotNull(mlAwareNodeService.getProperty(n1, aspectNoderefsProp));
assertEquals(0, ((Collection) mlAwareNodeService.getProperty(n1, aspectNoderefsProp)).size());
assertEquals(1, ((Collection) mlAwareNodeService.getProperty(n1, aspectNoderefsProp)).size());
assertNotNull(nodeService.getProperties(n1).get(aspectCategoriesProp));
assertEquals(0, ((Collection) nodeService.getProperties(n1).get(aspectCategoriesProp)).size());
assertNotNull(nodeService.getProperties(n1).get(aspectNoderefsProp));
@@ -1041,11 +1055,11 @@ public class NodeRefPropertyMethodInterceptorTest extends BaseSpringTest
NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER, properties).getChildRef();
assertNotNull(mlAwareNodeService.getProperty(n1, aspectCategoriesProp));
assertEquals(0, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertEquals(1, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertNotNull(mlAwareNodeService.getProperty(n1, aspectNoderefsProp));
assertEquals(1, ((Collection) mlAwareNodeService.getProperty(n1, aspectNoderefsProp)).size());
assertNotNull(mlAwareNodeService.getProperty(n1, aspectCategoriesProp));
assertEquals(0, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertEquals(1, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertNotNull(mlAwareNodeService.getProperty(n1, aspectNoderefsProp));
assertEquals(1, ((Collection) mlAwareNodeService.getProperty(n1, aspectNoderefsProp)).size());
assertNotNull(nodeService.getProperties(n1).get(aspectCategoriesProp));
@@ -1107,13 +1121,13 @@ public class NodeRefPropertyMethodInterceptorTest extends BaseSpringTest
NodeRef n1 = nodeService.createNode(rootNodeRef, ContentModel.ASSOC_CHILDREN, QName.createQName("{namespace}one"), ContentModel.TYPE_FOLDER, properties).getChildRef();
assertNotNull(mlAwareNodeService.getProperty(n1, aspectCategoriesProp));
assertEquals(1, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertEquals(3, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertNotNull(mlAwareNodeService.getProperty(n1, aspectNoderefsProp));
assertEquals(2, ((Collection) mlAwareNodeService.getProperty(n1, aspectNoderefsProp)).size());
assertEquals(3, ((Collection) mlAwareNodeService.getProperty(n1, aspectNoderefsProp)).size());
assertNotNull(mlAwareNodeService.getProperty(n1, aspectCategoriesProp));
assertEquals(1, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertEquals(3, ((Collection) mlAwareNodeService.getProperty(n1, aspectCategoriesProp)).size());
assertNotNull(mlAwareNodeService.getProperty(n1, aspectNoderefsProp));
assertEquals(2, ((Collection) mlAwareNodeService.getProperty(n1, aspectNoderefsProp)).size());
assertEquals(3, ((Collection) mlAwareNodeService.getProperty(n1, aspectNoderefsProp)).size());
assertNotNull(nodeService.getProperties(n1).get(aspectCategoriesProp));
assertEquals(1, ((Collection) nodeService.getProperties(n1).get(aspectCategoriesProp)).size());
assertNotNull(nodeService.getProperties(n1).get(aspectNoderefsProp));