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

WCM services - update test since code has now been merged from V3.1 (r13605)

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@13661 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-03-17 18:04:15 +00:00
parent aeedf77d3a
commit 3ad91710fa
1 changed files with 0 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
source/java/org/alfresco/wcm/sandbox/SandboxServiceImplTest.java
View File

@@ -35,12 +35,10 @@ import java.util.Map;
import org.alfresco.repo.content.MimetypeMap; import org.alfresco.repo.content.MimetypeMap;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.security.permissions.AccessDeniedException; 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.avm.AVMService;
import org.alfresco.service.cmr.repository.ContentReader; import org.alfresco.service.cmr.repository.ContentReader;
import org.alfresco.service.cmr.repository.ContentWriter; import org.alfresco.service.cmr.repository.ContentWriter;
import org.alfresco.service.namespace.QName; import org.alfresco.service.namespace.QName;
import org.alfresco.service.transaction.TransactionService;
import org.alfresco.wcm.AbstractWCMServiceImplTest; import org.alfresco.wcm.AbstractWCMServiceImplTest;
import org.alfresco.wcm.asset.AssetInfo; import org.alfresco.wcm.asset.AssetInfo;
import org.alfresco.wcm.asset.AssetService; import org.alfresco.wcm.asset.AssetService;
@@ -67,9 +65,6 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest
private SandboxService sbService; private SandboxService sbService;
private AssetService assetService; 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 avmService; // non-locking-aware
//private AVMService avmLockingAwareService; //private AVMService avmLockingAwareService;
@@ -87,9 +82,6 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest
avmService = (AVMService)ctx.getBean("AVMService"); 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 // WCM locking
//avmLockingAwareService = (AVMService)ctx.getBean("AVMLockingAwareService"); //avmLockingAwareService = (AVMService)ctx.getBean("AVMLockingAwareService");
@@ -105,35 +97,12 @@ public class SandboxServiceImplTest extends AbstractWCMServiceImplTest
// Switch back to Admin // Switch back to Admin
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); 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_ONE);
deleteUser(USER_TWO); deleteUser(USER_TWO);
deleteUser(USER_THREE); deleteUser(USER_THREE);
deleteUser(USER_FOUR); deleteUser(USER_FOUR);
} }
AuthenticationUtil.clearCurrentSecurityContext();
super.tearDown(); super.tearDown();
} }