Modified: maven/indexer/trunk/indexer-core/src/test/java/org/sonatype/nexus/artifact/M2GavCalculatorTest.java URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/test/java/org/sonatype/nexus/artifact/M2GavCalculatorTest.java?rev=1035289&r1=1035288&r2=1035289&view=diff ============================================================================== --- maven/indexer/trunk/indexer-core/src/test/java/org/sonatype/nexus/artifact/M2GavCalculatorTest.java (original) +++ maven/indexer/trunk/indexer-core/src/test/java/org/sonatype/nexus/artifact/M2GavCalculatorTest.java Mon Nov 15 14:25:48 2010 @@ -28,12 +28,11 @@ import org.apache.maven.index.artifact.N import junit.framework.TestCase; - public class M2GavCalculatorTest extends TestCase { private M2GavCalculator gavCalculator; - + private NexusEnforcer enforcer; private SimpleDateFormat formatter = new SimpleDateFormat( "yyyyMMdd.HHmmss" ); @@ -43,9 +42,9 @@ public class M2GavCalculatorTest throws Exception { super.setUp(); - + gavCalculator = new M2GavCalculator(); - + enforcer = new DefaultNexusEnforcer(); } @@ -86,8 +85,8 @@ public class M2GavCalculatorTest path = gavCalculator.gavToPath( gav ); assertEquals( "/org/jruby/jruby/1.0RC1-SNAPSHOT/jruby-1.0RC1-20070504.160758-25-javadoc.jar", path ); - gav = gavCalculator - .pathToGav( "/com/sun/xml/ws/jaxws-local-transport/2.1.3/jaxws-local-transport-2.1.3.pom.md5" ); + gav = + gavCalculator.pathToGav( "/com/sun/xml/ws/jaxws-local-transport/2.1.3/jaxws-local-transport-2.1.3.pom.md5" ); assertEquals( "com.sun.xml.ws", gav.getGroupId() ); assertEquals( "jaxws-local-transport", gav.getArtifactId() ); @@ -177,8 +176,8 @@ public class M2GavCalculatorTest path = gavCalculator.gavToPath( gav ); assertEquals( "/org/jruby/jruby/1.0RC1-SNAPSHOT/jruby-1.0RC1-20070504.160758-2-sources.jar", path ); - gav = gavCalculator - .pathToGav( "/com/stchome/products/dsms/services/dsms-intervention-service/2.4.2-64-SNAPSHOT/dsms-intervention-service-2.4.2-64-SNAPSHOT.jar.sha1" ); + gav = + gavCalculator.pathToGav( "/com/stchome/products/dsms/services/dsms-intervention-service/2.4.2-64-SNAPSHOT/dsms-intervention-service-2.4.2-64-SNAPSHOT.jar.sha1" ); assertEquals( "com.stchome.products.dsms.services", gav.getGroupId() ); assertEquals( "dsms-intervention-service", gav.getArtifactId() ); @@ -198,8 +197,8 @@ public class M2GavCalculatorTest "/com/stchome/products/dsms/services/dsms-intervention-service/2.4.2-64-SNAPSHOT/dsms-intervention-service-2.4.2-64-SNAPSHOT.jar.sha1", path ); - gav = gavCalculator - .pathToGav( "/com/stchome/products/dsms/services/dsms-intervention-service/2.4.2-64-SNAPSHOT/dsms-intervention-service-2.4.2-64-SNAPSHOT-javadoc.jar.sha1" ); + gav = + gavCalculator.pathToGav( "/com/stchome/products/dsms/services/dsms-intervention-service/2.4.2-64-SNAPSHOT/dsms-intervention-service-2.4.2-64-SNAPSHOT-javadoc.jar.sha1" ); assertEquals( "com.stchome.products.dsms.services", gav.getGroupId() ); assertEquals( "dsms-intervention-service", gav.getArtifactId() ); @@ -219,8 +218,8 @@ public class M2GavCalculatorTest "/com/stchome/products/dsms/services/dsms-intervention-service/2.4.2-64-SNAPSHOT/dsms-intervention-service-2.4.2-64-SNAPSHOT-javadoc.jar.sha1", path ); - gav = gavCalculator - .pathToGav( "/com/stchome/products/dsms/services/dsms-intervention-service/2.4.2-64-SNAPSHOT/dsms-intervention-service-2.4.2-64-SNAPSHOT.jar" ); + gav = + gavCalculator.pathToGav( "/com/stchome/products/dsms/services/dsms-intervention-service/2.4.2-64-SNAPSHOT/dsms-intervention-service-2.4.2-64-SNAPSHOT.jar" ); assertEquals( "com.stchome.products.dsms.services", gav.getGroupId() ); assertEquals( "dsms-intervention-service", gav.getArtifactId() ); @@ -363,10 +362,10 @@ public class M2GavCalculatorTest assertEquals( true, gav.isSnapshot() ); assertEquals( false, gav.isHash() ); assertEquals( null, gav.getHashType() ); - + path = gavCalculator.gavToPath( gav ); assertEquals( "/foo1/foo1/0.0.1SNAPSHOT/foo1-0.0.1SNAPSHOT.pom", path ); - + gav = gavCalculator.pathToGav( "/foo1/foo1/0.0.1.SNAPSHOT/foo1-0.0.1.SNAPSHOT.pom" ); assertEquals( "foo1", gav.getGroupId() ); assertEquals( "foo1", gav.getArtifactId() ); @@ -380,7 +379,7 @@ public class M2GavCalculatorTest assertEquals( true, gav.isSnapshot() ); assertEquals( false, gav.isHash() ); assertEquals( null, gav.getHashType() ); - + path = gavCalculator.gavToPath( gav ); assertEquals( "/foo1/foo1/0.0.1.SNAPSHOT/foo1-0.0.1.SNAPSHOT.pom", path ); @@ -419,8 +418,9 @@ public class M2GavCalculatorTest path = gavCalculator.gavToPath( gav ); assertEquals( "/foo1/foo1/1.0.0-beta-4-SNAPSHOT/foo1-1.0.0-beta-4-20080623.175436-1.jar", path ); - - gav = gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-4-SNAPSHOT/nexus-webapp-1.0.0-beta-4-20080623.203653-349.pom" ); + + gav = + gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-4-SNAPSHOT/nexus-webapp-1.0.0-beta-4-20080623.203653-349.pom" ); assertEquals( "org.sonatype.nexus", gav.getGroupId() ); assertEquals( "nexus-webapp", gav.getArtifactId() ); assertEquals( "1.0.0-beta-4-20080623.203653-349", gav.getVersion() ); @@ -435,9 +435,12 @@ public class M2GavCalculatorTest assertEquals( null, gav.getHashType() ); path = gavCalculator.gavToPath( gav ); - assertEquals( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-4-SNAPSHOT/nexus-webapp-1.0.0-beta-4-20080623.203653-349.pom", path ); + assertEquals( + "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-4-SNAPSHOT/nexus-webapp-1.0.0-beta-4-20080623.203653-349.pom", + path ); - gav = gavCalculator.pathToGav( "/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-20080411.005221-75.pom.asc" ); + gav = + gavCalculator.pathToGav( "/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-20080411.005221-75.pom.asc" ); assertEquals( "org.apache.maven.artifact", gav.getGroupId() ); assertEquals( "maven-artifact", gav.getArtifactId() ); assertEquals( "3.0-20080411.005221-75", gav.getVersion() ); @@ -454,9 +457,12 @@ public class M2GavCalculatorTest assertEquals( Gav.SignatureType.gpg, gav.getSignatureType() ); path = gavCalculator.gavToPath( gav ); - assertEquals( "/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-20080411.005221-75.pom.asc", path ); + assertEquals( + "/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-20080411.005221-75.pom.asc", + path ); - gav = gavCalculator.pathToGav( "/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-20080411.005221-75.pom.asc.sha1" ); + gav = + gavCalculator.pathToGav( "/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-20080411.005221-75.pom.asc.sha1" ); assertEquals( "org.apache.maven.artifact", gav.getGroupId() ); assertEquals( "maven-artifact", gav.getArtifactId() ); assertEquals( "3.0-20080411.005221-75", gav.getVersion() ); @@ -473,9 +479,12 @@ public class M2GavCalculatorTest assertEquals( Gav.SignatureType.gpg, gav.getSignatureType() ); path = gavCalculator.gavToPath( gav ); - assertEquals( "/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-20080411.005221-75.pom.asc.sha1", path ); - - gav = gavCalculator.pathToGav( "/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20080302.032223-6-bin.zip.sha1" ); + assertEquals( + "/org/apache/maven/artifact/maven-artifact/3.0-SNAPSHOT/maven-artifact-3.0-20080411.005221-75.pom.asc.sha1", + path ); + + gav = + gavCalculator.pathToGav( "/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20080302.032223-6-bin.zip.sha1" ); assertEquals( "org.apache.maven", gav.getGroupId() ); assertEquals( "maven-core", gav.getArtifactId() ); assertEquals( "2.0.9-20080302.032223-6", gav.getVersion() ); @@ -491,9 +500,11 @@ public class M2GavCalculatorTest assertEquals( false, gav.isSignature() ); path = gavCalculator.gavToPath( gav ); - assertEquals( "/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20080302.032223-6-bin.zip.sha1", path ); + assertEquals( "/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20080302.032223-6-bin.zip.sha1", + path ); - gav = gavCalculator.pathToGav( "/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20080302.032223-6-bin.tar.gz" ); + gav = + gavCalculator.pathToGav( "/org/apache/maven/maven-core/2.0.9-SNAPSHOT/maven-core-2.0.9-20080302.032223-6-bin.tar.gz" ); assertEquals( "org.apache.maven", gav.getGroupId() ); assertEquals( "maven-core", gav.getArtifactId() ); assertEquals( "2.0.9-20080302.032223-6", gav.getVersion() ); @@ -522,12 +533,12 @@ public class M2GavCalculatorTest assertEquals( false, gav.isHash() ); assertEquals( null, gav.getHashType() ); assertEquals( false, gav.isSignature() ); - + path = gavCalculator.gavToPath( gav ); assertEquals( "/org/sonatype/nexus/nexus-webapp/1.4.0/nexus-webapp-1.4.0-bundle.tar.gz", path ); gav = gavCalculator.pathToGav( "/foo/artifact/SNAPSHOT/artifact-SNAPSHOT.jar" ); - + if ( enforcer.isStrict() ) { assertEquals( "foo", gav.getGroupId() ); @@ -542,7 +553,7 @@ public class M2GavCalculatorTest assertEquals( false, gav.isSnapshot() ); assertEquals( false, gav.isHash() ); assertEquals( null, gav.getHashType() ); - + path = gavCalculator.gavToPath( gav ); assertEquals( "/foo/artifact/SNAPSHOT/artifact-SNAPSHOT.jar", path ); } @@ -560,11 +571,11 @@ public class M2GavCalculatorTest assertEquals( true, gav.isSnapshot() ); assertEquals( false, gav.isHash() ); assertEquals( null, gav.getHashType() ); - + path = gavCalculator.gavToPath( gav ); - assertEquals( "/foo/artifact/SNAPSHOT/artifact-SNAPSHOT.jar", path ); + assertEquals( "/foo/artifact/SNAPSHOT/artifact-SNAPSHOT.jar", path ); } - + gav = gavCalculator.pathToGav( "/foo/artifact/SNAPSHOT/artifact-20080623.175436-1.jar" ); if ( enforcer.isStrict() ) { @@ -584,7 +595,7 @@ public class M2GavCalculatorTest assertEquals( true, gav.isSnapshot() ); assertEquals( false, gav.isHash() ); assertEquals( null, gav.getHashType() ); - + path = gavCalculator.gavToPath( gav ); assertEquals( "/foo/artifact/SNAPSHOT/artifact-20080623.175436-1.jar", path ); } @@ -622,7 +633,7 @@ public class M2GavCalculatorTest gav = gavCalculator.pathToGav( "org/apache/maven/scm/maven-scm" ); assertEquals( null, gav ); - + gav = gavCalculator.pathToGav( "org/apache/geronimo/javamail/geronimo-javamail_1.4_mail" ); assertEquals( null, gav ); } @@ -632,97 +643,111 @@ public class M2GavCalculatorTest { Gav gav; // broken path, baseVersion and version mismatch (2.0-SNAPSHOT vs 2.0-alpha-1...) - gav = gavCalculator - .pathToGav( "/org/apache/maven/plugins/maven-dependency-plugin/2.0-SNAPSHOT/maven-dependency-plugin-2.0-alpha-1-20070109.165112-13.jar" ); + gav = + gavCalculator.pathToGav( "/org/apache/maven/plugins/maven-dependency-plugin/2.0-SNAPSHOT/maven-dependency-plugin-2.0-alpha-1-20070109.165112-13.jar" ); assertEquals( null, gav ); } - - public void testGavExtensionAndClassifier() throws Exception + + public void testGavExtensionAndClassifier() + throws Exception { - Gav gav; - - gav = gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-5/nexus-webapp-1.0.0-beta-5.tar.gz" ); - assertNotNull( gav ); - assertEquals( "tar.gz", gav.getExtension() ); - assertEquals( null, gav.getClassifier() ); - assertEquals( "1.0.0-beta-5", gav.getVersion() ); - - gav = gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-5/nexus-webapp-1.0.0-beta-5-bundle.tar.gz" ); - assertNotNull( gav ); - assertEquals( "tar.gz", gav.getExtension() ); - assertEquals( "bundle", gav.getClassifier() ); - assertEquals( "1.0.0-beta-5", gav.getVersion() ); - - gav = gavCalculator.pathToGav( "/org/codehaus/tycho/tycho-distribution/0.3.0-SNAPSHOT/tycho-distribution-0.3.0-SNAPSHOT-bin.tar.gz" ); - assertNotNull( gav ); - assertEquals( "tar.gz", gav.getExtension() ); - assertEquals( "bin", gav.getClassifier() ); - assertEquals( "0.3.0-SNAPSHOT", gav.getVersion() ); - - gav = gavCalculator.pathToGav( "/org/codehaus/tycho/tycho-distribution/SNAPSHOT/tycho-distribution-SNAPSHOT-bin.tar.gz" ); - assertNotNull( gav ); - assertEquals( "tar.gz", gav.getExtension() ); - assertEquals( "bin", gav.getClassifier() ); - assertEquals( "SNAPSHOT", gav.getVersion() ); - - gav = gavCalculator.pathToGav( "/org/codehaus/tycho/tycho-distribution/0.3.0-SNAPSHOT/tycho-distribution-0.3.0-20080818.153246-33-bin.tar.gz" ); - assertNotNull( gav ); - assertEquals( "tar.gz", gav.getExtension() ); - assertEquals( "bin", gav.getClassifier() ); - assertEquals( "0.3.0-20080818.153246-33", gav.getVersion() ); - - gav = gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-4.2/nexus-webapp-1.0.0-beta-4.2-javadoc.jar" ); - assertNotNull( gav ); - assertEquals( "jar", gav.getExtension() ); - assertEquals( "javadoc", gav.getClassifier() ); - assertEquals( "1.0.0-beta-4.2", gav.getVersion() ); - - gav = gavCalculator.pathToGav( "/org/codehaus/tycho/tycho-distribution/0.3.0-SNAPSHOT/tycho-distribution-0.3.0-20080818.153246-33-bin.zip" ); - assertNotNull( gav ); - assertEquals( "zip", gav.getExtension() ); - assertEquals( "bin", gav.getClassifier() ); - assertEquals( "0.3.0-20080818.153246-33", gav.getVersion() ); - - gav = gavCalculator.pathToGav( "/org/sonatype/nexus/tools/nexus-migration-app/1.0.0-beta-6-SNAPSHOT/nexus-migration-app-1.0.0-beta-6-20080809.181715-2-cli.jar" ); - assertNotNull( gav ); - assertEquals( "jar", gav.getExtension() ); - assertEquals( "cli", gav.getClassifier() ); - assertEquals( "1.0.0-beta-6-20080809.181715-2", gav.getVersion() ); + Gav gav; + + gav = + gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-5/nexus-webapp-1.0.0-beta-5.tar.gz" ); + assertNotNull( gav ); + assertEquals( "tar.gz", gav.getExtension() ); + assertEquals( null, gav.getClassifier() ); + assertEquals( "1.0.0-beta-5", gav.getVersion() ); + + gav = + gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-5/nexus-webapp-1.0.0-beta-5-bundle.tar.gz" ); + assertNotNull( gav ); + assertEquals( "tar.gz", gav.getExtension() ); + assertEquals( "bundle", gav.getClassifier() ); + assertEquals( "1.0.0-beta-5", gav.getVersion() ); + + gav = + gavCalculator.pathToGav( "/org/codehaus/tycho/tycho-distribution/0.3.0-SNAPSHOT/tycho-distribution-0.3.0-SNAPSHOT-bin.tar.gz" ); + assertNotNull( gav ); + assertEquals( "tar.gz", gav.getExtension() ); + assertEquals( "bin", gav.getClassifier() ); + assertEquals( "0.3.0-SNAPSHOT", gav.getVersion() ); + + gav = + gavCalculator.pathToGav( "/org/codehaus/tycho/tycho-distribution/SNAPSHOT/tycho-distribution-SNAPSHOT-bin.tar.gz" ); + assertNotNull( gav ); + assertEquals( "tar.gz", gav.getExtension() ); + assertEquals( "bin", gav.getClassifier() ); + assertEquals( "SNAPSHOT", gav.getVersion() ); + + gav = + gavCalculator.pathToGav( "/org/codehaus/tycho/tycho-distribution/0.3.0-SNAPSHOT/tycho-distribution-0.3.0-20080818.153246-33-bin.tar.gz" ); + assertNotNull( gav ); + assertEquals( "tar.gz", gav.getExtension() ); + assertEquals( "bin", gav.getClassifier() ); + assertEquals( "0.3.0-20080818.153246-33", gav.getVersion() ); + + gav = + gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-4.2/nexus-webapp-1.0.0-beta-4.2-javadoc.jar" ); + assertNotNull( gav ); + assertEquals( "jar", gav.getExtension() ); + assertEquals( "javadoc", gav.getClassifier() ); + assertEquals( "1.0.0-beta-4.2", gav.getVersion() ); + + gav = + gavCalculator.pathToGav( "/org/codehaus/tycho/tycho-distribution/0.3.0-SNAPSHOT/tycho-distribution-0.3.0-20080818.153246-33-bin.zip" ); + assertNotNull( gav ); + assertEquals( "zip", gav.getExtension() ); + assertEquals( "bin", gav.getClassifier() ); + assertEquals( "0.3.0-20080818.153246-33", gav.getVersion() ); + + gav = + gavCalculator.pathToGav( "/org/sonatype/nexus/tools/nexus-migration-app/1.0.0-beta-6-SNAPSHOT/nexus-migration-app-1.0.0-beta-6-20080809.181715-2-cli.jar" ); + assertNotNull( gav ); + assertEquals( "jar", gav.getExtension() ); + assertEquals( "cli", gav.getClassifier() ); + assertEquals( "1.0.0-beta-6-20080809.181715-2", gav.getVersion() ); } - - public void testGavSnapshotVersion() throws Exception + + public void testGavSnapshotVersion() + throws Exception { Gav gav; - - gav = gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-5-SNAPSHOT/nexus-webapp-1.0.0-beta-5-SNAPSHOT.tar.gz" ); + + gav = + gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-5-SNAPSHOT/nexus-webapp-1.0.0-beta-5-SNAPSHOT.tar.gz" ); assertNotNull( gav ); assertEquals( "tar.gz", gav.getExtension() ); assertEquals( null, gav.getClassifier() ); assertEquals( "1.0.0-beta-5-SNAPSHOT", gav.getVersion() ); assertTrue( gav.isSnapshot() ); - - gav = gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-5-SNAPSHOT-1234/nexus-webapp-1.0.0-beta-5-SNAPSHOT-1234.tar.gz" ); + + gav = + gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-5-SNAPSHOT-1234/nexus-webapp-1.0.0-beta-5-SNAPSHOT-1234.tar.gz" ); assertNotNull( gav ); assertEquals( "tar.gz", gav.getExtension() ); assertEquals( null, gav.getClassifier() ); assertEquals( "1.0.0-beta-5-SNAPSHOT-1234", gav.getVersion() ); assertFalse( gav.isSnapshot() ); - - gav = gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-5-SNAPSHOT/nexus-webapp-1.0.0-beta-5-SNAPSHOT-bundle.tar.gz" ); + + gav = + gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-5-SNAPSHOT/nexus-webapp-1.0.0-beta-5-SNAPSHOT-bundle.tar.gz" ); assertNotNull( gav ); assertEquals( "tar.gz", gav.getExtension() ); assertEquals( "bundle", gav.getClassifier() ); assertEquals( "1.0.0-beta-5-SNAPSHOT", gav.getVersion() ); assertTrue( gav.isSnapshot() ); - - gav = gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-5-SNAPSHOT-1234/nexus-webapp-1.0.0-beta-5-SNAPSHOT-1234-bundle.tar.gz" ); + + gav = + gavCalculator.pathToGav( "/org/sonatype/nexus/nexus-webapp/1.0.0-beta-5-SNAPSHOT-1234/nexus-webapp-1.0.0-beta-5-SNAPSHOT-1234-bundle.tar.gz" ); assertNotNull( gav ); assertEquals( "tar.gz", gav.getExtension() ); assertEquals( "bundle", gav.getClassifier() ); assertEquals( "1.0.0-beta-5-SNAPSHOT-1234", gav.getVersion() ); assertFalse( gav.isSnapshot() ); } - + public void testGavLooseStrictedSnapshot() throws Exception { @@ -737,15 +762,15 @@ public class M2GavCalculatorTest assertEquals( "nexus-3148", gav.getArtifactId() ); assertEquals( null, gav.getClassifier() ); assertEquals( "pom", gav.getExtension() ); - assertEquals( new Integer(1), gav.getSnapshotBuildNumber() ); + assertEquals( new Integer( 1 ), gav.getSnapshotBuildNumber() ); // the timestamp is UTC, not EST timezoned! // also, the Gav is it seems TZ sensitive!!! - assertEquals( parseTimestamp("20100111.064938"), gav.getSnapshotTimeStamp() ); + assertEquals( parseTimestamp( "20100111.064938" ), gav.getSnapshotTimeStamp() ); assertEquals( "nexus-3148-1.0.20100111.064938-1.pom", gav.getName() ); assertEquals( true, gav.isSnapshot() ); assertEquals( false, gav.isHash() ); assertEquals( null, gav.getHashType() ); - + String path = gavCalculator.gavToPath( gav ); assertEquals( "/org/sonatype/nexus-3148/1.0.SNAPSHOT/nexus-3148-1.0.20100111.064938-1.pom", path ); }
Modified: maven/indexer/trunk/indexer-core/src/test/java/org/sonatype/nexus/artifact/MavenArtifactRecognizerTest.java URL: http://svn.apache.org/viewvc/maven/indexer/trunk/indexer-core/src/test/java/org/sonatype/nexus/artifact/MavenArtifactRecognizerTest.java?rev=1035289&r1=1035288&r2=1035289&view=diff ============================================================================== --- maven/indexer/trunk/indexer-core/src/test/java/org/sonatype/nexus/artifact/MavenArtifactRecognizerTest.java (original) +++ maven/indexer/trunk/indexer-core/src/test/java/org/sonatype/nexus/artifact/MavenArtifactRecognizerTest.java Mon Nov 15 14:25:48 2010 @@ -22,39 +22,47 @@ import org.apache.maven.index.artifact.M import junit.framework.TestCase; -public class MavenArtifactRecognizerTest extends TestCase { - - public void testIsPom() { - assertEquals(true, M2ArtifactRecognizer.isPom("aaa.pom")); - assertEquals(true, M2ArtifactRecognizer.isPom("zxc-1-2-3.pom")); - assertEquals(false, M2ArtifactRecognizer.isPom("aaa.jar")); - assertEquals(false, M2ArtifactRecognizer.isPom("aaa.pom-a")); - } - - public void testIsSnapshot1() { - // NEXUS-3148 - assertEquals(true, M2ArtifactRecognizer.isSnapshot("/org/somewhere/aid/1.0SNAPSHOT/xsdSNAPSHOT.jar")); - - assertEquals(true, M2ArtifactRecognizer.isSnapshot("/org/somewhere/aid/1.0-SNAPSHOT/xsd-SNAPSHOT.jar")); - assertEquals(true, M2ArtifactRecognizer.isSnapshot("/org/somewhere/aid/1.0-SNAPSHOT/xsd-SNAPSHOT.pom")); - assertEquals(true, M2ArtifactRecognizer.isSnapshot("/org/somewhere/aid/1.0-SNAPSHOT/a/b/c/xsd-1.2.3-.pom")); - assertEquals(false, M2ArtifactRecognizer.isSnapshot("/org/somewhere/aid/1.0/xsd-SNAPsHOT.jar")); - assertEquals(false, M2ArtifactRecognizer.isSnapshot("/org/somewhere/aid/1.0/xsd-SNAPHOT.pom")); - assertEquals(false, M2ArtifactRecognizer.isSnapshot("/org/somewhere/aid/1.0/a/b/c/xsd-1.2.3NAPSHOT.pom")); - assertEquals(false, M2ArtifactRecognizer.isSnapshot("/javax/mail/mail/1.4/mail-1.4.jar")); - } - - public void testIsSnapshot2() { - assertEquals(true, M2ArtifactRecognizer - .isSnapshot("/org/somewhere/aid/1.0-SNAPSHOT/appassembler-maven-plugin-1.0-20060714.142547-1.pom")); - assertEquals(false, M2ArtifactRecognizer - .isSnapshot("/org/somewhere/aid/1.0/appassembler-maven-plugin-1.0-20060714.142547-1.pom")); - } - - public void testIsMetadata() { - assertEquals(true, M2ArtifactRecognizer.isMetadata("maven-metadata.xml")); - assertEquals(false, M2ArtifactRecognizer.isMetadata("aven-metadata.xml")); - assertEquals(false, M2ArtifactRecognizer.isMetadata("/javax/mail/mail/1.4/mail-1.4.jar")); - } +public class MavenArtifactRecognizerTest + extends TestCase +{ + + public void testIsPom() + { + assertEquals( true, M2ArtifactRecognizer.isPom( "aaa.pom" ) ); + assertEquals( true, M2ArtifactRecognizer.isPom( "zxc-1-2-3.pom" ) ); + assertEquals( false, M2ArtifactRecognizer.isPom( "aaa.jar" ) ); + assertEquals( false, M2ArtifactRecognizer.isPom( "aaa.pom-a" ) ); + } + + public void testIsSnapshot1() + { + // NEXUS-3148 + assertEquals( true, M2ArtifactRecognizer.isSnapshot( "/org/somewhere/aid/1.0SNAPSHOT/xsdSNAPSHOT.jar" ) ); + + assertEquals( true, M2ArtifactRecognizer.isSnapshot( "/org/somewhere/aid/1.0-SNAPSHOT/xsd-SNAPSHOT.jar" ) ); + assertEquals( true, M2ArtifactRecognizer.isSnapshot( "/org/somewhere/aid/1.0-SNAPSHOT/xsd-SNAPSHOT.pom" ) ); + assertEquals( true, M2ArtifactRecognizer.isSnapshot( "/org/somewhere/aid/1.0-SNAPSHOT/a/b/c/xsd-1.2.3-.pom" ) ); + assertEquals( false, M2ArtifactRecognizer.isSnapshot( "/org/somewhere/aid/1.0/xsd-SNAPsHOT.jar" ) ); + assertEquals( false, M2ArtifactRecognizer.isSnapshot( "/org/somewhere/aid/1.0/xsd-SNAPHOT.pom" ) ); + assertEquals( false, M2ArtifactRecognizer.isSnapshot( "/org/somewhere/aid/1.0/a/b/c/xsd-1.2.3NAPSHOT.pom" ) ); + assertEquals( false, M2ArtifactRecognizer.isSnapshot( "/javax/mail/mail/1.4/mail-1.4.jar" ) ); + } + + public void testIsSnapshot2() + { + assertEquals( + true, + M2ArtifactRecognizer.isSnapshot( "/org/somewhere/aid/1.0-SNAPSHOT/appassembler-maven-plugin-1.0-20060714.142547-1.pom" ) ); + assertEquals( + false, + M2ArtifactRecognizer.isSnapshot( "/org/somewhere/aid/1.0/appassembler-maven-plugin-1.0-20060714.142547-1.pom" ) ); + } + + public void testIsMetadata() + { + assertEquals( true, M2ArtifactRecognizer.isMetadata( "maven-metadata.xml" ) ); + assertEquals( false, M2ArtifactRecognizer.isMetadata( "aven-metadata.xml" ) ); + assertEquals( false, M2ArtifactRecognizer.isMetadata( "/javax/mail/mail/1.4/mail-1.4.jar" ) ); + } }
