jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From alexparvule...@apache.org
Subject svn commit: r1408345 - in /jackrabbit/oak/trunk/oak-lucene: pom.xml src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
Date Mon, 12 Nov 2012 16:34:55 GMT
Author: alexparvulescu
Date: Mon Nov 12 16:34:55 2012
New Revision: 1408345

URL: http://svn.apache.org/viewvc?rev=1408345&view=rev
Log:
OAK-438 Provide the lucene index as an osgi bundle
 - enabled the query tests

Modified:
    jackrabbit/oak/trunk/oak-lucene/pom.xml
    jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java

Modified: jackrabbit/oak/trunk/oak-lucene/pom.xml
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/pom.xml?rev=1408345&r1=1408344&r2=1408345&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/pom.xml (original)
+++ jackrabbit/oak/trunk/oak-lucene/pom.xml Mon Nov 12 16:34:55 2012
@@ -121,6 +121,12 @@
       <artifactId>junit</artifactId>
       <scope>test</scope>
     </dependency>
+        <dependency>
+      <groupId>org.apache.jackrabbit</groupId>
+      <artifactId>oak-core</artifactId>
+      <version>${project.version}</version>
+      <classifier>tests</classifier>
+    </dependency>
     <dependency>
         <groupId>ch.qos.logback</groupId>
         <artifactId>logback-classic</artifactId>

Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java?rev=1408345&r1=1408344&r2=1408345&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
(original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexQueryTest.java
Mon Nov 12 16:34:55 2012
@@ -1,119 +1,119 @@
-///*
-// * Licensed to the Apache Software Foundation (ASF) under one or more
-// * contributor license agreements.  See the NOTICE file distributed with
-// * this work for additional information regarding copyright ownership.
-// * The ASF licenses this file to You under the Apache License, Version 2.0
-// * (the "License"); you may not use this file except in compliance with
-// * the License.  You may obtain a copy of the License at
-// *
-// *      http://www.apache.org/licenses/LICENSE-2.0
-// *
-// * Unless required by applicable law or agreed to in writing, software
-// * distributed under the License is distributed on an "AS IS" BASIS,
-// * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// * See the License for the specific language governing permissions and
-// * limitations under the License.
-// */
-//package org.apache.jackrabbit.oak.plugins.index.lucene;
-//
-//import static junit.framework.Assert.assertEquals;
-//import static org.junit.Assert.assertFalse;
-//import static org.junit.Assert.assertTrue;
-//
-//import java.util.Iterator;
-//
-//import org.apache.jackrabbit.oak.Oak;
-//import org.apache.jackrabbit.oak.api.ContentRepository;
-//import org.apache.jackrabbit.oak.api.Tree;
-//import org.apache.jackrabbit.oak.plugins.index.IndexHookManager;
-//import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent;
-//import org.apache.jackrabbit.oak.query.AbstractQueryTest;
-//import org.apache.jackrabbit.oak.query.JsopUtil;
-//import org.junit.Ignore;
-//import org.junit.Test;
-//
-///**
-// * Tests the query engine using the default index implementation: the
-// * {@link LuceneIndexProvider}
-// */
-//public class LuceneIndexQueryTest extends AbstractQueryTest {
-//
-//    @Override
-//    protected void createTestIndexNode() throws Exception {
-//        Tree index = root.getTree("/");
-//        createTestIndexNode(index, LuceneIndexConstants.TYPE_LUCENE);
-//        root.commit();
-//    }
-//
-//    @Override
-//    protected ContentRepository createRepository() {
-//        return new Oak()
-//            .with(new InitialContent())
-//            .with(new LuceneIndexProvider())
-//            .with(new IndexHookManager(new LuceneIndexHookProvider()))
-//            .createContentRepository();
-//    }
-//
-//    @Test
-//    @Ignore("OAK-420")
-//    public void sql2() throws Exception {
-//        test("sql2.txt");
-//    }
-//
-//    @Test
-//    @Ignore("OAK-420")
-//    public void sql2Measure() throws Exception {
-//        test("sql2_measure.txt");
-//    }
-//
-//    @Test
-//    public void descendantTest() throws Exception {
-//        JsopUtil.apply(root, "/ + \"test\": { \"a\": {}, \"b\": {} }");
-//        root.commit();
-//
-//        Iterator<String> result = executeQuery(
-//                "select * from [nt:base] where isdescendantnode('/test')",
-//                "JCR-SQL2").iterator();
-//        assertTrue(result.hasNext());
-//        assertEquals("/test/a", result.next());
-//        assertEquals("/test/b", result.next());
-//        assertFalse(result.hasNext());
-//    }
-//
-//    @Test
-//    public void descendantTest2() throws Exception {
-//        JsopUtil.apply(
-//                root,
-//                "/ + \"test\": { \"a\": { \"name\": [\"Hello\", \"World\" ] }, \"b\": {
\"name\" : \"Hello\" }}");
-//        root.commit();
-//
-//        Iterator<String> result = executeQuery(
-//                "select * from [nt:base] where isdescendantnode('/test') and name='World'",
-//                "JCR-SQL2").iterator();
-//        assertTrue(result.hasNext());
-//        assertEquals("/test/a", result.next());
-//        assertFalse(result.hasNext());
-//    }
-//
-//    @Test
-//    @Ignore("OAK-420")
-//    public void ischildnodeTest() throws Exception {
-//        JsopUtil.apply(
-//                root,
-//                "/ + \"parents\": { \"p0\": {\"id\": \"0\"}, \"p1\": {\"id\": \"1\"}, \"p2\":
{\"id\": \"2\"}}");
-//        JsopUtil.apply(
-//                root,
-//                "/ + \"children\": { \"c1\": {\"p\": \"1\"}, \"c2\": {\"p\": \"1\"}, \"c3\":
{\"p\": \"2\"}, \"c4\": {\"p\": \"3\"}}");
-//        root.commit();
-//
-//        Iterator<String> result = executeQuery(
-//                "select * from [nt:base] as p inner join [nt:base] as p2 on ischildnode(p2,
p) where p.[jcr:path] = '/'",
-//                "JCR-SQL2").iterator();
-//        assertTrue(result.hasNext());
-//        assertEquals("/, /children", result.next());
-//        assertEquals("/, /jcr:system", result.next());
-//        assertEquals("/, /oak:index", result.next());
-//        assertEquals("/, /parents", result.next());
-//        assertFalse(result.hasNext());
-//    }
-//}
\ No newline at end of file
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.apache.jackrabbit.oak.plugins.index.lucene;
+
+import static junit.framework.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertTrue;
+
+import java.util.Iterator;
+
+import org.apache.jackrabbit.oak.Oak;
+import org.apache.jackrabbit.oak.api.ContentRepository;
+import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.plugins.index.IndexHookManager;
+import org.apache.jackrabbit.oak.plugins.nodetype.InitialContent;
+import org.apache.jackrabbit.oak.query.AbstractQueryTest;
+import org.apache.jackrabbit.oak.query.JsopUtil;
+import org.junit.Ignore;
+import org.junit.Test;
+
+/**
+ * Tests the query engine using the default index implementation: the
+ * {@link LuceneIndexProvider}
+ */
+public class LuceneIndexQueryTest extends AbstractQueryTest {
+
+    @Override
+    protected void createTestIndexNode() throws Exception {
+        Tree index = root.getTree("/");
+        createTestIndexNode(index, LuceneIndexConstants.TYPE_LUCENE);
+        root.commit();
+    }
+
+    @Override
+    protected ContentRepository createRepository() {
+        return new Oak()
+            .with(new InitialContent())
+            .with(new LuceneIndexProvider())
+            .with(new IndexHookManager(new LuceneIndexHookProvider()))
+            .createContentRepository();
+    }
+
+    @Test
+    @Ignore("OAK-420")
+    public void sql2() throws Exception {
+        test("sql2.txt");
+    }
+
+    @Test
+    @Ignore("OAK-420")
+    public void sql2Measure() throws Exception {
+        test("sql2_measure.txt");
+    }
+
+    @Test
+    public void descendantTest() throws Exception {
+        JsopUtil.apply(root, "/ + \"test\": { \"a\": {}, \"b\": {} }");
+        root.commit();
+
+        Iterator<String> result = executeQuery(
+                "select * from [nt:base] where isdescendantnode('/test')",
+                "JCR-SQL2").iterator();
+        assertTrue(result.hasNext());
+        assertEquals("/test/a", result.next());
+        assertEquals("/test/b", result.next());
+        assertFalse(result.hasNext());
+    }
+
+    @Test
+    public void descendantTest2() throws Exception {
+        JsopUtil.apply(
+                root,
+                "/ + \"test\": { \"a\": { \"name\": [\"Hello\", \"World\" ] }, \"b\": { \"name\"
: \"Hello\" }}");
+        root.commit();
+
+        Iterator<String> result = executeQuery(
+                "select * from [nt:base] where isdescendantnode('/test') and name='World'",
+                "JCR-SQL2").iterator();
+        assertTrue(result.hasNext());
+        assertEquals("/test/a", result.next());
+        assertFalse(result.hasNext());
+    }
+
+    @Test
+    @Ignore("OAK-420")
+    public void ischildnodeTest() throws Exception {
+        JsopUtil.apply(
+                root,
+                "/ + \"parents\": { \"p0\": {\"id\": \"0\"}, \"p1\": {\"id\": \"1\"}, \"p2\":
{\"id\": \"2\"}}");
+        JsopUtil.apply(
+                root,
+                "/ + \"children\": { \"c1\": {\"p\": \"1\"}, \"c2\": {\"p\": \"1\"}, \"c3\":
{\"p\": \"2\"}, \"c4\": {\"p\": \"3\"}}");
+        root.commit();
+
+        Iterator<String> result = executeQuery(
+                "select * from [nt:base] as p inner join [nt:base] as p2 on ischildnode(p2,
p) where p.[jcr:path] = '/'",
+                "JCR-SQL2").iterator();
+        assertTrue(result.hasNext());
+        assertEquals("/, /children", result.next());
+        assertEquals("/, /jcr:system", result.next());
+        assertEquals("/, /oak:index", result.next());
+        assertEquals("/, /parents", result.next());
+        assertFalse(result.hasNext());
+    }
+}
\ No newline at end of file



Mime
View raw message