svn commit: r1572492 - /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationRefreshTest.java

[mduerig]

Author: mduerig
Date: Thu Feb 27 10:03:39 2014
New Revision: 1572492

URL: http://svn.apache.org/r1572492
Log:
OAK-1267: Failure in ObservationRefreshTest
OAK-1477: ObservationRefreshTest very slow for DOCUMENT_JDBC fixture
Don't run tests in parallel to avoid competing for resources
Exclude DOCUMENT_JDBC fixture

Modified:
    
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationRefreshTest.java

Modified: 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationRefreshTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationRefreshTest.java?rev=1572492&r1=1572491&r2=1572492&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationRefreshTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationRefreshTest.java
 Thu Feb 27 10:03:39 2014
@@ -51,10 +51,13 @@ import org.apache.jackrabbit.oak.jcr.Nod
 import org.apache.jackrabbit.oak.jcr.repository.RepositoryImpl;
 import org.apache.jackrabbit.test.api.util.Text;
 import org.junit.After;
+import org.junit.Assume;
 import org.junit.Before;
-import org.junit.Ignore;
 import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.junit.runners.Parameterized;
 
+@RunWith(Parameterized.class)
 public class ObservationRefreshTest extends AbstractRepositoryTest {
     public static final int ALL_EVENTS = NODE_ADDED | NODE_REMOVED | 
NODE_MOVED | PROPERTY_ADDED |
             PROPERTY_REMOVED | PROPERTY_CHANGED | PERSIST;
@@ -101,8 +104,8 @@ public class ObservationRefreshTest exte
     }
 
     @Test
-    @Ignore("OAK-1267")  // FIXME OAK-1267
     public void observation() throws RepositoryException, 
InterruptedException, ExecutionException {
+        Assume.assumeTrue(fixture != NodeStoreFixture.DOCUMENT_JDBC);  // 
FIXME too slow. See OAK-1477
         final MyListener listener = new MyListener();
         observationManager.addEventListener(listener, ALL_EVENTS, "/", true, 
null, null, false);
         try {
@@ -216,7 +219,7 @@ public class ObservationRefreshTest exte
 
     private class MyListener implements EventListener {
 
-        private String error = "";
+        private volatile String error = "";
 
         private volatile int numAdded = 0;