svn commit: r1666100 - in /jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr: LuceneOakRepositoryStub.java query/SuggestTest.java

[tommaso]

Author: tommaso
Date: Thu Mar 12 09:10:25 2015
New Revision: 1666100

URL: http://svn.apache.org/r1666100
Log:
OAK-2611 - improved test configuration, avoid updating suggester other that in 
SuggestTest

Modified:
    
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
    
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java?rev=1666100&r1=1666099&r2=1666100&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/LuceneOakRepositoryStub.java
 Thu Mar 12 09:10:25 2015
@@ -85,7 +85,7 @@ public class LuceneOakRepositoryStub ext
                         .setProperty(REINDEX_PROPERTY_NAME, true)
                         .setProperty(LuceneIndexConstants.TEST_MODE, true)
                         
.setProperty(LuceneIndexConstants.EVALUATE_PATH_RESTRICTION, true)
-                        
.setProperty(LuceneIndexConstants.SUGGEST_UPDATE_FREQUENCY_MINUTES, 0) // 
always update suggester
+                        
.setProperty(LuceneIndexConstants.SUGGEST_UPDATE_FREQUENCY_MINUTES, 10)
                         .setProperty(LuceneIndexConstants.COMPAT_MODE, 
IndexFormatVersion.V2.getVersion());
 
                 NodeBuilder props = 
index.child(LuceneIndexConstants.INDEX_RULES)

Modified: 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java
URL: 
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java?rev=1666100&r1=1666099&r2=1666100&view=diff
==============================================================================
--- 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java
 (original)
+++ 
jackrabbit/oak/trunk/oak-lucene/src/test/java/org/apache/jackrabbit/oak/jcr/query/SuggestTest.java
 Thu Mar 12 09:10:25 2015
@@ -28,14 +28,33 @@ import javax.jcr.query.Row;
 import javax.jcr.query.RowIterator;
 
 import org.apache.jackrabbit.core.query.AbstractQueryTest;
+import org.junit.After;
+import org.junit.Before;
 
 /**
  * Tests the suggest support.
  */
 public class SuggestTest extends AbstractQueryTest {
 
+    @Before
+    public void setUp() throws Exception {
+        super.setUp();
+
+        // change suggester update frequency
+        
superuser.getNode("/oak:index/luceneGlobal").setProperty("suggestUpdateFrequencyMinutes",
 0);
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        // reset suggester update frequency
+        
superuser.getNode("/oak:index/luceneGlobal").setProperty("suggestUpdateFrequencyMinutes",
 10);
+
+        super.tearDown();
+    }
+
     public void testSuggestSql() throws Exception {
         Session session = superuser;
+
         QueryManager qm = session.getWorkspace().getQueryManager();
         Node n1 = testRootNode.addNode("node1");
         n1.setProperty("jcr:title", "in 2015 my fox is red, like mike's fox 
and john's fox");