root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

[SPR-6011] SpringJUnit4ClassRunner once again supports collective timeouts for repeated tests.

This commit is contained in:
Sam Brannen 2009-08-28 17:28:25 +00:00
parent e0c63d8cba
commit 984504735e
2 changed files with 46 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
org.springframework.test/src/main/java/org/springframework/test/context/junit4/SpringJUnit4ClassRunner.java
View File

@ -309,8 +309,8 @@ public class SpringJUnit4ClassRunner extends BlockJUnit4ClassRunner {
statement = possiblyExpectingExceptions(frameworkMethod, testInstance, statement); statement = possiblyExpectingExceptions(frameworkMethod, testInstance, statement);
statement = withBefores(frameworkMethod, testInstance, statement); statement = withBefores(frameworkMethod, testInstance, statement);
statement = withAfters(frameworkMethod, testInstance, statement); statement = withAfters(frameworkMethod, testInstance, statement);
statement = withPotentialTimeout(frameworkMethod, testInstance, statement);
statement = withPotentialRepeat(frameworkMethod, testInstance, statement); statement = withPotentialRepeat(frameworkMethod, testInstance, statement);
statement = withPotentialTimeout(frameworkMethod, testInstance, statement);
return statement; return statement;
} }

53
org.springframework.test/src/test/java/org/springframework/test/context/junit4/RepeatedSpringRunnerTests.java
View File

@ -30,7 +30,6 @@ import org.junit.runners.Parameterized;
import org.junit.runners.Parameterized.Parameters; import org.junit.runners.Parameterized.Parameters;
import org.springframework.test.annotation.Repeat; import org.springframework.test.annotation.Repeat;
import org.springframework.test.annotation.Timed; import org.springframework.test.annotation.Timed;
import org.springframework.test.context.ContextConfiguration;
import org.springframework.test.context.TestExecutionListeners; import org.springframework.test.context.TestExecutionListeners;
/** /**
@ -76,7 +75,8 @@ public class RepeatedSpringRunnerTests {
{ NonAnnotatedRepeatedTestCase.class, 0, 1, 1, 1 },// { NonAnnotatedRepeatedTestCase.class, 0, 1, 1, 1 },//
{ DefaultRepeatValueRepeatedTestCase.class, 0, 1, 1, 1 },// { DefaultRepeatValueRepeatedTestCase.class, 0, 1, 1, 1 },//
{ NegativeRepeatValueRepeatedTestCase.class, 0, 1, 1, 1 },// { NegativeRepeatValueRepeatedTestCase.class, 0, 1, 1, 1 },//
{ RepeatedFiveTimesRepeatedTestCase.class, 0, 1, 1, 5 } // { RepeatedFiveTimesRepeatedTestCase.class, 0, 1, 1, 5 },//
{ TimedRepeatedTestCase.class, 3, 4, 4, (5 + 1 + 4 + 10) } //
}); });
} }
@ -101,7 +101,6 @@ public class RepeatedSpringRunnerTests {
@RunWith(SpringJUnit4ClassRunner.class) @RunWith(SpringJUnit4ClassRunner.class)
@TestExecutionListeners( {}) @TestExecutionListeners( {})
@ContextConfiguration(locations = {})
public abstract static class AbstractRepeatedTestCase { public abstract static class AbstractRepeatedTestCase {
protected void incrementInvocationCount() throws IOException { protected void incrementInvocationCount() throws IOException {
@ -113,7 +112,7 @@ public class RepeatedSpringRunnerTests {
@Test @Test
@Timed(millis = 10000) @Timed(millis = 10000)
public void testNonAnnotated() throws Exception { public void nonAnnotated() throws Exception {
incrementInvocationCount(); incrementInvocationCount();
} }
} }
@ -123,7 +122,7 @@ public class RepeatedSpringRunnerTests {
@Test @Test
@Repeat @Repeat
@Timed(millis = 10000) @Timed(millis = 10000)
public void testDefaultRepeatValue() throws Exception { public void defaultRepeatValue() throws Exception {
incrementInvocationCount(); incrementInvocationCount();
} }
} }
@ -133,7 +132,7 @@ public class RepeatedSpringRunnerTests {
@Test @Test
@Repeat(-5) @Repeat(-5)
@Timed(millis = 10000) @Timed(millis = 10000)
public void testNegativeRepeatValue() throws Exception { public void negativeRepeatValue() throws Exception {
incrementInvocationCount(); incrementInvocationCount();
} }
} }
@ -142,10 +141,48 @@ public class RepeatedSpringRunnerTests {
@Test @Test
@Repeat(5) @Repeat(5)
@Timed(millis = 10000) public void repeatedFiveTimes() throws Exception {
public void testRepeatedFiveTimes() throws Exception {
incrementInvocationCount(); incrementInvocationCount();
} }
} }
/**
* Unit tests for claims raised in <a
* href="http://jira.springframework.org/browse/SPR-6011"
* target="_blank">SPR-6011</a>.
*/
public static final class TimedRepeatedTestCase extends AbstractRepeatedTestCase {
@Test
@Timed(millis = 10000)
@Repeat(5)
public void repeatedFiveTimesButDoesNotExceedTimeout() throws Exception {
incrementInvocationCount();
}
@Test
@Timed(millis = 100)
@Repeat(1)
public void singleRepetitionExceedsTimeout() throws Exception {
incrementInvocationCount();
Thread.sleep(250);
}
@Test
@Timed(millis = 200)
@Repeat(4)
public void firstRepetitionOfManyExceedsTimeout() throws Exception {
incrementInvocationCount();
Thread.sleep(250);
}
@Test
@Timed(millis = 1000)
@Repeat(10)
public void collectiveRepetitionsExceedTimeout() throws Exception {
incrementInvocationCount();
Thread.sleep(150);
}
}
} }