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/HEAD/root@119945 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jean-Pierre Huynh
2015-12-10 10:35:05 +00:00
parent 73561a5fa3
commit e3c4cb6561
19 changed files with 781 additions and 99 deletions

View File

@@ -30,6 +30,7 @@ import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Set;
import javax.transaction.Status;
import javax.transaction.UserTransaction;
@@ -67,6 +68,7 @@ import org.alfresco.service.ServiceRegistry;
import org.alfresco.service.cmr.repository.NodeRef;
import org.alfresco.service.cmr.repository.NodeService;
import org.alfresco.service.cmr.repository.StoreRef;
import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.AuthorityService;
import org.alfresco.service.cmr.security.MutableAuthenticationService;
import org.alfresco.service.cmr.security.PersonService;
@@ -392,6 +394,9 @@ public class AuthenticationTest extends TestCase
public void testGuest()
{
authenticationService.authenticate(AuthenticationUtil.getGuestUserName(), "".toCharArray());
Set<String> guestUsers = authenticationService.getDefaultGuestUserNames();
assertNotNull(guestUsers);
assertTrue(guestUsers.contains(AuthenticationUtil.getGuestUserName()));
}
public void testCreateUsers()
@@ -466,9 +471,12 @@ public class AuthenticationTest extends TestCase
public void testAuthenticateMultiTenant()
{
// Create a tenant domain
TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<Object>() {
public Object doWork() throws Exception {
if (!tenantAdminService.existsTenant(TEST_TENANT_DOMAIN)) {
TenantUtil.runAsSystemTenant(new TenantUtil.TenantRunAsWork<Object>()
{
public Object doWork() throws Exception
{
if (!tenantAdminService.existsTenant(TEST_TENANT_DOMAIN))
{
tenantAdminService.createTenant(TEST_TENANT_DOMAIN, TENANT_ADMIN_PW.toCharArray(), null);
}
return null;
@@ -1767,6 +1775,61 @@ public class AuthenticationTest extends TestCase
// authenticationService.deleteAuthentication("andy");
}
public void testAuthenticationServiceImpl()
{
Set<String> domains = authenticationService.getDomains();
assertNotNull(domains);
domains = authenticationService.getDomainsThatAllowUserCreation();
assertNotNull(domains);
domains = authenticationService.getDomiansThatAllowUserPasswordChanges();
assertNotNull(domains);
domains = authenticationService.getDomainsThatAllowUserDeletion();
assertNotNull(domains);
List<AuthenticationService> services = ((AbstractChainingAuthenticationService) authenticationService).getUsableAuthenticationServices();
for (AuthenticationService service : services)
{
if (service instanceof AuthenticationServiceImpl)
{
AuthenticationServiceImpl impl = (AuthenticationServiceImpl) service;
assertFalse("Not just anyone", impl.authenticationExists("anyone"));
assertFalse("Hardcoded to true", impl.getAuthenticationEnabled("anyone"));
authenticationService.invalidateUserSession("anyone");
impl.setDomain("mydomain");
String domain = impl.getDomain();
assertEquals("mydomain", domain);
Set<TicketComponent> ticketComponents = impl.getTicketComponents();
assertNotNull(ticketComponents);
boolean allows = impl.getAllowsUserPasswordChange();
impl.setAllowsUserPasswordChange(allows);
assertEquals(allows, impl.getAllowsUserPasswordChange());
allows = impl.getAllowsUserDeletion();
impl.setAllowsUserDeletion(allows);
assertEquals(allows, impl.getAllowsUserDeletion());
allows = impl.getAllowsUserCreation();
impl.setAllowsUserCreation(allows);
assertEquals(allows, impl.getAllowsUserCreation());
assertFalse(impl.isCurrentUserTheSystemUser());
Set<String> users = impl.getUsersWithTickets(true);
assertNotNull(users);
int tickets = impl.countTickets(true);
assertFalse(tickets < users.size());
tickets = impl.invalidateTickets(true);
assertTrue(impl.guestUserAuthenticationAllowed());
break;
}
}
}
public void testLoginNotExistingTenant()
{