You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by us...@apache.org on 2012/07/27 16:27:02 UTC
svn commit: r1366393 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java
Author: uschindler
Date: Fri Jul 27 14:27:02 2012
New Revision: 1366393
URL: http://svn.apache.org/viewvc?rev=1366393&view=rev
Log:
Merged revision(s) 1366392 from lucene/dev/trunk:
Improve test
Modified:
lucene/dev/branches/branch_4x/ (props changed)
lucene/dev/branches/branch_4x/lucene/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/ (props changed)
lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java
Modified: lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java?rev=1366393&r1=1366392&r2=1366393&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestAllAnalyzersHaveFactories.java Fri Jul 27 14:27:02 2012
@@ -50,7 +50,9 @@ import org.apache.lucene.analysis.path.R
import org.apache.lucene.analysis.sinks.TeeSinkTokenFilter;
import org.apache.lucene.analysis.snowball.SnowballFilter;
import org.apache.lucene.analysis.util.CharFilterFactory;
+import org.apache.lucene.analysis.util.ResourceLoader;
import org.apache.lucene.analysis.util.ResourceLoaderAware;
+import org.apache.lucene.analysis.util.StringMockResourceLoader;
import org.apache.lucene.analysis.util.TokenFilterFactory;
import org.apache.lucene.analysis.util.TokenizerFactory;
import org.apache.lucene.util.LuceneTestCase;
@@ -109,6 +111,8 @@ public class TestAllAnalyzersHaveFactori
);
}
+ private static final ResourceLoader loader = new StringMockResourceLoader("");
+
public void test() throws Exception {
List<Class<?>> analysisClasses = new ArrayList<Class<?>>();
TestRandomChains.getClassesForPackage("org.apache.lucene.analysis", analysisClasses);
@@ -138,12 +142,12 @@ public class TestAllAnalyzersHaveFactori
try {
instance.setLuceneMatchVersion(TEST_VERSION_CURRENT);
instance.init(Collections.<String,String>emptyMap());
- // TODO: provide fake ResourceLoader
- if (!(instance instanceof ResourceLoaderAware)) {
- assertSame(c, instance.create(new StringReader("")).getClass());
+ if (instance instanceof ResourceLoaderAware) {
+ ((ResourceLoaderAware) instance).inform(loader);
}
+ assertSame(c, instance.create(new StringReader("")).getClass());
} catch (IllegalArgumentException e) {
- // TODO: For now pass because some factories have not yet a default config that always works, some require ResourceLoader
+ // TODO: For now pass because some factories have not yet a default config that always works
}
} else if (TokenFilter.class.isAssignableFrom(c)) {
String clazzName = c.getSimpleName();
@@ -154,16 +158,16 @@ public class TestAllAnalyzersHaveFactori
try {
instance.setLuceneMatchVersion(TEST_VERSION_CURRENT);
instance.init(Collections.<String,String>emptyMap());
- // TODO: provide fake ResourceLoader
- if (!(instance instanceof ResourceLoaderAware)) {
- Class<? extends TokenStream> createdClazz = instance.create(new KeywordTokenizer(new StringReader(""))).getClass();
- // only check instance if factory have wrapped at all!
- if (KeywordTokenizer.class != createdClazz) {
- assertSame(c, createdClazz);
- }
+ if (instance instanceof ResourceLoaderAware) {
+ ((ResourceLoaderAware) instance).inform(loader);
+ }
+ Class<? extends TokenStream> createdClazz = instance.create(new KeywordTokenizer(new StringReader(""))).getClass();
+ // only check instance if factory have wrapped at all!
+ if (KeywordTokenizer.class != createdClazz) {
+ assertSame(c, createdClazz);
}
} catch (IllegalArgumentException e) {
- // TODO: For now pass because some factories have not yet a default config that always works, some require ResourceLoader
+ // TODO: For now pass because some factories have not yet a default config that always works
}
} else if (CharFilter.class.isAssignableFrom(c)) {
String clazzName = c.getSimpleName();
@@ -174,16 +178,16 @@ public class TestAllAnalyzersHaveFactori
try {
instance.setLuceneMatchVersion(TEST_VERSION_CURRENT);
instance.init(Collections.<String,String>emptyMap());
- // TODO: provide fake ResourceLoader
- if (!(instance instanceof ResourceLoaderAware)) {
- Class<? extends Reader> createdClazz = instance.create(new StringReader("")).getClass();
- // only check instance if factory have wrapped at all!
- if (StringReader.class != createdClazz) {
- assertSame(c, createdClazz);
- }
+ if (instance instanceof ResourceLoaderAware) {
+ ((ResourceLoaderAware) instance).inform(loader);
+ }
+ Class<? extends Reader> createdClazz = instance.create(new StringReader("")).getClass();
+ // only check instance if factory have wrapped at all!
+ if (StringReader.class != createdClazz) {
+ assertSame(c, createdClazz);
}
} catch (IllegalArgumentException e) {
- // TODO: For now pass because some factories have not yet a default config that always works, some require ResourceLoader
+ // TODO: For now pass because some factories have not yet a default config that always works
}
}
}