diff options
Diffstat (limited to 'src/junit/com')
6 files changed, 15 insertions, 5 deletions
diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2DynamicLibraryBundle.java b/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2DynamicLibraryBundle.java index e4adce1..fbf0ff0 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2DynamicLibraryBundle.java +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2DynamicLibraryBundle.java @@ -37,6 +37,7 @@ import com.jogamp.common.util.RunnableExecutor; import com.jogamp.common.util.TestIOUtil01; import java.util.ArrayList; +import java.util.Arrays; import java.util.List; import org.junit.AfterClass; @@ -58,6 +59,7 @@ public class Test1p2DynamicLibraryBundle extends BaseClass { public static void chapter__TestLoadLibrary() throws Exception { dlb = new DynamicLibraryBundle(new Test1DynLibBundleInfo()); Assert.assertTrue("DynamicLibraryBundle failed", dlb.isLibComplete()); + System.err.println("Loaded: "+dlb.getToolLibraries()); Bindingtest1p2Impl.resetProcAddressTable(dlb); } @@ -262,6 +264,9 @@ public class Test1p2DynamicLibraryBundle extends BaseClass { } @Override + public List<String> getSymbolForToolLibPath() { return Arrays.asList("testXID"); } + + @Override public final List<String> getToolGetProcAddressFuncNameList() { return null; } diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2LoadJNIAndImplLib.java b/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2LoadJNIAndImplLib.java index e61c600..4791002 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2LoadJNIAndImplLib.java +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2LoadJNIAndImplLib.java @@ -48,8 +48,9 @@ public class Test1p2LoadJNIAndImplLib extends BaseClass { @BeforeClass public static void chapter__TestLoadLibrary() throws Exception { BindingJNILibLoader.loadBindingtest1p2(); - dynamicLookupHelper = NativeLibrary.open("test1", true, true, Test1p2LoadJNIAndImplLib.class.getClassLoader(), true); + dynamicLookupHelper = NativeLibrary.open("test1", true, true, Test1p2LoadJNIAndImplLib.class.getClassLoader(), true, "testXID"); Assert.assertNotNull("NativeLibrary.open(test1) failed", dynamicLookupHelper); + System.err.println("Loaded: "+dynamicLookupHelper); Bindingtest1p2Impl.resetProcAddressTable(dynamicLookupHelper); } diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2ProcAddressEmitter.java b/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2ProcAddressEmitter.java index 366d9eb..b2c1974 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2ProcAddressEmitter.java +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/Test1p2ProcAddressEmitter.java @@ -57,8 +57,9 @@ public class Test1p2ProcAddressEmitter extends BaseClass { @BeforeClass public static void chapter__TestLoadLibrary() throws Exception { BindingJNILibLoader.loadBindingtest1p2(); - dynamicLookupHelper = NativeLibrary.open("test1", false, false, Test1p2ProcAddressEmitter.class.getClassLoader(), true); + dynamicLookupHelper = NativeLibrary.open("test1", false, false, Test1p2ProcAddressEmitter.class.getClassLoader(), true, "testXID"); Assert.assertNotNull("NativeLibrary.open(test1) failed", dynamicLookupHelper); + System.err.println("Loaded: "+dynamicLookupHelper); Bindingtest1p2Impl.resetProcAddressTable(dynamicLookupHelper); } diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/Test2p2FuncPtr.java b/src/junit/com/jogamp/gluegen/test/junit/generation/Test2p2FuncPtr.java index 05ae826..4e75fd0 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/Test2p2FuncPtr.java +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/Test2p2FuncPtr.java @@ -49,8 +49,9 @@ public class Test2p2FuncPtr extends BaseClass2FuncPtr { @BeforeClass public static void chapter__TestLoadLibrary() throws Exception { BindingJNILibLoader.loadBindingtest2p2(); - dynamicLookupHelper = NativeLibrary.open("test2", false, false, Test2p2FuncPtr.class.getClassLoader(), true); + dynamicLookupHelper = NativeLibrary.open("test2", false, false, Test2p2FuncPtr.class.getClassLoader(), true, "textXID"); Assert.assertNotNull("NativeLibrary.open(test2) failed", dynamicLookupHelper); + System.err.println("Loaded: "+dynamicLookupHelper); Bindingtest2p2Impl.resetProcAddressTable(dynamicLookupHelper); } diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/Test3p2PtrStorage.java b/src/junit/com/jogamp/gluegen/test/junit/generation/Test3p2PtrStorage.java index 642e1bd..2c77c1b 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/Test3p2PtrStorage.java +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/Test3p2PtrStorage.java @@ -49,8 +49,9 @@ public class Test3p2PtrStorage extends BaseClass3PtrStorage { @BeforeClass public static void chapter__TestLoadLibrary() throws Exception { BindingJNILibLoader.loadBindingtest2p2(); - dynamicLookupHelper = NativeLibrary.open("test2", false, false, Test3p2PtrStorage.class.getClassLoader(), true); + dynamicLookupHelper = NativeLibrary.open("test2", false, false, Test3p2PtrStorage.class.getClassLoader(), true, "textXID"); Assert.assertNotNull("NativeLibrary.open(test2) failed", dynamicLookupHelper); + System.err.println("Loaded: "+dynamicLookupHelper); Bindingtest2p2Impl.resetProcAddressTable(dynamicLookupHelper); } diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/Test4p2JavaCallback.java b/src/junit/com/jogamp/gluegen/test/junit/generation/Test4p2JavaCallback.java index 7dd9a79..0b0588d 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/Test4p2JavaCallback.java +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/Test4p2JavaCallback.java @@ -49,8 +49,9 @@ public class Test4p2JavaCallback extends BaseClass4JavaCallback { @BeforeClass public static void chapter__TestLoadLibrary() throws Exception { BindingJNILibLoader.loadBindingtest2p2(); - dynamicLookupHelper = NativeLibrary.open("test2", false, false, Test4p2JavaCallback.class.getClassLoader(), true); + dynamicLookupHelper = NativeLibrary.open("test2", false, false, Test4p2JavaCallback.class.getClassLoader(), true, "textXID"); Assert.assertNotNull("NativeLibrary.open(test2) failed", dynamicLookupHelper); + System.err.println("Loaded: "+dynamicLookupHelper); Bindingtest2p2Impl.resetProcAddressTable(dynamicLookupHelper); } |