svn commit: r1400046 - in /jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak: AbstractOakTest.java plugins/index/old/QueryTest.java query/AbstractQueryTest.java

[ju...@apache.org]

Author: jukka
Date: Fri Oct 19 11:30:45 2012
New Revision: 1400046

URL: http://svn.apache.org/viewvc?rev=1400046&view=rev
Log:
OAK-352: Oak builder for simplified repository construction

Some cleanup after previous commits.

Modified:
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractOakTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java
    jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractOakTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractOakTest.java?rev=1400046&r1=1400045&r2=1400046&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractOakTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/AbstractOakTest.java Fri Oct 19 11:30:45 2012
@@ -16,9 +16,6 @@
  */
 package org.apache.jackrabbit.oak;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import javax.jcr.Credentials;
 import javax.jcr.NoSuchWorkspaceException;
 import javax.jcr.SimpleCredentials;
@@ -71,10 +68,4 @@ public abstract class AbstractOakTest {
         return new SimpleCredentials("admin", "admin".toCharArray());
     }
 
-    protected static MicroKernelTracker createDefaultKernelTracker() {
-        List<MicroKernelTracker> hooks = new ArrayList<MicroKernelTracker>();
-        hooks.add(new InitialContent());
-        return new CompositeMicroKernelTracker(hooks);
-    }
-
 }
\ No newline at end of file

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java?rev=1400046&r1=1400045&r2=1400046&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/old/QueryTest.java Fri Oct 19 11:30:45 2012
@@ -13,6 +13,8 @@
  */
 package org.apache.jackrabbit.oak.plugins.index.old;
 
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+
 import org.apache.jackrabbit.mk.core.MicroKernelImpl;
 import org.apache.jackrabbit.mk.index.IndexWrapper;
 import org.apache.jackrabbit.oak.Oak;

Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java?rev=1400046&r1=1400045&r2=1400046&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/query/AbstractQueryTest.java Fri Oct 19 11:30:45 2012
@@ -42,14 +42,15 @@ import org.apache.jackrabbit.oak.api.Ses
 import org.apache.jackrabbit.oak.api.Tree;
 import org.apache.jackrabbit.oak.api.Type;
 import org.apache.jackrabbit.oak.commons.PathUtils;
-import org.apache.jackrabbit.oak.plugins.index.IndexConstants;
 import org.apache.jackrabbit.oak.spi.query.PropertyValues;
-import org.apache.jackrabbit.oak.spi.security.OpenSecurityProvider;
-import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
 import org.junit.Before;
 import org.junit.Ignore;
 import org.junit.Test;
 
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.DEFAULT_INDEX_HOME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.INDEX_DEFINITIONS_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.REINDEX_PROPERTY_NAME;
+import static org.apache.jackrabbit.oak.plugins.index.IndexConstants.TYPE_PROPERTY_NAME;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
@@ -57,7 +58,7 @@ import static org.junit.Assert.fail;
 /**
  * AbstractQueryTest...
  */
-public abstract class AbstractQueryTest implements IndexConstants {
+public abstract class AbstractQueryTest {
 
     protected static final String TEST_INDEX_NAME = "test-index";
     protected static final String TEST_INDEX_HOME = DEFAULT_INDEX_HOME;
@@ -113,10 +114,6 @@ public abstract class AbstractQueryTest 
                 session.getLatestRoot(), null);
     }
 
-    protected SecurityProvider getSecurityProvider() {
-        return new OpenSecurityProvider();
-    }
-
     @Test
     public void sql1() throws Exception {
         test("sql1.txt");