From 38cb6fa11f00fb358b8bbe40dc79443a5f30269f Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Wed, 3 Apr 2019 21:09:35 +0200 Subject: TestVersionSemanticsNOUI: Adapt to upcoming NON_BACKWARD_COMPATIBLE version 2.4.0 --- make/scripts/tests.sh | 4 +- .../junit/jogl/acore/TestVersionSemanticsNOUI.java | 52 +--------------------- 2 files changed, 4 insertions(+), 52 deletions(-) diff --git a/make/scripts/tests.sh b/make/scripts/tests.sh index 50c010f2c..9399ad913 100644 --- a/make/scripts/tests.sh +++ b/make/scripts/tests.sh @@ -437,7 +437,7 @@ 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 $* # # @@ -846,7 +846,7 @@ function testawtswt() { # JavaFX (testjfx) # #testjfx com.jogamp.opengl.test.junit.jogl.javafx.JFXStageGLChild01 $* -testjfx com.jogamp.opengl.test.junit.jogl.javafx.TestNewtCanvasJFXGLn $* +#testjfx com.jogamp.opengl.test.junit.jogl.javafx.TestNewtCanvasJFXGLn $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NewtCanvasAWT $* #testnoawt com.jogamp.opengl.test.junit.jogl.demos.es2.newt.TestGearsES2NEWT $* #testawt com.jogamp.opengl.test.junit.jogl.demos.es2.awt.TestGearsES2AWT $* 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 07d9e2954..933e79731 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 @@ -110,61 +110,13 @@ public class TestVersionSemanticsNOUI extends SingletonJunitCase { currentJar, curVersionNumber, excludes); } - @Test - 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.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, - 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 Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_BINARY; - - 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, - excludesStereoPackageAndAppletUtils); - } - @Test - public void testVersionV231V23x_01patch() throws IllegalArgumentException, IOException, URISyntaxException { - // final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.NON_BACKWARD_COMPATIBLE; - // final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER; - final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_BINARY; - - final VersionNumberString preVersionNumber = new VersionNumberString("2.3.1"); - 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, - excludesStereoPackageAndAppletUtils); - } - @Test public void testVersionV230V232() throws IllegalArgumentException, IOException, URISyntaxException { testVersions(diffCriteria, Delta.CompatibilityType.BACKWARD_COMPATIBLE_BINARY, "2.3.0", "2.3.2", excludesStereoPackageAndAppletUtils); } - // @Test - public void testVersionV232V24x0() throws IllegalArgumentException, IOException, URISyntaxException { + @Test + public void testVersionV232V24x() throws IllegalArgumentException, IOException, URISyntaxException { final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.NON_BACKWARD_COMPATIBLE; // final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER; // final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_BINARY; -- cgit v1.2.3