You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@felix.apache.org by fm...@apache.org on 2010/03/22 11:24:33 UTC
svn commit: r926022 -
/felix/trunk/utils/src/test/java/org/apache/felix/utils/version/VersionCleanerTest.java
Author: fmeschbe
Date: Mon Mar 22 10:24:33 2010
New Revision: 926022
URL: http://svn.apache.org/viewvc?rev=926022&view=rev
Log:
Add test for null version string
Modified:
felix/trunk/utils/src/test/java/org/apache/felix/utils/version/VersionCleanerTest.java
Modified: felix/trunk/utils/src/test/java/org/apache/felix/utils/version/VersionCleanerTest.java
URL: http://svn.apache.org/viewvc/felix/trunk/utils/src/test/java/org/apache/felix/utils/version/VersionCleanerTest.java?rev=926022&r1=926021&r2=926022&view=diff
==============================================================================
--- felix/trunk/utils/src/test/java/org/apache/felix/utils/version/VersionCleanerTest.java (original)
+++ felix/trunk/utils/src/test/java/org/apache/felix/utils/version/VersionCleanerTest.java Mon Mar 22 10:24:33 2010
@@ -26,47 +26,50 @@ public class VersionCleanerTest extends
{
String osgiVersion;
- osgiVersion = VersionCleaner.clean( "" );
- assertEquals( "0.0.0", osgiVersion );
+ osgiVersion = VersionCleaner.clean(null);
+ assertEquals("0.0.0", osgiVersion);
- osgiVersion = VersionCleaner.clean( "2.1.0-SNAPSHOT" );
- assertEquals( "2.1.0.SNAPSHOT", osgiVersion );
+ osgiVersion = VersionCleaner.clean("");
+ assertEquals("0.0.0", osgiVersion);
- osgiVersion = VersionCleaner.clean( "2.1-SNAPSHOT" );
- assertEquals( "2.1.0.SNAPSHOT", osgiVersion );
+ osgiVersion = VersionCleaner.clean("2.1.0-SNAPSHOT");
+ assertEquals("2.1.0.SNAPSHOT", osgiVersion);
- osgiVersion = VersionCleaner.clean( "2-SNAPSHOT" );
- assertEquals( "2.0.0.SNAPSHOT", osgiVersion );
+ osgiVersion = VersionCleaner.clean("2.1-SNAPSHOT");
+ assertEquals("2.1.0.SNAPSHOT", osgiVersion);
- osgiVersion = VersionCleaner.clean( "2" );
- assertEquals( "2.0.0", osgiVersion );
+ osgiVersion = VersionCleaner.clean("2-SNAPSHOT");
+ assertEquals("2.0.0.SNAPSHOT", osgiVersion);
- osgiVersion = VersionCleaner.clean( "2.1" );
- assertEquals( "2.1.0", osgiVersion );
+ osgiVersion = VersionCleaner.clean("2");
+ assertEquals("2.0.0", osgiVersion);
- osgiVersion = VersionCleaner.clean( "2.1.3" );
- assertEquals( "2.1.3", osgiVersion );
+ osgiVersion = VersionCleaner.clean("2.1");
+ assertEquals("2.1.0", osgiVersion);
- osgiVersion = VersionCleaner.clean( "2.1.3.4" );
- assertEquals( "2.1.3.4", osgiVersion );
+ osgiVersion = VersionCleaner.clean("2.1.3");
+ assertEquals("2.1.3", osgiVersion);
- osgiVersion = VersionCleaner.clean( "4aug2000r7-dev" );
- assertEquals( "0.0.0.4aug2000r7-dev", osgiVersion );
+ osgiVersion = VersionCleaner.clean("2.1.3.4");
+ assertEquals("2.1.3.4", osgiVersion);
- osgiVersion = VersionCleaner.clean( "1.1-alpha-2" );
- assertEquals( "1.1.0.alpha-2", osgiVersion );
+ osgiVersion = VersionCleaner.clean("4aug2000r7-dev");
+ assertEquals("0.0.0.4aug2000r7-dev", osgiVersion);
- osgiVersion = VersionCleaner.clean( "1.0-alpha-16-20070122.203121-13" );
- assertEquals( "1.0.0.alpha-16-20070122_203121-13", osgiVersion );
+ osgiVersion = VersionCleaner.clean("1.1-alpha-2");
+ assertEquals("1.1.0.alpha-2", osgiVersion);
- osgiVersion = VersionCleaner.clean( "1.0-20070119.021432-1" );
- assertEquals( "1.0.0.20070119_021432-1", osgiVersion );
+ osgiVersion = VersionCleaner.clean("1.0-alpha-16-20070122.203121-13");
+ assertEquals("1.0.0.alpha-16-20070122_203121-13", osgiVersion);
- osgiVersion = VersionCleaner.clean( "1-20070119.021432-1" );
- assertEquals( "1.0.0.20070119_021432-1", osgiVersion );
+ osgiVersion = VersionCleaner.clean("1.0-20070119.021432-1");
+ assertEquals("1.0.0.20070119_021432-1", osgiVersion);
- osgiVersion = VersionCleaner.clean( "1.4.1-20070217.082013-7" );
- assertEquals( "1.4.1.20070217_082013-7", osgiVersion );
+ osgiVersion = VersionCleaner.clean("1-20070119.021432-1");
+ assertEquals("1.0.0.20070119_021432-1", osgiVersion);
+
+ osgiVersion = VersionCleaner.clean("1.4.1-20070217.082013-7");
+ assertEquals("1.4.1.20070217_082013-7", osgiVersion);
}
}