summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--make/lib/v2.3.0/jogl-all.jarbin0 -> 3314632 bytes
-rw-r--r--make/scripts/tests.sh4
-rw-r--r--src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java27
3 files changed, 27 insertions, 4 deletions
diff --git a/make/lib/v2.3.0/jogl-all.jar b/make/lib/v2.3.0/jogl-all.jar
new file mode 100644
index 000000000..a1d03e81f
--- /dev/null
+++ b/make/lib/v2.3.0/jogl-all.jar
Binary files differ
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index aa2cbc778..eeec83ec1 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -409,12 +409,12 @@ function testawtswt() {
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile02NEWTNoARBCtx $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile03NEWTOffscreen $*
#testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile04NEWTOffscreenNoARBCtx $*
-#testawt com.jogamp.opengl.test.junit.jogl.acore.TestVersionSemanticsNOUI $*
+testawt com.jogamp.opengl.test.junit.jogl.acore.TestVersionSemanticsNOUI $*
#
# Stereo
#
-testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $*
+#testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $*
#
# HiDPI
diff --git a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java
index 5cf9655f8..bd1da8357 100644
--- a/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java
+++ b/src/test/com/jogamp/opengl/test/junit/jogl/acore/TestVersionSemanticsNOUI.java
@@ -56,9 +56,12 @@ public class TestVersionSemanticsNOUI extends SingletonJunitCase {
static final VersionNumberString curVersionNumber = new VersionNumberString(curVersion.getImplementationVersion());
static final Set<String> excludesDefault;
+ static final Set<String> excludesV230V23X;
static {
excludesDefault = new HashSet<String>();
excludesDefault.add("^\\Qjogamp/\\E.*$");
+ excludesV230V23X = new HashSet<String>(excludesDefault);
+ excludesV230V23X.add("^\\Qcom/jogamp/opengl/util/stereo/\\E.*$");
}
@@ -87,6 +90,11 @@ public class TestVersionSemanticsNOUI extends SingletonJunitCase {
testVersions(diffCriteria, Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER, "2.2.0", "2.2.1", excludesDefault);
}
+ @Test
+ public void testVersionV221V230() throws IllegalArgumentException, IOException, URISyntaxException {
+ testVersions(diffCriteria, Delta.CompatibilityType.NON_BACKWARD_COMPATIBLE, "2.2.1", "2.3.0", excludesDefault);
+ }
+
void testVersions(final DiffCriteria diffCriteria, final Delta.CompatibilityType expectedCompatibilityType,
final String v1, final String v2, final Set<String> excludes)
throws IllegalArgumentException, IOException, URISyntaxException {
@@ -103,11 +111,11 @@ public class TestVersionSemanticsNOUI extends SingletonJunitCase {
}
@Test
- public void testVersionV221V23x() throws IllegalArgumentException, IOException, URISyntaxException {
+ public void testVersionV230V23x_00std() throws IllegalArgumentException, IOException, URISyntaxException {
final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.NON_BACKWARD_COMPATIBLE;
// final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER;
- final VersionNumberString preVersionNumber = new VersionNumberString("2.2.1");
+ final VersionNumberString preVersionNumber = new VersionNumberString("2.3.0");
final File previousJar = new File("lib/v"+preVersionNumber.getVersionString()+"/"+jarFile);
final ClassLoader currentCL = TestVersionSemanticsNOUI.class.getClassLoader();
@@ -117,6 +125,21 @@ public class TestVersionSemanticsNOUI extends SingletonJunitCase {
curVersion.getClass(), currentCL, curVersionNumber,
excludesDefault);
}
+ @Test
+ public void testVersionV230V23x_01patch() throws IllegalArgumentException, IOException, URISyntaxException {
+ // final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.NON_BACKWARD_COMPATIBLE;
+ final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER;
+
+ final VersionNumberString preVersionNumber = new VersionNumberString("2.3.0");
+ final File previousJar = new File("lib/v"+preVersionNumber.getVersionString()+"/"+jarFile);
+
+ final ClassLoader currentCL = TestVersionSemanticsNOUI.class.getClassLoader();
+
+ VersionSemanticsUtil.testVersion(diffCriteria, expectedCompatibilityType,
+ previousJar, preVersionNumber,
+ curVersion.getClass(), currentCL, curVersionNumber,
+ excludesV230V23X);
+ }
public static void main(final String args[]) throws IOException {
final String tstname = TestVersionSemanticsNOUI.class.getName();