You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by ol...@apache.org on 2014/03/07 04:53:17 UTC
svn commit: r1575143 - in
/maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index:
./ context/ updater/
Author: olamy
Date: Fri Mar 7 03:53:17 2014
New Revision: 1575143
URL: http://svn.apache.org/r1575143
Log:
Migrate test classes for Lucene 4 API
Modified:
maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java
maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java
maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java?rev=1575143&r1=1575142&r2=1575143&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/AbstractRepoNexusIndexerTest.java Fri Mar 7 03:53:17 2014
@@ -29,7 +29,9 @@ import java.util.Set;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
+import org.apache.lucene.index.MultiFields;
import org.apache.lucene.search.Query;
+import org.apache.lucene.util.Bits;
import org.apache.maven.index.search.grouping.GAGrouping;
public abstract class AbstractRepoNexusIndexerTest
@@ -521,9 +523,10 @@ public abstract class AbstractRepoNexusI
{
IndexReader reader = context.acquireIndexSearcher().getIndexReader();
+ Bits liveDocs = MultiFields.getLiveDocs(reader);
for ( int i = 0; i < reader.maxDoc(); i++ )
{
- if ( !reader.isDeleted( i ) )
+ if ( liveDocs.get(i) )
{
Document document = reader.document( i );
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java?rev=1575143&r1=1575142&r2=1575143&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java Fri Mar 7 03:53:17 2014
@@ -29,9 +29,8 @@ import java.util.Iterator;
import java.util.List;
import java.util.Map;
import java.util.Set;
-
import org.apache.lucene.index.Term;
-import org.apache.lucene.queryParser.ParseException;
+import org.apache.lucene.queryparser.classic.ParseException;
import org.apache.lucene.search.FilteredQuery;
import org.apache.lucene.search.PrefixQuery;
import org.apache.lucene.search.Query;
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java?rev=1575143&r1=1575142&r2=1575143&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java Fri Mar 7 03:53:17 2014
@@ -23,8 +23,8 @@ import java.io.File;
import org.apache.lucene.document.Document;
import org.apache.lucene.index.IndexReader;
-import org.apache.maven.index.ArtifactInfo;
-import org.apache.maven.index.NexusIndexer;
+import org.apache.lucene.index.MultiFields;
+import org.apache.lucene.util.Bits;
/** http://issues.sonatype.org/browse/NEXUS-737 */
public class Nexus737NexusIndexerTest
@@ -45,12 +45,13 @@ public class Nexus737NexusIndexerTest
throws Exception
{
IndexReader reader = context.acquireIndexSearcher().getIndexReader();
+ Bits liveDocs = MultiFields.getLiveDocs(reader);
int foundCount = 0;
for ( int i = 0; i < reader.maxDoc(); i++ )
{
- if ( !reader.isDeleted( i ) )
+ if ( liveDocs.get(i) )
{
Document document = reader.document( i );
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java?rev=1575143&r1=1575142&r2=1575143&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/context/NexusAnalyzerTest.java Fri Mar 7 03:53:17 2014
@@ -27,7 +27,7 @@ import java.util.Arrays;
import junit.framework.TestCase;
import org.apache.lucene.analysis.Tokenizer;
-import org.apache.lucene.analysis.tokenattributes.TermAttribute;
+import org.apache.lucene.analysis.tokenattributes.CharTermAttribute;
import org.apache.maven.index.IndexerField;
import org.apache.maven.index.creator.MinimalArtifactInfoIndexCreator;
@@ -63,9 +63,8 @@ public class NexusAnalyzerTest
{
while ( ts.incrementToken() )
{
- TermAttribute term = ts.getAttribute( TermAttribute.class );
-
- tokenList.add( term.term() );
+ CharTermAttribute term = ts.addAttribute( CharTermAttribute.class );
+ tokenList.add( term.toString());
}
}
else
Modified: maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java
URL: http://svn.apache.org/viewvc/maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java?rev=1575143&r1=1575142&r2=1575143&view=diff
==============================================================================
--- maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java (original)
+++ maven/indexer/branches/lucene-4.6/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java Fri Mar 7 03:53:17 2014
@@ -35,6 +35,7 @@ import org.apache.lucene.index.Term;
import org.apache.lucene.search.Query;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
+import org.apache.lucene.store.IOContext;
import org.apache.lucene.store.RAMDirectory;
import org.apache.maven.index.ArtifactInfo;
import org.apache.maven.index.FlatSearchRequest;
@@ -149,7 +150,7 @@ public class DefaultIndexUpdaterTest
Collection<ArtifactInfo> tempContent = tempResponse.getResults();
assertEquals( tempContent.toString(), 3, tempContent.size() );
- RAMDirectory tempDir2 = new RAMDirectory( tempContext.getIndexDirectory() );
+ RAMDirectory tempDir2 = new RAMDirectory( tempContext.getIndexDirectory(), IOContext.DEFAULT );
indexer.removeIndexingContext( tempContext, false );
@@ -192,7 +193,7 @@ public class DefaultIndexUpdaterTest
indexer.deleteArtifactFromIndex(
createArtifactContext( repositoryId, "commons-lang", "commons-lang", "2.4", null ), tempContext );
- RAMDirectory tempDir2 = new RAMDirectory( tempContext.getIndexDirectory() );
+ RAMDirectory tempDir2 = new RAMDirectory( tempContext.getIndexDirectory(), IOContext.DEFAULT );
indexer.removeIndexingContext( tempContext, false );
@@ -266,7 +267,7 @@ public class DefaultIndexUpdaterTest
indexer.addArtifactToIndex(
createArtifactContext( repositoryId, "org.slf4j.foo", "jcl104-over-slf4j", "1.4.2", null ), context );
- RAMDirectory tempDir2 = new RAMDirectory( tempContext.getIndexDirectory() );
+ RAMDirectory tempDir2 = new RAMDirectory( tempContext.getIndexDirectory(), IOContext.DEFAULT );
indexer.removeIndexingContext( tempContext, false );