diff options
| author | Michael Bien <[email protected]> | 2010-04-01 02:57:02 +0200 |
|---|---|---|
| committer | Michael Bien <[email protected]> | 2010-04-01 02:57:02 +0200 |
| commit | 82ac66ba1e7494b0a76a2063f0d56d3b785c6c31 (patch) | |
| tree | 6f2300de71579c1c44931ded562bb355894b866a /src/junit/com | |
| parent | 11e70dff96d23708188bf1c8d7c3ffea3c110d43 (diff) | |
| parent | f96bcce55789d2101d594c433aea95806d4eb05c (diff) | |
Merge branch 'master' of github.com:mbien/gluegen
Diffstat (limited to 'src/junit/com')
3 files changed, 2 insertions, 3 deletions
diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/BaseTest1.java b/src/junit/com/jogamp/gluegen/test/junit/generation/BaseTest1.java index b689e6d..5a5d17c 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/BaseTest1.java +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/BaseTest1.java @@ -307,6 +307,7 @@ public class BaseTest1 { // System.out.println("lb3: "+lb3); Assert.assertTrue("Wrong result: "+pb.capacity(), BindingTest1.ARRAY_SIZE == pb.capacity()); Assert.assertTrue("Wrong result: "+pb.remaining(), BindingTest1.ARRAY_SIZE == pb.remaining()); + Assert.assertNotNull(pb.getReferencedBuffer(0)); Assert.assertTrue("Wrong result: "+pb.getReferencedBuffer(0)+" != "+lb2.getBuffer(), pb.getReferencedBuffer(0).equals(lb2.getBuffer())); PointerBuffer pb2 = binding.arrayTestFoo3PtrPtr(pb); diff --git a/src/junit/com/jogamp/gluegen/test/junit/generation/test1-common.cfg b/src/junit/com/jogamp/gluegen/test/junit/generation/test1-common.cfg index 6ba4b78..30cdd96 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/generation/test1-common.cfg +++ b/src/junit/com/jogamp/gluegen/test/junit/generation/test1-common.cfg @@ -28,7 +28,6 @@ CustomCCode #include "test1.h" # Imports needed by all glue code Import java.nio.* Import java.util.* -Import com.jogamp.common.util.* Import com.jogamp.common.os.* Import com.jogamp.common.nio.* diff --git a/src/junit/com/jogamp/gluegen/test/junit/runtime/TestPointerBufferEndian.java b/src/junit/com/jogamp/gluegen/test/junit/runtime/TestPointerBufferEndian.java index a57fd22..afe3405 100644 --- a/src/junit/com/jogamp/gluegen/test/junit/runtime/TestPointerBufferEndian.java +++ b/src/junit/com/jogamp/gluegen/test/junit/runtime/TestPointerBufferEndian.java @@ -33,8 +33,7 @@ public class TestPointerBufferEndian { int i=0; while(ptr.hasRemaining()) { - long mask = Platform.is32Bit() ? 0x00000000FFFFFFFFL : 0xFFFFFFFFFFFFFFFFL ; - long v = ptr.get() & mask; + long v = ptr.get() ; long t = Platform.is32Bit() ? values32Bit[i] : valuesSource[i]; Assert.assertTrue("Value["+i+"] shall be 0x"+Long.toHexString(t)+", is: 0x"+Long.toHexString(v), t == v); i++; |