diff --git a/test/ParseVersion.java b/test/ParseVersion.java
new file mode 100644
index 000000000..ea839ef8c
--- /dev/null
+++ b/test/ParseVersion.java
@@ -0,0 +1,33 @@
+import junit.framework.TestCase;
+
+public class ParseVersion extends TestCase {
+
+	/**
+	 * Test method for 'yacy.combinedVersionString2PrettyString(String)'
+	 * @author Bost
+	 * @link <a href="http://www.yacy-forum.de/viewtopic.php?t=2717">yacy-forum.de: ne Verbesserung von combinedVersionString2PrettyString(...)</a>
+	 */
+	public void testCombinedVersionString2PrettyString() {
+        assertEquals("dev/00000",       yacy.combinedVersionString2PrettyString(""));                 // not a number
+        assertEquals("dev/00000",       yacy.combinedVersionString2PrettyString(" "));                // not a number
+        assertEquals("dev/02417",       yacy.combinedVersionString2PrettyString("0.10002417"));
+        assertEquals("dev/02440",       yacy.combinedVersionString2PrettyString("0.10002440"));
+        assertEquals("dev/02417",       yacy.combinedVersionString2PrettyString("0.10002417"));
+        assertEquals("dev/00000",       yacy.combinedVersionString2PrettyString("0.100024400"));      // input is too long
+        assertEquals("dev/02440",       yacy.combinedVersionString2PrettyString("0.10902440"));
+        assertEquals("0.110/02440",     yacy.combinedVersionString2PrettyString("0.11002440"));
+        assertEquals("0.111/02440",     yacy.combinedVersionString2PrettyString("0.11102440"));    
+        assertEquals("dev/00000",       yacy.combinedVersionString2PrettyString("0.00000000"));       // input is valid - no warning generated
+        assertEquals("dev/00000",       yacy.combinedVersionString2PrettyString("    0.11102440"));   // spaces are not allowed
+        assertEquals("dev/00000",       yacy.combinedVersionString2PrettyString("0.111244"));         // input is too short
+        assertEquals("dev/00000",       yacy.combinedVersionString2PrettyString("0.1112440\t\n"));    // \t and \n are not allowed
+        assertEquals("dev/00000",       yacy.combinedVersionString2PrettyString("124353432xxxx4546399999"));  // not a number + too long 
+        assertEquals("dev/00000",       yacy.combinedVersionString2PrettyString("123456789x"));       // not a number
+        assertEquals("dev/00000",       yacy.combinedVersionString2PrettyString("9999999999"));       // missing decimal point
+        assertEquals("dev/00000",       yacy.combinedVersionString2PrettyString("999.999999"));       // floating point part must have 3 and SVN-Version 5 digits
+        assertEquals("0.999/99999",     yacy.combinedVersionString2PrettyString("0.99999999"));    
+        assertEquals("99999.004/56789", yacy.combinedVersionString2PrettyString("99999.00456789"));    
+        assertEquals("dev/00000",       yacy.combinedVersionString2PrettyString("99999.003456789"));  // input is too long
+    }
+
+}