svn commit: r1401074 - in /archiva/trunk/archiva-modules/archiva-base/archiva-common/src: main/java/org/apache/archiva/common/utils/VersionUtil.java test/java/org/apache/archiva/common/utils/VersionUtilTest.java

[olamy]

Author: olamy
Date: Mon Oct 22 20:51:46 2012
New Revision: 1401074

URL: http://svn.apache.org/viewvc?rev=1401074&view=rev
Log:
add util method to extract version from generic snapshot version

Modified:
    
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java
    
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionUtilTest.java

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java?rev=1401074&r1=1401073&r2=1401074&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/main/java/org/apache/archiva/common/utils/VersionUtil.java
 Mon Oct 22 20:51:46 2012
@@ -26,8 +26,6 @@ import java.util.regex.Pattern;
 
 /**
  * Version utility methods.
- *
- *
  */
 public class VersionUtil
 {
@@ -191,4 +189,14 @@ public class VersionUtil
     {
         return version.endsWith( SNAPSHOT );
     }
+
+    public static String getVersionFromGenericSnapshot( String version )
+    {
+        Matcher m = GENERIC_SNAPSHOT_PATTERN.matcher( version );
+        if ( m.matches() )
+        {
+            return m.group( 1 );
+        }
+        return version;
+    }
 }

Modified: 
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionUtilTest.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionUtilTest.java?rev=1401074&r1=1401073&r2=1401074&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionUtilTest.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-base/archiva-common/src/test/java/org/apache/archiva/common/utils/VersionUtilTest.java
 Mon Oct 22 20:51:46 2012
@@ -21,74 +21,81 @@ package org.apache.archiva.common.utils;
 
 import junit.framework.TestCase;
 
-public class VersionUtilTest extends 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" ) );
     }
-    
+
+    public void testGetVersionFromGenericSnapshot()
+    {
+        assertEquals( "3.0", VersionUtil.getVersionFromGenericSnapshot( 
"3.0-SNAPSHOT" ) );
+
+    }
+
 }