From 08a8defda8b6f49eb794cf787f688ba65bfe7b37 Mon Sep 17 00:00:00 2001
From: Sven Gothel <sgothel@jausoft.com>
Date: Wed, 24 Oct 2012 16:50:23 +0200
Subject: Fix VersionNumber: Non digits cut off pattern was '\D.*' and cut off
 digits in case leading non digits appear.

'\D.*' matches a leading non-digit and then any character.

First the string is tokenized by delim:
  "OpenGL ES GLSL ES 1.0.16" -> "OpenGL ES GLSL ES 1", "0", "16"

Enhance pattern as follows and access collected group if matching:
        // group1: \D* == leading non digits, optional
        // group2: \d* == digits
        // group3: .*  == any pending chars, optional
        final java.util.regex.Pattern nonDigitsCutOff = java.util.regex.Pattern.compile("(\\D*)(\\d*)(.*)");

Reorganized storage from atomic values to int[3] array, allowing simple pattern matching loop.

Added unit test.
---
 .../com/jogamp/common/util/TestVersionNumber.java  | 102 +++++++++++++++++++++
 1 file changed, 102 insertions(+)
 create mode 100644 src/junit/com/jogamp/common/util/TestVersionNumber.java

(limited to 'src/junit/com/jogamp')

diff --git a/src/junit/com/jogamp/common/util/TestVersionNumber.java b/src/junit/com/jogamp/common/util/TestVersionNumber.java
new file mode 100644
index 0000000..f1ed157
--- /dev/null
+++ b/src/junit/com/jogamp/common/util/TestVersionNumber.java
@@ -0,0 +1,102 @@
+/**
+ * Copyright 2012 JogAmp Community. All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification, are
+ * permitted provided that the following conditions are met:
+ * 
+ *    1. Redistributions of source code must retain the above copyright notice, this list of
+ *       conditions and the following disclaimer.
+ * 
+ *    2. Redistributions in binary form must reproduce the above copyright notice, this list
+ *       of conditions and the following disclaimer in the documentation and/or other materials
+ *       provided with the distribution.
+ * 
+ * THIS SOFTWARE IS PROVIDED BY JogAmp Community ``AS IS'' AND ANY EXPRESS OR IMPLIED
+ * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+ * FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL JogAmp Community OR
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+ * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
+ * ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+ * ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * 
+ * The views and conclusions contained in the software and documentation are those of the
+ * authors and should not be interpreted as representing official policies, either expressed
+ * or implied, of JogAmp Community.
+ */
+ 
+package com.jogamp.common.util;
+
+import java.io.IOException;
+
+import org.junit.Assert;
+import org.junit.Test;
+
+import com.jogamp.junit.util.JunitTracer;
+
+public class TestVersionNumber extends JunitTracer {
+
+    @Test
+    public void test01() {
+        final String delim = ".";
+        
+        final String vs00 = "1.0.16";
+        final String vs01 = "OpenGL ES GLSL ES 1.0.16";
+        final String vs02 = "1.0.16 OpenGL ES GLSL ES";
+        final VersionNumber vn0 = new VersionNumber(1, 0, 16);
+        
+        VersionNumber vn;
+        
+        vn = new VersionNumber(vs00, delim);
+        Assert.assertEquals(vn0, vn);
+        vn = new VersionNumber(vs01, delim);
+        Assert.assertEquals(vn0, vn);
+        vn = new VersionNumber(vs02, delim);
+        Assert.assertEquals(vn0, vn);
+    }
+
+    @Test
+    public void test02() {
+        final String delim = ".";
+        
+        final String vs00 = "4.20";
+        final String vs01 = "COMPANY via Stupid tool 4.20";
+        final String vs02 = "4.20 COMPANY via Stupid tool";
+        final VersionNumber vn0 = new VersionNumber(4, 20, 0);
+        
+        VersionNumber vn;
+        
+        vn = new VersionNumber(vs00, delim);
+        Assert.assertEquals(vn0, vn);
+        vn = new VersionNumber(vs01, delim);
+        Assert.assertEquals(vn0, vn);
+        vn = new VersionNumber(vs02, delim);
+        Assert.assertEquals(vn0, vn);
+    }
+
+    @Test
+    public void test03() {
+        final String delim = ".";
+        
+        final String vs00 = "A10.11.12b";
+        final String vs01 = "Prelim Text 10.Funny11 .Weird12 Something is odd";
+        final String vs02 = "Prelim Text 10 .Funny11l1.Weird12 2 Something is odd";
+        final VersionNumber vn0 = new VersionNumber(10, 11, 12);
+        
+        VersionNumber vn;
+        
+        vn = new VersionNumber(vs00, delim);
+        Assert.assertEquals(vn0, vn);
+        vn = new VersionNumber(vs01, delim);
+        Assert.assertEquals(vn0, vn);
+        vn = new VersionNumber(vs02, delim);
+        Assert.assertEquals(vn0, vn);
+    }
+    
+    public static void main(String args[]) throws IOException {
+        String tstname = TestVersionNumber.class.getName();
+        org.junit.runner.JUnitCore.main(tstname);
+    }
+
+}
-- 
cgit v1.2.3