From 3ad91710fa47524091e1f6f42c371b5a43e8756b Mon Sep 17 00:00:00 2001
From: Jan Vonka <jan.vonka@alfresco.com>
Date: Tue, 17 Mar 2009 18:04:15 +0000
Subject: [PATCH] WCM services - update test since code has now been merged
 from V3.1 (r13605)

git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
---
 .../wcm/sandbox/SandboxServiceImplTest.java   | 31 -------------------
 1 file changed, 31 deletions(-)

diff --git a/source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java b/source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java
index 446575ad97..bc6909d285 100644
--- a/source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java
+++ b/source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java
@@ -35,12 +35,10 @@ import java.util.Map;
 import org.alfresco.repo.content.MimetypeMap;
 import org.alfresco.repo.security.authentication.AuthenticationUtil;
 import org.alfresco.repo.security.permissions.AccessDeniedException;
-import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
 import org.alfresco.service.cmr.avm.AVMService;
 import org.alfresco.service.cmr.repository.ContentReader;
 import org.alfresco.service.cmr.repository.ContentWriter;
 import org.alfresco.service.namespace.QName;
-import org.alfresco.service.transaction.TransactionService;
 import org.alfresco.wcm.AbstractWCMServiceImplTest;
 import org.alfresco.wcm.asset.AssetInfo;
 import org.alfresco.wcm.asset.AssetService;
@@ -67,9 +65,6 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest
     private SandboxService sbService;
     private AssetService assetService;
     
-    // TODO: temporary - remove from here when r13170 is merged from V3.1->HEAD
-    private TransactionService transactionService;
-    
     private AVMService avmService; // non-locking-aware
     
     //private AVMService avmLockingAwareService;
@@ -87,9 +82,6 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest
         
         avmService = (AVMService)ctx.getBean("AVMService");
         
-        // TODO: temporary - remove from here when r13170 is merged from V3.1->HEAD
-        transactionService = (TransactionService)ctx.getBean("TransactionService");
-        
         // WCM locking
         //avmLockingAwareService = (AVMService)ctx.getBean("AVMLockingAwareService");
         
@@ -105,35 +97,12 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest
             // Switch back to Admin
             AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
             
-            List<WebProjectInfo> webProjects = wpService.listWebProjects();
-            for (final WebProjectInfo wpInfo : webProjects)
-            {
-                if (wpInfo.getStoreId().startsWith(TEST_WEBPROJ_DNS))
-                {
-                    // TODO: temporary - remove from here when r13170 is merged from V3.1->HEAD
-                    
-                    // note: added retry for now, due to intermittent concurrent update (during tearDown) possibly due to OrphanReaper ?
-                    // org.hibernate.StaleObjectStateException: Row was updated or deleted by another transaction (or unsaved-value mapping was incorrect): [org.alfresco.repo.avm.PlainFileNodeImpl#3752]
-                    RetryingTransactionCallback<Object> deleteWebProjectWork = new RetryingTransactionCallback<Object>()
-                    {
-                        public Object execute() throws Exception
-                        {
-                            wpService.deleteWebProject(wpInfo.getNodeRef());
-                            return null;
-                        }
-                    };
-                    transactionService.getRetryingTransactionHelper().doInTransaction(deleteWebProjectWork);
-
-                }
-            }
-
             deleteUser(USER_ONE);
             deleteUser(USER_TWO);
             deleteUser(USER_THREE);
             deleteUser(USER_FOUR);
         }
         
-        AuthenticationUtil.clearCurrentSecurityContext();
         super.tearDown();
     }