svn commit: r1503779 - in /sling/trunk/bundles/extensions/event/src/test/java/org/apache/sling/event/it: AbstractJobHandlingTest.java ClassloadingTest.java

[rombert]

Author: rombert
Date: Tue Jul 16 16:15:24 2013
New Revision: 1503779

URL: http://svn.apache.org/r1503779
Log:
SLING-2969 - IT failure: ClassloadingTest.testSimpleClassloading fails
intermitently

- fix test logic which was changed inadvertently - spotted by @cziegler
- include the org.apache.sling.testing.tools bundle in the pax-exam
setup

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

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=1503779&r1=1503778&r2=1503779&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
 Tue Jul 16 16:15:24 2013
@@ -137,6 +137,8 @@ public abstract class AbstractJobHandlin
                 mavenBundle("org.apache.derby", "derby", "10.5.3.0_1"),
                 mavenBundle("org.apache.sling", 
"org.apache.sling.jcr.jackrabbit.server", "2.1.1-SNAPSHOT"),
 
+                mavenBundle("org.apache.sling", 
"org.apache.sling.testing.tools", "1.0.6"),
+
                 CoreOptions.bundle( bundleFile.toURI().toString() ),
 
                 junitBundles()

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=1503779&r1=1503778&r2=1503779&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
 Tue Jul 16 16:15:24 2013
@@ -142,7 +142,7 @@ public class ClassloadingTest extends Ab
                 @Override
                 public boolean isTrue() throws Exception {
                     return jobManager.getStatistics().getNumberOfQueuedJobs() 
== 0
-                            && processedJobsCount.get() == 0
+                            && processedJobsCount.get() == 1
                             && jobManager.findJobs(JobManager.QueryType.ALL, 
TOPIC, -1, (Map<String, Object>[]) null)
                                     .size() == 0;
                 }