Repository: maven-indexer Updated Branches: refs/heads/master 028aef5af -> 8b2644f53
http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java index c9c0dbb..0db0c84 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/FullIndexNexusIndexerTest.java @@ -39,21 +39,6 @@ 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.ArtifactInfoGroup; -import org.apache.maven.index.Field; -import org.apache.maven.index.FlatSearchRequest; -import org.apache.maven.index.FlatSearchResponse; -import org.apache.maven.index.GroupedSearchRequest; -import org.apache.maven.index.GroupedSearchResponse; -import org.apache.maven.index.IteratorSearchRequest; -import org.apache.maven.index.IteratorSearchResponse; -import org.apache.maven.index.MAVEN; -import org.apache.maven.index.MatchHighlight; -import org.apache.maven.index.MatchHighlightMode; -import org.apache.maven.index.MatchHighlightRequest; -import org.apache.maven.index.NexusIndexer; -import org.apache.maven.index.SearchType; import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.packer.DefaultIndexPacker; import org.apache.maven.index.search.grouping.GAGrouping; @@ -273,13 +258,13 @@ public class FullIndexNexusIndexerTest assertEquals( r.toString(), 2, list1.size() ); ArtifactInfo ai1 = list1.get( 0 ); - assertEquals( "org.slf4j", ai1.groupId ); - assertEquals( "slf4j-api", ai1.artifactId ); - assertEquals( "1.4.2", ai1.version ); + assertEquals( "org.slf4j", ai1.getGroupId() ); + assertEquals( "slf4j-api", ai1.getArtifactId() ); + assertEquals( "1.4.2", ai1.getVersion() ); ArtifactInfo ai2 = list1.get( 1 ); - assertEquals( "org.slf4j", ai2.groupId ); - assertEquals( "slf4j-api", ai2.artifactId ); - assertEquals( "1.4.1", ai2.version ); + assertEquals( "org.slf4j", ai2.getGroupId() ); + assertEquals( "slf4j-api", ai2.getArtifactId() ); + assertEquals( "1.4.1", ai2.getVersion() ); } // this is fixed now, no more false hit @@ -315,27 +300,27 @@ public class FullIndexNexusIndexerTest Iterator<ArtifactInfo> it = r.iterator(); { ArtifactInfo ai = it.next(); - assertEquals( "org.apache.directory.server", ai.groupId ); - assertEquals( "apacheds-schema-archetype", ai.artifactId ); - assertEquals( "1.0.2", ai.version ); + assertEquals( "org.apache.directory.server", ai.getGroupId() ); + assertEquals( "apacheds-schema-archetype", ai.getArtifactId() ); + assertEquals( "1.0.2", ai.getVersion() ); } { ArtifactInfo ai = it.next(); - assertEquals( "org.apache.servicemix.tooling", ai.groupId ); - assertEquals( "servicemix-service-engine", ai.artifactId ); - assertEquals( "3.1", ai.version ); + assertEquals( "org.apache.servicemix.tooling", ai.getGroupId() ); + assertEquals( "servicemix-service-engine", ai.getArtifactId() ); + assertEquals( "3.1", ai.getVersion() ); } { ArtifactInfo ai = it.next(); - assertEquals( "org.terracotta.maven.archetypes", ai.groupId ); - assertEquals( "pojo-archetype", ai.artifactId ); - assertEquals( "1.0.3", ai.version ); + assertEquals( "org.terracotta.maven.archetypes", ai.getGroupId() ); + assertEquals( "pojo-archetype", ai.getArtifactId() ); + assertEquals( "1.0.3", ai.getVersion() ); } { ArtifactInfo ai = it.next(); - assertEquals( "proptest", ai.groupId ); - assertEquals( "proptest-archetype", ai.artifactId ); - assertEquals( "1.0", ai.version ); + assertEquals( "proptest", ai.getGroupId() ); + assertEquals( "proptest-archetype", ai.getArtifactId() ); + assertEquals( "1.0", ai.getVersion() ); } } @@ -377,13 +362,13 @@ public class FullIndexNexusIndexerTest ArtifactInfo ai = list.get( 0 ); - assertEquals( "1.6.1", ai.version ); + assertEquals( "1.6.1", ai.getVersion() ); ai = list.get( 1 ); - assertEquals( "1.5", ai.version ); + assertEquals( "1.5", ai.getVersion() ); - assertEquals( "test", ai.repository ); + assertEquals( "test", ai.getRepository() ); Date timestamp = newContext.getTimestamp(); @@ -442,10 +427,10 @@ public class FullIndexNexusIndexerTest ArtifactInfo ai = r.iterator().next(); - assertEquals( "brokenjar", ai.groupId ); - assertEquals( "brokenjar", ai.artifactId ); - assertEquals( "1.0", ai.version ); - assertEquals( null, ai.classNames ); + assertEquals( "brokenjar", ai.getGroupId() ); + assertEquals( "brokenjar", ai.getArtifactId() ); + assertEquals( "1.0", ai.getVersion() ); + assertEquals( null, ai.getClassNames() ); } public void testMissingPom() @@ -463,11 +448,11 @@ public class FullIndexNexusIndexerTest ArtifactInfo ai = r.iterator().next(); - assertEquals( "missingpom", ai.groupId ); - assertEquals( "missingpom", ai.artifactId ); - assertEquals( "1.0", ai.version ); + assertEquals( "missingpom", ai.getGroupId() ); + assertEquals( "missingpom", ai.getArtifactId() ); + assertEquals( "1.0", ai.getVersion() ); // See Nexus 2318. It should be null for a jar without classes - assertNull( ai.classNames ); + assertNull( ai.getClassNames() ); } // == @@ -493,9 +478,6 @@ public class FullIndexNexusIndexerTest for ( ArtifactInfo ai : response ) { - // These are _all_ classnames - String classnames = ai.classNames; - for ( MatchHighlight mh : ai.getMatchHighlights() ) { for ( String highlighted : mh.getHighlightedMatch() ) http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/Index20081108RegressionTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/Index20081108RegressionTest.java b/indexer-core/src/test/java/org/apache/maven/index/Index20081108RegressionTest.java index ff6cd63..ece3409 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/Index20081108RegressionTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/Index20081108RegressionTest.java @@ -33,13 +33,6 @@ import org.apache.lucene.search.Query; import org.apache.lucene.search.TermQuery; import org.apache.lucene.store.Directory; import org.apache.lucene.store.RAMDirectory; -import org.apache.maven.index.ArtifactInfo; -import org.apache.maven.index.ArtifactInfoGroup; -import org.apache.maven.index.FlatSearchRequest; -import org.apache.maven.index.FlatSearchResponse; -import org.apache.maven.index.GroupedSearchRequest; -import org.apache.maven.index.GroupedSearchResponse; -import org.apache.maven.index.NexusIndexer; import org.apache.maven.index.search.grouping.GAGrouping; import org.apache.maven.index.updater.DefaultIndexUpdater; @@ -80,15 +73,15 @@ public class Index20081108RegressionTest { ArtifactInfo ai = list.get( 0 ); - assertEquals( "1.6.1", ai.version ); - assertEquals( "jar", ai.fextension ); - assertEquals( "jar", ai.packaging ); + assertEquals( "1.6.1", ai.getVersion() ); + assertEquals( "jar", ai.getFileExtension() ); + assertEquals( "jar", ai.getPackaging() ); } { ArtifactInfo ai = list.get( 1 ); - assertEquals( "1.5", ai.version ); - assertEquals( "jar", ai.fextension ); - assertEquals( "jar", ai.packaging ); + assertEquals( "1.5", ai.getVersion() ); + assertEquals( "jar", ai.getFileExtension() ); + assertEquals( "jar", ai.getPackaging() ); } } { @@ -97,8 +90,8 @@ public class Index20081108RegressionTest assertEquals( response.getResults().toString(), 1, response.getTotalHits() ); ArtifactInfo ai = response.getResults().iterator().next(); - assertEquals( "tar.gz", ai.packaging ); - assertEquals( "tar.gz", ai.fextension ); + assertEquals( "tar.gz", ai.getPackaging() ); + assertEquals( "tar.gz", ai.getFileExtension() ); } { Query query = new TermQuery( new Term( ArtifactInfo.PACKAGING, "zip" ) ); @@ -106,8 +99,8 @@ public class Index20081108RegressionTest assertEquals( response.getResults().toString(), 1, response.getTotalHits() ); ArtifactInfo ai = response.getResults().iterator().next(); - assertEquals( "zip", ai.packaging ); - assertEquals( "zip", ai.fextension ); + assertEquals( "zip", ai.getPackaging() ); + assertEquals( "zip", ai.getFileExtension() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/Mindexer35NexusIndexerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/Mindexer35NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Mindexer35NexusIndexerTest.java index cd91c6b..90fc8b2 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/Mindexer35NexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/Mindexer35NexusIndexerTest.java @@ -59,12 +59,12 @@ public class Mindexer35NexusIndexerTest // g a v p c #1 ai = list.get( 0 ); - assertEquals( "org.apache.maven.indexer.test", ai.groupId ); - assertEquals( "sample-war", ai.artifactId ); - assertEquals( "1.0-SNAPSHOT", ai.version ); - assertEquals( "war", ai.packaging ); - assertEquals( null, ai.classifier ); - assertEquals( "mindexer-35", ai.repository ); - assertEquals( "war", ai.fextension ); + assertEquals( "org.apache.maven.indexer.test", ai.getGroupId() ); + assertEquals( "sample-war", ai.getArtifactId() ); + assertEquals( "1.0-SNAPSHOT", ai.getVersion() ); + assertEquals( "war", ai.getPackaging() ); + assertEquals( null, ai.getClassifier() ); + assertEquals( "mindexer-35", ai.getRepository() ); + assertEquals( "war", ai.getFileExtension() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/MinimalIndexNexusIndexerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/MinimalIndexNexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/MinimalIndexNexusIndexerTest.java index d447c29..b19fc5e 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/MinimalIndexNexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/MinimalIndexNexusIndexerTest.java @@ -56,12 +56,12 @@ public class MinimalIndexNexusIndexerTest ArtifactInfo ai = r.iterator().next(); - assertEquals( "com.adobe.flexunit", ai.groupId ); - assertEquals( "flexunit", ai.artifactId ); - assertEquals( "0.90", ai.version ); - assertEquals( null, ai.classifier ); - assertEquals( "swc", ai.packaging ); + assertEquals( "com.adobe.flexunit", ai.getGroupId() ); + assertEquals( "flexunit", ai.getArtifactId() ); + assertEquals( "0.90", ai.getVersion() ); + assertEquals( null, ai.getClassifier() ); + assertEquals( "swc", ai.getPackaging() ); - assertEquals( "swc", ai.fextension ); + assertEquals( "swc", ai.getFileExtension() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java index 2d7a451..8d2006c 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus1179NexusIndexerTest.java @@ -65,45 +65,46 @@ public class Nexus1179NexusIndexerTest // g a v p c #1 ai = list.get( 0 ); - assertEquals( "ant", ai.groupId ); - assertEquals( "ant", ai.artifactId ); - assertEquals( "1.6.5", ai.version ); - assertEquals( "jar", ai.packaging ); - assertEquals( null, ai.classifier ); - assertEquals( "nexus-1179", ai.repository ); - assertEquals( "jar", ai.fextension ); + assertEquals( "ant", ai.getGroupId() ); + assertEquals( "ant", ai.getArtifactId() ); + assertEquals( "1.6.5", ai.getVersion() ); + assertEquals( "jar", ai.getPackaging() ); + assertEquals( null, ai.getClassifier() ); + assertEquals( "nexus-1179", ai.getRepository() ); + assertEquals( "jar", ai.getFileExtension() ); // g a v p c #2 ai = list.get( 1 ); - assertEquals( "ant", ai.groupId ); - assertEquals( "ant", ai.artifactId ); - assertEquals( "1.5.1", ai.version ); - assertEquals( null, ai.packaging ); - assertEquals( null, ai.classifier ); - assertEquals( "nexus-1179", ai.repository ); - assertEquals( "pom", ai.fextension ); + assertEquals( "ant", ai.getGroupId() ); + assertEquals( "ant", ai.getArtifactId() ); + assertEquals( "1.5.1", ai.getVersion() ); + assertEquals( null, ai.getPackaging() ); + assertEquals( null, ai.getClassifier() ); + assertEquals( "nexus-1179", ai.getRepository() ); + assertEquals( "pom", ai.getFileExtension() ); // g a v p c #3 ai = list.get( 2 ); - assertEquals( "asm", ai.groupId ); - assertEquals( "asm-commons", ai.artifactId ); - assertEquals( "3.1", ai.version ); - assertEquals( "jar", ai.packaging ); - assertEquals( null, ai.classifier ); - assertEquals( "nexus-1179", ai.repository ); - assertEquals( "pom", ai.fextension ); + assertEquals( "asm", ai.getGroupId() ); + assertEquals( "asm-commons", ai.getArtifactId() ); + assertEquals( "3.1", ai.getVersion() ); + assertEquals( "jar", ai.getPackaging() ); + assertEquals( null, ai.getClassifier() ); + assertEquals( "nexus-1179", ai.getRepository() ); + assertEquals( "pom", ai.getFileExtension() ); // g a v p c #4 ai = list.get( 3 ); - assertEquals( "org", ai.groupId ); - assertEquals( "test", ai.artifactId ); - assertEquals( "1.0", ai.version ); - assertEquals( null, ai.packaging ); - assertEquals( null, ai.classifier ); - assertEquals( "nexus-1179", ai.repository ); - assertEquals( "pom", ai.fextension ); + assertEquals( "org", ai.getGroupId() ); + assertEquals( "test", ai.getArtifactId() ); + assertEquals( "1.0", ai.getVersion() ); + assertEquals( null, ai.getPackaging() ); + assertEquals( null, ai.getClassifier() ); + assertEquals( "nexus-1179", ai.getRepository() ); + assertEquals( "pom", ai.getFileExtension() ); + } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java index d40e2ac..21d01b7 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus13NexusIndexerTest.java @@ -98,9 +98,9 @@ public class Nexus13NexusIndexerTest assertEquals( r.toString(), 1, r.size() ); ArtifactInfo ai = r.iterator().next(); - assertEquals( "cisco.infra.dft", ai.groupId ); - assertEquals( "archetype.sdf", ai.artifactId ); - assertEquals( "1.0-SNAPSHOT", ai.version ); + assertEquals( "cisco.infra.dft", ai.getGroupId() ); + assertEquals( "archetype.sdf", ai.getArtifactId() ); + assertEquals( "1.0-SNAPSHOT", ai.getVersion() ); } public void testIndexTimestamp() @@ -141,13 +141,13 @@ public class Nexus13NexusIndexerTest ArtifactInfo ai = list.get( 0 ); - assertEquals( "1.0-SNAPSHOT", ai.version ); + assertEquals( "1.0-SNAPSHOT", ai.getVersion() ); ai = list.get( 1 ); - assertEquals( "1.0-SNAPSHOT", ai.version ); + assertEquals( "1.0-SNAPSHOT", ai.getVersion() ); - assertEquals( "nexus-13", ai.repository ); + assertEquals( "nexus-13", ai.getRepository() ); newContext.close( true ); } @@ -176,11 +176,11 @@ public class Nexus13NexusIndexerTest ArtifactInfo ai = list.get( 0 ); - assertEquals( "1.0-SNAPSHOT", ai.version ); + assertEquals( "1.0-SNAPSHOT", ai.getVersion() ); ai = list.get( 1 ); - assertEquals( "nexus-13", ai.repository ); + assertEquals( "nexus-13", ai.getRepository() ); } @@ -209,7 +209,7 @@ public class Nexus13NexusIndexerTest ArtifactInfo ai = list.get( 0 ); - assertEquals( "1.0-SNAPSHOT", ai.version ); + assertEquals( "1.0-SNAPSHOT", ai.getVersion() ); } public void testSearchGroupedProblematicNames() @@ -246,11 +246,11 @@ public class Nexus13NexusIndexerTest assertNotNull( ai ); - assertEquals( "cisco.infra.dft", ai.groupId ); + assertEquals( "cisco.infra.dft", ai.getGroupId() ); - assertEquals( "dma.plugin.utils", ai.artifactId ); + assertEquals( "dma.plugin.utils", ai.getArtifactId() ); - assertEquals( "1.0-SNAPSHOT", ai.version ); + assertEquals( "1.0-SNAPSHOT", ai.getVersion() ); // Using a file @@ -266,10 +266,10 @@ public class Nexus13NexusIndexerTest assertNotNull( ai ); - assertEquals( "cisco.infra.dft", ai.groupId ); + assertEquals( "cisco.infra.dft", ai.getGroupId() ); - assertEquals( "maven-dma-mgmt-plugin", ai.artifactId ); + assertEquals( "maven-dma-mgmt-plugin", ai.getArtifactId() ); - assertEquals( "1.0-SNAPSHOT", ai.version ); + assertEquals( "1.0-SNAPSHOT", ai.getVersion() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/Nexus2046NexusIndexerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus2046NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus2046NexusIndexerTest.java index 2459289..f49d3c4 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/Nexus2046NexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus2046NexusIndexerTest.java @@ -25,10 +25,6 @@ import java.util.Collection; import java.util.List; import org.apache.lucene.search.Query; -import org.apache.maven.index.ArtifactInfo; -import org.apache.maven.index.FlatSearchRequest; -import org.apache.maven.index.FlatSearchResponse; -import org.apache.maven.index.NexusIndexer; public class Nexus2046NexusIndexerTest extends AbstractNexusIndexerTest @@ -62,12 +58,12 @@ public class Nexus2046NexusIndexerTest // g a v p c #1 ai = list.get( 0 ); - assertEquals( "org.maven.ide.eclipse", ai.groupId ); - assertEquals( "org.maven.ide.eclipse.feature", ai.artifactId ); - assertEquals( "0.9.7", ai.version ); - assertEquals( "eclipse-feature", ai.packaging ); - assertEquals( null, ai.classifier ); - assertEquals( "nexus-2046", ai.repository ); - assertEquals( "jar", ai.fextension ); + assertEquals( "org.maven.ide.eclipse", ai.getGroupId() ); + assertEquals( "org.maven.ide.eclipse.feature", ai.getArtifactId() ); + assertEquals( "0.9.7", ai.getVersion() ); + assertEquals( "eclipse-feature", ai.getPackaging() ); + assertEquals( null, ai.getClassifier() ); + assertEquals( "nexus-2046", ai.getRepository() ); + assertEquals( "jar", ai.getFileExtension() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/Nexus3233NexusIndexerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus3233NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus3233NexusIndexerTest.java index 7ce4091..4b3a047 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/Nexus3233NexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus3233NexusIndexerTest.java @@ -49,11 +49,11 @@ public class Nexus3233NexusIndexerTest assertNotNull( ai ); - assertEquals( "cisco.infra.dft", ai.groupId ); + assertEquals( "cisco.infra.dft", ai.getGroupId() ); - assertEquals( "dma.maven.plugins", ai.artifactId ); + assertEquals( "dma.maven.plugins", ai.getArtifactId() ); - assertEquals( "1.0-SNAPSHOT", ai.version ); + assertEquals( "1.0-SNAPSHOT", ai.getVersion() ); // POM2 ais = nexusIndexer.identify( MAVEN.SHA1, "efb52d4ef65452b4e575fc2e7709595915775857" ); @@ -64,10 +64,10 @@ public class Nexus3233NexusIndexerTest assertNotNull( ai ); - assertEquals( "cisco.infra.dft", ai.groupId ); + assertEquals( "cisco.infra.dft", ai.getGroupId() ); - assertEquals( "parent.pom", ai.artifactId ); + assertEquals( "parent.pom", ai.getArtifactId() ); - assertEquals( "1.0-SNAPSHOT", ai.version ); + assertEquals( "1.0-SNAPSHOT", ai.getVersion() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/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 43bb413..ead5ef6 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 @@ -131,7 +131,7 @@ public class Nexus3293TimestampSnapshotTest ArtifactInfo ai = r.iterator().next(); - assertEquals( "jar", ai.packaging ); - assertEquals( "jar", ai.fextension ); + assertEquals( "jar", ai.getPackaging() ); + assertEquals( "jar", ai.getFileExtension() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/Nexus645NexusIndexerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus645NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus645NexusIndexerTest.java index b2e476b..a386723 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/Nexus645NexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus645NexusIndexerTest.java @@ -57,34 +57,34 @@ public class Nexus645NexusIndexerTest // g a v p c #1 ai = list.get( 0 ); - assertEquals( "org.codehaus.tycho", ai.groupId ); - assertEquals( "tycho-distribution", ai.artifactId ); - assertEquals( "0.3.0-SNAPSHOT", ai.version ); - assertEquals( "pom", ai.packaging ); - assertEquals( null, ai.classifier ); - assertEquals( "nexus-645", ai.repository ); - assertEquals( "pom", ai.fextension ); + assertEquals( "org.codehaus.tycho", ai.getGroupId() ); + assertEquals( "tycho-distribution", ai.getArtifactId() ); + assertEquals( "0.3.0-SNAPSHOT", ai.getVersion() ); + assertEquals( "pom", ai.getPackaging() ); + assertEquals( null, ai.getClassifier() ); + assertEquals( "nexus-645", ai.getRepository() ); + assertEquals( "pom", ai.getFileExtension() ); // g a v p c #2 ai = list.get( 1 ); - assertEquals( "org.codehaus.tycho", ai.groupId ); - assertEquals( "tycho-distribution", ai.artifactId ); - assertEquals( "0.3.0-SNAPSHOT", ai.version ); - assertEquals( "tar.gz", ai.packaging ); - assertEquals( "bin", ai.classifier ); - assertEquals( "nexus-645", ai.repository ); - assertEquals( "tar.gz", ai.fextension ); + assertEquals( "org.codehaus.tycho", ai.getGroupId() ); + assertEquals( "tycho-distribution", ai.getArtifactId() ); + assertEquals( "0.3.0-SNAPSHOT", ai.getVersion() ); + assertEquals( "tar.gz", ai.getPackaging() ); + assertEquals( "bin", ai.getClassifier() ); + assertEquals( "nexus-645", ai.getRepository() ); + assertEquals( "tar.gz", ai.getFileExtension() ); // g a v p c #3 ai = list.get( 2 ); - assertEquals( "org.codehaus.tycho", ai.groupId ); - assertEquals( "tycho-distribution", ai.artifactId ); - assertEquals( "0.3.0-SNAPSHOT", ai.version ); - assertEquals( "zip", ai.packaging ); - assertEquals( "bin", ai.classifier ); - assertEquals( "nexus-645", ai.repository ); - assertEquals( "zip", ai.fextension ); + assertEquals( "org.codehaus.tycho", ai.getGroupId() ); + assertEquals( "tycho-distribution", ai.getArtifactId() ); + assertEquals( "0.3.0-SNAPSHOT", ai.getVersion() ); + assertEquals( "zip", ai.getPackaging() ); + assertEquals( "bin", ai.getClassifier() ); + assertEquals( "nexus-645", ai.getRepository() ); + assertEquals( "zip", ai.getFileExtension() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/Nexus658NexusIndexerTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/Nexus658NexusIndexerTest.java b/indexer-core/src/test/java/org/apache/maven/index/Nexus658NexusIndexerTest.java index 0de80db..8f7872a 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/Nexus658NexusIndexerTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/Nexus658NexusIndexerTest.java @@ -53,43 +53,43 @@ public class Nexus658NexusIndexerTest // g a v p c #1 ArtifactInfo ai1 = list.get( 0 ); - assertEquals( "org.sonatype.nexus", ai1.groupId ); - assertEquals( "nexus-webapp", ai1.artifactId ); - assertEquals( "1.0.0-SNAPSHOT", ai1.version ); - assertEquals( "jar", ai1.packaging ); - assertEquals( null, ai1.classifier ); - assertEquals( ArtifactAvailablility.PRESENT, ai1.sourcesExists ); - assertEquals( "nexus-658", ai1.repository ); + assertEquals( "org.sonatype.nexus", ai1.getGroupId() ); + assertEquals( "nexus-webapp", ai1.getArtifactId() ); + assertEquals( "1.0.0-SNAPSHOT", ai1.getVersion() ); + assertEquals( "jar", ai1.getPackaging() ); + assertEquals( null, ai1.getClassifier() ); + assertEquals( ArtifactAvailability.PRESENT, ai1.getSourcesExists() ); + assertEquals( "nexus-658", ai1.getRepository() ); // g a v p c #2 ArtifactInfo ai2 = list.get( 1 ); - assertEquals( "org.sonatype.nexus", ai2.groupId ); - assertEquals( "nexus-webapp", ai2.artifactId ); - assertEquals( "1.0.0-SNAPSHOT", ai2.version ); - assertEquals( "tar.gz", ai2.packaging ); - assertEquals( "bundle", ai2.classifier ); - assertEquals( ArtifactAvailablility.NOT_AVAILABLE, ai2.sourcesExists ); - assertEquals( "nexus-658", ai2.repository ); + assertEquals( "org.sonatype.nexus", ai2.getGroupId() ); + assertEquals( "nexus-webapp", ai2.getArtifactId() ); + assertEquals( "1.0.0-SNAPSHOT", ai2.getVersion() ); + assertEquals( "tar.gz", ai2.getPackaging() ); + assertEquals( "bundle", ai2.getClassifier() ); + assertEquals( ArtifactAvailability.NOT_AVAILABLE, ai2.getSourcesExists() ); + assertEquals( "nexus-658", ai2.getRepository() ); // g a v p c #3 ArtifactInfo ai3 = list.get( 2 ); - assertEquals( "org.sonatype.nexus", ai3.groupId ); - assertEquals( "nexus-webapp", ai3.artifactId ); - assertEquals( "1.0.0-SNAPSHOT", ai3.version ); - assertEquals( "zip", ai3.packaging ); - assertEquals( "bundle", ai3.classifier ); - assertEquals( ArtifactAvailablility.NOT_AVAILABLE, ai3.sourcesExists ); - assertEquals( "nexus-658", ai3.repository ); + assertEquals( "org.sonatype.nexus", ai3.getGroupId() ); + assertEquals( "nexus-webapp", ai3.getArtifactId() ); + assertEquals( "1.0.0-SNAPSHOT", ai3.getVersion() ); + assertEquals( "zip", ai3.getPackaging() ); + assertEquals( "bundle", ai3.getClassifier() ); + assertEquals( ArtifactAvailability.NOT_AVAILABLE, ai3.getSourcesExists() ); + assertEquals( "nexus-658", ai3.getRepository() ); // g a v p c #3 ArtifactInfo ai4 = list.get( 3 ); - assertEquals( "org.sonatype.nexus", ai4.groupId ); - assertEquals( "nexus-webapp", ai4.artifactId ); - assertEquals( "1.0.0-SNAPSHOT", ai4.version ); - assertEquals( "jar", ai4.packaging ); - assertEquals( "sources", ai4.classifier ); - assertEquals( ArtifactAvailablility.NOT_AVAILABLE, ai4.sourcesExists ); - assertEquals( "nexus-658", ai4.repository ); + assertEquals( "org.sonatype.nexus", ai4.getGroupId() ); + assertEquals( "nexus-webapp", ai4.getArtifactId() ); + assertEquals( "1.0.0-SNAPSHOT", ai4.getVersion() ); + assertEquals( "jar", ai4.getPackaging() ); + assertEquals( "sources", ai4.getClassifier() ); + assertEquals( ArtifactAvailability.NOT_AVAILABLE, ai4.getSourcesExists() ); + assertEquals( "nexus-658", ai4.getRepository() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/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 3226942..a64f460 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 @@ -60,12 +60,12 @@ public class Nexus687NexusIndexerTest ArtifactInfo ai = list.get( 0 ); - assertEquals( "xstream", ai.groupId ); + assertEquals( "xstream", ai.getGroupId() ); - assertEquals( "xstream", ai.artifactId ); + assertEquals( "xstream", ai.getArtifactId() ); - assertEquals( "1.2.2", ai.version ); + assertEquals( "1.2.2", ai.getVersion() ); - assertNull( ai.packaging ); + assertNull( ai.getPackaging() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/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 84f70c0..ecd7364 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 @@ -281,7 +281,7 @@ public class NexusIndexerTest for ( ArtifactInfo ai : res ) { - line = ai.context + " :: " + ai.toString(); + line = ai.getContext() + " :: " + ai.toString(); if ( print ) { @@ -337,7 +337,7 @@ public class NexusIndexerTest for ( ArtifactInfo ai : response.getResults() ) { - assertEquals( "GroupId must match \"qdox\"!", "qdox", ai.groupId ); + assertEquals( "GroupId must match \"qdox\"!", "qdox", ai.getGroupId() ); } } @@ -353,7 +353,7 @@ public class NexusIndexerTest public boolean accepts( IndexingContext ctx, ArtifactInfo ai ) { // we reject version "1.5" for fun - return !StringUtils.equals( ai.version, "1.5" ); + return !StringUtils.equals( ai.getVersion(), "1.5" ); } } ); @@ -365,7 +365,7 @@ public class NexusIndexerTest ArtifactInfo ai = response.getResults().next(); - assertEquals( "1.5 is filtered out, so 1.6.1 must appear here!", "1.6.1", ai.version ); + assertEquals( "1.5 is filtered out, so 1.6.1 must appear here!", "1.6.1", ai.getVersion() ); } public void testSearchGrouped() @@ -384,10 +384,10 @@ public class NexusIndexerTest assertEquals( "qdox : qdox", gi0.getGroupKey() ); List<ArtifactInfo> list = new ArrayList<ArtifactInfo>( gi0.getArtifactInfos() ); ArtifactInfo ai0 = list.get( 0 ); - assertEquals( "1.6.1", ai0.version ); + assertEquals( "1.6.1", ai0.getVersion() ); ArtifactInfo ai1 = list.get( 1 ); - assertEquals( "1.5", ai1.version ); - assertEquals( "test", ai1.repository ); + assertEquals( "1.5", ai1.getVersion() ); + assertEquals( "test", ai1.getRepository() ); } { WildcardQuery q = new WildcardQuery( new Term( ArtifactInfo.UINFO, "commons-log*" ) ); @@ -453,13 +453,13 @@ public class NexusIndexerTest assertNotNull( ai ); - assertEquals( "qdox", ai.groupId ); + assertEquals( "qdox", ai.getGroupId() ); - assertEquals( "qdox", ai.artifactId ); + assertEquals( "qdox", ai.getArtifactId() ); - assertEquals( "1.5", ai.version ); + assertEquals( "1.5", ai.getVersion() ); - assertEquals( "test", ai.repository ); + assertEquals( "test", ai.getRepository() ); // Using a file @@ -473,13 +473,13 @@ public class NexusIndexerTest assertNotNull( ai ); - assertEquals( "qdox", ai.groupId ); + assertEquals( "qdox", ai.getGroupId() ); - assertEquals( "qdox", ai.artifactId ); + assertEquals( "qdox", ai.getArtifactId() ); - assertEquals( "1.5", ai.version ); + assertEquals( "1.5", ai.getVersion() ); - assertEquals( "test", ai.repository ); + assertEquals( "test", ai.getRepository() ); } public void testUpdateArtifact() @@ -498,13 +498,13 @@ public class NexusIndexerTest ArtifactInfo ai = res1.iterator().next(); - assertEquals( "Maven Core Integration Test Plugin", ai.name ); + assertEquals( "Maven Core Integration Test Plugin", ai.getName() ); - long oldSize = ai.size; + long oldSize = ai.getSize(); - ai.name = "bla bla bla"; + ai.setName( "bla bla bla" ); - ai.size += 100; + ai.setSize( ai.getSize() + 100 ); IndexingContext indexingContext = indexer.getIndexingContexts().get( "test" ); @@ -523,9 +523,9 @@ public class NexusIndexerTest ArtifactInfo ai2 = res2.iterator().next(); - assertEquals( oldSize + 100, ai2.size ); + assertEquals( oldSize + 100, ai2.getSize() ); - assertEquals( "bla bla bla", ai2.name ); + assertEquals( "bla bla bla", ai2.getName() ); } public void testUnpack() http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/UniqueArtifactFilterTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/UniqueArtifactFilterTest.java b/indexer-core/src/test/java/org/apache/maven/index/UniqueArtifactFilterTest.java index acfaa14..6c3b538 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/UniqueArtifactFilterTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/UniqueArtifactFilterTest.java @@ -23,13 +23,6 @@ import java.io.File; import java.io.IOException; import org.apache.lucene.search.Query; -import org.apache.maven.index.ArtifactInfo; -import org.apache.maven.index.IteratorSearchRequest; -import org.apache.maven.index.IteratorSearchResponse; -import org.apache.maven.index.MAVEN; -import org.apache.maven.index.NexusIndexer; -import org.apache.maven.index.SearchType; -import org.apache.maven.index.UniqueArtifactFilterPostprocessor; import org.apache.maven.index.context.IndexingContext; import org.apache.maven.index.context.UnsupportedExistingLuceneIndexException; import org.codehaus.plexus.util.FileUtils; @@ -54,7 +47,7 @@ public class UniqueArtifactFilterTest for ( ArtifactInfo ai : response.getResults() ) { - assertEquals( "GroupId must match \"qdox\"!", "qdox", ai.groupId ); + assertEquals( "GroupId must match \"qdox\"!", "qdox", ai.getGroupId() ); } } @@ -82,11 +75,11 @@ public class UniqueArtifactFilterTest assertTrue( "Iterator has to have next (2 should be returned)", ai != null ); assertEquals( "Property that is not unique has to have \"COLLAPSED\" value!", - UniqueArtifactFilterPostprocessor.COLLAPSED, ai.version ); + UniqueArtifactFilterPostprocessor.COLLAPSED, ai.getVersion() ); assertEquals( "Property that is not unique has to have \"COLLAPSED\" value!", - UniqueArtifactFilterPostprocessor.COLLAPSED, ai.packaging ); + UniqueArtifactFilterPostprocessor.COLLAPSED, ai.getPackaging() ); assertEquals( "Property that is not unique has to have \"COLLAPSED\" value!", - UniqueArtifactFilterPostprocessor.COLLAPSED, ai.classifier ); + UniqueArtifactFilterPostprocessor.COLLAPSED, ai.getClassifier() ); } // == http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/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 d84a5e8..304b21f 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 @@ -56,7 +56,7 @@ public class JarFileContentsIndexCreatorTest indexCreator.populateArtifactInfo( artifactContext ); - assertNotNull( "Classes should not be null", artifactContext.getArtifactInfo().classNames ); + assertNotNull( "Classes should not be null", artifactContext.getArtifactInfo().getClassNames() ); } public void test_nexus_2318_indexJarWithSources() @@ -73,7 +73,7 @@ public class JarFileContentsIndexCreatorTest indexCreator.populateArtifactInfo( artifactContext ); - assertNull( "Classes should be null", artifactContext.getArtifactInfo().classNames ); + assertNull( "Classes should be null", artifactContext.getArtifactInfo().getClassNames() ); } public void testMindexer35ScanWar() @@ -95,8 +95,8 @@ public class JarFileContentsIndexCreatorTest indexCreator.populateArtifactInfo( artifactContext ); assertTrue( "Classes should contain WebappClass", - artifactContext.getArtifactInfo().classNames.contains( "WebappClass" ) ); + artifactContext.getArtifactInfo().getClassNames().contains( "WebappClass" ) ); assertEquals( "WebappClass should have proper package", - "/org/apache/maven/indexer/samples/webapp/WebappClass", artifactContext.getArtifactInfo().classNames ); + "/org/apache/maven/indexer/samples/webapp/WebappClass", artifactContext.getArtifactInfo().getClassNames() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/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 bb862f0..49656c2 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 @@ -60,14 +60,14 @@ public class MavenPluginArtifactInfoIndexCreatorTest ArtifactInfo artifactInfo = new ArtifactInfo( "test", "org.apache.maven.plugins", "maven-dependency-plugin", "2.0", null ); - artifactInfo.packaging = "maven-plugin"; - artifactInfo.fextension = "jar"; + artifactInfo.setPackaging( "maven-plugin" ); + artifactInfo.setFileExtension( "jar" ); ArtifactContext artifactContext = new ArtifactContext( pom, artifact, null, artifactInfo, null ); indexCreator.populateArtifactInfo( artifactContext ); - assertEquals( "dependency", artifactContext.getArtifactInfo().prefix ); + assertEquals( "dependency", artifactContext.getArtifactInfo().getPrefix() ); List<String> goals = new ArrayList<String>( 16 ); goals.add( "analyze-dep-mgt" ); @@ -87,7 +87,7 @@ public class MavenPluginArtifactInfoIndexCreatorTest goals.add( "tree" ); goals.add( "unpack-dependencies" ); - assertEquals( goals, artifactContext.getArtifactInfo().goals ); + assertEquals( goals, artifactContext.getArtifactInfo().getGoals() ); } } http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/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 c12c0e1..1a08cf4 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 @@ -82,30 +82,30 @@ public class OsgiArtifactIndexCreatorTest indexCreator.populateArtifactInfo( artifactContext ); - assertNotNull( "bundleSymbolicName", artifactContext.getArtifactInfo().bundleSymbolicName ); + assertNotNull( "bundleSymbolicName", artifactContext.getArtifactInfo().getBundleSymbolicName() ); - assertNotNull( "bundleVersion", artifactContext.getArtifactInfo().bundleVersion ); + assertNotNull( "bundleVersion", artifactContext.getArtifactInfo().getBundleVersion() ); - assertNotNull( "bundleExportPackage", artifactContext.getArtifactInfo().bundleExportPackage ); + assertNotNull( "bundleExportPackage", artifactContext.getArtifactInfo().getBundleExportPackage() ); - assertEquals( "org.apache.karaf.features.command", artifactContext.getArtifactInfo().bundleSymbolicName ); + assertEquals( "org.apache.karaf.features.command", artifactContext.getArtifactInfo().getBundleSymbolicName() ); - assertEquals( "2.2.2", artifactContext.getArtifactInfo().bundleVersion ); + assertEquals( "2.2.2", artifactContext.getArtifactInfo().getBundleVersion() ); assertEquals( "org.apache.karaf.features.command.completers;uses:=\"org.apache.karaf.features,org.apache.karaf.shell.console,org.apache.karaf.shell.console.completer\";version=\"2.2.2\",org.apache.karaf.features.command;uses:=\"org.apache.felix.gogo.commands,org.apache.karaf.features,org.apache.karaf.shell.console,org.osgi.framework,org.apache.felix.service.command\";version=\"2.2.2\"", - artifactContext.getArtifactInfo().bundleExportPackage ); + artifactContext.getArtifactInfo().getBundleExportPackage() ); ArtifactInfo ai = artifactContext.getArtifactInfo(); - assertEquals( "This bundle provides the Karaf shell commands to manipulate features.", ai.bundleDescription ); - assertEquals( "Apache Karaf :: Features :: Command", ai.bundleName ); - assertEquals( "http://www.apache.org/licenses/LICENSE-2.0.txt";, ai.bundleLicense ); - assertEquals( "http://www.apache.org/";, ai.bundleDocUrl ); + assertEquals( "This bundle provides the Karaf shell commands to manipulate features.", ai.getBundleDescription() ); + assertEquals( "Apache Karaf :: Features :: Command", ai.getBundleName() ); + assertEquals( "http://www.apache.org/licenses/LICENSE-2.0.txt";, ai.getBundleLicense() ); + assertEquals( "http://www.apache.org/";, ai.getBundleDocUrl() ); assertEquals( "javax.management,javax.management.loading,org.apache.felix.gogo.commands;version=\"[0.6,1)\",org.apache.felix.service.command;status=provisional;version=\"[0.6,1)\",org.apache.karaf.features;version=\"[2.2,3)\",org.apache.karaf.shell.console;version=\"[2.2,3)\",org.apache.karaf.shell.console.completer;version=\"[2.2,3)\",org.osgi.framework;version=\"[1.5,2)\",org.osgi.service.blueprint;version=\"[1.0.0,2.0.0)\"", - ai.bundleImportPackage ); + ai.getBundleImportPackage() ); } @@ -228,21 +228,21 @@ public class OsgiArtifactIndexCreatorTest ArtifactInfo ai = response.getResults().iterator().next(); - assertEquals( "org.apache.karaf.features", ai.groupId ); - assertEquals( "org.apache.karaf.features.command", ai.artifactId ); - assertEquals( "2.2.2", ai.version ); - assertEquals( "org.apache.karaf.features.command", ai.bundleSymbolicName ); - assertEquals( "2.2.2", ai.bundleVersion ); + assertEquals( "org.apache.karaf.features", ai.getGroupId() ); + assertEquals( "org.apache.karaf.features.command", ai.getArtifactId() ); + assertEquals( "2.2.2", ai.getVersion() ); + assertEquals( "org.apache.karaf.features.command", ai.getBundleSymbolicName() ); + assertEquals( "2.2.2", ai.getBundleVersion() ); assertEquals( "This bundle provides the Karaf shell commands to manipulate features.", - ai.bundleDescription ); - assertEquals( "Apache Karaf :: Features :: Command", ai.bundleName ); - assertEquals( "http://www.apache.org/licenses/LICENSE-2.0.txt";, ai.bundleLicense ); - assertEquals( "http://www.apache.org/";, ai.bundleDocUrl ); + ai.getBundleDescription() ); + assertEquals( "Apache Karaf :: Features :: Command", ai.getBundleName() ); + assertEquals( "http://www.apache.org/licenses/LICENSE-2.0.txt";, ai.getBundleLicense() ); + assertEquals( "http://www.apache.org/";, ai.getBundleDocUrl() ); assertEquals( "javax.management,javax.management.loading,org.apache.felix.gogo.commands;version=\"[0.6,1)\",org.apache.felix.service.command;status=provisional;version=\"[0.6,1)\",org.apache.karaf.features;version=\"[2.2,3)\",org.apache.karaf.shell.console;version=\"[2.2,3)\",org.apache.karaf.shell.console.completer;version=\"[2.2,3)\",org.osgi.framework;version=\"[1.5,2)\",org.osgi.service.blueprint;version=\"[1.0.0,2.0.0)\"", - ai.bundleImportPackage ); + ai.getBundleImportPackage() ); } finally @@ -275,12 +275,12 @@ public class OsgiArtifactIndexCreatorTest ArtifactInfo ai = response.getResults().iterator().next(); System.out.println( "ai " + ai ); - assertEquals( "org.apache.felix", ai.groupId ); - assertEquals( "org.apache.felix.bundlerepository", ai.artifactId ); - assertEquals( "1.6.6", ai.version ); - assertEquals( "bundle", ai.packaging ); - assertEquals( "org.apache.felix.bundlerepository", ai.bundleSymbolicName ); - assertEquals( "1.6.6", ai.bundleVersion ); + assertEquals( "org.apache.felix", ai.getGroupId() ); + assertEquals( "org.apache.felix.bundlerepository", ai.getArtifactId() ); + assertEquals( "1.6.6", ai.getVersion() ); + assertEquals( "bundle", ai.getPackaging() ); + assertEquals( "org.apache.felix.bundlerepository", ai.getBundleSymbolicName() ); + assertEquals( "1.6.6", ai.getBundleVersion() ); } finally http://git-wip-us.apache.org/repos/asf/maven-indexer/blob/687c2027/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java ---------------------------------------------------------------------- diff --git a/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java b/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java index 1d64f39..c1759b5 100644 --- a/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java +++ b/indexer-core/src/test/java/org/apache/maven/index/updater/DefaultIndexUpdaterTest.java @@ -232,7 +232,7 @@ public class DefaultIndexUpdaterTest Set<ArtifactInfo> results = response.getResults(); ArtifactInfo artifactInfo = results.iterator().next(); - assertEquals( artifactInfo.artifactId, "dma.integration.tests" ); + assertEquals( artifactInfo.getArtifactId(), "dma.integration.tests" ); } public void testMergeGroups()
