You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@lucene.apache.org by rj...@apache.org on 2014/10/08 22:05:24 UTC
svn commit: r1630223 - in /lucene/dev/trunk/lucene:
analysis/common/src/test/org/apache/lucene/analysis/br/
analysis/common/src/test/org/apache/lucene/analysis/core/
analysis/common/src/test/org/apache/lucene/analysis/nl/
analysis/common/src/test/org/a...
Author: rjernst
Date: Wed Oct 8 20:05:23 2014
New Revision: 1630223
URL: http://svn.apache.org/r1630223
Log:
LUCENE-5999: Move standard analyzer tests on trunk to match location on branch_5x
Added:
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java
- copied, changed from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java
- copied, changed from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/LuceneResourcesWikiPage.html
- copied unchanged from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/LuceneResourcesWikiPage.html
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/LuceneResourcesWikiPageURLs.txt
- copied unchanged from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/LuceneResourcesWikiPageURLs.txt
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java
- copied, changed from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java
- copied, changed from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java
- copied, changed from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java
- copied, changed from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/WordBreakTestUnicode_6_3_0.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/email.addresses.from.random.text.with.email.addresses.txt
- copied unchanged from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/email.addresses.from.random.text.with.email.addresses.txt
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/generateJavaUnicodeWordBreakTest.pl
- copied unchanged from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/generateJavaUnicodeWordBreakTest.pl
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/random.text.with.email.addresses.txt
- copied unchanged from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/random.text.with.email.addresses.txt
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/random.text.with.urls.txt
- copied unchanged from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/random.text.with.urls.txt
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/urls.from.random.text.with.urls.txt
- copied unchanged from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/urls.from.random.text.with.urls.txt
Removed:
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/LuceneResourcesWikiPage.html
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/LuceneResourcesWikiPageURLs.txt
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/WordBreakTestUnicode_6_3_0.java
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/email.addresses.from.random.text.with.email.addresses.txt
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/generateJavaUnicodeWordBreakTest.pl
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/random.text.with.email.addresses.txt
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/random.text.with.urls.txt
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/urls.from.random.text.with.urls.txt
lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java
Modified:
lucene/dev/trunk/lucene/tools/junit4/cached-timehints.txt
Copied: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java (from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java?p2=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java&p1=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java&r1=1630189&r2=1630223&rev=1630223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianStemmer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/br/TestBrazilianAnalyzer.java Wed Oct 8 20:05:23 2014
@@ -35,7 +35,7 @@ import org.apache.lucene.analysis.util.C
* It is very similar to the snowball portuguese algorithm but not exactly the same.
*
*/
-public class TestBrazilianStemmer extends BaseTokenStreamTestCase {
+public class TestBrazilianAnalyzer extends BaseTokenStreamTestCase {
public void testWithSnowballExamples() throws Exception {
check("boa", "boa");
Copied: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java (from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java?p2=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java&p1=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java&r1=1630189&r2=1630223&rev=1630223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchStemmer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/nl/TestDutchAnalyzer.java Wed Oct 8 20:05:23 2014
@@ -30,7 +30,7 @@ import org.apache.lucene.analysis.util.C
* The code states that it uses the snowball algorithm, but tests reveal some differences.
*
*/
-public class TestDutchStemmer extends BaseTokenStreamTestCase {
+public class TestDutchAnalyzer extends BaseTokenStreamTestCase {
public void testWithSnowballExamples() throws Exception {
check("lichaamsziek", "lichaamsziek");
Copied: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java (from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java?p2=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java&p1=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java&r1=1630189&r2=1630223&rev=1630223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestStandardAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestStandardAnalyzer.java Wed Oct 8 20:05:23 2014
@@ -1,4 +1,4 @@
-package org.apache.lucene.analysis.core;
+package org.apache.lucene.analysis.standard;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
@@ -27,8 +27,6 @@ import org.apache.lucene.analysis.BaseTo
import org.apache.lucene.analysis.MockGraphTokenFilter;
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.standard.StandardAnalyzer;
-import org.apache.lucene.analysis.standard.StandardTokenizer;
import org.apache.lucene.util.TestUtil;
public class TestStandardAnalyzer extends BaseTokenStreamTestCase {
Copied: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java (from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java?p2=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java&p1=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java&r1=1630189&r2=1630223&rev=1630223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailAnalyzer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailAnalyzer.java Wed Oct 8 20:05:23 2014
@@ -1,4 +1,4 @@
-package org.apache.lucene.analysis.core;
+package org.apache.lucene.analysis.standard;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java (from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java?p2=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java&p1=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java&r1=1630189&r2=1630223&rev=1630223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/TestUAX29URLEmailTokenizer.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/TestUAX29URLEmailTokenizer.java Wed Oct 8 20:05:23 2014
@@ -1,4 +1,4 @@
-package org.apache.lucene.analysis.core;
+package org.apache.lucene.analysis.standard;
import org.apache.lucene.analysis.Analyzer;
import org.apache.lucene.analysis.BaseTokenStreamTestCase;
@@ -6,11 +6,11 @@ import org.apache.lucene.analysis.TokenF
import org.apache.lucene.analysis.TokenStream;
import org.apache.lucene.analysis.Tokenizer;
import org.apache.lucene.analysis.standard.UAX29URLEmailTokenizer;
+import org.apache.lucene.analysis.standard.WordBreakTestUnicode_6_3_0;
import org.apache.lucene.analysis.tokenattributes.TypeAttribute;
import org.apache.lucene.util.TestUtil;
import java.io.BufferedReader;
-import java.io.FileInputStream;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.Reader;
@@ -20,7 +20,6 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
import java.util.Random;
-import java.util.regex.Pattern;
/*
* Licensed to the Apache Software Foundation (ASF) under one or more
Copied: lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java (from r1630189, lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/WordBreakTestUnicode_6_3_0.java)
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java?p2=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java&p1=lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/WordBreakTestUnicode_6_3_0.java&r1=1630189&r2=1630223&rev=1630223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/core/WordBreakTestUnicode_6_3_0.java (original)
+++ lucene/dev/trunk/lucene/analysis/common/src/test/org/apache/lucene/analysis/standard/WordBreakTestUnicode_6_3_0.java Wed Oct 8 20:05:23 2014
@@ -1,4 +1,4 @@
-package org.apache.lucene.analysis.core;
+package org.apache.lucene.analysis.standard;
/**
* Licensed to the Apache Software Foundation (ASF) under one or more
Modified: lucene/dev/trunk/lucene/tools/junit4/cached-timehints.txt
URL: http://svn.apache.org/viewvc/lucene/dev/trunk/lucene/tools/junit4/cached-timehints.txt?rev=1630223&r1=1630222&r2=1630223&view=diff
==============================================================================
--- lucene/dev/trunk/lucene/tools/junit4/cached-timehints.txt (original)
+++ lucene/dev/trunk/lucene/tools/junit4/cached-timehints.txt Wed Oct 8 20:05:23 2014
@@ -48,14 +48,14 @@ org.apache.lucene.analysis.core.TestDuel
org.apache.lucene.analysis.core.TestFactories=13995,17156,12500,15103,14760,22010,13206
org.apache.lucene.analysis.core.TestKeywordAnalyzer=241,205,234,403,223,326,209
org.apache.lucene.analysis.core.TestRandomChains=3048,4646,3050,5003,4274,4400,3679
-org.apache.lucene.analysis.core.TestStandardAnalyzer=3672,3118,2532,4071,2379,2271,2479
+org.apache.lucene.analysis.standard.TestStandardAnalyzer=3672,3118,2532,4071,2379,2271,2479
org.apache.lucene.analysis.core.TestStopAnalyzer=31,39,16,22,66,10,19
org.apache.lucene.analysis.core.TestStopFilter=76,83,64,12,148,19,19
org.apache.lucene.analysis.core.TestStopFilterFactory=31,7,27,92,10,29,22
org.apache.lucene.analysis.core.TestTypeTokenFilter=13,26,18,352,18,113,44
org.apache.lucene.analysis.core.TestTypeTokenFilterFactory=23,36,85,60,23,16,112
-org.apache.lucene.analysis.core.TestUAX29URLEmailAnalyzer=315,243,502,493,183,240,564
-org.apache.lucene.analysis.core.TestUAX29URLEmailTokenizer=1656,837,1071,1402,2610,1318,1134
+org.apache.lucene.analysis.standard.TestUAX29URLEmailAnalyzer=315,243,502,493,183,240,564
+org.apache.lucene.analysis.standard.TestUAX29URLEmailTokenizer=1656,837,1071,1402,2610,1318,1134
org.apache.lucene.analysis.cz.TestCzechAnalyzer=610,176,302,835,120,221,92
org.apache.lucene.analysis.cz.TestCzechStemFilterFactory=8,10,8,18,23,35,53
org.apache.lucene.analysis.cz.TestCzechStemmer=38,126,47,24,242,96,34