You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rm...@apache.org on 2014/04/24 21:18:40 UTC
svn commit: r1589838 - in /lucene/dev/branches/branch_4x: ./ lucene/
lucene/analysis/ lucene/analysis/common/src/resources/META-INF/services/
lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
Author: rmuir
Date: Thu Apr 24 19:18:39 2014
New Revision: 1589838
URL: http://svn.apache.org/r1589838
Log:
fix TestAllAnalysersHaveFactories to actually work, and add missing SPI entry
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/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory
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/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory
URL: http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory?rev=1589838&r1=1589837&r2=1589838&view=diff
==============================================================================
--- lucene/dev/branches/branch_4x/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory (original)
+++ lucene/dev/branches/branch_4x/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory Thu Apr 24 19:18:39 2014
@@ -30,6 +30,7 @@ org.apache.lucene.analysis.compound.Hyph
org.apache.lucene.analysis.core.LowerCaseFilterFactory
org.apache.lucene.analysis.core.StopFilterFactory
org.apache.lucene.analysis.core.TypeTokenFilterFactory
+org.apache.lucene.analysis.core.UpperCaseFilterFactory
org.apache.lucene.analysis.cz.CzechStemFilterFactory
org.apache.lucene.analysis.de.GermanLightStemFilterFactory
org.apache.lucene.analysis.de.GermanMinimalStemFilterFactory
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=1589838&r1=1589837&r2=1589838&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 Thu Apr 24 19:18:39 2014
@@ -130,6 +130,7 @@ public class TestAllAnalyzersHaveFactori
|| crazyComponents.contains(c)
|| oddlyNamedComponents.contains(c)
|| deprecatedDuplicatedComponents.contains(c)
+ || c.isAnnotationPresent(Deprecated.class) // deprecated ones are typically back compat hacks
|| !(Tokenizer.class.isAssignableFrom(c) || TokenFilter.class.isAssignableFrom(c) || CharFilter.class.isAssignableFrom(c))
) {
continue;
@@ -151,7 +152,7 @@ public class TestAllAnalyzersHaveFactori
}
assertSame(c, instance.create(new StringReader("")).getClass());
} catch (IllegalArgumentException e) {
- if (!e.getMessage().contains("SPI")) {
+ if (!e.getMessage().contains("SPI") || e.getMessage().contains("does not exist")) {
throw e;
}
// TODO: For now pass because some factories have not yet a default config that always works
@@ -173,7 +174,7 @@ public class TestAllAnalyzersHaveFactori
assertSame(c, createdClazz);
}
} catch (IllegalArgumentException e) {
- if (!e.getMessage().contains("SPI")) {
+ if (!e.getMessage().contains("SPI") || e.getMessage().contains("does not exist")) {
throw e;
}
// TODO: For now pass because some factories have not yet a default config that always works
@@ -195,7 +196,7 @@ public class TestAllAnalyzersHaveFactori
assertSame(c, createdClazz);
}
} catch (IllegalArgumentException e) {
- if (!e.getMessage().contains("SPI")) {
+ if (!e.getMessage().contains("SPI") || e.getMessage().contains("does not exist")) {
throw e;
}
// TODO: For now pass because some factories have not yet a default config that always works
Re: svn commit: r1589838 - in /lucene/dev/branches/branch_4x: ./ lucene/ lucene/analysis/ lucene/analysis/common/src/resources/META-INF/services/ lucene/analysis/common/src/test/org/apache/lucene/analysis/core/
Posted by Uwe Schindler <uw...@thetaphi.de>.
Can you commit this to 4.8, because otherwise the uppercase factory does not work in solr. Its still time to do this.
Uwe
On 24. April 2014 21:18:40 MESZ, rmuir@apache.org wrote:
>Author: rmuir
>Date: Thu Apr 24 19:18:39 2014
>New Revision: 1589838
>
>URL: http://svn.apache.org/r1589838
>Log:
>fix TestAllAnalysersHaveFactories to actually work, and add missing SPI
>entry
>
>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/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory
>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/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory
>URL:
>http://svn.apache.org/viewvc/lucene/dev/branches/branch_4x/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory?rev=1589838&r1=1589837&r2=1589838&view=diff
>==============================================================================
>---
>lucene/dev/branches/branch_4x/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory
>(original)
>+++
>lucene/dev/branches/branch_4x/lucene/analysis/common/src/resources/META-INF/services/org.apache.lucene.analysis.util.TokenFilterFactory
>Thu Apr 24 19:18:39 2014
>@@ -30,6 +30,7 @@ org.apache.lucene.analysis.compound.Hyph
> org.apache.lucene.analysis.core.LowerCaseFilterFactory
> org.apache.lucene.analysis.core.StopFilterFactory
> org.apache.lucene.analysis.core.TypeTokenFilterFactory
>+org.apache.lucene.analysis.core.UpperCaseFilterFactory
> org.apache.lucene.analysis.cz.CzechStemFilterFactory
> org.apache.lucene.analysis.de.GermanLightStemFilterFactory
> org.apache.lucene.analysis.de.GermanMinimalStemFilterFactory
>
>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=1589838&r1=1589837&r2=1589838&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
>Thu Apr 24 19:18:39 2014
>@@ -130,6 +130,7 @@ public class TestAllAnalyzersHaveFactori
> || crazyComponents.contains(c)
> || oddlyNamedComponents.contains(c)
> || deprecatedDuplicatedComponents.contains(c)
>+ || c.isAnnotationPresent(Deprecated.class) // deprecated ones
>are typically back compat hacks
>|| !(Tokenizer.class.isAssignableFrom(c) ||
>TokenFilter.class.isAssignableFrom(c) ||
>CharFilter.class.isAssignableFrom(c))
> ) {
> continue;
>@@ -151,7 +152,7 @@ public class TestAllAnalyzersHaveFactori
> }
> assertSame(c, instance.create(new StringReader("")).getClass());
> } catch (IllegalArgumentException e) {
>- if (!e.getMessage().contains("SPI")) {
>+ if (!e.getMessage().contains("SPI") ||
>e.getMessage().contains("does not exist")) {
> throw e;
> }
>// TODO: For now pass because some factories have not yet a default
>config that always works
>@@ -173,7 +174,7 @@ public class TestAllAnalyzersHaveFactori
> assertSame(c, createdClazz);
> }
> } catch (IllegalArgumentException e) {
>- if (!e.getMessage().contains("SPI")) {
>+ if (!e.getMessage().contains("SPI") ||
>e.getMessage().contains("does not exist")) {
> throw e;
> }
>// TODO: For now pass because some factories have not yet a default
>config that always works
>@@ -195,7 +196,7 @@ public class TestAllAnalyzersHaveFactori
> assertSame(c, createdClazz);
> }
> } catch (IllegalArgumentException e) {
>- if (!e.getMessage().contains("SPI")) {
>+ if (!e.getMessage().contains("SPI") ||
>e.getMessage().contains("does not exist")) {
> throw e;
> }
>// TODO: For now pass because some factories have not yet a default
>config that always works
--
Uwe Schindler
H.-H.-Meier-Allee 63, 28213 Bremen
http://www.thetaphi.de