TestVersionSemantics: BACKWARD_COMPATIBLE_USER current vs 2.2.0

5 files changed, 27 insertions, 8 deletions

diff --git a/make/lib/v2.2.0/jogl-all.jar b/make/lib/v2.2.0/jogl-all.jar
new file mode 100644
index 000000000..994bdde5a
--- /dev/null
+++ b/make/lib/v2.2.0/jogl-all.jar
diff --git a/make/scripts/make.jogl.all.linux-x86_64.sh b/make/scripts/make.jogl.all.linux-x86_64.sh
index 9e8d52980..bb6bdf047 100755
--- a/make/scripts/make.jogl.all.linux-x86_64.sh
+++ b/make/scripts/make.jogl.all.linux-x86_64.sh
@@ -2,6 +2,12 @@
 
 SDIR=`dirname $0` 
 
+#J2RE_HOME=/opt-linux-x86_64/jre1.7.0_45
+#JAVA_HOME=/opt-linux-x86_64/jdk1.7.0_45
+#J2RE_HOME=/opt-linux-x86_64/jre7
+#JAVA_HOME=/opt-linux-x86_64/j2se7
+#export J2RE_HOME JAVA_HOME
+
 if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
     . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
diff --git a/make/scripts/tests-x64.sh b/make/scripts/tests-x64.sh
index 421b912fb..30b0aaf8a 100755
--- a/make/scripts/tests-x64.sh
+++ b/make/scripts/tests-x64.sh
@@ -12,6 +12,12 @@ SDIR=`dirname $0`
 #export LD_LIBRARY_PATH=$HOME/ffmpeg-2.2.2/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=$HOME/ffmpeg-2.2.3/lib:$LD_LIBRARY_PATH
 
+#J2RE_HOME=/opt-linux-x86_64/jre1.7.0_45
+#JAVA_HOME=/opt-linux-x86_64/jdk1.7.0_45
+#J2RE_HOME=/opt-linux-x86_64/jre7
+#JAVA_HOME=/opt-linux-x86_64/j2se7
+#export J2RE_HOME JAVA_HOME
+
 if [ -e $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh ] ; then
     . $SDIR/../../../gluegen/make/scripts/setenv-build-jogl-x86_64.sh
 fi
diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh
index 1e229ec2f..06eb92c45 100644
--- a/make/scripts/tests.sh
+++ b/make/scripts/tests.sh
@@ -284,7 +284,7 @@ function jrun() {
     #D_ARGS="-Djogl.debug.GLMediaPlayer.StreamWorker.delay=25 -Djogl.debug.GLMediaPlayer"
     #D_ARGS="-Djogl.debug.GLMediaPlayer.Native"
     #D_ARGS="-Djogl.debug.StereoDevice -Djogl.debug.StereoDevice.DumpData"
-    D_ARGS="-Djogl.debug.StereoDevice"
+    #D_ARGS="-Djogl.debug.StereoDevice"
 
     if [ $awton -eq 1 ] ; then
         export USE_CLASSPATH=$JOGAMP_ALL_AWT_CLASSPATH
@@ -377,12 +377,12 @@ function testawtswt() {
 #testawt com.jogamp.opengl.test.junit.jogl.acore.TestMainVersionGLCanvasAWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile00NEWT $*
 #testnoawt com.jogamp.opengl.test.junit.jogl.acore.TestGLProfile01NEWT $*
-#testnoawt 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
@@ -800,6 +800,8 @@ testnoawt com.jogamp.opengl.test.junit.jogl.stereo.StereoDemo01 $*
 #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT00 $*
 #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT01 $*
 #testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWT10 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.TestFontsNEWT00 $*
+#testnoawt com.jogamp.opengl.test.junit.graph.TestTextRendererNEWTBugXXXX $*
 #testnoawt com.jogamp.opengl.test.junit.graph.demos.ui.UINewtDemo01 $*
 #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPUTextNewtDemo $*
 #testnoawt com.jogamp.opengl.test.junit.graph.demos.GPURegionNewtDemo $*
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 6f38c4b2f..1d70899df 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
@@ -37,7 +37,6 @@ import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runners.MethodSorters;
 import org.osjava.jardiff.DiffCriteria;
-import org.osjava.jardiff.SimpleDiffCriteria;
 import org.semver.Delta;
 
 import com.jogamp.common.util.JogampVersion;
@@ -49,11 +48,12 @@ import com.jogamp.opengl.JoglVersion;
 @FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class TestVersionSemanticsNOUI extends JunitTracer {
     static final String jarFile = "jogl-all.jar";
-    static final VersionNumberString preVersionNumber = new VersionNumberString("2.1.5");
-    static final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.NON_BACKWARD_COMPATIBLE;
+    static final VersionNumberString preVersionNumber = new VersionNumberString("2.2.0");
+    // static final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.NON_BACKWARD_COMPATIBLE;
+    static final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER;
 
-    static final DiffCriteria diffCriteria = new SimpleDiffCriteria();
-    // static final DiffCriteria diffCriteria = new PublicDiffCriteria();
+    static final DiffCriteria diffCriteria = new org.osjava.jardiff.SimpleDiffCriteria();
+    // static final DiffCriteria diffCriteria = new org.osjava.jardiff.PublicDiffCriteria();
 
     static final JogampVersion curVersion = JoglVersion.getInstance();
     static final VersionNumberString curVersionNumber = new VersionNumberString(curVersion.getImplementationVersion());
@@ -80,6 +80,11 @@ public class TestVersionSemanticsNOUI extends JunitTracer {
         testVersions(diffCriteria, Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER, "2.1.4", "2.1.5");
     }
 
+    // @Test
+    public void testVersionV215V220() throws IllegalArgumentException, IOException, URISyntaxException {
+        testVersions(diffCriteria, Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER, "2.1.5", "2.2.0");
+    }
+
     void testVersions(final DiffCriteria diffCriteria, final Delta.CompatibilityType expectedCompatibilityType,
                       final String v1, final String v2) throws IllegalArgumentException, IOException, URISyntaxException {
         final VersionNumberString preVersionNumber = new VersionNumberString(v1);