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-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)

Browse Source 
94078: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94055: MNT-13089 Integration tests hanging on SQL Server
        Set the db.txn.isolation system property to 4096 when running on SQLServer - this was probably the problem from the beginning
        Plug back tests MultiTServiceImplTest.testGetName(), MultiTServiceImplTest.testGetUserDomain() and SubscriptionServiceActivitiesTest.testFollowingActivity() on SQLServer


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95041 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 15:31:54 +00:00
parent 4c2947f897
commit df3bc3d923
2 changed files with 1 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
source/test-java/org/alfresco/repo/tenant/MultiTServiceImplTest.java
View File

@@ -42,8 +42,6 @@ import org.alfresco.service.namespace.NamespaceService;
import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.SQLServerDialect;
import org.junit.After;
import org.junit.Before;
import org.junit.Test;
@@ -67,7 +65,6 @@ public class MultiTServiceImplTest
private NodeService nodeService;
private SearchService searchService;
private NamespaceService namespaceService;
private Dialect dialect;
private UserTransaction txn;
@@ -116,7 +113,6 @@ public class MultiTServiceImplTest
nodeService = ctx.getBean("NodeService", NodeService.class);
searchService = ctx.getBean("SearchService", SearchService.class);
namespaceService = ctx.getBean("NamespaceService", NamespaceService.class);
dialect = ctx.getBean("dialect", Dialect.class);
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
@@ -194,12 +190,6 @@ public class MultiTServiceImplTest
@Test
public void testGetName()
{
// disable in case of SQL Server
// see MNT-13089
if (dialect instanceof SQLServerDialect)
{
return;
}
NodeRef userNodeRef = createUser(USER1, TenantService.DEFAULT_DOMAIN, PASS);
assertNotNull("The user was not created.", userNodeRef);
TenantRunAsWork<NodeRef> work1 = new TenantRunAsWork<NodeRef>()
@@ -596,13 +586,6 @@ public class MultiTServiceImplTest
@Test
public void testGetUserDomain()
{
// disable in case of SQL Server
// see MNT-13089
if (dialect instanceof SQLServerDialect)
{
return;
}
String result = tenantService.getUserDomain(USER1);
assertEquals("The user domain should be the default one for a non tenant user without a tenant in name.", TenantService.DEFAULT_DOMAIN, result);