From d40f2568b0210766c3569ae6e005a4213a2ac570 Mon Sep 17 00:00:00 2001
From: Alan Davis <alan.davis@alfresco.com>
Date: Sat, 31 Jan 2015 12:22:10 +0000
Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud)    93378:
 Merged 5.0.N (5.0.1) to HEAD-BUG-FIX (5.1/Cloud)       93342: MNT-13089:
 RepoAdminServiceImplTest hangs on SQL Server       Disabled
 org.alfresco.repo.admin.RepoAdminServiceImplTest#testConcurrentDynamicModelDelete
 in case of MS SQl Server.

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@94958 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../repo/admin/RepoAdminServiceImplTest.java  | 65 ++++++++++---------
 1 file changed, 35 insertions(+), 30 deletions(-)

diff --git a/source/test-java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java b/source/test-java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java
index 9e5b9d76c7..f9a661b2b9 100644
--- a/source/test-java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java
+++ b/source/test-java/org/alfresco/repo/admin/RepoAdminServiceImplTest.java
@@ -625,38 +625,43 @@ public class RepoAdminServiceImplTest extends TestCase
     
     public void testConcurrentDynamicModelDelete() throws Exception
     {
-        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++)
+        // disable in case of SQL Server
+        // see MNT-13089
+        if (!(dialect instanceof SQLServerDialect))
         {
-            assertTrue(isModelDeployed(modelPrefix+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());
         }
-        
-        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()