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 al...@apache.org on 2012/08/22 13:25:12 UTC
svn commit: r1375994 - in
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit:
mk/index/ oak/plugins/index/ oak/plugins/index/IndexTest.java
oak/plugins/index/PrefixIndexTest.java
oak/plugins/index/PropertyIndexTest.java
Author: alexparvulescu
Date: Wed Aug 22 11:25:12 2012
New Revision: 1375994
URL: http://svn.apache.org/viewvc?rev=1375994&view=rev
Log:
OAK-269 Query: IndexManager to manage existing indexes - moved tests
Added:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexTest.java (contents, props changed)
- copied, changed from r1375930, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/IndexTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/PrefixIndexTest.java (contents, props changed)
- copied, changed from r1375930, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PrefixIndexTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexTest.java (contents, props changed)
- copied, changed from r1375930, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PropertyIndexTest.java
Removed:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexTest.java (from r1375930, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/IndexTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/IndexTest.java&r1=1375930&r2=1375994&rev=1375994&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/IndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexTest.java Wed Aug 22 11:25:12 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.index;
+package org.apache.jackrabbit.oak.plugins.index;
import java.util.Iterator;
import java.util.Random;
@@ -26,6 +26,7 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.index.Cursor;
import org.apache.jackrabbit.oak.plugins.index.Indexer;
import org.apache.jackrabbit.oak.plugins.index.PropertyIndex;
+import org.junit.Before;
import org.junit.Test;
/**
@@ -33,10 +34,13 @@ import org.junit.Test;
*/
public class IndexTest {
- private final MicroKernel mk = new MicroKernelImpl();
- private final Indexer indexer = Indexer.getInstance(mk);
+ private MicroKernel mk;
+ private Indexer indexer;
- {
+ @Before
+ public void before() {
+ mk = new MicroKernelImpl();
+ indexer = new Indexer(mk);
indexer.init();
}
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/IndexTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/PrefixIndexTest.java (from r1375930, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PrefixIndexTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/PrefixIndexTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/PrefixIndexTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PrefixIndexTest.java&r1=1375930&r2=1375994&rev=1375994&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PrefixIndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/PrefixIndexTest.java Wed Aug 22 11:25:12 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.index;
+package org.apache.jackrabbit.oak.plugins.index;
import java.util.Iterator;
import junit.framework.Assert;
@@ -32,7 +32,7 @@ public class PrefixIndexTest {
@Test
public void test() {
MicroKernel mk = new MicroKernelImpl();
- Indexer indexer = Indexer.getInstance(mk);
+ Indexer indexer = new Indexer(mk);
indexer.init();
PrefixIndex index = indexer.createPrefixIndex("d:");
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/PrefixIndexTest.java
------------------------------------------------------------------------------
svn:eol-style = native
Copied: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexTest.java (from r1375930, jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PropertyIndexTest.java)
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexTest.java?p2=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexTest.java&p1=jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PropertyIndexTest.java&r1=1375930&r2=1375994&rev=1375994&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/mk/index/PropertyIndexTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexTest.java Wed Aug 22 11:25:12 2012
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.jackrabbit.mk.index;
+package org.apache.jackrabbit.oak.plugins.index;
import junit.framework.Assert;
import org.apache.jackrabbit.mk.api.MicroKernel;
@@ -31,7 +31,7 @@ public class PropertyIndexTest {
@Test
public void test() {
MicroKernel mk = new MicroKernelImpl();
- Indexer indexer = Indexer.getInstance(mk);
+ Indexer indexer = new Indexer(mk);
indexer.init();
PropertyIndex index = indexer.createPropertyIndex("id", true);
@@ -64,7 +64,7 @@ public class PropertyIndexTest {
Assert.assertEquals("/test/test", index.getPath("3", head));
// Recreate the indexer
- indexer = Indexer.getInstance(mk);
+ indexer = new Indexer(mk);
indexer.init();
index = indexer.createPropertyIndex("id", true);
head = mk.getHeadRevision();
Propchange: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/PropertyIndexTest.java
------------------------------------------------------------------------------
svn:eol-style = native