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

Removed test's assumptions about the specific concurrency failure

Browse Source 
- Reduced retry count to 1 to prevent 40x40 retries each doing DB lock waits
 - Removed testNestedWithoutPropogationOuterFailing


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@17063 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261
This commit is contained in:
Derek Hulley
2009-10-21 12:13:41 +00:00
parent f9e37748aa
commit 055b18fb70
1 changed files with 5 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
source/java/org/alfresco/repo/transaction/RetryingTransactionHelperTest.java
View File

@@ -47,6 +47,7 @@ import org.alfresco.service.transaction.TransactionService;
import org.alfresco.util.ApplicationContextHelper; import org.alfresco.util.ApplicationContextHelper;
import org.apache.commons.lang.mutable.MutableInt; import org.apache.commons.lang.mutable.MutableInt;
import org.hibernate.SessionFactory; import org.hibernate.SessionFactory;
import org.hibernate.engine.TransactionHelper;
import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContext;
import org.springframework.dao.ConcurrencyFailureException; import org.springframework.dao.ConcurrencyFailureException;
import org.springframework.orm.hibernate3.support.HibernateDaoSupport; import org.springframework.orm.hibernate3.support.HibernateDaoSupport;
@@ -376,6 +377,8 @@ public class RetryingTransactionHelperTest extends TestCase
@SuppressWarnings("unchecked") @SuppressWarnings("unchecked")
public void testNestedWithoutPropogationConcurrentUntilFailure() public void testNestedWithoutPropogationConcurrentUntilFailure()
{ {
final RetryingTransactionHelper txnHelperForTest = transactionService.getRetryingTransactionHelper();
txnHelperForTest.setMaxRetries(1);
RetryingTransactionCallback<Long> callback = new RetryingTransactionCallback<Long>() RetryingTransactionCallback<Long> callback = new RetryingTransactionCallback<Long>()
{ {
public Long execute() throws Throwable public Long execute() throws Throwable
@@ -389,13 +392,13 @@ public class RetryingTransactionHelperTest extends TestCase
} }
}; };
incrementCheckValue(); incrementCheckValue();
txnHelper.doInTransaction(callbackInner, false, true); txnHelperForTest.doInTransaction(callbackInner, false, true);
return getCheckValue(); return getCheckValue();
} }
}; };
try try
{ {
txnHelper.doInTransaction(callback); txnHelperForTest.doInTransaction(callback);
fail("Concurrent nested access not leading to failure"); fail("Concurrent nested access not leading to failure");
} }
catch (Throwable e) catch (Throwable e)
@@ -405,46 +408,6 @@ public class RetryingTransactionHelperTest extends TestCase
} }
} }
/**
* Checks nesting of two transactions with <code>requiresNew == true</code>,
* but where the inner transaction fails writes values that the outer transaction
* fails on.
*/
public void testNestedWithoutPropogationOuterFailing()
{
RetryingTransactionCallback<Long> callback = new RetryingTransactionCallback<Long>()
{
private int maxCalls = 3;
private int callCount = 0;
public Long execute() throws Throwable
{
callCount++;
RetryingTransactionCallback<Long> callbackInner = new RetryingTransactionCallback<Long>()
{
public Long execute() throws Throwable
{
for (int i = 0; i < 5; i++)
{
incrementCheckValue();
}
return getCheckValue();
}
};
// Increment the value so that the outer transaction is bound to the particular
// version of the data
incrementCheckValue();
// Don't execute the inner transaction the last time around
if (callCount < maxCalls)
{
txnHelper.doInTransaction(callbackInner, false, true);
}
return getCheckValue();
}
};
long checkValue = txnHelper.doInTransaction(callback);
assertEquals("Check value not incremented", 11, checkValue);
}
public void testLostConnectionRecovery() public void testLostConnectionRecovery()
{ {
RetryingTransactionCallback<Object> killConnectionCallback = new RetryingTransactionCallback<Object>() RetryingTransactionCallback<Object> killConnectionCallback = new RetryingTransactionCallback<Object>()