You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by st...@apache.org on 2016/11/01 11:36:16 UTC

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

Author: stefanegli
Date: Tue Nov  1 11:36:16 2016
New Revision: 1767479

URL: http://svn.apache.org/viewvc?rev=1767479&view=rev
Log:
OAK-5020 : another test variant added

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

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java?rev=1767479&r1=1767478&r2=1767479&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/observation/ObservationTest.java Tue Nov  1 11:36:16 2016
@@ -1299,6 +1299,21 @@ public class ObservationTest extends Abs
 
     @Test
     public void includeAncestorsRemove() throws Exception {
+        JackrabbitEventFilter filter = new JackrabbitEventFilter();
+        filter.setEventTypes(ALL_EVENTS);
+        filter.setAbsPath(TEST_PATH + "/a/b/c/d");
+        filter.setIsDeep(true);
+        filter = FilterFactory.wrap(filter).withIncludeAncestorsRemove();
+        doIncludeAncestorsRemove(filter);
+
+        filter = new JackrabbitEventFilter();
+        filter.setEventTypes(ALL_EVENTS);
+        filter.setIsDeep(true);
+        filter = FilterFactory.wrap(filter).withIncludeAncestorsRemove().withIncludeGlobPaths(TEST_PATH + "/a/b/c/**");
+        doIncludeAncestorsRemove(filter);
+    }
+    
+    private void doIncludeAncestorsRemove(JackrabbitEventFilter filter) throws Exception {
         assumeTrue(observationManager instanceof ObservationManagerImpl);
 
         Node testNode = getNode(TEST_PATH);
@@ -1308,12 +1323,6 @@ public class ObservationTest extends Abs
         ObservationManagerImpl oManager = (ObservationManagerImpl) observationManager;
         ExpectationListener listener = new ExpectationListener();
         
-        JackrabbitEventFilter filter = new JackrabbitEventFilter();
-        filter.setEventTypes(ALL_EVENTS);
-        filter.setAbsPath(TEST_PATH + "/a/b/c/d");
-        filter.setIsDeep(true);
-        filter = FilterFactory.wrap(filter).withIncludeAncestorsRemove();
-
         oManager.addEventListener(listener, filter);
 
         Node d = testNode.getNode("a").getNode("b").getNode("c").getNode("d");