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/AVM - fix for AVMServiceLocalTest.testLayeredFolderDelete2, also decrease poll for WCMTestSuite

Browse Source 
git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17105 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Jan Vonka
2009-10-23 08:29:01 +00:00
parent b990648554
commit 33cb3d594e
3 changed files with 223 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
source/java/org/alfresco/repo/avm/ibatis/AVMNodeDAOIbatis.java
View File

@@ -420,6 +420,11 @@ class AVMNodeDAOIbatis extends HibernateDaoSupport implements AVMNodeDAO
private AVMNode convertNodeEntityToNode(AVMNodeEntity nodeEntity, boolean withStore) private AVMNode convertNodeEntityToNode(AVMNodeEntity nodeEntity, boolean withStore)
{ {
if (nodeEntity == null)
{
return null;
}
AVMNodeImpl node = null; AVMNodeImpl node = null;
if (nodeEntity.getType() == AVMNodeType.PLAIN_FILE) if (nodeEntity.getType() == AVMNodeType.PLAIN_FILE)
{ {

433
source/java/org/alfresco/wcm/AbstractWCMServiceImplTest.java
View File

@@ -1,228 +1,227 @@
/* /*
* Copyright (C) 2005-2009 Alfresco Software Limited. * Copyright (C) 2005-2009 Alfresco Software Limited.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2 * as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version. * of the License, or (at your option) any later version.
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software * along with this program; if not, write to the Free Software
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
* As a special exception to the terms and conditions of version 2.0 of * As a special exception to the terms and conditions of version 2.0 of
* the GPL, you may redistribute this Program in connection with Free/Libre * the GPL, you may redistribute this Program in connection with Free/Libre
* and Open Source Software ("FLOSS") applications as described in Alfresco's * and Open Source Software ("FLOSS") applications as described in Alfresco's
* FLOSS exception. You should have recieved a copy of the text describing * FLOSS exception. You should have recieved a copy of the text describing
* the FLOSS exception, and it is also available here: * the FLOSS exception, and it is also available here:
* http://www.alfresco.com/legal/licensing" * http://www.alfresco.com/legal/licensing"
*/ */
package org.alfresco.wcm; package org.alfresco.wcm;
import java.util.List; import java.util.List;
import junit.framework.TestCase; import junit.framework.TestCase;
import org.alfresco.error.AlfrescoRuntimeException; import org.alfresco.error.AlfrescoRuntimeException;
import org.alfresco.model.ContentModel; import org.alfresco.model.ContentModel;
import org.alfresco.repo.security.authentication.AuthenticationUtil; import org.alfresco.repo.security.authentication.AuthenticationUtil;
import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback; import org.alfresco.repo.transaction.RetryingTransactionHelper.RetryingTransactionCallback;
import org.alfresco.service.cmr.security.AuthenticationService; import org.alfresco.service.cmr.security.AuthenticationService;
import org.alfresco.service.cmr.security.PersonService; import org.alfresco.service.cmr.security.PersonService;
import org.alfresco.service.transaction.TransactionService; import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ApplicationContextHelper;
import org.alfresco.util.PropertyMap; import org.alfresco.util.PropertyMap;
import org.alfresco.wcm.asset.AssetService; import org.alfresco.wcm.asset.AssetService;
import org.alfresco.wcm.sandbox.SandboxService; import org.alfresco.wcm.sandbox.SandboxService;
import org.alfresco.wcm.util.WCMUtil; import org.alfresco.wcm.util.WCMUtil;
import org.alfresco.wcm.webproject.WebProjectInfo; import org.alfresco.wcm.webproject.WebProjectInfo;
import org.alfresco.wcm.webproject.WebProjectService; import org.alfresco.wcm.webproject.WebProjectService;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext; import org.springframework.context.support.ClassPathXmlApplicationContext;
/** /**
* Abstract WCM Service implementation unit test * Abstract WCM Service implementation unit test
* *
* @author janv * @author janv
*/ */
public class AbstractWCMServiceImplTest extends TestCase public class AbstractWCMServiceImplTest extends TestCase
{ {
private static Log logger = LogFactory.getLog(AbstractWCMServiceImplTest.class); private static Log logger = LogFactory.getLog(AbstractWCMServiceImplTest.class);
private static final String PREVIEW_CONFIG_LOCATION = "classpath:wcm/wcm-test-preview-context.xml"; private static final String PREVIEW_CONFIG_LOCATION = "classpath:wcm/wcm-test-preview-context.xml";
// override jbpm.job.executor idleInterval to 5s (was 1.5m) for WCM unit tests // override jbpm.job.executor idleInterval to 1s (was 1.5m) for WCM unit tests
private static final String SUBMIT_CONFIG_LOCATION = "classpath:wcm/wcm-jbpm-context.xml"; private static final String SUBMIT_CONFIG_LOCATION = "classpath:wcm/wcm-jbpm-context.xml";
protected static final long SUBMIT_DELAY = 15000L; // (in millis) 15s - to allow async submit direct workflow to complete (as per 5s idleInterval above)
protected static final long POLL_DELAY = 1500L; // (in millis) 1.5s
protected static final long POLL_DELAY = 5000L; // (in millis) 5s protected static final int POLL_MAX_ATTEMPTS = 5;
protected static final int POLL_MAX_ATTEMPTS = 5;
// note: all tests share same context (when run via WCMTestSuite)
// note: all tests share same context (when run via WCMTestSuite) protected static ApplicationContext ctx = new ClassPathXmlApplicationContext(new String[] {ApplicationContextHelper.CONFIG_LOCATIONS[0], SUBMIT_CONFIG_LOCATION, PREVIEW_CONFIG_LOCATION});;
protected static ApplicationContext ctx = new ClassPathXmlApplicationContext(new String[] {ApplicationContextHelper.CONFIG_LOCATIONS[0], SUBMIT_CONFIG_LOCATION, PREVIEW_CONFIG_LOCATION});;
//
// // test data
// test data //
//
protected static final String TEST_RUN = ""+System.currentTimeMillis();
protected static final String TEST_RUN = ""+System.currentTimeMillis(); protected static final boolean CLEAN = true; // cleanup during teardown
protected static final boolean CLEAN = true; // cleanup during teardown
// base web project
// base web project protected static final String TEST_WEBPROJ_DNS = "testWebProj-"+TEST_RUN;
protected static final String TEST_WEBPROJ_DNS = "testWebProj-"+TEST_RUN;
protected static final String TEST_WEBPROJ_NAME = "testSandbox Web Project Display Name - "+TEST_RUN;
protected static final String TEST_WEBPROJ_NAME = "testSandbox Web Project Display Name - "+TEST_RUN; protected static final String TEST_WEBPROJ_TITLE = "This is my title";
protected static final String TEST_WEBPROJ_TITLE = "This is my title"; protected static final String TEST_WEBPROJ_DESCRIPTION = "This is my description";
protected static final String TEST_WEBPROJ_DESCRIPTION = "This is my description"; protected static final String TEST_WEBPROJ_DEFAULT_WEBAPP = WCMUtil.DIR_ROOT;
protected static final String TEST_WEBPROJ_DEFAULT_WEBAPP = WCMUtil.DIR_ROOT; protected static final boolean TEST_WEBPROJ_USE_AS_TEMPLATE = true;
protected static final boolean TEST_WEBPROJ_USE_AS_TEMPLATE = true; protected static final boolean TEST_WEBPROJ_DONT_USE_AS_TEMPLATE = false;
protected static final boolean TEST_WEBPROJ_DONT_USE_AS_TEMPLATE = false;
// base web users
// base web users
protected static String USER_ADMIN; protected static String USER_ADMIN;
protected static final String TEST_USER = "testWebUser-"+TEST_RUN; protected static final String TEST_USER = "testWebUser-"+TEST_RUN;
protected static final String USER_ONE = TEST_USER+"-One"; protected static final String USER_ONE = TEST_USER+"-One";
protected static final String USER_TWO = TEST_USER+"-Two"; protected static final String USER_TWO = TEST_USER+"-Two";
protected static final String USER_THREE = TEST_USER+"-Three"; protected static final String USER_THREE = TEST_USER+"-Three";
protected static final String USER_FOUR = TEST_USER+"-Four"; protected static final String USER_FOUR = TEST_USER+"-Four";
// //
// services // services
// //
protected WebProjectService wpService; protected WebProjectService wpService;
protected SandboxService sbService; protected SandboxService sbService;
protected AssetService assetService; protected AssetService assetService;
protected AuthenticationService authenticationService; protected AuthenticationService authenticationService;
protected PersonService personService; protected PersonService personService;
protected TransactionService transactionService; protected TransactionService transactionService;
@Override @Override
protected void setUp() throws Exception protected void setUp() throws Exception
{ {
// Get the required services // Get the required services
wpService = (WebProjectService)ctx.getBean("WebProjectService"); wpService = (WebProjectService)ctx.getBean("WebProjectService");
sbService = (SandboxService)ctx.getBean("SandboxService"); sbService = (SandboxService)ctx.getBean("SandboxService");
assetService = (AssetService)ctx.getBean("AssetService"); assetService = (AssetService)ctx.getBean("AssetService");
authenticationService = (AuthenticationService)ctx.getBean("AuthenticationService"); authenticationService = (AuthenticationService)ctx.getBean("AuthenticationService");
personService = (PersonService)ctx.getBean("PersonService"); personService = (PersonService)ctx.getBean("PersonService");
transactionService = (TransactionService)ctx.getBean("TransactionService"); transactionService = (TransactionService)ctx.getBean("TransactionService");
// By default run as Admin // By default run as Admin
USER_ADMIN = AuthenticationUtil.getAdminUserName(); USER_ADMIN = AuthenticationUtil.getAdminUserName();
AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN); AuthenticationUtil.setFullyAuthenticatedUser(USER_ADMIN);
createUser(USER_ONE); createUser(USER_ONE);
createUser(USER_TWO); createUser(USER_TWO);
createUser(USER_THREE); createUser(USER_THREE);
createUser(USER_FOUR); createUser(USER_FOUR);
} }
@Override @Override
protected void tearDown() throws Exception protected void tearDown() throws Exception
{ {
if (CLEAN) if (CLEAN)
{ {
// Switch back to Admin // Switch back to Admin
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
List<WebProjectInfo> webProjects = wpService.listWebProjects(); List<WebProjectInfo> webProjects = wpService.listWebProjects();
for (final WebProjectInfo wpInfo : webProjects) for (final WebProjectInfo wpInfo : webProjects)
{ {
if (wpInfo.getStoreId().startsWith(TEST_WEBPROJ_DNS)) if (wpInfo.getStoreId().startsWith(TEST_WEBPROJ_DNS))
{ {
// note: added retry for now, due to intermittent concurrent update (during tearDown) possibly due to OrphanReaper ? // 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] // 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>() RetryingTransactionCallback<Object> deleteWebProjectWork = new RetryingTransactionCallback<Object>()
{ {
public Object execute() throws Exception public Object execute() throws Exception
{ {
wpService.deleteWebProject(wpInfo.getNodeRef()); wpService.deleteWebProject(wpInfo.getNodeRef());
return null; return null;
} }
}; };
transactionService.getRetryingTransactionHelper().doInTransaction(deleteWebProjectWork); 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(); AuthenticationUtil.clearCurrentSecurityContext();
} }
protected void createUser(String userName) protected void createUser(String userName)
{ {
if (authenticationService.authenticationExists(userName) == false) if (authenticationService.authenticationExists(userName) == false)
{ {
authenticationService.createAuthentication(userName, "PWD".toCharArray()); authenticationService.createAuthentication(userName, "PWD".toCharArray());
PropertyMap ppOne = new PropertyMap(4); PropertyMap ppOne = new PropertyMap(4);
ppOne.put(ContentModel.PROP_USERNAME, userName); ppOne.put(ContentModel.PROP_USERNAME, userName);
ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName"); ppOne.put(ContentModel.PROP_FIRSTNAME, "firstName");
ppOne.put(ContentModel.PROP_LASTNAME, "lastName"); ppOne.put(ContentModel.PROP_LASTNAME, "lastName");
ppOne.put(ContentModel.PROP_EMAIL, "email@email.com"); ppOne.put(ContentModel.PROP_EMAIL, "email@email.com");
ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle"); ppOne.put(ContentModel.PROP_JOBTITLE, "jobTitle");
personService.createPerson(ppOne); personService.createPerson(ppOne);
} }
} }
protected void deleteUser(String userName) protected void deleteUser(String userName)
{ {
personService.deletePerson(userName); personService.deletePerson(userName);
} }
protected int pollForSnapshotCount(final String stagingStoreId, final int expectedCnt) throws InterruptedException protected int pollForSnapshotCount(final String stagingStoreId, final int expectedCnt) throws InterruptedException
{ {
long start = System.currentTimeMillis(); long start = System.currentTimeMillis();
String currentUser = AuthenticationUtil.getFullyAuthenticatedUser(); String currentUser = AuthenticationUtil.getFullyAuthenticatedUser();
int attempts = 0; int attempts = 0;
try try
{ {
AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName()); AuthenticationUtil.setFullyAuthenticatedUser(AuthenticationUtil.getAdminUserName());
int cnt = 0; int cnt = 0;
while (cnt != expectedCnt) while (cnt != expectedCnt)
{ {
Thread.sleep(POLL_DELAY); Thread.sleep(POLL_DELAY);
cnt = sbService.listSnapshots(stagingStoreId, false).size(); cnt = sbService.listSnapshots(stagingStoreId, false).size();
attempts++; attempts++;
if (attempts > POLL_MAX_ATTEMPTS) if (attempts > POLL_MAX_ATTEMPTS)
{ {
throw new AlfrescoRuntimeException("Too many poll attempts"); throw new AlfrescoRuntimeException("Too many poll attempts");
} }
} }
} }
finally finally
{ {
AuthenticationUtil.setFullyAuthenticatedUser(currentUser); AuthenticationUtil.setFullyAuthenticatedUser(currentUser);
} }
logger.debug("pollForSnapshotCount: "+stagingStoreId+" in "+(System.currentTimeMillis()-start)+" msecs ("+attempts+" attempts)"); logger.debug("pollForSnapshotCount: "+stagingStoreId+" in "+(System.currentTimeMillis()-start)+" msecs ("+attempts+" attempts)");
return attempts; return attempts;
} }
} }

4
source/test-resources/wcm/jbpm.cfg.xml
View File

@@ -58,9 +58,9 @@
<int value="1" /> <int value="1" />
</field> </field>
<!-- overridden for WCM unit tests to 5 secs (was 1.5 mins) --> <!-- overridden for WCM unit tests to 1 secs (was 1.5 mins) -->
<field name="idleInterval"> <field name="idleInterval">
<int value="5000" /> <int value="1000" />
</field> </field>
<field name="maxIdleInterval"> <field name="maxIdleInterval">