From 8a0578dfe2fe345bc240e117b43882455e369733 Mon Sep 17 00:00:00 2001 From: Robert Muir Date: Wed, 17 Aug 2011 14:19:15 +0000 Subject: [PATCH] LUCENE-3378: move VocabularyAssert to test-framework git-svn-id: https://svn.apache.org/repos/asf/lucene/dev/trunk@1158730 13f79535-47bb-0310-9956-ffa450edef68 --- .../org/apache/lucene/analysis}/VocabularyAssert.java | 2 +- .../apache/lucene/analysis/de/TestGermanLightStemFilter.java | 2 +- .../apache/lucene/analysis/de/TestGermanMinimalStemFilter.java | 2 +- .../org/apache/lucene/analysis/de/TestGermanStemFilter.java | 2 +- .../src/test/org/apache/lucene/analysis/en/TestKStemmer.java | 2 +- .../org/apache/lucene/analysis/en/TestPorterStemFilter.java | 2 +- .../apache/lucene/analysis/es/TestSpanishLightStemFilter.java | 2 +- .../apache/lucene/analysis/fi/TestFinnishLightStemFilter.java | 2 +- .../apache/lucene/analysis/fr/TestFrenchLightStemFilter.java | 2 +- .../apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java | 2 +- .../org/apache/lucene/analysis/gl/TestGalicianStemFilter.java | 2 +- .../apache/lucene/analysis/hu/TestHungarianLightStemFilter.java | 2 +- .../apache/lucene/analysis/it/TestItalianLightStemFilter.java | 2 +- .../lucene/analysis/pt/TestPortugueseLightStemFilter.java | 2 +- .../lucene/analysis/pt/TestPortugueseMinimalStemFilter.java | 2 +- .../org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java | 2 +- .../apache/lucene/analysis/ru/TestRussianLightStemFilter.java | 2 +- .../org/apache/lucene/analysis/snowball/TestSnowballVocab.java | 2 +- .../apache/lucene/analysis/sv/TestSwedishLightStemFilter.java | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) rename {modules/analysis/common/src/test/org/apache/lucene/analysis/util => lucene/src/test-framework/org/apache/lucene/analysis}/VocabularyAssert.java (98%) diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/util/VocabularyAssert.java b/lucene/src/test-framework/org/apache/lucene/analysis/VocabularyAssert.java similarity index 98% rename from modules/analysis/common/src/test/org/apache/lucene/analysis/util/VocabularyAssert.java rename to lucene/src/test-framework/org/apache/lucene/analysis/VocabularyAssert.java index 4beba4bba0b..7a1dedcca55 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/util/VocabularyAssert.java +++ b/lucene/src/test-framework/org/apache/lucene/analysis/VocabularyAssert.java @@ -1,4 +1,4 @@ -package org.apache.lucene.analysis.util; +package org.apache.lucene.analysis; /** * Licensed to the Apache Software Foundation (ASF) under one or more diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java index 4c83a19300f..68404261718 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanLightStemFilter.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Simple tests for {@link GermanLightStemFilter} diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java index b1a83e4257f..cd776fd1f40 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanMinimalStemFilter.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Simple tests for {@link GermanMinimalStemFilter} diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java index 510a5adc327..70c5eedf754 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/de/TestGermanStemFilter.java @@ -27,7 +27,7 @@ import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Test the German stemmer. The stemming algorithm is known to work less diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java index aa35bcd1245..a80940d9436 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestKStemmer.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.en; * limitations under the License. */ -import static org.apache.lucene.analysis.util.VocabularyAssert.assertVocabulary; +import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; import java.io.Reader; diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java index 1316bc4080a..3d941b06df6 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/en/TestPorterStemFilter.java @@ -30,7 +30,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.TokenStream; import org.apache.lucene.analysis.Tokenizer; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Test the PorterStemFilter with Martin Porter's test data. diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java index 79ebe77380b..1c6ce8f5fd1 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/es/TestSpanishLightStemFilter.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Simple tests for {@link SpanishLightStemFilter} diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java index d7d44a8d41c..54a7f6dbfbc 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/fi/TestFinnishLightStemFilter.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Simple tests for {@link FinnishLightStemFilter} diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java index 20adf2d3f68..7362dad2281 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchLightStemFilter.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Simple tests for {@link FrenchLightStemFilter} diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java index 2eb28b1e427..7eab5e9c5c9 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/fr/TestFrenchMinimalStemFilter.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Simple tests for {@link FrenchMinimalStemFilter} diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java index 85f0efbdf1d..927970d6ff2 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/gl/TestGalicianStemFilter.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.gl; * limitations under the License. */ -import static org.apache.lucene.analysis.util.VocabularyAssert.assertVocabulary; +import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; import java.io.IOException; import java.io.Reader; diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java index 803be3e79be..60a7b1cd1d7 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/hu/TestHungarianLightStemFilter.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Simple tests for {@link HungarianLightStemFilter} diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java index ed09d598a86..3bb0297caae 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/it/TestItalianLightStemFilter.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Simple tests for {@link ItalianLightStemFilter} diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java index bd5405b034b..b121397ddcb 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseLightStemFilter.java @@ -28,7 +28,7 @@ import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Simple tests for {@link PortugueseLightStemFilter} diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java index 27fda5e244b..17a3b227344 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseMinimalStemFilter.java @@ -28,7 +28,7 @@ import org.apache.lucene.analysis.core.LowerCaseFilter; import org.apache.lucene.analysis.standard.StandardTokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Simple tests for {@link PortugueseMinimalStemFilter} diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java index 4cf797a008e..ba819e49227 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/pt/TestPortugueseStemFilter.java @@ -17,7 +17,7 @@ package org.apache.lucene.analysis.pt; * limitations under the License. */ -import static org.apache.lucene.analysis.util.VocabularyAssert.assertVocabulary; +import static org.apache.lucene.analysis.VocabularyAssert.assertVocabulary; import java.io.IOException; import java.io.Reader; diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java index ea1e0ebadfc..527b660fa33 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/ru/TestRussianLightStemFilter.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Simple tests for {@link RussianLightStemFilter} diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java index 1fb3a88b695..5a305451286 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/snowball/TestSnowballVocab.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.core.KeywordTokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; import org.apache.lucene.util.LuceneTestCase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Test the snowball filters against the snowball data tests diff --git a/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java b/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java index 8b42f2602fd..11ad21c2160 100644 --- a/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java +++ b/modules/analysis/common/src/test/org/apache/lucene/analysis/sv/TestSwedishLightStemFilter.java @@ -26,7 +26,7 @@ import org.apache.lucene.analysis.MockTokenizer; import org.apache.lucene.analysis.Tokenizer; import org.apache.lucene.analysis.util.ReusableAnalyzerBase; -import static org.apache.lucene.analysis.util.VocabularyAssert.*; +import static org.apache.lucene.analysis.VocabularyAssert.*; /** * Simple tests for {@link SwedishLightStemFilter}