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 re...@apache.org on 2015/12/14 15:02:08 UTC
svn commit: r1719914 - in
/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr:
AbstractRepositoryTest.java query/QueryFulltextTest.java query/QueryTest.java
Author: reschke
Date: Mon Dec 14 14:02:08 2015
New Revision: 1719914
URL: http://svn.apache.org/viewvc?rev=1719914&view=rev
Log:
OAK-3743: revert repository fixture to original state
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java?rev=1719914&r1=1719913&r2=1719914&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/AbstractRepositoryTest.java Mon Dec 14 14:02:08 2015
@@ -118,11 +118,8 @@ public abstract class AbstractRepository
protected Jcr initJcr(Jcr jcr) {
QueryEngineSettings qs = new QueryEngineSettings();
- // OAK-3743: fullTextComparisonWithoutIndex temporarily disabled
- // qs.setFullTextComparisonWithoutIndex(true);
- // OAK-3743: withAsyncIndexing temporarily disabled
- // return jcr.withAsyncIndexing().with(qs);
- return jcr.with(qs);
+ qs.setFullTextComparisonWithoutIndex(true);
+ return jcr.withAsyncIndexing().with(qs);
}
protected Session getAdminSession() throws RepositoryException {
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java?rev=1719914&r1=1719913&r2=1719914&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryFulltextTest.java Mon Dec 14 14:02:08 2015
@@ -32,7 +32,6 @@ import javax.jcr.query.RowIterator;
import org.apache.jackrabbit.oak.jcr.AbstractRepositoryTest;
import org.apache.jackrabbit.oak.jcr.NodeStoreFixture;
-import org.junit.Ignore;
import org.junit.Test;
/**
@@ -43,8 +42,7 @@ public class QueryFulltextTest extends A
public QueryFulltextTest(NodeStoreFixture fixture) {
super(fixture);
}
-
- @Ignore("OAK-3743")
+
@Test
public void excerpt() throws Exception {
Session session = getAdminSession();
@@ -95,8 +93,7 @@ public class QueryFulltextTest extends A
assertTrue(path + ":" + s + " (7)", s.indexOf("Hello World") >= 0);
assertTrue(path + ":" + s + " (8)", s.indexOf("Description") < 0);
}
-
- @Ignore("OAK-3743")
+
@Test
public void fulltextOrWithinText() throws Exception {
Session session = getAdminSession();
Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java?rev=1719914&r1=1719913&r2=1719914&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java (original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/query/QueryTest.java Mon Dec 14 14:02:08 2015
@@ -324,8 +324,7 @@ public class QueryTest extends AbstractR
NodeIterator it = r.getNodes();
assertFalse(it.hasNext());
}
-
- @Ignore("OAK-3743")
+
@Test
public void unicode() throws Exception {
Session session = getAdminSession();
@@ -757,7 +756,6 @@ public class QueryTest extends AbstractR
}
}
- @Ignore("OAK-3743")
@Test
public void testOak1096() throws RepositoryException {
Session writer = createAdminSession();