From 9c679b9b546eca6809cb118af0134454969c0981 Mon Sep 17 00:00:00 2001 From: Roy Wetherall Date: Thu, 4 Dec 2014 00:19:46 +0000 Subject: [PATCH] Introduce Mockito unit tests into Share AMP project git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/modules/recordsmanagement/HEAD@91731 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../action/impl/CopyMoveLinkFileToBaseAction.java | 3 ++- .../admin/RecordsManagementAdminServiceImpl.java | 3 ++- .../repo/action/parameter/DateParameterProcessor.java | 6 ++++-- .../RmSubstitutionSuggestionsGet.java | 9 ++++++--- .../test/legacy/webscript/RmRestApiTest.java | 4 ---- 5 files changed, 14 insertions(+), 11 deletions(-) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java index 614e6e222a..b879c733a0 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/action/impl/CopyMoveLinkFileToBaseAction.java @@ -335,7 +335,8 @@ public abstract class CopyMoveLinkFileToBaseAction extends RMActionExecuterAbstr { NodeRef child = null; List children = getNodeService().getChildAssocs(parent); - for (ChildAssociationRef childAssoc : children) { + for (ChildAssociationRef childAssoc : children) + { NodeRef childNodeRef = childAssoc.getChildRef(); String existingChildName = (String)getNodeService().getProperty(childNodeRef, ContentModel.PROP_NAME); if(existingChildName.equals(childName)) diff --git a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java index 9110b7a391..2008fd8851 100644 --- a/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java +++ b/rm-server/source/java/org/alfresco/module/org_alfresco_module_rm/admin/RecordsManagementAdminServiceImpl.java @@ -831,7 +831,8 @@ public class RecordsManagementAdminServiceImpl extends RecordsManagementAdminBas M2Property targetProperty = findProperty(propQName, deserializedModel); // Need to count backwards to remove constraints - for (int i = targetProperty.getConstraints().size() - 1; i >= 0; i--) { + for (int i = targetProperty.getConstraints().size() - 1; i >= 0; i--) + { String ref = targetProperty.getConstraints().get(i).getRef(); targetProperty.removeConstraintRef(ref); } diff --git a/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java b/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java index e8c61e95e0..1c475bc5bd 100644 --- a/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java +++ b/rm-server/source/java/org/alfresco/repo/action/parameter/DateParameterProcessor.java @@ -221,7 +221,8 @@ public class DateParameterProcessor extends ParameterProcessor implements Parame String namePrefix = this.getName() + "."; if(StringUtils.isBlank(substitutionFragment) || this.getName().toLowerCase().contains(substitutionFragment.toLowerCase())) { - for(String field: ALL_FIELDS_FOR_SUBSTITUTION_QUERY) { + for(String field: ALL_FIELDS_FOR_SUBSTITUTION_QUERY) + { suggestions.add(namePrefix + field); if(suggestions.size() >= maximumNumberSuggestions) { @@ -231,7 +232,8 @@ public class DateParameterProcessor extends ParameterProcessor implements Parame } else { - for(String field: ALL_FIELDS_FOR_SUBSTITUTION_QUERY) { + for(String field: ALL_FIELDS_FOR_SUBSTITUTION_QUERY) + { String prefixFieldName = namePrefix + field; if(prefixFieldName.toLowerCase().contains(substitutionFragment.toLowerCase())) { diff --git a/rm-server/source/java/org/alfresco/repo/web/scripts/substitutionsuggestions/RmSubstitutionSuggestionsGet.java b/rm-server/source/java/org/alfresco/repo/web/scripts/substitutionsuggestions/RmSubstitutionSuggestionsGet.java index dfc6fffdda..29249ec9fb 100644 --- a/rm-server/source/java/org/alfresco/repo/web/scripts/substitutionsuggestions/RmSubstitutionSuggestionsGet.java +++ b/rm-server/source/java/org/alfresco/repo/web/scripts/substitutionsuggestions/RmSubstitutionSuggestionsGet.java @@ -163,7 +163,8 @@ public class RmSubstitutionSuggestionsGet extends DeclarativeWebScript * @param fragment * @return */ - private List getSubPathSuggestions(WebScriptRequest req, final String path, final String fragment, boolean unfiled) { + private List getSubPathSuggestions(WebScriptRequest req, final String path, final String fragment, boolean unfiled) + { List pathSuggestions = new ArrayList(); if((path != null) && path.startsWith("/") && (fragment != null)) { @@ -177,7 +178,8 @@ public class RmSubstitutionSuggestionsGet extends DeclarativeWebScript { boolean foundThisPathFragment = false; List children = nodeService.getChildAssocs(currentNode); - for (ChildAssociationRef childAssoc : children) { + for (ChildAssociationRef childAssoc : children) + { NodeRef childNodeRef = childAssoc.getChildRef(); String fileName = (String) nodeService.getProperty(childNodeRef, ContentModel.PROP_NAME); if(fileName.equals(pathFragment) && isNodeRefAppropriateForPathSuggestion(childNodeRef, unfiled)) @@ -199,7 +201,8 @@ public class RmSubstitutionSuggestionsGet extends DeclarativeWebScript { String lowerCaseFragment = fragment.toLowerCase(); List children = nodeService.getChildAssocs(currentNode); - for (ChildAssociationRef childAssoc : children) { + for (ChildAssociationRef childAssoc : children) + { NodeRef childNodeRef = childAssoc.getChildRef(); String fileName = (String) nodeService.getProperty(childNodeRef, ContentModel.PROP_NAME); if((fragment.isEmpty() || fileName.toLowerCase().startsWith(lowerCaseFragment)) && isNodeRefAppropriateForPathSuggestion(childNodeRef, unfiled)) diff --git a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmRestApiTest.java b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmRestApiTest.java index 3c9ec4744a..1a943fc203 100644 --- a/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmRestApiTest.java +++ b/rm-server/test/java/org/alfresco/module/org_alfresco_module_rm/test/legacy/webscript/RmRestApiTest.java @@ -426,10 +426,6 @@ public class RmRestApiTest extends BaseRMWebScriptTestCase implements RecordsMan JSONArray customRefsObj = (JSONArray)dataObj.get("customReferences"); assertNotNull("JSON 'customReferences' object was null", customRefsObj); -// for (int i = 0; i < customRefsObj.length(); i++) { -// System.out.println(customRefsObj.getString(i)); -// } - assertTrue("There should be at least two custom references. Found " + customRefsObj, customRefsObj.length() >= 2); // GET a specific custom reference definition.