inteligr8/alfresco-community-repo
1
0
Fork 0
mirror of https://github.com/Alfresco/alfresco-community-repo.git synced 2025-10-08 14:51:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merged HEAD (5.1) to 5.1.N (5.1.1)

Browse Source 
119945 jphuynh: Merged 5.1-MC1 (5.1.0) to HEAD (5.1)
      119558 gcornwell: Merged code coverage improvements to 5.1-MC1 (5.1.0)
         r117774 gjames: RA-567: Increase /workflow/processes API code coverage
         r117773 gjames: RA-567: /workflow/processes coverage, removed unused ActivitiTypeConverter
         r116883 gjames: RA-531: reapplied change after merge, for MultiTServiceImpl test coverage
         r116629 gjames: RA-568 Increase /workflow/process-definitions API code coverage
         r116574 gjames: RA-569 Increase /workflow/tasks API code coverage
         r116286 gjames: RA-567: Increase /workflow/processes API code coverage
         r115853 gjames: RA-566: Increasing /people api coverage (description field)
         r115811 gjames: RA-566: Increasing /people api coverage
         r113007 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DynamicNamespacePrefixResolver RA-521
         r113006 gjames: Adding additional test coverage for DictionaryNamespaceComponent and DictionaryComponent RA-514
         r112969 gjames: Adding additional test coverage for TemplateServiceImpl RA-530
         r112960 gjames: Alternative test approach for ModuleServiceImpl RA-520
         r112703 gjames: Adding additional test coverage for NodeLocatorService RA-522
         r112702 gjames: Adding additional test coverage for JobLockServiceImpl RA-516
         r112699 gjames: Adding additional test coverage for ModuleServiceImpl RA-520
         r112508 gjames: Adding additional test coverage for RenditionServiceImpl RA-526
         r112476 gjames: Adding additional test coverage for ContentServiceImpl RA-513
         r112475 gjames: Adding additional test coverage for MimetypeMap RA-519
         r112238 gjames: Adding additional test coverage for MimetypeMap RA-519
         r112237 gjames: Adding additional test coverage for TaggingService RA-529
         r112236 gjames: Adding additional test coverage for MultiTServiceImpl RA-531
         r112206 gjames: Adding additional test coverage for ContentServiceImpl RA-513
         r112167 gcornwell: RA-523: Increase NodeService code coverage (removed redundant code that was testing a version store we no longer use)
         r112102 gjames: Reverted changes to PermissionServiceImpl for RA-524
         r112048 gjames: Temporarily removed some PermissionServiceImpl code. I need to put it back.
         r111620 gjames: Adding additional test coverage for PermissionService RA-524
         r111619 gjames: Added some @Override to make Sonar happier
         r111456 gjames: Adding additional test coverage for AuthenticationService RA-509
         r111427 gjames: Adding additional test coverage for AttributeService RA-509
         r111317 gjames: Adding additional test coverage for WorkflowService RA-533


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/BRANCHES/DEV/5.1.N/root@120192 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Andreea Dragoi
2015-12-15 13:26:39 +00:00
parent db6475fae6
commit 2c82c256cb
19 changed files with 780 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
source/test-java/org/alfresco/repo/attributes/AttributeServiceTest.java
View File

@@ -37,6 +37,7 @@ import org.alfresco.service.cmr.attributes.AttributeService.AttributeQueryCallba
import org.alfresco.service.cmr.attributes.DuplicateAttributeException;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.GUID;
import org.alfresco.util.Pair;
import org.apache.commons.lang.mutable.MutableInt;
import org.springframework.context.ApplicationContext;
@@ -94,7 +95,17 @@ public class AttributeServiceTest extends TestCase
assertEquals(VALUE_AAA_STRING, attributeService.getAttribute(KEY_AAA));
assertEquals(VALUE_AAB_STRING, attributeService.getAttribute(KEY_AAB));
assertEquals(VALUE_AAC_STRING, attributeService.getAttribute(KEY_AAC));
//
//Too many keys
try
{
attributeService.exists(new Serializable[]{"a", "a", "a", "a", "a"});
fail("You can't have more than 3 keys");
}
catch (IllegalArgumentException expected)
{
}
// attributeService.removeAttribute(KEY_AAA);
// attributeService.removeAttribute(KEY_AAB);
// attributeService.removeAttribute(KEY_AAC);
@@ -298,4 +309,33 @@ public class AttributeServiceTest extends TestCase
propertyValueDAO.cleanupUnusedValues();
}
}
public void testUpdateOrCreateAttribute()
{
final String KEY_RND_STR_1 = "string1"+ GUID.generate();
final String KEY_RND_STR_2 = "string2"+ GUID.generate();
try
{
attributeService.updateOrCreateAttribute(KEY_RND_STR_2, null, null, KEY_RND_STR_1, null, null);
try
{
attributeService.updateOrCreateAttribute(KEY_RND_STR_2, null, null, KEY_RND_STR_1, null, null);
fail("Duplicate attribute creation should not be allowed");
}
catch (DuplicateAttributeException expected)
{
}
//First call creates it, the second updates it. No errors.
attributeService.updateOrCreateAttribute(KEY_RND_STR_1, null, null, KEY_RND_STR_2, null, null);
attributeService.updateOrCreateAttribute(KEY_RND_STR_2, null, null, KEY_RND_STR_2, null, null);
}
finally
{
attributeService.removeAttribute(KEY_RND_STR_1, null, null);
attributeService.removeAttribute(KEY_RND_STR_2, null, null);
}
}
}