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 
94232: Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)
      94116: MNT-13089 Reinstate the tests that had been disabled on SQLServer, before we understood the problem was with transaction isolation
      Reverted following commits:
         93292: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelCreate in case of SQL Server
         93342: Disabled org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelDelete in case of MS SQl Server.
         93522: Disabled org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionRestore and org.alfresco.repo.node.archive.ArchiveAndRestoreTest#testInTransactionPurge in case of MS SQL Server.
         93680: Disabled org.alfresco.repo.rendition.RenditionServiceIntegrationTest.testCompositeReformatAndResizeRendition in case of SQL Server
         93772: Disabled for MS SQL Server AuthenticationTest.testLoginNotExistingTenant, RenditionServiceIntegrationTest.testALF3733, RenditionServiceIntegrationTest.testJavascriptAPI.


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@95059 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Alan Davis
2015-01-31 15:35:56 +00:00
parent 1811553da1
commit 3929596255
5 changed files with 91 additions and 140 deletions
Download Patch File Download Diff File Expand all files Collapse all files

142
source/test-java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java
View File

@@ -53,7 +53,6 @@ import org.alfresco.test_category.OwnJVMTestsCategory;
import org.alfresco.util.ApplicationContextHelper;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.hibernate.dialect.*;
import org.junit.experimental.categories.Category;
import org.springframework.context.ApplicationContext;
@@ -76,8 +75,7 @@ public class RepoAdminServiceImplTest extends TestCase
private ContentService contentService;
private SearchService searchService;
private NamespaceService namespaceService;
private Dialect dialect;
final String modelPrefix = "model-";
final static String MKR = "{MKR}";
@@ -119,7 +117,7 @@ public class RepoAdminServiceImplTest extends TestCase
protected void setUp() throws Exception
{
super.setUp();
dialect = (Dialect) ctx.getBean("dialect");
repoAdminService = (RepoAdminService) ctx.getBean("RepoAdminService");
dictionaryService = (DictionaryService) ctx.getBean("DictionaryService");
transactionService = (TransactionService) ctx.getBean("TransactionService");
@@ -581,87 +579,77 @@ public class RepoAdminServiceImplTest extends TestCase
public void testConcurrentDynamicModelCreate() throws Exception
{
// disable in case of SQL Server
// see MNT-13089
if (!(dialect instanceof SQLServerDialect))
final int n = 2;
undeployModels(n);
int deployedModelCount = repoAdminService.getModels().size();
logger.info("Before deploy: deployed custom model count: "+deployedModelCount);
int dictModelCount = getModelCount();
logger.info("Before deploy: dictionary model count: "+dictModelCount);
// concurrently deploy N models
runConcurrentOps(n, 1);
int newDeployedModelCount = repoAdminService.getModels().size();
logger.info("After deploy: deployed custom model count: "+newDeployedModelCount);
assertEquals(deployedModelCount+n, newDeployedModelCount);
for (int i = 1; i <= n; i++)
{
final int n = 2;
undeployModels(n);
int deployedModelCount = repoAdminService.getModels().size();
logger.info("Before deploy: deployed custom model count: "+deployedModelCount);
int dictModelCount = getModelCount();
logger.info("Before deploy: dictionary model count: "+dictModelCount);
// concurrently deploy N models
runConcurrentOps(n, 1);
int newDeployedModelCount = repoAdminService.getModels().size();
logger.info("After deploy: deployed custom model count: "+newDeployedModelCount);
assertEquals(deployedModelCount+n, newDeployedModelCount);
for (int i = 1; i <= n; i++)
{
assertTrue(isModelDeployed(modelPrefix+i));
}
int newDictModelCount = getModelCount();
logger.info("After deploy: dictionary model count: "+newDictModelCount);
assertEquals(dictModelCount+n, newDictModelCount);
undeployModels(n);
newDeployedModelCount = repoAdminService.getModels().size();
logger.info("After undeploy: deployed custom model count: "+newDeployedModelCount);
assertEquals(deployedModelCount, newDeployedModelCount);
newDictModelCount = getModelCount();
logger.info("After undeploy: dictionary model count: "+newDictModelCount);
assertEquals(dictModelCount, newDictModelCount);
assertTrue(isModelDeployed(modelPrefix+i));
}
int newDictModelCount = getModelCount();
logger.info("After deploy: dictionary model count: "+newDictModelCount);
assertEquals(dictModelCount+n, newDictModelCount);
undeployModels(n);
newDeployedModelCount = repoAdminService.getModels().size();
logger.info("After undeploy: deployed custom model count: "+newDeployedModelCount);
assertEquals(deployedModelCount, newDeployedModelCount);
newDictModelCount = getModelCount();
logger.info("After undeploy: dictionary model count: "+newDictModelCount);
assertEquals(dictModelCount, newDictModelCount);
}
public void testConcurrentDynamicModelDelete() throws Exception
{
// disable in case of SQL Server
// see MNT-13089
if (!(dialect instanceof SQLServerDialect))
final int n = 2;
undeployModels(n);
int deployedModelCount = repoAdminService.getModels().size();
logger.info("Existing deployed custom model count: "+deployedModelCount);
int dictModelCount = getModelCount();
logger.info("Existing dictionary model count: "+dictModelCount);
deployModels(n);
assertEquals("assert A: deployed model count not equal to the repoAdminService", deployedModelCount+n, repoAdminService.getModels().size());
for (int i = 1; i <= n; i++)
{
final int n = 2;
undeployModels(n);
int deployedModelCount = repoAdminService.getModels().size();
logger.info("Existing deployed custom model count: "+deployedModelCount);
int dictModelCount = getModelCount();
logger.info("Existing dictionary model count: "+dictModelCount);
deployModels(n);
assertEquals("assert A: deployed model count not equal to the repoAdminService", deployedModelCount+n, repoAdminService.getModels().size());
for (int i = 1; i <= n; i++)
{
assertTrue(isModelDeployed(modelPrefix+i));
}
assertEquals(dictModelCount+n, getModelCount());
// concurrently undeploy N models
runConcurrentOps(n, 2);
assertEquals("assert after concurrent undeploy", deployedModelCount, repoAdminService.getModels().size());
for (int i = 1; i <= n; i++)
{
assertFalse(isModelDeployed(modelPrefix+i));
}
assertEquals(dictModelCount, getModelCount());
assertTrue(isModelDeployed(modelPrefix+i));
}
assertEquals(dictModelCount+n, getModelCount());
// concurrently undeploy N models
runConcurrentOps(n, 2);
assertEquals("assert after concurrent undeploy", deployedModelCount, repoAdminService.getModels().size());
for (int i = 1; i <= n; i++)
{
assertFalse(isModelDeployed(modelPrefix+i));
}
assertEquals(dictModelCount, getModelCount());
}
private int getModelCount()