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:04:34 UTC
svn commit: r1679235 - in
/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr:
configuration/DefaultAnalyzersConfigurationTest.java
util/NodeTypeIndexingUtilsTest.java
Author: mreutegg
Date: Wed May 13 16:04:34 2015
New Revision: 1679235
URL: http://svn.apache.org/r1679235
Log:
OAK-2832: Test failure: DefaultAnalyzersConfigurationTest
Modified:
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java
jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java
Modified: jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java?rev=1679235&r1=1679234&r2=1679235&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/configuration/DefaultAnalyzersConfigurationTest.java Wed May 13 16:04:34 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/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java?rev=1679235&r1=1679234&r2=1679235&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java (original)
+++ jackrabbit/oak/trunk/oak-solr-core/src/test/java/org/apache/jackrabbit/oak/plugins/index/solr/util/NodeTypeIndexingUtilsTest.java Wed May 13 16:04:34 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());
}