Repository: maven-indexer Updated Branches: refs/heads/master 7e7202d77 -> b03b841c0
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalTest.java index c0a4ed9..95300bd 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus1911IncrementalTest.java @@ -26,6 +26,7 @@ import java.util.Properties; import java.util.Set; import junit.framework.Assert; +import org.apache.lucene.search.IndexSearcher; import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.packer.IndexPacker; import org.apache.maven.index.packer.IndexPackingRequest; @@ -88,14 +89,22 @@ public class Nexus1911IncrementalTest public void testNoIncremental() throws Exception { - IndexPackingRequest request = new IndexPackingRequest( context, indexPackDir ); - request.setCreateIncrementalChunks( true ); - packer.packIndex( request ); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + IndexPackingRequest request = + new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexPackDir ); + request.setCreateIncrementalChunks( true ); + packer.packIndex( request ); + } + finally + { + context.releaseIndexSearcher( indexSearcher ); + } Set<String> filenames = getFilenamesFromFiles( indexPackDir.listFiles() ); Properties props = getPropertiesFromFiles( indexPackDir.listFiles() ); - Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".zip" ) ); Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".gz" ) ); Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".properties" ) ); Assert.assertFalse( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".1.gz" ) ); @@ -115,16 +124,24 @@ public class Nexus1911IncrementalTest public void test1Incremental() throws Exception { - IndexPackingRequest request = new IndexPackingRequest( context, indexPackDir ); - request.setCreateIncrementalChunks( true ); - packer.packIndex( request ); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + IndexPackingRequest request = + new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexPackDir ); + request.setCreateIncrementalChunks( true ); + packer.packIndex( request ); + } + finally + { + context.releaseIndexSearcher( indexSearcher ); + } - copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), request ); + copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), IndexPackingRequest.MAX_CHUNKS ); Set<String> filenames = getFilenamesFromFiles( indexPackDir.listFiles() ); Properties props = getPropertiesFromFiles( indexPackDir.listFiles() ); - Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".zip" ) ); Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".gz" ) ); Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".properties" ) ); Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".1.gz" ) ); @@ -144,17 +161,25 @@ public class Nexus1911IncrementalTest public void test2Incremental() throws Exception { - IndexPackingRequest request = new IndexPackingRequest( context, indexPackDir ); - request.setCreateIncrementalChunks( true ); - packer.packIndex( request ); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + IndexPackingRequest request = + new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexPackDir ); + request.setCreateIncrementalChunks( true ); + packer.packIndex( request ); + } + finally + { + context.releaseIndexSearcher( indexSearcher ); + } - copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), request ); - copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-2" ), request ); + copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), IndexPackingRequest.MAX_CHUNKS ); + copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-2" ), IndexPackingRequest.MAX_CHUNKS ); Set<String> filenames = getFilenamesFromFiles( indexPackDir.listFiles() ); Properties props = getPropertiesFromFiles( indexPackDir.listFiles() ); - Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".zip" ) ); Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".gz" ) ); Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".properties" ) ); //1 is missing with updated Lucene 4 implementation @@ -176,18 +201,26 @@ public class Nexus1911IncrementalTest public void test3Incremental() throws Exception { - IndexPackingRequest request = new IndexPackingRequest( context, indexPackDir ); - request.setCreateIncrementalChunks( true ); - packer.packIndex( request ); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + IndexPackingRequest request = + new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexPackDir ); + request.setCreateIncrementalChunks( true ); + packer.packIndex( request ); + } + finally + { + context.releaseIndexSearcher( indexSearcher ); + } - copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), request ); - copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-2" ), request ); - copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-3" ), request ); + copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), IndexPackingRequest.MAX_CHUNKS ); + copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-2" ), IndexPackingRequest.MAX_CHUNKS ); + copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-3" ), IndexPackingRequest.MAX_CHUNKS ); Set<String> filenames = getFilenamesFromFiles( indexPackDir.listFiles() ); Properties props = getPropertiesFromFiles( indexPackDir.listFiles() ); - Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".zip" ) ); Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".gz" ) ); Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".properties" ) ); //1,2 are missing with updated Lucene 4 implementation @@ -209,20 +242,30 @@ public class Nexus1911IncrementalTest public void testMaxChunks() throws Exception { - IndexPackingRequest request = new IndexPackingRequest( context, indexPackDir ); - request.setCreateIncrementalChunks( true ); - request.setMaxIndexChunks( 3 ); - packer.packIndex( request ); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + IndexPackingRequest request = + new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexPackDir ); + request.setCreateIncrementalChunks( true ); + request.setMaxIndexChunks( 3 ); + packer.packIndex( request ); + } + finally + { + context.releaseIndexSearcher( indexSearcher ); + } - copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), request ); - copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-2" ), request ); - copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-3" ), request ); - copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-4" ), request ); + copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-1" ), 3 ); + copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-2" ), 3 ); + copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-3" ), 3 ); + copyRepoContentsAndReindex( new File( getBasedir(), "src/test/nexus-1911/repo-inc-4" ), 3 ); Set<String> filenames = getFilenamesFromFiles( indexPackDir.listFiles() ); Properties props = getPropertiesFromFiles( indexPackDir.listFiles() ); - Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".zip" ) ); + System.out.println( filenames ); + Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".gz" ) ); Assert.assertTrue( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".properties" ) ); Assert.assertFalse( filenames.contains( IndexingContext.INDEX_FILE_PREFIX + ".1.gz" ) ); @@ -243,7 +286,7 @@ public class Nexus1911IncrementalTest Assert.assertNotNull( props.getProperty( IndexingContext.INDEX_CHAIN_ID ) ); } - private void copyRepoContentsAndReindex( File src, IndexPackingRequest request ) + private void copyRepoContentsAndReindex( File src, int maxIndexChunks ) throws Exception { File reposTargetDir = new File( getBasedir(), "target/repos/nexus-1911/repo" ); @@ -254,7 +297,19 @@ public class Nexus1911IncrementalTest // TODO: fix this! indexer.scan( reindexedContext, false ); - packer.packIndex( request ); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + IndexPackingRequest request = + new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexPackDir ); + request.setCreateIncrementalChunks( true ); + request.setMaxIndexChunks( maxIndexChunks ); + packer.packIndex( request ); + } + finally + { + context.releaseIndexSearcher( indexSearcher ); + } } private Set<String> getFilenamesFromFiles( File[] files ) http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/Nexus687NexusIndexerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus687NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus687NexusIndexerTest.java index a64f460..f1f0d91 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/Nexus687NexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus687NexusIndexerTest.java @@ -66,6 +66,6 @@ public class Nexus687NexusIndexerTest assertEquals( "1.2.2", ai.getVersion() ); - assertNull( ai.getPackaging() ); + assertEquals( "jar", ai.getPackaging() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java index 78591c1..adb8393 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus737NexusIndexerTest.java @@ -57,7 +57,7 @@ public class Nexus737NexusIndexerTest String uinfo = document.get( ArtifactInfo.UINFO ); - if ( "org.sonatype.nexus|nexus-webapp|1.0.0-SNAPSHOT|NA".equals( uinfo ) + if ( "org.sonatype.nexus|nexus-webapp|1.0.0-SNAPSHOT|NA|jar".equals( uinfo ) || "org.sonatype.nexus|nexus-webapp|1.0.0-SNAPSHOT|bundle|zip".equals( uinfo ) || "org.sonatype.nexus|nexus-webapp|1.0.0-SNAPSHOT|bundle|tar.gz".equals( uinfo ) ) { http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java index a7acb68..4af552c 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/NexusIndexerTest.java @@ -33,9 +33,11 @@ import java.util.Collections; import java.util.List; import java.util.Map; import java.util.Set; + import org.apache.lucene.index.Term; import org.apache.lucene.search.BooleanClause.Occur; import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.search.WildcardQuery; @@ -47,9 +49,14 @@ import org.apache.maven.index.context.StaticContextMemberProvider; import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException; import org.apache.maven.index.creator.MinimalArtifactInfoIndexCreator; import org.apache.maven.index.packer.DefaultIndexPacker; +import org.apache.maven.index.packer.IndexPacker; +import org.apache.maven.index.packer.IndexPackingRequest; import org.apache.maven.index.search.grouping.GAGrouping; import org.apache.maven.index.updater.DefaultIndexUpdater; +import org.apache.maven.index.updater.IndexUpdateRequest; +import org.apache.maven.index.updater.IndexUpdater; import org.codehaus.plexus.util.StringUtils; + import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; @@ -245,7 +252,7 @@ public class NexusIndexerTest assertTrue( ai != null ); // we assure we found what we wanted - assertEquals( "commons-logging:commons-logging:1.0.4:null:jar", ai.toString() ); + assertEquals( "commons-logging:commons-logging:1.0.4:null:jar", ai.getGroupId() + ":" + ai.getArtifactId() + ":" + ai.getVersion() + ":" + ai.getClassifier() + ":" + ai.getPackaging() ); } public void testQueryCreatorNGSearch() @@ -301,7 +308,7 @@ public class NexusIndexerTest for ( ArtifactInfo ai : res ) { - line = ai.getContext() + " :: " + ai.toString(); + line = ai.getContext() + " :: " + ai.getGroupId() + ":" + ai.getArtifactId() + ":" + ai.getVersion() + ":" + ai.getClassifier() + ":" + ai.getPackaging(); if ( print ) { @@ -508,7 +515,7 @@ public class NexusIndexerTest NexusIndexer indexer = prepare(); Query q = - new TermQuery( new Term( ArtifactInfo.UINFO, "org.apache.maven.plugins|maven-core-it-plugin|1.0|NA" ) ); + new TermQuery( new Term( ArtifactInfo.UINFO, "org.apache.maven.plugins|maven-core-it-plugin|1.0|NA|jar" ) ); FlatSearchRequest request = new FlatSearchRequest( q ); @@ -560,20 +567,33 @@ public class NexusIndexerTest List<IndexCreator> indexCreators = context.getIndexCreators(); // Directory directory = context.getIndexDirectory(); - RAMDirectory newDirectory = new RAMDirectory(); - - ByteArrayOutputStream bos = new ByteArrayOutputStream(); - - DefaultIndexPacker.packIndexArchive( context, bos ); + final File targetDir = File.createTempFile( "testIndexTimestamp", "ut-tmp" ); + targetDir.delete(); + targetDir.mkdirs(); - DefaultIndexUpdater.unpackIndexArchive( new ByteArrayInputStream( bos.toByteArray() ), newDirectory, // - context ); + final IndexPacker indexPacker = lookup( IndexPacker.class ); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + final IndexPackingRequest request = + new IndexPackingRequest( context, indexSearcher.getIndexReader(), targetDir ); + indexPacker.packIndex( request ); + } + finally + { + context.releaseIndexSearcher( indexSearcher ); + } indexer.removeIndexingContext( context, false ); - indexer.addIndexingContext( indexId, // + RAMDirectory newDirectory = new RAMDirectory(); + + IndexingContext newContext = indexer.addIndexingContext( indexId, // repositoryId, repository, newDirectory, repositoryUrl, null, indexCreators ); + final IndexUpdater indexUpdater = lookup( IndexUpdater.class ); + indexUpdater.fetchAndUpdateIndex( new IndexUpdateRequest( newContext, new DefaultIndexUpdater.FileFetcher( targetDir ) ) ); + WildcardQuery q = new WildcardQuery( new Term( ArtifactInfo.PACKAGING, "maven-plugin" ) ); FlatSearchResponse response = indexer.searchFlat( new FlatSearchRequest( q ) ); Collection<ArtifactInfo> infos = response.getResults(); http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/SearchWithAnEmptyIndexTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/SearchWithAnEmptyIndexTest.java b/indexer-core/src/test/java/org/apache/maven/index/SearchWithAnEmptyIndexTest.java index 12642eb..ae028b0 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/SearchWithAnEmptyIndexTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/SearchWithAnEmptyIndexTest.java @@ -21,6 +21,7 @@ package org.apache.maven.index; import org.apache.lucene.search.BooleanClause; import org.apache.lucene.search.BooleanQuery; +import org.apache.lucene.search.IndexSearcher; import org.apache.maven.index.context.IndexCreator; import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.expr.StringSearchExpression; @@ -240,9 +241,15 @@ public class SearchWithAnEmptyIndexTest indexingContext.optimize(); File managedRepository = new File( repoIndex ); - final File indexLocation = new File( managedRepository, ".index" ); - IndexPackingRequest request = new IndexPackingRequest( indexingContext, indexLocation ); - indexPacker.packIndex( request ); + final IndexSearcher indexSearcher = indexingContext.acquireIndexSearcher(); + try + { + final File indexLocation = new File( managedRepository, ".index" ); + IndexPackingRequest request = new IndexPackingRequest( indexingContext, indexSearcher.getIndexReader(), indexLocation ); + indexPacker.packIndex( request ); + } finally { + indexingContext.releaseIndexSearcher( indexSearcher ); + } } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/incremental/DefaultIncrementalHandlerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/incremental/DefaultIncrementalHandlerTest.java b/indexer-core/src/test/java/org/apache/maven/index/incremental/DefaultIncrementalHandlerTest.java index 8cfc15d..1e8518b 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/incremental/DefaultIncrementalHandlerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/incremental/DefaultIncrementalHandlerTest.java @@ -19,13 +19,7 @@ package org.apache.maven.index.incremental; * under the License. */ -import java.io.File; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.io.InputStream; -import java.util.List; -import java.util.Properties; - +import org.apache.lucene.search.IndexSearcher; import org.apache.maven.index.AbstractIndexCreatorHelper; import org.apache.maven.index.NexusIndexer; import org.apache.maven.index.context.IndexingContext; @@ -34,6 +28,13 @@ import org.apache.maven.index.updater.IndexUpdateRequest; import org.apache.maven.index.updater.ResourceFetcher; import org.codehaus.plexus.util.FileUtils; +import java.io.File; +import java.io.FileNotFoundException; +import java.io.IOException; +import java.io.InputStream; +import java.util.List; +import java.util.Properties; + public class DefaultIncrementalHandlerTest extends AbstractIndexCreatorHelper { @@ -76,23 +77,31 @@ public class DefaultIncrementalHandlerTest public void testUpdateInvalidProperties() throws Exception { - Properties properties = new Properties(); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + Properties properties = new Properties(); - IndexPackingRequest request = new IndexPackingRequest( context, indexDir ); + IndexPackingRequest request = new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexDir ); - // No properties definite fail - assertNull( handler.getIncrementalUpdates( request, properties ) ); + // No properties definite fail + assertNull( handler.getIncrementalUpdates( request, properties ) ); - properties.setProperty( IndexingContext.INDEX_TIMESTAMP, "junk" ); + properties.setProperty( IndexingContext.INDEX_TIMESTAMP, "junk" ); - // property set, but invalid - assertNull( handler.getIncrementalUpdates( request, properties ) ); + // property set, but invalid + assertNull( handler.getIncrementalUpdates( request, properties ) ); - properties.setProperty( IndexingContext.INDEX_TIMESTAMP, "19991112182432.432 -0600" ); + properties.setProperty( IndexingContext.INDEX_TIMESTAMP, "19991112182432.432 -0600" ); - List<Integer> updates = handler.getIncrementalUpdates( request, properties ); + List<Integer> updates = handler.getIncrementalUpdates( request, properties ); - assertEquals( updates.size(), 0 ); + assertEquals( updates.size(), 0 ); + } + finally + { + context.releaseIndexSearcher( indexSearcher ); + } } public void testUpdateValid() @@ -100,17 +109,24 @@ public class DefaultIncrementalHandlerTest { Properties properties = new Properties(); - IndexPackingRequest request = new IndexPackingRequest( context, indexDir ); - properties.setProperty( IndexingContext.INDEX_TIMESTAMP, "19991112182432.432 -0600" ); FileUtils.copyDirectoryStructure( new File( getBasedir(), "src/test/repo/ch" ), new File( repoDir, "ch" ) ); indexer.scan( context ); - List<Integer> updates = handler.getIncrementalUpdates( request, properties ); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + IndexPackingRequest request = new IndexPackingRequest( context, indexSearcher.getIndexReader(), indexDir ); + List<Integer> updates = handler.getIncrementalUpdates( request, properties ); - assertEquals( updates.size(), 1 ); + assertEquals( updates.size(), 1 ); + } + finally + { + context.releaseIndexSearcher( indexSearcher ); + } } public void testRemoteUpdatesInvalidProperties() http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/packer/NEXUS4149TransferFormatTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/packer/NEXUS4149TransferFormatTest.java b/indexer-core/src/test/java/org/apache/maven/index/packer/NEXUS4149TransferFormatTest.java index 7d4c090..8d6b378 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/packer/NEXUS4149TransferFormatTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/packer/NEXUS4149TransferFormatTest.java @@ -28,6 +28,7 @@ import java.util.List; import junit.framework.Assert; import org.apache.lucene.document.Document; +import org.apache.lucene.search.IndexSearcher; import org.apache.maven.index.AbstractNexusIndexerTest; import org.apache.maven.index.ArtifactInfo; import org.apache.maven.index.NexusIndexer; @@ -126,11 +127,17 @@ public class NEXUS4149TransferFormatTest IndexPacker packer = lookup( IndexPacker.class ); - IndexPackingRequest request = new IndexPackingRequest( context, packTargetDir ); - request.setCreateIncrementalChunks( false ); - request.setFormats( Arrays.asList( IndexFormat.FORMAT_V1 ) ); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + IndexPackingRequest request = new IndexPackingRequest( context, indexSearcher.getIndexReader(), packTargetDir ); + request.setCreateIncrementalChunks( false ); + request.setFormats( Arrays.asList( IndexFormat.FORMAT_V1 ) ); - packer.packIndex( request ); + packer.packIndex( request ); + } finally { + context.releaseIndexSearcher( indexSearcher ); + } // read it up and verify, but stay "low level", directly consume the GZ file and count FileInputStream fis = new FileInputStream( new File( packTargetDir, "nexus-maven-repository-index.gz" ) ); http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java b/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java index a196dda..fe5cc9f 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/updater/AbstractIndexUpdaterTest.java @@ -23,6 +23,7 @@ import java.io.File; import java.io.IOException; import java.util.ArrayList; +import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.search.Query; import org.apache.maven.index.AbstractIndexCreatorHelper; import org.apache.maven.index.ArtifactContext; @@ -124,9 +125,16 @@ public abstract class AbstractIndexUpdaterTest protected void packIndex( File targetDir, IndexingContext context ) throws IllegalArgumentException, IOException { - IndexPackingRequest request = new IndexPackingRequest( context, targetDir ); - request.setUseTargetProperties( true ); - packer.packIndex( request ); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + IndexPackingRequest request = new IndexPackingRequest( context, indexSearcher.getIndexReader(), targetDir ); + request.setUseTargetProperties( true ); + packer.packIndex( request ); + } finally + { + context.releaseIndexSearcher( indexSearcher ); + } } protected void searchFor( String groupId, int expected, IndexingContext context ) http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/java/org/apache/maven/index/updater/IndexDataTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/updater/IndexDataTest.java b/indexer-core/src/test/java/org/apache/maven/index/updater/IndexDataTest.java index b098b27..91db7f2 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/updater/IndexDataTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/updater/IndexDataTest.java @@ -30,6 +30,7 @@ import java.util.Map.Entry; import org.apache.lucene.document.Document; import org.apache.lucene.index.CorruptIndexException; import org.apache.lucene.index.IndexReader; +import org.apache.lucene.search.IndexSearcher; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; import org.apache.maven.index.AbstractRepoNexusIndexerTest; @@ -69,7 +70,14 @@ public class IndexDataTest ByteArrayOutputStream bos = new ByteArrayOutputStream(); IndexDataWriter dw = new IndexDataWriter( bos ); - dw.write( context, null ); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + dw.write( context, indexSearcher.getIndexReader(), null ); + } finally + { + context.releaseIndexSearcher( indexSearcher ); + } ByteArrayInputStream is = new ByteArrayInputStream( bos.toByteArray() ); @@ -99,7 +107,14 @@ public class IndexDataTest ByteArrayOutputStream bos = new ByteArrayOutputStream(); IndexDataWriter dw = new IndexDataWriter( bos ); - dw.write( context, null ); + final IndexSearcher indexSearcher = context.acquireIndexSearcher(); + try + { + dw.write( context, indexSearcher.getIndexReader(), null ); + }finally + { + context.releaseIndexSearcher( indexSearcher ); + } ByteArrayInputStream is = new ByteArrayInputStream( bos.toByteArray() ); http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/nexus-maven-repository-index.20081108.zip ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/nexus-maven-repository-index.20081108.zip b/indexer-core/src/test/nexus-maven-repository-index.20081108.zip deleted file mode 100644 index b1d04fb..0000000 Binary files a/indexer-core/src/test/nexus-maven-repository-index.20081108.zip and /dev/null differ http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/resources/testQueryCreatorNGSearch/case05.txt ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/resources/testQueryCreatorNGSearch/case05.txt b/indexer-core/src/test/resources/testQueryCreatorNGSearch/case05.txt index ce29a33..bd52ac6 100644 --- a/indexer-core/src/test/resources/testQueryCreatorNGSearch/case05.txt +++ b/indexer-core/src/test/resources/testQueryCreatorNGSearch/case05.txt @@ -3,7 +3,7 @@ test :: proptest:proptest-archetype:1.0:null:maven-archetype test :: org.apache.maven.plugins:maven-core-it-plugin:1.0:null:maven-plugin test :: org.apache.maven.plugins:maven-core-it-plugin:1.0:sources:jar test :: org.apache.maven.plugins:maven-core-it-plugin:1.0:javadoc:jar -test :: missingpom:missingpom:1.0:null:jar +test :: missingpom:missingpom:1.0:null:null test :: commons-logging:commons-logging:1.0:null:jar test :: commons-logging:commons-logging:1.0:javadoc:jar test :: commons-cli:commons-cli:1.0:null:jar http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/indexer-core/src/test/resources/testQueryCreatorNGSearch/case06.txt ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/resources/testQueryCreatorNGSearch/case06.txt b/indexer-core/src/test/resources/testQueryCreatorNGSearch/case06.txt index 1060556..b62f44a 100644 --- a/indexer-core/src/test/resources/testQueryCreatorNGSearch/case06.txt +++ b/indexer-core/src/test/resources/testQueryCreatorNGSearch/case06.txt @@ -3,7 +3,7 @@ test :: proptest:proptest-archetype:1.0:null:maven-archetype test :: org.apache.maven.plugins:maven-core-it-plugin:1.0:null:maven-plugin test :: org.apache.maven.plugins:maven-core-it-plugin:1.0:sources:jar test :: org.apache.maven.plugins:maven-core-it-plugin:1.0:javadoc:jar -test :: missingpom:missingpom:1.0:null:jar +test :: missingpom:missingpom:1.0:null:null test :: commons-logging:commons-logging:1.0:null:jar test :: commons-logging:commons-logging:1.0:javadoc:jar test :: commons-cli:commons-cli:1.0:null:jar http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/22fbfe07/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index d6a64d1..2ed5f89 100644 --- a/pom.xml +++ b/pom.xml @@ -83,6 +83,7 @@ under the License. </distributionManagement> <properties> + <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <maven.compiler.source>1.7</maven.compiler.source> <maven.compiler.target>1.7</maven.compiler.target> @@ -90,10 +91,10 @@ under the License. <sisu-guice.version>3.2.2</sisu-guice.version> <lucene.version>4.8.1</lucene.version> - <truezip.version>7.6.6</truezip.version> - <maven.version>3.0.5</maven.version> <aether.version>1.0.0.v20140518</aether.version> + + <truezip.version>7.6.6</truezip.version> <archetype.version>2.2</archetype.version> <wagon.version>2.3</wagon.version> @@ -109,18 +110,18 @@ under the License. </dependency> <dependency> - <groupId>org.slf4j</groupId> - <artifactId>slf4j-simple</artifactId> - <version>1.7.5</version> - </dependency> - - <dependency> <groupId>com.google.guava</groupId> <artifactId>guava</artifactId> <version>16.0.1</version> </dependency> <dependency> + <groupId>joda-time</groupId> + <artifactId>joda-time</artifactId> + <version>2.3</version> + </dependency> + + <dependency> <groupId>com.google.code.findbugs</groupId> <artifactId>jsr305</artifactId> <version>2.0.3</version> @@ -318,18 +319,28 @@ under the License. <version>4.11</version> <scope>test</scope> </dependency> + + <dependency> + <groupId>org.slf4j</groupId> + <artifactId>slf4j-simple</artifactId> + <version>1.7.5</version> + <scope>test</scope> + </dependency> + <dependency> <groupId>org.jmock</groupId> <artifactId>jmock</artifactId> <version>2.5.1</version> <scope>test</scope> </dependency> + <dependency> <groupId>org.mortbay.jetty</groupId> <artifactId>jetty</artifactId> <version>6.1.19</version> <scope>test</scope> </dependency> + <dependency> <groupId>org.apache.maven.wagon</groupId> <artifactId>wagon-http</artifactId>
