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 md...@apache.org on 2013/11/27 17:50:57 UTC

svn commit: r1546106 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilterTest.java

Author: mduerig
Date: Wed Nov 27 16:50:56 2013
New Revision: 1546106

URL: http://svn.apache.org/r1546106
Log:
OAK-1133: Observation listener PLUS
More exact test expectations

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilterTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilterTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilterTest.java?rev=1546106&r1=1546105&r2=1546106&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilterTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/observation/filter/GlobbingPathFilterTest.java Wed Nov 27 16:50:56 2013
@@ -98,8 +98,8 @@ public class GlobbingPathFilterTest {
         ImmutableTree t = tree;
 
         for(String name : elements("a/b/c/d")) {
-            assertTrue(filter.includeAdd(name, t.getNodeState()));
             t = t.getChild(name);
+            assertTrue(filter.includeAdd(name, t.getNodeState()));
             filter = filter.create(name, t.getNodeState(), t.getNodeState());
             assertNotNull(filter);
         }
@@ -215,14 +215,14 @@ public class GlobbingPathFilterTest {
 
         for(int c = 0; c < 2; c++) {
             for(String name : elements("r/s/t/u")) {
-                assertFalse(filter.includeAdd(name, t.getNodeState()));
                 t = t.getChild(name);
+                assertFalse(filter.includeAdd(name, t.getNodeState()));
                 filter = filter.create(name, t.getNodeState(), t.getNodeState());
                 assertNotNull(filter);
             }
 
-            assertTrue(filter.includeAdd("v", t.getNodeState()));
             t = t.getChild("v");
+            assertTrue(filter.includeAdd("v", t.getNodeState()));
             filter = filter.create("v", t.getNodeState(), t.getNodeState());
             assertNotNull(filter);
         }
@@ -237,14 +237,14 @@ public class GlobbingPathFilterTest {
         ImmutableTree t = tree;
 
         for(String name : elements("r/s/t/u/v/r/s/t/u/v/r/s/t/u/v")) {
-            assertFalse(filter.includeAdd(name, t.getNodeState()));
             t = t.getChild(name);
+            assertFalse(filter.includeAdd(name, t.getNodeState()));
             filter = filter.create(name, t.getNodeState(), t.getNodeState());
             assertNotNull(filter);
         }
 
-        assertTrue(filter.includeAdd("w", t.getNodeState()));
         t = t.getChild("w");
+        assertTrue(filter.includeAdd("w", t.getNodeState()));
         filter = filter.create("w", t.getNodeState(), t.getNodeState());
         assertNotNull(filter);
     }
@@ -258,15 +258,15 @@ public class GlobbingPathFilterTest {
         ImmutableTree t = tree;
 
         for(String name : elements("r/s")) {
-            assertFalse(filter.includeAdd(name, t.getNodeState()));
             t = t.getChild(name);
+            assertFalse(filter.includeAdd(name, t.getNodeState()));
             filter = filter.create(name, t.getNodeState(), t.getNodeState());
             assertNotNull(filter);
         }
 
         for (String name: elements("t/u/v/r/s/t/u/v/r/s/t/u/v/w")) {
-            assertTrue(filter.includeAdd(name, t.getNodeState()));
             t = t.getChild(name);
+            assertTrue(filter.includeAdd(name, t.getNodeState()));
             filter = filter.create(name, t.getNodeState(), t.getNodeState());
             assertNotNull(filter);
         }