diff options
| author | Sven Gothel <[email protected]> | 2012-10-24 16:50:23 +0200 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2012-10-24 16:50:23 +0200 |
| commit | 08a8defda8b6f49eb794cf787f688ba65bfe7b37 (patch) | |
| tree | a0aed7a50d301d4351120073560d20c88234c60b /make | |
| parent | 761b2855b9c01c421ecd4d435a828a67b3a2471b (diff) | |
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.
Diffstat (limited to 'make')
| -rwxr-xr-x | make/scripts/runtest.sh | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/make/scripts/runtest.sh b/make/scripts/runtest.sh index aebe608..8cdf352 100755 --- a/make/scripts/runtest.sh +++ b/make/scripts/runtest.sh @@ -70,6 +70,7 @@ function onetest() { #onetest com.jogamp.common.GlueGenVersion 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestSystemPropsAndEnvs 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestVersionInfo 2>&1 | tee -a $LOG +onetest com.jogamp.common.util.TestVersionNumber 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestIteratorIndexCORE 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.locks.TestRecursiveLock01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.locks.TestRecursiveThreadGroupLock01 2>&1 | tee -a $LOG @@ -91,7 +92,7 @@ function onetest() { #onetest com.jogamp.common.util.TestIOUtil01 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestTempJarCache 2>&1 | tee -a $LOG #onetest com.jogamp.common.util.TestJarUtil 2>&1 | tee -a $LOG -onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG +#onetest com.jogamp.common.util.TestValueConversion 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.AssetURLConnectionUnregisteredTest 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.AssetURLConnectionRegisteredTest 2>&1 | tee -a $LOG #onetest com.jogamp.common.net.URLCompositionTest 2>&1 | tee -a $LOG |