From 78f641de80d1c37cd61e5300eeba369c6aa9b1a1 Mon Sep 17 00:00:00 2001 From: Sven Gothel Date: Fri, 10 Oct 2014 16:04:55 +0200 Subject: TestVersionSemanticsNOUI: Add tests against v2.2.3 --- make/lib/v2.2.3/jogl-all.jar | Bin 0 -> 3205519 bytes .../junit/jogl/acore/TestVersionSemanticsNOUI.java | 34 ++++++++++++--------- 2 files changed, 20 insertions(+), 14 deletions(-) create mode 100644 make/lib/v2.2.3/jogl-all.jar diff --git a/make/lib/v2.2.3/jogl-all.jar b/make/lib/v2.2.3/jogl-all.jar new file mode 100644 index 000000000..0d3474176 Binary files /dev/null and b/make/lib/v2.2.3/jogl-all.jar differ 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 d4399fbde..b7524746d 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 @@ -87,6 +87,16 @@ public class TestVersionSemanticsNOUI extends JunitTracer { testVersions(diffCriteria, Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER, "2.2.0", "2.2.1", excludesDefault); } + // @Test /* Broken backward compat in 2.2.2 !! */ + public void testVersionV221V222() throws IllegalArgumentException, IOException, URISyntaxException { + testVersions(diffCriteria, Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER, "2.2.1", "2.2.2", excludesDefault); + } + + @Test + public void testVersionV221V223() throws IllegalArgumentException, IOException, URISyntaxException { + testVersions(diffCriteria, Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER, "2.2.1", "2.2.3", excludesDefault); + } + void testVersions(final DiffCriteria diffCriteria, final Delta.CompatibilityType expectedCompatibilityType, final String v1, final String v2, final Set excludes) throws IllegalArgumentException, IOException, URISyntaxException { @@ -104,26 +114,22 @@ public class TestVersionSemanticsNOUI extends JunitTracer { @Test public void testVersionV220V22X() throws IllegalArgumentException, IOException, URISyntaxException { - // static 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.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); + testVersionV22nV22X( new VersionNumberString("2.2.0") ); } @Test public void testVersionV221V22X() throws IllegalArgumentException, IOException, URISyntaxException { - // static final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.NON_BACKWARD_COMPATIBLE; + testVersionV22nV22X( new VersionNumberString("2.2.1") ); + } + + @Test + public void testVersionV223V22X() throws IllegalArgumentException, IOException, URISyntaxException { + testVersionV22nV22X( new VersionNumberString("2.2.3") ); + } + + void testVersionV22nV22X(final VersionNumberString preVersionNumber) throws IllegalArgumentException, IOException, URISyntaxException { final Delta.CompatibilityType expectedCompatibilityType = Delta.CompatibilityType.BACKWARD_COMPATIBLE_USER; - final VersionNumberString preVersionNumber = new VersionNumberString("2.2.1"); final File previousJar = new File("lib/v"+preVersionNumber.getVersionString()+"/"+jarFile); final ClassLoader currentCL = TestVersionSemanticsNOUI.class.getClassLoader(); -- cgit v1.2.3