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 mr...@apache.org on 2015/05/13 18:07:48 UTC
svn commit: r1679236 - in /jackrabbit/oak/branches/1.2: ./
oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/
oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/
Author: mreutegg
Date: Wed May 13 16:07:48 2015
New Revision: 1679236
URL: http://svn.apache.org/r1679236
Log:
OAK-2832: Test failure: DefaultAnalyzersConfigurationTest
Merged revision 1679235 from trunk
Modified:
jackrabbit/oak/branches/1.2/ (props changed)
jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java
jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java
Propchange: jackrabbit/oak/branches/1.2/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed May 13 16:07:48 2015
@@ -1,3 +1,3 @@
/jackrabbit/oak/branches/1.0:1665962
-/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675055,1675332,1675354,1675357,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676725,1677939,1678173,1678758,1678938,1679165,1679191
+/jackrabbit/oak/trunk:1672350,1672468,1672537,1672603,1672642,1672644,1672834-1672835,1673351,1673410,1673414,1673436,1673644,1673662-1673664,1673669,1673695,1674046,1674065,1674075,1674107,1674228,1674880,1675055,1675332,1675354,1675357,1675593,1676198,1676237,1676407,1676458,1676539,1676670,1676725,1677939,1678173,1678758,1678938,1679165,1679191,1679235
/jackrabbit/trunk:1345480
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java?rev=1679236&r1=1679235&r2=1679236&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java Wed May 13 16:07:48 2015
@@ -21,7 +21,6 @@ import java.io.StringReader;
import java.util.regex.Pattern;
import org.apache.lucene.analysis.Analyzer;
-import org.apache.lucene.analysis.BaseTokenStreamTestCase;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.core.KeywordTokenizer;
@@ -31,18 +30,19 @@ import org.apache.lucene.analysis.path.P
import org.apache.lucene.analysis.pattern.PatternCaptureGroupTokenFilter;
import org.apache.lucene.analysis.pattern.PatternReplaceFilter;
import org.apache.lucene.analysis.reverse.ReverseStringFilter;
-import org.apache.lucene.util.LuceneTestCase;
import org.apache.lucene.util.Version;
import org.junit.Before;
import org.junit.Test;
+import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertAnalyzesTo;
+import static org.apache.lucene.analysis.BaseTokenStreamTestCase.assertTokenStreamContents;
+
/**
* Testcase for checking default analyzers configurations behave as expected with regards to path related restrictions
*
* Note that default Solr analyzers for Oak should be equivalent to the ones programmatically defined here.
*/
-@LuceneTestCase.SuppressCodecs({"Lucene3x"})
-public class DefaultAnalyzersConfigurationTest extends BaseTokenStreamTestCase {
+public class DefaultAnalyzersConfigurationTest {
private Analyzer parentPathIndexingAnalyzer;
private Analyzer parentPathSearchingAnalyzer;
@@ -54,7 +54,6 @@ public class DefaultAnalyzersConfigurati
@Before
public void setUp() throws Exception {
- super.setUp();
this.exactPathAnalyzer = new Analyzer() {
@Override
protected TokenStreamComponents createComponents(String fieldName, Reader reader) {
Modified: jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java?rev=1679236&r1=1679235&r2=1679236&view=diff
==============================================================================
--- jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java (original)
+++ jackrabbit/oak/branches/1.2/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java Wed May 13 16:07:48 2015
@@ -18,18 +18,48 @@ package org.apache.jackrabbit.oak.plugin
import java.io.File;
-import org.apache.jackrabbit.core.query.AbstractQueryTest;
-import org.apache.jackrabbit.oak.plugins.index.solr.util.NodeTypeIndexingUtils;
+import javax.jcr.Repository;
+import javax.jcr.RepositoryException;
+import javax.jcr.Session;
+import javax.jcr.SimpleCredentials;
+
+import org.apache.jackrabbit.api.JackrabbitRepository;
+import org.apache.jackrabbit.oak.jcr.Jcr;
+import org.junit.After;
+import org.junit.Before;
import org.junit.Test;
+import static org.junit.Assert.assertNotNull;
+import static org.junit.Assert.assertTrue;
+
/**
* Testcase for {@link org.apache.jackrabbit.oak.plugins.index.solr.util.NodeTypeIndexingUtils}
*/
-public class NodeTypeIndexingUtilsTest extends AbstractQueryTest {
+public class NodeTypeIndexingUtilsTest {
+
+ private Repository r;
+ private Session s;
+
+ @Before
+ public void setUp() throws RepositoryException {
+ r = new Jcr().createRepository();
+ s = r.login(new SimpleCredentials("admin", "admin".toCharArray()));
+ }
+
+ @After
+ public void tearDown() {
+ s.logout();
+ s = null;
+ if (r instanceof JackrabbitRepository) {
+ ((JackrabbitRepository) r).shutdown();
+ }
+ r = null;
+ }
+ @Test
public void testSynonymsFileCreation() throws Exception {
File synonymsFile = NodeTypeIndexingUtils.createPrimaryTypeSynonymsFile(getClass().getResource("/").getFile() +
- "/pt-synonyms.txt", superuser);
+ "/pt-synonyms.txt", s);
assertNotNull(synonymsFile);
assertTrue(synonymsFile.exists());
}