2 files changed, 8 insertions, 11 deletions
diff --git a/src/junit/com/jogamp/common/nio/TestPointerBufferEndian.java b/src/junit/com/jogamp/common/nio/TestPointerBufferEndian.java
index da232a2..e587acf 100644
--- a/src/junit/com/jogamp/common/nio/TestPointerBufferEndian.java
+++ b/src/junit/com/jogamp/common/nio/TestPointerBufferEndian.java
@@ -11,13 +11,11 @@ import static java.lang.System.*;
 public class TestPointerBufferEndian {
 
     protected void testImpl (boolean direct) {
-        int bitsPtr = Platform.getPointerSizeInBits();
+        final MachineDescription machine = Platform.getMachineDescription();
+        int bitsPtr = machine.pointerSizeInBytes() * 8;
         String bitsProp = System.getProperty("sun.arch.data.model");
-        String os = System.getProperty("os.name");
-        String cpu = System.getProperty("os.arch");
-        out.println("OS: <"+os+"> CPU: <"+cpu+"> Bits: <"+bitsPtr+"/"+bitsProp+">");
-        out.println("CPU is: "+ (Platform.is32Bit()?"32":"64") + " bit");
-        out.println("Buffer is in: "+ (Platform.isLittleEndian()?"little":"big") + " endian");
+        out.println("OS: <"+Platform.OS+"> CPU: <"+Platform.ARCH+"> Bits: <"+bitsPtr+"/"+bitsProp+">");
+        out.println(machine.toString());
 
         long[] valuesSource = { 0x0123456789ABCDEFL, 0x8877665544332211L, 0xAFFEDEADBEEFAFFEL };
         long[] values32Bit  = { 0x0000000089ABCDEFL, 0x0000000044332211L, 0x00000000BEEFAFFEL };
diff --git a/src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java b/src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java
index 09781ec..8a20272 100644
--- a/src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java
+++ b/src/junit/com/jogamp/common/nio/TestStructAccessorEndian.java
@@ -14,13 +14,12 @@ public class TestStructAccessorEndian {
 
     @Test
     public void testStructAccessorEndian1 () {
-        int bitsPtr = Platform.getPointerSizeInBits();
+        final MachineDescription machine = Platform.getMachineDescription();        
+        int bitsPtr = machine.pointerSizeInBytes() * 8;
         String bitsProp = System.getProperty("sun.arch.data.model");
-        String os = System.getProperty("os.name");
-        String cpu = System.getProperty("os.arch");
-        out.println("OS: <"+os+"> CPU: <"+cpu+"> Bits: <"+bitsPtr+"/"+bitsProp+">");
+        out.println("OS: <"+Platform.OS+"> CPU: <"+Platform.ARCH+"> Bits: <"+bitsPtr+"/"+bitsProp+">");
         out.println("CPU is: "+ (Platform.is32Bit()?"32":"64") + " bit");
-        out.println("Buffer is in: "+ (Platform.isLittleEndian()?"little":"big") + " endian");
+        out.println(machine.toString());
 
         long[] valuesSource = { 0x0123456789ABCDEFL, 0x8877665544332211L, 0xAFFEDEADBEEFAFFEL };
         ByteBuffer tst = Buffers.newDirectByteBuffer(Buffers.SIZEOF_LONG * valuesSource.length);