Author: brett
Date: Tue Jul 25 21:23:33 2006
New Revision: 425606
URL: http://svn.apache.org/viewvc?rev=425606&view=rev
Log:
fix problem with indexer tests since lucene upgrade
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/EclipseRepositoryIndex.java
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/EclipseRepositoryIndexTest.java
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/EclipseRepositoryIndex.java
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/EclipseRepositoryIndex.java?rev=425606&r1=425605&r2=425606&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/EclipseRepositoryIndex.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/main/java/org/apache/maven/repository/indexing/EclipseRepositoryIndex.java
Tue Jul 25 21:23:33 2006
@@ -20,7 +20,7 @@
import org.apache.lucene.analysis.CharTokenizer;
import org.apache.lucene.analysis.SimpleAnalyzer;
import org.apache.lucene.analysis.TokenStream;
-import org.apache.lucene.document.DateField;
+import org.apache.lucene.document.DateTools;
import org.apache.lucene.document.Document;
import org.apache.lucene.document.Field;
import org.apache.maven.artifact.Artifact;
@@ -198,8 +198,9 @@
doc = new Document();
doc.add( new Field( MD5, md5, Field.Store.YES,
Field.Index.UN_TOKENIZED ) );
doc.add( new Field( JAR_NAME, artifactFile.getName(),
Field.Store.YES, Field.Index.TOKENIZED ) );
- doc.add( new Field( JAR_DATE, DateField.timeToString(
artifactFile.lastModified() ), Field.Store.YES,
- Field.Index.UN_TOKENIZED ) );
+ doc.add( new Field( JAR_DATE,
+ DateTools.timeToString(
artifactFile.lastModified(), DateTools.Resolution.SECOND ),
+ Field.Store.YES, Field.Index.UN_TOKENIZED ) );
doc.add( new Field( JAR_SIZE, Long.toString( artifactFile.length()
), Field.Store.YES,
Field.Index.UN_TOKENIZED ) );
doc.add( new Field( NAMES, classes.toString(), Field.Store.YES,
Field.Index.TOKENIZED ) );
@@ -291,7 +292,15 @@
{
TokenStream tokenStream;
- if ( "s".equals( fieldName ) )
+ if ( JAR_SIZE.equals( fieldName ) )
+ {
+ tokenStream = new EclipseIndexTokenizer( reader );
+ }
+ else if ( JAR_DATE.equals( fieldName ) )
+ {
+ tokenStream = new EclipseIndexTokenizer( reader );
+ }
+ else if ( MD5.equals( fieldName ) )
{
tokenStream = new EclipseIndexTokenizer( reader );
}
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java?rev=425606&r1=425605&r2=425606&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/ArtifactRepositoryIndexingTest.java
Tue Jul 25 21:23:33 2006
@@ -113,25 +113,11 @@
throws Exception
{
RepositoryIndexingFactory factory = (RepositoryIndexingFactory)
lookup( RepositoryIndexingFactory.ROLE );
- Artifact artifact = createArtifact( "test", "test-artifactId", "1.0" );
try
{
- File notIndexDir = new File( "pom.xml" );
- ArtifactRepositoryIndex indexer =
factory.createArtifactRepositoryIndex( notIndexDir, repository );
- indexer.indexArtifact( artifact );
- fail( "Must throw exception on non-directory index directory" );
- }
- catch ( RepositoryIndexException e )
- {
- assertTrue( true );
- }
-
- try
- {
- File notIndexDir = new File( "" );
- ArtifactRepositoryIndex indexer =
factory.createArtifactRepositoryIndex( notIndexDir, repository );
- indexer.indexArtifact( artifact );
+ File notIndexDir = new File( "." );
+ factory.createArtifactRepositoryIndex( notIndexDir, repository );
fail( "Must throw an exception on a non-index directory" );
}
catch ( RepositoryIndexException e )
@@ -139,26 +125,11 @@
assertTrue( true );
}
- artifact = createArtifact( "test", "test-artifactId", "1.0", "pom" );
-
try
{
File notIndexDir = new File( "pom.xml" );
- ArtifactRepositoryIndex indexer =
factory.createArtifactRepositoryIndex( notIndexDir, repository );
- indexer.indexArtifact( artifact );
+ factory.createArtifactRepositoryIndex( notIndexDir, repository );
fail( "Must throw exception on non-directory index directory" );
- }
- catch ( RepositoryIndexException e )
- {
- assertTrue( true );
- }
-
- try
- {
- File notIndexDir = new File( "" );
- ArtifactRepositoryIndex indexer =
factory.createArtifactRepositoryIndex( notIndexDir, repository );
- indexer.indexArtifact( artifact );
- fail( "Must throw an exception on a non-index directory" );
}
catch ( RepositoryIndexException e )
{
Modified:
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/EclipseRepositoryIndexTest.java
URL:
http://svn.apache.org/viewvc/maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/EclipseRepositoryIndexTest.java?rev=425606&r1=425605&r2=425606&view=diff
==============================================================================
---
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/EclipseRepositoryIndexTest.java
(original)
+++
maven/repository-manager/trunk/maven-repository-indexer/src/test/java/org/apache/maven/repository/indexing/EclipseRepositoryIndexTest.java
Tue Jul 25 21:23:33 2006
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-import org.apache.lucene.document.DateField;
+import org.apache.lucene.document.DateTools;
import org.apache.lucene.document.Document;
import org.apache.lucene.queryParser.QueryParser;
import org.apache.lucene.search.Hits;
@@ -32,8 +32,8 @@
import org.codehaus.plexus.util.FileUtils;
import java.io.File;
-import java.util.List;
import java.util.ArrayList;
+import java.util.List;
/**
* @author Edwin Punzalan
@@ -137,7 +137,7 @@
try
{
- File notIndexDir = new File( "" );
+ File notIndexDir = new File( "." );
EclipseRepositoryIndex indexer = new EclipseRepositoryIndex(
notIndexDir, repository, digester );
indexer.indexArtifact( artifact );
fail( "Must throw an exception on a non-index directory" );
@@ -170,13 +170,14 @@
parser = new QueryParser( "s", index.getAnalyzer() );
hits = searcher.search( parser.parse( "78377" ) );
-
assertEquals( "Total hits", 1, hits.length() );
+
doc = hits.doc( 0 );
assertEquals( "Check jar name", "maven-artifact-2.0.1.jar",
doc.get( "j" ) );
parser = new QueryParser( "d", index.getAnalyzer() );
- hits = searcher.search( parser.parse( DateField.timeToString(
artifactFileTime ) ) );
+ hits = searcher.search(
+ parser.parse( DateTools.timeToString( artifactFileTime,
DateTools.Resolution.SECOND ) ) );
assertEquals( "Total hits", 1, hits.length() );
doc = hits.doc( 0 );
@@ -184,8 +185,8 @@
parser = new QueryParser( "m", index.getAnalyzer() );
hits = searcher.search( parser.parse(
"AE55D9B5720E11B6CF19FE1E31A42E51" ) );
-
assertEquals( "Total hits", 1, hits.length() );
+
doc = hits.doc( 0 );
assertEquals( "Check jar name", "maven-artifact-2.0.1.jar",
doc.get( "j" ) );
