You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by ro...@apache.org on 2013/08/09 13:27:25 UTC
svn commit: r1512261 -
/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/
Author: rombert
Date: Fri Aug 9 11:27:24 2013
New Revision: 1512261
URL: http://svn.apache.org/r1512261
Log:
SLING-3004 - Event ITs should use timeouts
Updated all test methods to specify a default timeout.
Modified:
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java
sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TimedJobsTest.java
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java?rev=1512261&r1=1512260&r2=1512261&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/AbstractJobHandlingTest.java Fri Aug 9 11:27:24 2013
@@ -52,6 +52,8 @@ public abstract class AbstractJobHandlin
private static final String BUNDLE_JAR_SYS_PROP = "project.bundle.file";
+ protected static final int DEFAULT_TEST_TIMEOUT = 1000*60*5;
+
@Inject
protected EventAdmin eventAdmin;
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java?rev=1512261&r1=1512260&r2=1512261&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/ClassloadingTest.java Fri Aug 9 11:27:24 2013
@@ -87,7 +87,7 @@ public class ClassloadingTest extends Ab
}
- @Test
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
public void testSimpleClassloading() throws Exception {
final AtomicInteger processedJobsCount = new AtomicInteger(0);
final List<Event> finishedEvents = Collections.synchronizedList(new ArrayList<Event>());
@@ -161,7 +161,7 @@ public class ClassloadingTest extends Ab
}
}
- @Test
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
public void testFailedClassloading() throws Exception {
final AtomicInteger failedJobsCount = new AtomicInteger(0);
final List<Event> finishedEvents = Collections.synchronizedList(new ArrayList<Event>());
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java?rev=1512261&r1=1512260&r2=1512261&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/DropQueueTest.java Fri Aug 9 11:27:24 2013
@@ -34,6 +34,7 @@ import org.apache.sling.event.jobs.Queue
import org.apache.sling.event.jobs.consumer.JobConsumer;
import org.junit.After;
import org.junit.Before;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
@@ -76,7 +77,8 @@ public class DropQueueTest extends Abstr
}
- @org.junit.Test public void testDroppingQueue() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testDroppingQueue() throws Exception {
final AtomicInteger count = new AtomicInteger(0);
final AtomicInteger dropCount = new AtomicInteger(0);
final ServiceRegistration jcReg = this.registerJobConsumer(TOPIC,
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java?rev=1512261&r1=1512260&r2=1512261&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/IgnoreQueueTest.java Fri Aug 9 11:27:24 2013
@@ -33,6 +33,7 @@ import org.apache.sling.event.jobs.Queue
import org.apache.sling.event.jobs.consumer.JobConsumer;
import org.junit.After;
import org.junit.Before;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
@@ -73,7 +74,8 @@ public class IgnoreQueueTest extends Abs
}
- @org.junit.Test public void testIgnoreQueue() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testIgnoreQueue() throws Exception {
final AtomicInteger count = new AtomicInteger(0);
final ServiceRegistration jcReg = this.registerJobConsumer(TOPIC,
new JobConsumer() {
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java?rev=1512261&r1=1512260&r2=1512261&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/JobHandlingTest.java Fri Aug 9 11:27:24 2013
@@ -102,7 +102,8 @@ public class JobHandlingTest extends Abs
* Test simple job execution.
* The job is executed once and finished successfully.
*/
- @Test public void testSimpleJobExecution() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testSimpleJobExecution() throws Exception {
final Barrier cb = new Barrier(2);
final ServiceRegistration reg = this.registerEventHandler("sling/test",
@@ -126,7 +127,8 @@ public class JobHandlingTest extends Abs
}
}
- @Test public void testManyJobs() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testManyJobs() throws Exception {
final ServiceRegistration reg1 = this.registerEventHandler("sling/test",
new EventHandler() {
@Override
@@ -180,7 +182,8 @@ public class JobHandlingTest extends Abs
* Test simple job execution with job id.
* The job is executed once and finished successfully.
*/
- @org.junit.Test public void testSimpleJobWithIdExecution() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testSimpleJobWithIdExecution() throws Exception {
final Barrier cb = new Barrier(2);
final ServiceRegistration jcReg = this.registerJobConsumer(TOPIC,
new JobConsumer() {
@@ -206,7 +209,8 @@ public class JobHandlingTest extends Abs
* Test canceling a job
* The job execution always fails
*/
- @org.junit.Test public void testCancelJob() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testCancelJob() throws Exception {
final Barrier cb = new Barrier(2);
final Barrier cb2 = new Barrier(2);
final ServiceRegistration jcReg = this.registerJobConsumer(TOPIC,
@@ -247,7 +251,8 @@ public class JobHandlingTest extends Abs
* Test force canceling a job
* The job execution always fails
*/
- @org.junit.Test public void testForceCancelJob() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testForceCancelJob() throws Exception {
final Barrier cb = new Barrier(2);
final ServiceRegistration jcReg = this.registerJobConsumer(TOPIC,
new JobConsumer() {
@@ -280,7 +285,8 @@ public class JobHandlingTest extends Abs
* Reschedule test.
* The job is rescheduled two times before it fails.
*/
- @org.junit.Test public void testStartJobAndReschedule() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testStartJobAndReschedule() throws Exception {
final List<Integer> retryCountList = new ArrayList<Integer>();
final Barrier cb = new Barrier(2);
final ServiceRegistration jcReg = this.registerJobConsumer(TOPIC,
@@ -326,7 +332,8 @@ public class JobHandlingTest extends Abs
* We send several jobs which are treated different and then see
* how many invocations have been sent.
*/
- @org.junit.Test public void testNotifications() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testNotifications() throws Exception {
final List<String> cancelled = Collections.synchronizedList(new ArrayList<String>());
final List<String> failed = Collections.synchronizedList(new ArrayList<String>());
final List<String> finished = Collections.synchronizedList(new ArrayList<String>());
@@ -443,7 +450,8 @@ public class JobHandlingTest extends Abs
/**
* Test sending of jobs with and without a processor
*/
- @org.junit.Test(timeout=1000*60*5) public void testNoJobProcessor() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testNoJobProcessor() throws Exception {
final AtomicInteger count = new AtomicInteger(0);
final AtomicInteger unprocessedCount = new AtomicInteger(0);
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java?rev=1512261&r1=1512260&r2=1512261&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/OrderedQueueTest.java Fri Aug 9 11:27:24 2013
@@ -82,7 +82,8 @@ public class OrderedQueueTest extends Ab
/**
* Ordered Queue Test
*/
- @Test public void testOrderedQueue() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testOrderedQueue() throws Exception {
final JobManager jobManager = this.getJobManager();
final Barrier cb = new Barrier(2);
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java?rev=1512261&r1=1512260&r2=1512261&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/RoundRobinQueueTest.java Fri Aug 9 11:27:24 2013
@@ -37,6 +37,7 @@ import org.apache.sling.event.jobs.Queue
import org.apache.sling.event.jobs.consumer.JobConsumer;
import org.junit.After;
import org.junit.Before;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
@@ -83,7 +84,8 @@ public class RoundRobinQueueTest extends
}
- @org.junit.Test public void testRoundRobinQueue() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testRoundRobinQueue() throws Exception {
final JobManager jobManager = this.getJobManager();
final Barrier cb = new Barrier(2);
Modified: sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TimedJobsTest.java
URL: http://svn.apache.org/viewvc/sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TimedJobsTest.java?rev=1512261&r1=1512260&r2=1512261&view=diff
==============================================================================
--- sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TimedJobsTest.java (original)
+++ sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it/TimedJobsTest.java Fri Aug 9 11:27:24 2013
@@ -30,6 +30,7 @@ import javax.inject.Inject;
import org.apache.sling.event.EventUtil;
import org.junit.Before;
+import org.junit.Test;
import org.junit.runner.RunWith;
import org.ops4j.pax.exam.junit.PaxExam;
import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
@@ -56,7 +57,8 @@ public class TimedJobsTest extends Abstr
this.sleep(1000L);
}
- @org.junit.Test public void testTimedJob() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testTimedJob() throws Exception {
final AtomicInteger counter = new AtomicInteger();
final ServiceRegistration ehReg = this.registerEventHandler(TOPIC, new EventHandler() {
@@ -85,7 +87,8 @@ public class TimedJobsTest extends Abstr
}
}
- @org.junit.Test public void testPeriodicTimedJob() throws Exception {
+ @Test(timeout = DEFAULT_TEST_TIMEOUT)
+ public void testPeriodicTimedJob() throws Exception {
final AtomicInteger counter = new AtomicInteger();
final ServiceRegistration ehReg = this.registerEventHandler(TOPIC, new EventHandler() {