Spring/spring-net
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

improved retry test performance

Browse Source
This commit is contained in:
eeichinger
2009-09-23 15:46:34 +00:00
parent 95ade89c08
commit dbb3951e6b
4 changed files with 92 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
test/Spring/Spring.Aop.Tests/Aspects/RetryAdviceTests.cs
View File

@@ -21,6 +21,7 @@
#region Imports
using System;
using System.Collections;
using NUnit.Framework;
using Spring.Aop.Framework;
@@ -58,23 +59,28 @@ namespace Spring.Aspects
private static void InvokeOncePassOnceFail(bool useExceptionName, bool isDelay)
{
ITestRemoteService rs = GetRemoteService(2, useExceptionName, isDelay);
TestSleepHandler testSleepHandler = new TestSleepHandler();
ITestRemoteService rs = GetRemoteService(2, useExceptionName, isDelay, testSleepHandler);
rs.DoTransfer();
AssertSleepsAndReset(testSleepHandler, 2, isDelay);
rs = GetRemoteService(3, useExceptionName, isDelay);
rs = GetRemoteService(3, useExceptionName, isDelay, testSleepHandler);
try
{
rs.DoTransfer();
Assert.Fail("Should have failed.");
} catch (ArithmeticException)
{
// they maximum retry count is 3, thus only 2 sleep calls
AssertSleepsAndReset(testSleepHandler, 2, isDelay);
}
}
private static void InvokeOnceFailWithUnexceptedException(bool useExceptionName, bool isDelay)
{
ITestRemoteService rs = GetRemoteService(3, useExceptionName, isDelay);
TestSleepHandler testSleepHandler = new TestSleepHandler();
ITestRemoteService rs = GetRemoteService(3, useExceptionName, isDelay, testSleepHandler);
try
{
rs.DoTransfer2();
@@ -86,12 +92,40 @@ namespace Spring.Aspects
}
}
private static ITestRemoteService GetRemoteService(int numFailures, bool usingExceptionName, bool isDelay)
private static void AssertSleepsAndReset(TestSleepHandler testSleepHandler, int numFailures, bool isDelay)
{
Assert.AreEqual(numFailures, testSleepHandler.CalledTimeSpans.Count);
for(int i=0;i<numFailures;i++)
{
if (isDelay)
{
Assert.AreEqual(TimeSpan.FromSeconds(1), testSleepHandler.CalledTimeSpans[i]);
}
else
{
Assert.AreEqual(TimeSpan.FromSeconds(1 * (i + 1) + 0.5), testSleepHandler.CalledTimeSpans[i]);
}
}
testSleepHandler.CalledTimeSpans.Clear();
}
private class TestSleepHandler
{
public readonly ArrayList CalledTimeSpans = new ArrayList();
public void Sleep(TimeSpan duration)
{
CalledTimeSpans.Add(duration);
}
}
private static ITestRemoteService GetRemoteService(int numFailures, bool usingExceptionName, bool isDelay, TestSleepHandler testSleepHandler)
{
TestRemoteService remoteService = new TestRemoteService();
remoteService.NumFailures = numFailures;
ProxyFactory factory = new ProxyFactory(remoteService);
RetryAdvice retryAdvice = new RetryAdvice();
RetryAdvice retryAdvice = new RetryAdvice(new RetryAdvice.SleepHandler(testSleepHandler.Sleep));
if (usingExceptionName)
{
if (isDelay)

4
test/Spring/Spring.Web.Tests/Spring.Web.Tests.2008.csproj
View File

@@ -176,10 +176,6 @@
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Net\2.0\Common.Logging.dll</HintPath>
</Reference>
<Reference Include="nunit.core.interfaces, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Net\2.0\nunit.core.interfaces.dll</HintPath>
</Reference>
<Reference Include="nunit.framework, Version=2.4.1.0, Culture=neutral, PublicKeyToken=96d09a1eb7f44a77">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\..\lib\Net\2.0\nunit.framework.dll</HintPath>