diff options
| author | Sven Gothel <[email protected]> | 2015-03-23 04:05:03 +0100 |
|---|---|---|
| committer | Sven Gothel <[email protected]> | 2015-03-23 04:05:03 +0100 |
| commit | b755b045fb7e3c8306f24dd645297992ab8db7f9 (patch) | |
| tree | 4be9dfb52b0e0ed91d5376ef1d770552d3252d1e /src/junit/com | |
| parent | 532b8df474976b474f0cf4eb2d93588ded2ad3fe (diff) | |
Bug 1149 - Replacing PCPP w/ JCPP, allowing complete macro handling (Part-1: Cleanup / Preparation)
Diffstat (limited to 'src/junit/com')
3 files changed, 7 insertions, 2 deletions
diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/BaseClass.java b/src/junit/com/jogamp/gluegen/test/junit/generation/BaseClass.java index 75ef808..6e56a49 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/BaseClass.java +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/BaseClass.java @@ -65,11 +65,12 @@ public class BaseClass extends SingletonJunitCase { Assert.assertNotNull(ifName+" does not exist", clazzIf); Assert.assertNotNull(implName+" does not exist", clazzImpl); - Assert.assertEquals(1, clazzIf.getDeclaredField("CONSTANT_ONE").get(null)); + Assert.assertNotNull(clazzImpl.getDeclaredMethod("nopTest")); final Object obj = clazzImpl.newInstance(); Assert.assertTrue("Not of type "+ifName, clazzIf.isAssignableFrom(obj.getClass())); - Assert.assertTrue("Not of type com.jogamp.gluegen.test.junit.generation.Bindingtest1", (obj instanceof com.jogamp.gluegen.test.junit.generation.Bindingtest1)); + Assert.assertTrue("Not of type com.jogamp.gluegen.test.junit.generation.Bindingtest1", + (obj instanceof com.jogamp.gluegen.test.junit.generation.Bindingtest1)); } /** diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/test1p1-gluegen.cfg b/src/junit/com/jogamp/gluegen/test/junit/generation/test1p1-gluegen.cfg index 6ef171b..b8582a8 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/test1p1-gluegen.cfg +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test1p1-gluegen.cfg @@ -6,6 +6,8 @@ NativeOutputDir native Extends Bindingtest1p1 Bindingtest1 +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/gluegen/test/junit/generation/Bindingtest1.java + Include test1-common.cfg Import com.jogamp.gluegen.test.junit.generation.Bindingtest1 diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/test1p2-gluegen.cfg b/src/junit/com/jogamp/gluegen/test/junit/generation/test1p2-gluegen.cfg index 708bd26..eb9fdcf 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/test1p2-gluegen.cfg +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test1p2-gluegen.cfg @@ -6,6 +6,8 @@ NativeOutputDir native Extends Bindingtest1p2 Bindingtest1 +ExtendedInterfaceSymbolsIgnore ../build-temp/gensrc/classes/com/jogamp/gluegen/test/junit/generation/Bindingtest1.java + # Use a ProcAddressTable so we dynamically look up the routines EmitProcAddressTable true ProcAddressTableClassName Bindingtest1p2ProcAddressTable |