You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@archiva.apache.org by oc...@apache.org on 2009/05/06 13:20:07 UTC
svn commit: r772151 - in
/archiva/trunk/archiva-modules/archiva-base/archiva-common/src:
main/java/org/apache/maven/archiva/common/utils/VersionUtil.java
test/java/org/apache/maven/archiva/common/utils/VersionUtilTest.java
Author: oching
Date: Wed May 6 11:20:06 2009
New Revision: 772151
URL: http://svn.apache.org/viewvc?rev=772151&view=rev
Log:
[MRM-1172]
submitted by Jan Ancajas
o loosen version validation rule in VersionUtil
o added test cases
Added:
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/VersionUtilTest.java
Modified:
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java
Modified: archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java?rev=772151&r1=772150&r2=772151&view=diff
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java (original)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/maven/archiva/common/utils/VersionUtil.java Wed May 6 11:20:06 2009
@@ -95,6 +95,10 @@
if ( mat.matches() )
{
+ if ( i == 0 ) // loosen rule to return true if first token matches
+ {
+ return true;
+ }
countValidParts++;
}
}
Added: archiva/trunk/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/VersionUtilTest.java
URL: http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/VersionUtilTest.java?rev=772151&view=auto
==============================================================================
--- archiva/trunk/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/VersionUtilTest.java (added)
+++ archiva/trunk/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/maven/archiva/common/utils/VersionUtilTest.java Wed May 6 11:20:06 2009
@@ -0,0 +1,75 @@
+package org.apache.maven.archiva.common.utils;
+
+import junit.framework.TestCase;
+
+public class VersionUtilTest extends TestCase
+{
+
+ public void testIsVersion()
+ {
+ // 0%
+ assertFalse( VersionUtil.isVersion( "project" ) );
+
+ // 0%
+ assertFalse( VersionUtil.isVersion( "project-not-version" ) );
+
+ // 50%
+ assertFalse( VersionUtil.isVersion( "project-ver-1.0-dev" ) );
+
+ // > 75%
+ assertTrue( VersionUtil.isVersion( "project-1.0-alpha" ) );
+
+ // 75%
+ assertTrue( VersionUtil.isVersion( "project-1.0-latest-nightly" ) );
+
+ // >75%
+ assertTrue( VersionUtil.isVersion( "1.0-project-unofficial-nightly-alpha-release" ) );
+
+ //only first token matches
+ assertTrue( VersionUtil.isVersion( "1.0-project-my-own-version" ) );
+
+ }
+
+ public void testIsSimpleVersionKeyword()
+ {
+ assertTrue( VersionUtil.isSimpleVersionKeyword( "rc4.34" ) );
+
+ assertTrue( VersionUtil.isSimpleVersionKeyword( "beta" ) );
+
+ assertFalse( VersionUtil.isSimpleVersionKeyword( "1.0-SNAPSHOT" ) );
+ }
+
+ public void testIsSnapshot()
+ {
+ assertTrue( VersionUtil.isSnapshot( "1.0-20070113.163208-99" ) );
+
+ assertTrue( VersionUtil.isSnapshot( "1.0-SNAPSHOT" ) );
+
+ assertFalse( VersionUtil.isSnapshot( "1.0-beta1" ) );
+ }
+
+ public void testGetBaseVersion()
+ {
+ assertEquals( VersionUtil.getBaseVersion( "1.3.2-20090420.083501-3" ), "1.3.2-SNAPSHOT" );
+ }
+
+ public void testGetReleaseVersion()
+ {
+ assertEquals( VersionUtil.getReleaseVersion( "1.3.2-20090420.083501-3" ), "1.3.2" );
+ }
+
+ public void testIsUniqueSnapshot()
+ {
+ assertTrue( VersionUtil.isUniqueSnapshot( "1.3.2-20090420.083501-3" ) );
+
+ assertFalse( VersionUtil.isUniqueSnapshot( "1.3.2" ) );
+ }
+
+ public void testIsGenericSnapshot()
+ {
+ assertFalse( VersionUtil.isGenericSnapshot( "1.3.2-20090420.083501-3" ) );
+
+ assertTrue( VersionUtil.isGenericSnapshot( "1.3.2-SNAPSHOT" ) );
+ }
+
+}