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 th...@apache.org on 2012/09/12 12:09:40 UTC

svn commit: r1383874 - /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/JsopUtil.java

Author: thomasm
Date: Wed Sep 12 10:09:39 2012
New Revision: 1383874

URL: http://svn.apache.org/viewvc?rev=1383874&view=rev
Log:
OAK-288 QueryTests should use the NodeStore apis - JsopUtils support for non-string property types

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/JsopUtil.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/JsopUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/JsopUtil.java?rev=1383874&r1=1383873&r2=1383874&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/JsopUtil.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/JsopUtil.java Wed Sep 12 10:09:39 2012
@@ -26,6 +26,7 @@ import org.apache.jackrabbit.oak.api.Cor
 import org.apache.jackrabbit.oak.api.Root;
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.commons.PathUtils;
+import org.apache.jackrabbit.oak.kernel.CoreValueMapper;
 
 /**
  * Utility class for working with jsop string diffs
@@ -104,12 +105,13 @@ public class JsopUtil {
             } else if (tokenizer.matches('[')) {
                 List<CoreValue> mvp = new ArrayList<CoreValue>();
                 do {
-                    mvp.add(vf.createValue(tokenizer.readString()));
+                    mvp.add(CoreValueMapper.fromJsopReader(tokenizer, vf));
                 } while (tokenizer.matches(','));
                 tokenizer.read(']');
                 t.setProperty(key, mvp);
             } else {
-                t.setProperty(key, vf.createValue(tokenizer.readString()));
+                t.setProperty(key, 
+                        CoreValueMapper.fromJsopReader(tokenizer, vf));
             }
         } while (tokenizer.matches(','));
     }