aboutsummaryrefslogtreecommitdiffstats
path: root/src/test/com
diff options
context:
space:
mode:
authorSven Gothel <[email protected]>2013-05-31 11:16:01 +0200
committerSven Gothel <[email protected]>2013-05-31 11:16:01 +0200
commitcbd7bf1d65a253381b0775d57c0c949c75aef008 (patch)
tree3dc0c44cfba319fef78e17860f7fdf993e4fff7d /src/test/com
parentef8949d4bdfb21bbe423acc661affaf59369f859 (diff)
GLVersionNumber.createVendorVersion(): Only test match result and potentially continue matching if having a pattern-match (don't loop for-ever).
Diffstat (limited to 'src/test/com')
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java16
1 files changed, 11 insertions, 5 deletions
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java
index f2f6e4aff..a39e68abf 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestGLVersionParsing00NEWT.java
@@ -68,7 +68,9 @@ public class TestGLVersionParsing00NEWT extends UITestCase {
public static final String[] glVersionStrings02 = new String[] {
"GL_VERSION_2_1", // 0
"OpenGL ES 2.0", // 1
- "OpenGL ES GLSL ES 2.0" // 2
+ "OpenGL ES GLSL ES 2.0", // 2
+ "OpenGL 2.1 LaLa", // 3
+ "4.2.11762 Compatibility Profile Context" // 4
};
public static final VersionNumberString[] glVersionNumbers = new VersionNumberString[] {
@@ -97,7 +99,9 @@ public class TestGLVersionParsing00NEWT extends UITestCase {
new VersionNumberString(2, 1, 0, glVersionStrings02[0]),
new VersionNumberString(2, 0, 0, glVersionStrings02[1]),
- new VersionNumberString(2, 0, 0, glVersionStrings02[1])
+ new VersionNumberString(2, 0, 0, glVersionStrings02[2]),
+ new VersionNumberString(2, 1, 0, glVersionStrings02[3]),
+ new VersionNumberString(4, 2, 0, glVersionStrings02[4])
};
public static final VersionNumberString[] glVendorVersionNumbersWithSub = new VersionNumberString[] {
new VersionNumberString(1, 2, 3, glVersionStrings00[0]),
@@ -125,9 +129,11 @@ public class TestGLVersionParsing00NEWT extends UITestCase {
new VersionNumberString(11, 33, 0, glVersionStrings01[9])
};
public static final VersionNumberString[] glVendorVersionNumbersNone = new VersionNumberString[] {
- new VersionNumberString(0, 0, 0, glVersionStrings02[0]),
- new VersionNumberString(0, 0, 0, glVersionStrings02[1]),
- new VersionNumberString(0, 0, 0, glVersionStrings02[2])
+ new VersionNumberString(0, 0, 0, glVersionStrings02[0]),
+ new VersionNumberString(0, 0, 0, glVersionStrings02[1]),
+ new VersionNumberString(0, 0, 0, glVersionStrings02[2]),
+ new VersionNumberString(0, 0, 0, glVersionStrings02[3]),
+ new VersionNumberString(0, 0, 0, glVersionStrings02[4])
};
@Test