jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ste...@apache.org
Subject svn commit: r1341485 - in /jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test: AbstractMicroKernelIT.java MicroKernelIT.java
Date Tue, 22 May 2012 14:08:17 GMT
Author: stefan
Date: Tue May 22 14:08:16 2012
New Revision: 1341485

URL: http://svn.apache.org/viewvc?rev=1341485&view=rev
Log:
OAK-75: specify format and semantics of 'filter' parameter in MicroKernel API (WIP)

Modified:
    jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/AbstractMicroKernelIT.java
    jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java

Modified: jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/AbstractMicroKernelIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/AbstractMicroKernelIT.java?rev=1341485&r1=1341484&r2=1341485&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/AbstractMicroKernelIT.java
(original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/AbstractMicroKernelIT.java
Tue May 22 14:08:16 2012
@@ -34,6 +34,7 @@ import org.junit.runners.Parameterized.P
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertNull;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -213,7 +214,7 @@ public abstract class AbstractMicroKerne
     protected void assertPropertyNotExists(JSONObject obj, String relPath)
             throws AssertionError {
         Object val = resolveValue(obj, relPath);
-        assertNotNull("not found: " + relPath, val);
+        assertNull(val);
     }
 
     protected void assertPropertyExists(JSONObject obj, String relPath, Class type)

Modified: jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java?rev=1341485&r1=1341484&r2=1341485&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
(original)
+++ jackrabbit/oak/trunk/oak-it/mk/src/main/java/org/apache/jackrabbit/mk/test/MicroKernelIT.java
Tue May 22 14:08:16 2012
@@ -410,15 +410,14 @@ public class MicroKernelIT extends Abstr
     }
 
     @Test
-    @Ignore
     public void getNodesFiltered() {
         String head = mk.getHeadRevision();
 
         // verify initial content using filter
-        String filter = "{ properties : { \"\\\\*ntProp\" } ";
-        JSONObject obj = parseJSONObject(mk.getNodes("/", head, 1, 0, -1, null));
+        String filter = "{ properties : [ \"\\\\*ntProp\", \"\\\\-mult\\\\*\" ] } ";
+        JSONObject obj = parseJSONObject(mk.getNodes("/", head, 1, 0, -1, filter));
         assertPropertyExists(obj, "test/intProp");
-        assertPropertyExists(obj, "test/multiIntProp");
+        assertPropertyNotExists(obj, "test/multiIntProp");
         assertPropertyNotExists(obj, "test/stringProp");
         assertPropertyNotExists(obj, "test/floatProp");
         assertPropertyNotExists(obj, "test/booleanProp");



Mime
View raw message