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/25 13:13:30 UTC
svn commit: r1641601 - in
/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene:
LuceneIndexEditorTest.java LuceneIndexExclusionQueryTest.java TestUtil.java
Author: chetanm
Date: Tue Nov 25 12:13:30 2014
New Revision: 1641601
URL: http://svn.apache.org/r1641601
Log:
OAK-2278 - Make current testcases pass with new index implementation
Explicitly specify index format version to V2 for cases where all test pass the default has been changed to use V1
Added:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java (with props)
Modified:
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java
Modified: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java?rev=1641601&r1=1641600&r2=1641601&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexEditorTest.java Tue Nov 25 12:13:30 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/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java?rev=1641601&r1=1641600&r2=1641601&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/LuceneIndexExclusionQueryTest.java Tue Nov 25 12:13:30 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();
}
Added: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java?rev=1641601&view=auto
==============================================================================
--- jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java (added)
+++ jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java Tue Nov 25 12:13:30 2014
@@ -0,0 +1,49 @@
+/*
+ * 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 java.util.Set;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import org.apache.jackrabbit.oak.api.Tree;
+import org.apache.jackrabbit.oak.plugins.index.lucene.util.LuceneIndexHelper;
+import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
+
+public class TestUtil {
+
+ static void useV2(NodeBuilder idxNb) {
+ idxNb.setProperty(LuceneIndexConstants.COMPAT_MODE, IndexFormatVersion.V2.getVersion());
+ }
+
+ static void useV2(Tree idxTree) {
+ idxTree.setProperty(LuceneIndexConstants.COMPAT_MODE, IndexFormatVersion.V2.getVersion());
+ }
+
+ public static NodeBuilder newLuceneIndexDefinitionV2(
+ @Nonnull NodeBuilder index, @Nonnull String name,
+ @Nullable Set<String> propertyTypes) {
+ NodeBuilder nb = LuceneIndexHelper.newLuceneIndexDefinition(index, name, propertyTypes, null, null, null);
+ useV2(nb);
+ return nb;
+ }
+
+}
Propchange: jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/plugins/index/lucene/TestUtil.java
------------------------------------------------------------------------------
svn:eol-style = native