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 ch...@apache.org on 2014/11/27 12:37:36 UTC
svn commit: r1642114 - in /jackrabbit/oak/branches/1.0: ./
oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/
Author: chetanm
Date: Thu Nov 27 11:37:35 2014
New Revision: 1642114
URL: http://svn.apache.org/r1642114
Log:
OAK-2278 - Make current testcases pass with new index implementation
Merging revisions 1641601
Added:
jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
- copied unchanged from r1641601, jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
Modified:
jackrabbit/oak/branches/1.0/ (props changed)
jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java
Propchange: jackrabbit/oak/branches/1.0/
------------------------------------------------------------------------------
Merged /jackrabbit/oak/trunk:r1641601
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java?rev=1642114&r1=1642113&r2=1642114&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java Thu Nov 27 11:37:35 2014
@@ -53,6 +53,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.plugins.index.lucene.FieldNames.PATH;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INCLUDE_PROPERTY_NAMES;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.VERSION;
+import static org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil.newLuceneIndexDefinitionV2;
import static org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper.newLuceneIndexDefinition;
import static org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState.EMPTY_NODE;
import static org.apache.jackrabbit.oak.plugins.memory.PropertyStates.createProperty;
@@ -80,9 +81,8 @@ public class LuceneIndexEditorTest {
@Test
public void testLuceneWithFullText() throws Exception {
NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
- NodeBuilder idxnb = newLuceneIndexDefinition(index, "lucene",
+ NodeBuilder idxnb = newLuceneIndexDefinitionV2(index, "lucene",
of(TYPENAME_STRING));
- setCompatVersionToV2(idxnb);
NodeState before = builder.getNodeState();
builder.child("test").setProperty("foo", "fox is jumping");
@@ -101,7 +101,7 @@ public class LuceneIndexEditorTest {
@Test
public void testLuceneWithNonFullText() throws Exception {
NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
- NodeBuilder nb = newLuceneIndexDefinition(index, "lucene",
+ NodeBuilder nb = newLuceneIndexDefinitionV2(index, "lucene",
of(TYPENAME_STRING));
nb.setProperty(LuceneIndexConstants.FULL_TEXT_ENABLED, false);
nb.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, of("foo", "price", "weight", "bool", "creationTime"), STRINGS));
@@ -141,7 +141,7 @@ public class LuceneIndexEditorTest {
@Test
public void noOfDocsIndexedNonFullText() throws Exception{
NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
- NodeBuilder nb = newLuceneIndexDefinition(index, "lucene",
+ NodeBuilder nb = newLuceneIndexDefinitionV2(index, "lucene",
of(TYPENAME_STRING));
nb.setProperty(LuceneIndexConstants.FULL_TEXT_ENABLED, false);
nb.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, of("foo"), STRINGS));
@@ -167,7 +167,7 @@ public class LuceneIndexEditorTest {
@Test
public void nonIncludedPropertyChange() throws Exception {
NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
- NodeBuilder nb = newLuceneIndexDefinition(index, "lucene",
+ NodeBuilder nb = newLuceneIndexDefinitionV2(index, "lucene",
of(TYPENAME_STRING));
nb.setProperty(LuceneIndexConstants.FULL_TEXT_ENABLED, false);
nb.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, of("foo"),
@@ -201,7 +201,7 @@ public class LuceneIndexEditorTest {
@Test
public void testLuceneWithRelativeProperty() throws Exception {
NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
- NodeBuilder nb = newLuceneIndexDefinition(index, "lucene",
+ NodeBuilder nb = newLuceneIndexDefinitionV2(index, "lucene",
of(TYPENAME_STRING));
nb.setProperty(LuceneIndexConstants.FULL_TEXT_ENABLED, false);
nb.setProperty(createProperty(INCLUDE_PROPERTY_NAMES, of("foo", "jcr:content/mime",
@@ -286,7 +286,7 @@ public class LuceneIndexEditorTest {
@Test
public void autoFormatUpdate() throws Exception{
NodeBuilder index = builder.child(INDEX_DEFINITIONS_NAME);
- NodeBuilder nb = newLuceneIndexDefinition(index, "lucene",
+ NodeBuilder nb = newLuceneIndexDefinitionV2(index, "lucene",
of(TYPENAME_STRING));
//1. Trigger a index so that next index step does not see it as a fresh index
@@ -389,7 +389,4 @@ public class LuceneIndexEditorTest {
return FieldFactory.dateToLong(ISO8601.format(createCal(dt)));
}
- private static void setCompatVersionToV2(NodeBuilder idxNb) {
- idxNb.setProperty(LuceneIndexConstants.COMPAT_MODE, IndexFormatVersion.V2.getVersion());
- }
}
Modified: jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java?rev=1642114&r1=1642113&r2=1642114&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java (original)
+++ jackrabbit/oak/branches/1.0/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java Thu Nov 27 11:37:35 2014
@@ -27,6 +27,7 @@ import static org.apache.jackrabbit.oak.
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.EXCLUDE_PROPERTY_NAMES;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.INCLUDE_PROPERTY_TYPES;
import static org.apache.jackrabbit.oak.plugins.index.lucene.LuceneIndexConstants.TYPE_LUCENE;
+import static org.apache.jackrabbit.oak.plugins.index.lucene.TestUtil.useV2;
import java.util.List;
@@ -53,6 +54,8 @@ public class LuceneIndexExclusionQueryTe
lucene.setProperty(INCLUDE_PROPERTY_TYPES,
of(TYPENAME_BINARY, TYPENAME_STRING), STRINGS);
lucene.setProperty(EXCLUDE_PROPERTY_NAMES, of(NOT_IN), STRINGS);
+ lucene.setProperty(LuceneIndexConstants.COMPAT_MODE, of(NOT_IN), STRINGS);
+ useV2(lucene);
root.commit();
}