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)
{ {

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

@@ -58,11 +58,10 @@ public class AbstractWCMServiceImplTest extends TestCase
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 = 5000L; // (in millis) 5s protected static final long POLL_DELAY = 1500L; // (in millis) 1.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)

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">