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 HEAD to DEV/caveatmarkdatatype:

Browse Source 
114610: Merged BRANCHES/V2.3 to HEAD:
        114007: (RECORD ONLY) ACE-4390 ([RM] Unable to Add User/Group to files / folders - form does not open)
   114659: Removed warnings
   114660: RM-2669 (Spike: Investigate RM Enterprise approach)
   114661: RM-2669 (Spike: Investigate RM Enterprise approach)
   114662: RM-2669 (Spike: Investigate RM Enterprise approach)
   114676: Updated Alfresco dependency to 5.1.b-EA
   114677: Updated the svn:ignore list
   114678: Removed a workaround which was causing problems with 5.1.a-EA
   114680: Deleted .ant-targets-build.xml from the code base
   114681: Added .ant-targets-build.xml to svn:ignore list
   114685: Removed warnings
   114777: RM-2394 Created another user with ALFRESCO_ADMINISTRATORS role to check that it wouldn't have its security clearance editable. Created EditUserPage class that would allow the editing of users profiles on the UI (especially the adding to a Alfresco group). Changed the test "adminIsNotShown" name to adminSecurityClearanceIsNotEditable to be more accurate what is really tested.
   114791: RM-2702 (RM HEAD does not work with Alfresco 5.1.b-EA)
   114809: RM-2702 (RM HEAD does not work with Alfresco 5.1.b-EA)
   114827: RM-2394 Review RM.
   114903: Merged V2.3 to HEAD
        114902: Merged V2.2 to V2.3
           114900: Merged V2.2.1.x (2.2.1.3) to V2.2
              114608: Merged DEV to V2.2.1.x
                 114604: MNT-14900 : Alfresco doesn't work with Records Management
                    - Fixed the circular reference problem from Spring config xml using NonBlockingLazyInitTargetSource
   114912: Merged V2.3 to HEAD
        114905: Merged V2.2 to V2.3
           114786: RM-2391 : The Audit Log GET requests have to verify first which user is logged in and to which data it has access.
              - Implemented final fix and added a unit test.
   114922: Merged BRANCHES/V2.3 to HEAD:
        114921: Merged BRANCHES/V2.2 to BRANCHES/V2.3:
             114258: RM-2522 : Select "Download Zip" (rm-download-zip) on RM Transfer Target inside RM Transfer view throws 400 Bad Request: Node is not fileplan
                  - used isFilePlan method from FilePlanService instead of old check
             114917: Merged BRANCHES/V2.2.1.x to BRANCHES/V2.2:
                  114437: Merged DEV to V2.2.1.x
                       114241: MNT-14900 : Alfresco doesn't work with Records Management
                          - Fixed problem with circular references during Spring dependency injection process
                  114605: Reverse merged V2.2.1.x
                             <<< Need to use a different approach. >>>
                             Merged DEV to V2.2.1.x
                                114241: MNT-14900 : Alfresco doesn't work with Records Management
                                   - Fixed problem with circular references during Spring dependency injection process
                  114609: (RECORD ONLY) Update version to 2.2.1.3
                  114687: (RECORD ONLY) Updated version to 2.2.1.3 and dependency.share.po.version to 4.2.5-SNAPSHOT in pom.xml files
   115015: Added some info why we override a managed version of a dependency
   115087: RM-2693 (Create RM Enterprise server AMP)



git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/DEV/caveatmarkdatatype@116451 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Tom Page
2015-11-06 16:43:58 +00:00
parent f7153d0e66 c1a558cfcd
commit 1455284db3
12 changed files with 110 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/referredmetadata/ReferredMetadataServiceImplUnitTest.java
View File

@@ -18,21 +18,24 @@
*/
package org.alfresco.module.org_alfresco_module_rm.referredmetadata;
import static java.util.Collections.emptyMap;
import static java.util.Arrays.asList;
import static org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataException.ReferentNodeNotFound;
import static org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataException.MetadataReferralNotFound;
import static java.util.Collections.emptyMap;
import static org.alfresco.module.org_alfresco_module_rm.test.util.ExceptionUtils.expectedException;
import static org.alfresco.module.org_alfresco_module_rm.test.util.FPUtils.asSet;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
import static org.mockito.Mockito.any;
import static org.mockito.Matchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.eq;
import static org.mockito.Mockito.when;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
import org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataException.MetadataReferralNotFound;
import org.alfresco.module.org_alfresco_module_rm.referredmetadata.ReferredMetadataException.ReferentNodeNotFound;
import org.alfresco.service.cmr.dictionary.ClassDefinition;
import org.alfresco.service.cmr.dictionary.DictionaryService;
import org.alfresco.service.cmr.dictionary.PropertyDefinition;
@@ -47,10 +50,6 @@ import org.mockito.InjectMocks;
import org.mockito.Mock;
import org.mockito.MockitoAnnotations;
import java.io.Serializable;
import java.util.HashMap;
import java.util.Map;
/**
* Unit tests for {@link ReferredMetadataServiceImpl}.
*
@@ -96,6 +95,7 @@ public class ReferredMetadataServiceImplUnitTest
this.setAspects(asSet(referredAspect1, referredAspect2));
}};
@SuppressWarnings("serial")
@Before public void setUp()
{
MockitoAnnotations.initMocks(this);

7
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/script/classification/UserSecurityClearanceGetUnitTest.java
View File

@@ -18,7 +18,6 @@
*/
package org.alfresco.module.org_alfresco_module_rm.script.classification;
import static java.util.Collections.emptyMap;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.mockito.Matchers.any;
@@ -34,8 +33,6 @@ import java.util.Arrays;
import java.util.List;
import java.util.Map;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
import org.alfresco.module.org_alfresco_module_rm.classification.ClassificationLevel;
import org.alfresco.module.org_alfresco_module_rm.classification.ClearanceLevel;
import org.alfresco.module.org_alfresco_module_rm.classification.SecurityClearance;
@@ -50,7 +47,6 @@ import org.alfresco.service.namespace.QName;
import org.alfresco.util.Pair;
import org.json.JSONArray;
import org.json.JSONObject;
import org.junit.Ignore;
import org.junit.Test;
import org.mockito.InjectMocks;
import org.mockito.Mock;
@@ -58,6 +54,9 @@ import org.mockito.Spy;
import org.springframework.extensions.webscripts.DeclarativeWebScript;
import org.springframework.extensions.webscripts.WebScriptRequest;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
/**
* Test for get user security clearance API
*

3
rm-server/unit-test/java/org/alfresco/module/org_alfresco_module_rm/test/util/FPUtils.java
View File

@@ -44,6 +44,7 @@ public class FPUtils
* @param <T> the type of elements in the list.
* @return the list with each element being the first retrieved from a {@code Supplier}.
*/
@SafeVarargs
public static <T> List<T> asListFrom(Supplier<T>... suppliers)
{
if (suppliers == null || suppliers.length == 0)
@@ -66,6 +67,7 @@ public class FPUtils
* @param <T> the type of elements in the set.
* @return the set with each element being the first retrieved from a {@code Supplier} (duplicates removed).
*/
@SafeVarargs
public static <T> Set<T> asSetFrom(Supplier<T>... suppliers)
{
List<T> l = asListFrom(suppliers);
@@ -78,6 +80,7 @@ public class FPUtils
* @param objects the objects to be added to the set
* @return a Set of objects (any equal objects will of course not be duplicated)
*/
@SafeVarargs
public static <T> Set<T> asSet(T... objects)
{
return new HashSet<>(asList(objects));