You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@maven.apache.org by cs...@apache.org on 2014/08/27 17:38:36 UTC
[5/6] git commit: Fixing the tests and more
Fixing the tests and more
relates to previous changes mostly in tests, to
not pollute "randomly created" files the build itself
Project: http://git-wip-us.apache.org/repos/asf/maven-indexer/repo
Commit: http://git-wip-us.apache.org/repos/asf/maven-indexer/commit/875d7b4c
Tree: http://git-wip-us.apache.org/repos/asf/maven-indexer/tree/875d7b4c
Diff: http://git-wip-us.apache.org/repos/asf/maven-indexer/diff/875d7b4c
Branch: refs/heads/master
Commit: 875d7b4c6f6de0a965b443cb963a937cac9f24b6
Parents: 85dace8
Author: Tamas Cservenak <ta...@cservenak.net>
Authored: Tue Jul 8 12:09:02 2014 +0200
Committer: Tamas Cservenak <ta...@cservenak.net>
Committed: Tue Jul 8 12:09:02 2014 +0200
----------------------------------------------------------------------
.../org/apache/maven/index/ArtifactContext.java | 4 +--
.../org/apache/maven/index/ArtifactInfo.java | 7 +++---
.../index/DefaultArtifactContextProducer.java | 2 +-
.../main/java/org/apache/maven/index/MAVEN.java | 2 +-
.../index/context/DefaultIndexingContext.java | 26 ++++++++++++++++++--
.../index/context/MergedIndexingContext.java | 25 +++++++++++++++++--
.../maven/index/packer/DefaultIndexPacker.java | 2 +-
.../apache/maven/index/util/zip/ZipFacade.java | 2 +-
.../apache/maven/index/ConcurrentUseTest.java | 4 +--
.../index/DefaultIndexNexusIndexerTest.java | 7 ------
.../maven/index/Mindexer14HitLimitTest.java | 2 +-
.../index/Nexus3293TimestampSnapshotTest.java | 2 +-
.../JarFileContentsIndexCreatorTest.java | 6 ++---
...MavenPluginArtifactInfoIndexCreatorTest.java | 2 +-
.../creator/OsgiArtifactIndexCreatorTest.java | 2 +-
.../index/updater/AbstractIndexUpdaterTest.java | 2 +-
16 files changed, 67 insertions(+), 30 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java b/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
index c911406..bd148a6 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/ArtifactContext.java
@@ -84,7 +84,7 @@ public class ArtifactContext
public Model getPomModel()
{
// First check for local pom file
- if ( getPom() != null && getPom().exists() )
+ if ( getPom() != null && getPom().isFile() )
{
try
{
@@ -100,7 +100,7 @@ public class ArtifactContext
}
}
// Otherwise, check for pom contained in maven generated artifact
- else if ( getArtifact() != null )
+ else if ( getArtifact() != null && getArtifact().isFile() )
{
ZipHandle handle = null;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java b/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
index d9011ec..40a3125 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/ArtifactInfo.java
@@ -27,18 +27,18 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import com.google.common.base.Strings;
import org.apache.maven.index.artifact.Gav;
import org.apache.maven.index.creator.JarFileContentsIndexCreator;
import org.apache.maven.index.creator.MavenPluginArtifactInfoIndexCreator;
import org.apache.maven.index.creator.MinimalArtifactInfoIndexCreator;
import org.apache.maven.index.creator.OsgiArtifactIndexCreator;
-import org.codehaus.plexus.util.StringUtils;
import org.eclipse.aether.util.version.GenericVersionScheme;
import org.eclipse.aether.version.InvalidVersionSpecificationException;
import org.eclipse.aether.version.Version;
import org.eclipse.aether.version.VersionScheme;
+import com.google.common.base.Strings;
+
/**
* ArtifactInfo holds the values known about an repository artifact. This is a simple Value Object kind of stuff.
* Phasing out.
@@ -295,7 +295,7 @@ public class ArtifactInfo
versionScheme = new GenericVersionScheme();
}
- public ArtifactInfo( String repository, String groupId, String artifactId, String version, String classifier )
+ public ArtifactInfo( String repository, String groupId, String artifactId, String version, String classifier, String extension )
{
this();
this.repository = repository;
@@ -303,6 +303,7 @@ public class ArtifactInfo
this.artifactId = artifactId;
this.version = version;
this.classifier = classifier;
+ this.fileExtension = extension;
}
public Version getArtifactVersion()
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java b/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java
index 35886cb..6e96222 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/DefaultArtifactContextProducer.java
@@ -117,7 +117,7 @@ public class DefaultArtifactContextProducer
String classifier = gav.getClassifier();
- ArtifactInfo ai = new ArtifactInfo( context.getRepositoryId(), groupId, artifactId, version, classifier );
+ ArtifactInfo ai = new ArtifactInfo( context.getRepositoryId(), groupId, artifactId, version, classifier, gav.getExtension() );
// store extension if classifier is not empty
if ( !StringUtils.isEmpty( ai.getClassifier() ) )
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java b/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java
index af2e472..42c124b 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/MAVEN.java
@@ -44,7 +44,7 @@ public interface MAVEN
// Artifact Packaging (extension for secondary artifacts!).
Field PACKAGING = new Field( null, MAVEN_NAMESPACE, "packaging", "Packaging/Extension" );
- // Artifact Packaging (extension for secondary artifacts!).
+ // Artifact extension
Field EXTENSION = new Field( null, MAVEN_NAMESPACE, "extension", "Extension" );
Field CLASSIFIER = new Field( null, MAVEN_NAMESPACE, "classifier", "Classifier" );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
index a02bfa1..afae82b 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/context/DefaultIndexingContext.java
@@ -146,6 +146,8 @@ public class DefaultIndexingContext
this.gavCalculator = new M2GavCalculator();
prepareIndex( reclaimIndex );
+
+ setIndexDirectoryFile( null );
}
public DefaultIndexingContext( String id, String repositoryId, File repository, File indexDirectoryFile,
@@ -156,7 +158,7 @@ public class DefaultIndexingContext
this( id, repositoryId, repository, repositoryUrl, indexUpdateUrl, indexCreators,
FSDirectory.open( indexDirectoryFile ), reclaimIndex );
- this.indexDirectoryFile = indexDirectoryFile;
+ setIndexDirectoryFile( indexDirectoryFile );
}
@Deprecated
@@ -169,7 +171,7 @@ public class DefaultIndexingContext
if ( indexDirectory instanceof FSDirectory )
{
- this.indexDirectoryFile = ( (FSDirectory) indexDirectory ).getDirectory();
+ setIndexDirectoryFile(( (FSDirectory) indexDirectory ).getDirectory() );
}
}
@@ -177,6 +179,26 @@ public class DefaultIndexingContext
{
return indexDirectory;
}
+
+ /**
+ * Sets index location. As usually index is persistent (is on disk), this will point to that value, but in
+ * some circumstances (ie, using RAMDisk for index), this will point to an existing tmp directory.
+ */
+ protected void setIndexDirectoryFile(File dir) throws IOException
+ {
+ if ( dir == null )
+ {
+ // best effort, to have a directory thru the life of a ctx
+ File tmpFile = File.createTempFile( "mindexer-ctx" + id, "tmp" );
+ tmpFile.delete();
+ tmpFile.mkdirs();
+ this.indexDirectoryFile = tmpFile;
+ }
+ else
+ {
+ this.indexDirectoryFile = dir;
+ }
+ }
public File getIndexDirectoryFile()
{
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java b/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
index 2fe0880..fc008ff 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/context/MergedIndexingContext.java
@@ -72,6 +72,7 @@ public class MergedIndexingContext
this.gavCalculator = new M2GavCalculator();
this.directory = indexDirectory;
this.searchable = searchable;
+ setIndexDirectoryFile( null );
}
public MergedIndexingContext( String id, String repositoryId, File repository, File indexDirectoryFile,
@@ -80,7 +81,7 @@ public class MergedIndexingContext
{
this( membersProvider, id, repositoryId, repository, FSDirectory.open( indexDirectoryFile ), searchable );
- this.directoryFile = indexDirectoryFile;
+ setIndexDirectoryFile( indexDirectoryFile );
}
@Deprecated
@@ -92,7 +93,7 @@ public class MergedIndexingContext
if ( indexDirectory instanceof FSDirectory )
{
- this.directoryFile = ( (FSDirectory) indexDirectory ).getDirectory();
+ setIndexDirectoryFile( ( (FSDirectory) indexDirectory ).getDirectory() );
}
}
@@ -291,6 +292,26 @@ public class MergedIndexingContext
return directoryFile;
}
+ /**
+ * Sets index location. As usually index is persistent (is on disk), this will point to that value, but in
+ * some circumstances (ie, using RAMDisk for index), this will point to an existing tmp directory.
+ */
+ protected void setIndexDirectoryFile(File dir) throws IOException
+ {
+ if ( dir == null )
+ {
+ // best effort, to have a directory thru the life of a ctx
+ File tmpFile = File.createTempFile( "mindexer-ctx" + id, "tmp" );
+ tmpFile.delete();
+ tmpFile.mkdirs();
+ this.directoryFile = tmpFile;
+ }
+ else
+ {
+ this.directoryFile = dir;
+ }
+ }
+
public GavCalculator getGavCalculator()
{
return gavCalculator;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java b/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java
index 4c084f3..b66cbde 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/packer/DefaultIndexPacker.java
@@ -183,7 +183,7 @@ public class DefaultIndexPacker
{
File file = null;
- if ( request.isUseTargetProperties() )
+ if ( request.isUseTargetProperties() || request.getContext().getIndexDirectoryFile() == null )
{
file = new File( request.getTargetDir(), IndexingContext.INDEX_REMOTE_PROPERTIES_FILE );
}
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipFacade.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipFacade.java b/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipFacade.java
index 9c0fa51..1dcae06 100644
--- a/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipFacade.java
+++ b/indexer-core/src/main/java/org/apache/maven/index/util/zip/ZipFacade.java
@@ -62,7 +62,7 @@ public class ZipFacade
}
}
- throw new IOException( "The targetFile should point to an existing ZIP file!" );
+ throw new IOException( "The targetFile should point to an existing ZIP file:" + targetFile );
}
public static void close( ZipHandle handle )
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java b/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java
index af70b34..fd9e6de 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/ConcurrentUseTest.java
@@ -63,7 +63,7 @@ public class ConcurrentUseTest
IndexUserThread[] threads = new IndexUserThread[THREAD_COUNT];
ArtifactInfo ai =
- new ArtifactInfo( "test-default", "org.apache.maven.indexer", "index-concurrent-artifact", "", null );
+ new ArtifactInfo( "test-default", "org.apache.maven.indexer", "index-concurrent-artifact", "", null, "jar" );
for ( int i = 0; i < THREAD_COUNT; i++ )
{
@@ -115,7 +115,7 @@ public class ConcurrentUseTest
{
final ArtifactInfo artifactInfo =
new ArtifactInfo( "test-default", "org.apache.maven.indexer", "index-concurrent-artifact", "1."
- + String.valueOf( versionSource.getAndIncrement() ), null );
+ + String.valueOf( versionSource.getAndIncrement() ), null , "jar");
final ArtifactContext ac = new ArtifactContext( null, null, null, artifactInfo, artifactInfo.calculateGav() );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
index 7d589a6..99f6183 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/DefaultIndexNexusIndexerTest.java
@@ -19,8 +19,6 @@ package org.apache.maven.index;
* under the License.
*/
-import java.io.ByteArrayInputStream;
-import java.io.ByteArrayOutputStream;
import java.io.File;
import java.util.ArrayList;
import java.util.Collection;
@@ -38,12 +36,7 @@ import org.apache.lucene.search.QueryWrapperFilter;
import org.apache.lucene.search.TermQuery;
import org.apache.lucene.store.Directory;
import org.apache.lucene.store.FSDirectory;
-import org.apache.maven.index.ArtifactInfo;
-import org.apache.maven.index.FlatSearchRequest;
-import org.apache.maven.index.FlatSearchResponse;
-import org.apache.maven.index.NexusIndexer;
import org.apache.maven.index.context.IndexingContext;
-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.updater.DefaultIndexUpdater;
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/test/java/org/apache/maven/index/Mindexer14HitLimitTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Mindexer14HitLimitTest.java b/indexer-core/src/test/java/org/apache/maven/index/Mindexer14HitLimitTest.java
index 9391399..5f62d1b 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Mindexer14HitLimitTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Mindexer14HitLimitTest.java
@@ -55,7 +55,7 @@ public class Mindexer14HitLimitTest
for ( int i = 0; i < count; i++ )
{
- final ArtifactInfo ai = new ArtifactInfo( "mindexer14", gid, aid, String.valueOf( version++ ), null );
+ final ArtifactInfo ai = new ArtifactInfo( "mindexer14", gid, aid, String.valueOf( version++ ), null, "jar" );
final ArtifactContext ac = new ArtifactContext( null, null, null, ai, ai.calculateGav() );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/test/java/org/apache/maven/index/Nexus3293TimestampSnapshotTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus3293TimestampSnapshotTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus3293TimestampSnapshotTest.java
index ead5ef6..6a4500a 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/Nexus3293TimestampSnapshotTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus3293TimestampSnapshotTest.java
@@ -69,7 +69,7 @@ public class Nexus3293TimestampSnapshotTest
File pom = new File( getBasedir(), "src/test/nexus-3293/aopalliance/aopalliance/1.0/aopalliance-1.0.pom" );
- ArtifactInfo artifactInfo = new ArtifactInfo( "test", "aopalliance", "aopalliance", "1.0-SNAPSHOT", null );
+ ArtifactInfo artifactInfo = new ArtifactInfo( "test", "aopalliance", "aopalliance", "1.0-SNAPSHOT", null, "jar" );
M2GavCalculator gavCalc = new M2GavCalculator();
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/test/java/org/apache/maven/index/creator/JarFileContentsIndexCreatorTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/creator/JarFileContentsIndexCreatorTest.java b/indexer-core/src/test/java/org/apache/maven/index/creator/JarFileContentsIndexCreatorTest.java
index a0ef5b8..7d559fc 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/creator/JarFileContentsIndexCreatorTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/creator/JarFileContentsIndexCreatorTest.java
@@ -50,7 +50,7 @@ public class JarFileContentsIndexCreatorTest
File pom = new File( getBasedir(), "src/test/nexus-2318/aopalliance/aopalliance/1.0/aopalliance-1.0.pom" );
- ArtifactInfo artifactInfo = new ArtifactInfo( "test", "aopalliance", "aopalliance", "1.0", null );
+ ArtifactInfo artifactInfo = new ArtifactInfo( "test", "aopalliance", "aopalliance", "1.0", null, "jar" );
ArtifactContext artifactContext = new ArtifactContext( pom, artifact, null, artifactInfo, null );
@@ -67,7 +67,7 @@ public class JarFileContentsIndexCreatorTest
File pom = new File( getBasedir(), "src/test/nexus-2318/aopalliance/aopalliance/1.0/aopalliance-1.0.pom" );
- ArtifactInfo artifactInfo = new ArtifactInfo( "test", "aopalliance", "aopalliance", "1.0", null );
+ ArtifactInfo artifactInfo = new ArtifactInfo( "test", "aopalliance", "aopalliance", "1.0", null, "jar" );
ArtifactContext artifactContext = new ArtifactContext( pom, artifact, null, artifactInfo, null );
@@ -88,7 +88,7 @@ public class JarFileContentsIndexCreatorTest
"src/test/mindexer-35/org/apache/maven/indexer/test/sample-war/1.0-SNAPSHOT/sample-war-1.0-SNAPSHOT.pom" );
ArtifactInfo artifactInfo =
- new ArtifactInfo( "test", "org.apache.maven.indexer.test", "sample-war", "1.0-SNAPSHOT", null );
+ new ArtifactInfo( "test", "org.apache.maven.indexer.test", "sample-war", "1.0-SNAPSHOT", null, "war" );
ArtifactContext artifactContext = new ArtifactContext( pom, artifact, null, artifactInfo, null );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/test/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreatorTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreatorTest.java b/indexer-core/src/test/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreatorTest.java
index a149d45..f8062bb 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreatorTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/creator/MavenPluginArtifactInfoIndexCreatorTest.java
@@ -57,7 +57,7 @@ public class MavenPluginArtifactInfoIndexCreatorTest
"src/test/repo-creator/org/apache/maven/plugins/maven-dependency-plugin/2.0/maven-dependency-plugin-2.0.pom" );
ArtifactInfo artifactInfo =
- new ArtifactInfo( "test", "org.apache.maven.plugins", "maven-dependency-plugin", "2.0", null );
+ new ArtifactInfo( "test", "org.apache.maven.plugins", "maven-dependency-plugin", "2.0", null, "jar" );
artifactInfo.setPackaging( "maven-plugin" );
artifactInfo.setFileExtension( "jar" );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
----------------------------------------------------------------------
diff --git a/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java b/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
index 6965cd3..027d471 100644
--- a/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
+++ b/indexer-core/src/test/java/org/apache/maven/index/creator/OsgiArtifactIndexCreatorTest.java
@@ -77,7 +77,7 @@ public class OsgiArtifactIndexCreatorTest
"src/test/repo-with-osgi/org/apache/karaf/features/org.apache.karaf.features.command/2.2.2/org.apache.karaf.features.command-2.2.2.pom" );
ArtifactInfo artifactInfo =
- new ArtifactInfo( "test", "org.apache.karaf.features", "org.apache.karaf.features.command", "2.2.2", null );
+ new ArtifactInfo( "test", "org.apache.karaf.features", "org.apache.karaf.features.command", "2.2.2", null, "jar" );
ArtifactContext artifactContext = new ArtifactContext( pom, artifact, null, artifactInfo, null );
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/875d7b4c/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 fe5cc9f..6a3b108 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
@@ -109,7 +109,7 @@ public abstract class AbstractIndexUpdaterTest
File pomFile = new File( path + ".pom" );
File artifact = new File( path + ".jar" );
File metadata = null;
- ArtifactInfo artifactInfo = new ArtifactInfo( repositoryId, groupId, artifactId, version, classifier );
+ ArtifactInfo artifactInfo = new ArtifactInfo( repositoryId, groupId, artifactId, version, classifier, "jar");
Gav gav =
new Gav( groupId, artifactId, version, classifier, "jar", null, null, artifact.getName(), false,
null, false, null );