4 files changed, 132 insertions, 13 deletions
diff --git a/src/junit/com/jogamp/common/nio/BuffersTest.java b/src/junit/com/jogamp/common/nio/BuffersTest.java
index c6a89f1..c267100 100644
--- a/src/junit/com/jogamp/common/nio/BuffersTest.java
+++ b/src/junit/com/jogamp/common/nio/BuffersTest.java
@@ -31,7 +31,15 @@
  */
 package com.jogamp.common.nio;
 
+import java.io.IOException;
+import java.nio.ByteBuffer;
+import java.nio.CharBuffer;
+import java.nio.DoubleBuffer;
+import java.nio.FloatBuffer;
 import java.nio.IntBuffer;
+import java.nio.LongBuffer;
+import java.nio.ShortBuffer;
+
 import org.junit.Test;
 
 import com.jogamp.junit.util.SingletonJunitCase;
@@ -48,7 +56,66 @@ import org.junit.runners.MethodSorters;
 public class BuffersTest extends SingletonJunitCase {
 
     @Test
-    public void slice() {
+    public void test01PositionLimitCapacityAfterArrayAllocation() {
+        final byte[] byteData = { 1, 2, 3, 4, 5, 6, 7, 8 };
+        final ByteBuffer byteBuffer = Buffers.newDirectByteBuffer(byteData);
+        assertEquals(0, byteBuffer.position());
+        assertEquals(8, byteBuffer.limit());
+        assertEquals(8, byteBuffer.capacity());
+        assertEquals(8, byteBuffer.remaining());
+        assertEquals(5, byteBuffer.get(4));
+
+        final double[] doubleData = { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0 };
+        final DoubleBuffer doubleBuffer = Buffers.newDirectDoubleBuffer(doubleData);
+        assertEquals(0, doubleBuffer.position());
+        assertEquals(8, doubleBuffer.limit());
+        assertEquals(8, doubleBuffer.capacity());
+        assertEquals(8, doubleBuffer.remaining());
+        assertEquals(5.0, doubleBuffer.get(4), 0.1);
+
+        final float[] floatData = { 1.0f, 2.0f, 3.0f, 4.0f, 5.0f, 6.0f, 7.0f, 8.0f };
+        final FloatBuffer floatBuffer = Buffers.newDirectFloatBuffer(floatData);
+        assertEquals(0, floatBuffer.position());
+        assertEquals(8, floatBuffer.limit());
+        assertEquals(8, floatBuffer.capacity());
+        assertEquals(8, floatBuffer.remaining());
+        assertEquals(5.0f, floatBuffer.get(4), 0.1f);
+
+        final int[] intData = { 1, 2, 3, 4, 5, 6, 7, 8 };
+        final IntBuffer intBuffer = Buffers.newDirectIntBuffer(intData);
+        assertEquals(0, intBuffer.position());
+        assertEquals(8, intBuffer.limit());
+        assertEquals(8, intBuffer.capacity());
+        assertEquals(8, intBuffer.remaining());
+        assertEquals(5, intBuffer.get(4));
+
+        final long[] longData = { 1, 2, 3, 4, 5, 6, 7, 8 };
+        final LongBuffer longBuffer = Buffers.newDirectLongBuffer(longData);
+        assertEquals(0, longBuffer.position());
+        assertEquals(8, longBuffer.limit());
+        assertEquals(8, longBuffer.capacity());
+        assertEquals(8, longBuffer.remaining());
+        assertEquals(5, longBuffer.get(4));
+
+        final short[] shortData = { 1, 2, 3, 4, 5, 6, 7, 8 };
+        final ShortBuffer shortBuffer = Buffers.newDirectShortBuffer(shortData);
+        assertEquals(0, shortBuffer.position());
+        assertEquals(8, shortBuffer.limit());
+        assertEquals(8, shortBuffer.capacity());
+        assertEquals(8, shortBuffer.remaining());
+        assertEquals(5, shortBuffer.get(4));
+
+        final char[] charData = { 1, 2, 3, 4, 5, 6, 7, 8 };
+        final CharBuffer charBuffer = Buffers.newDirectCharBuffer(charData);
+        assertEquals(0, charBuffer.position());
+        assertEquals(8, charBuffer.limit());
+        assertEquals(8, charBuffer.capacity());
+        assertEquals(8, charBuffer.remaining());
+        assertEquals(5, charBuffer.get(4));
+    }
+
+    @Test
+    public void test10Slice() {
 
         final IntBuffer buffer = Buffers.newDirectIntBuffer(6);
         buffer.put(new int[]{1,2,3,4,5,6}).rewind();
@@ -87,8 +154,10 @@ public class BuffersTest extends SingletonJunitCase {
 
         assertEquals(42, buffer.get(2));
         assertEquals(42, onetwothree.get(2));
-
-
     }
 
+    public static void main(final String args[]) throws IOException {
+        final String tstname = BuffersTest.class.getName();
+        org.junit.runner.JUnitCore.main(tstname);
+    }
 }
diff --git a/src/junit/com/jogamp/common/nio/TestByteBufferCopyStream.java b/src/junit/com/jogamp/common/nio/TestByteBufferCopyStream.java
index bef813b..9524e91 100644
--- a/src/junit/com/jogamp/common/nio/TestByteBufferCopyStream.java
+++ b/src/junit/com/jogamp/common/nio/TestByteBufferCopyStream.java
@@ -35,6 +35,7 @@ import java.nio.channels.FileChannel;
 import org.junit.Assert;
 import org.junit.Test;
 
+import com.jogamp.common.os.Platform;
 import com.jogamp.junit.util.SingletonJunitCase;
 
 import org.junit.FixMethodOrder;
@@ -171,27 +172,42 @@ public class TestByteBufferCopyStream extends SingletonJunitCase {
 
     @Test
     public void test00() throws IOException {
+        final long size;
+        if( !manualTest && Platform.OSType.MACOS == Platform.getOSType() ) {
+            size = quaterGiB;
+        } else {
+            size = twoPlusGiB;
+        }
         final int srcSliceShift = MappedByteBufferInputStream.DEFAULT_SLICE_SHIFT;
         final int dstSliceShift = MappedByteBufferInputStream.DEFAULT_SLICE_SHIFT;
-        final long size = twoPlusGiB;
         testImpl(getSimpleTestName(".")+"_In.bin", size, MappedByteBufferInputStream.CacheMode.FLUSH_PRE_HARD, srcSliceShift,
-                 getSimpleTestName(".")+"_Out.bin", MappedByteBufferInputStream.CacheMode.FLUSH_PRE_HARD, dstSliceShift );
+                getSimpleTestName(".")+"_Out.bin", MappedByteBufferInputStream.CacheMode.FLUSH_PRE_HARD, dstSliceShift );
     }
 
     @Test
     public void test01() throws IOException {
+        final long size;
+        if( !manualTest && Platform.OSType.MACOS == Platform.getOSType() ) {
+            size = quaterGiB;
+        } else {
+            size = twoPlusGiB;
+        }
         final int srcSliceShift = MappedByteBufferInputStream.DEFAULT_SLICE_SHIFT;
         final int dstSliceShift = MappedByteBufferInputStream.DEFAULT_SLICE_SHIFT;
-        final long size = twoPlusGiB;
         testImpl(getSimpleTestName(".")+"_In.bin", size, MappedByteBufferInputStream.CacheMode.FLUSH_PRE_SOFT, srcSliceShift,
                  getSimpleTestName(".")+"_Out.bin", MappedByteBufferInputStream.CacheMode.FLUSH_PRE_SOFT, dstSliceShift );
     }
 
     @Test
     public void test02() throws IOException {
+        final long size;
+        if( !manualTest && Platform.OSType.MACOS == Platform.getOSType() ) {
+            size = quaterPlusGiB;
+        } else {
+            size = halfPlusGiB;
+        }
         final int srcSliceShift = 27; // 125M bytes per slice
         final int dstSliceShift = 27; // 125M bytes per slice
-        final long size = halfPlusGiB;
         testImpl(getSimpleTestName(".")+"_In.bin", size, MappedByteBufferInputStream.CacheMode.FLUSH_PRE_SOFT, srcSliceShift,
                  getSimpleTestName(".")+"_Out.bin", MappedByteBufferInputStream.CacheMode.FLUSH_PRE_SOFT, dstSliceShift );
     }
@@ -214,7 +230,14 @@ public class TestByteBufferCopyStream extends SingletonJunitCase {
                  getSimpleTestName(".")+"_Out.bin", MappedByteBufferInputStream.CacheMode.FLUSH_PRE_SOFT, dstSliceShift );
     }
 
+    static boolean manualTest = false;
+
     public static void main(final String args[]) throws IOException {
+        for(int i=0; i<args.length; i++) {
+            if(args[i].equals("-manual")) {
+                manualTest = true;
+            }
+        }
         final String tstname = TestByteBufferCopyStream.class.getName();
         org.junit.runner.JUnitCore.main(tstname);
     }
diff --git a/src/junit/com/jogamp/common/nio/TestByteBufferInputStream.java b/src/junit/com/jogamp/common/nio/TestByteBufferInputStream.java
index 53ebac9..90a954b 100644
--- a/src/junit/com/jogamp/common/nio/TestByteBufferInputStream.java
+++ b/src/junit/com/jogamp/common/nio/TestByteBufferInputStream.java
@@ -41,6 +41,7 @@ import org.junit.Assert;
 import org.junit.BeforeClass;
 import org.junit.Test;
 
+import com.jogamp.common.os.Platform;
 import com.jogamp.common.util.IOUtil;
 import com.jogamp.junit.util.SingletonJunitCase;
 
@@ -144,20 +145,32 @@ public class TestByteBufferInputStream extends SingletonJunitCase {
 
     @Test
     public void test11MMap1GiBFlushNone() throws IOException {
-        testCopyIntSize1Impl2(0, SrcType.MMAP2_NONE, 0, fileOneGiB, oneGiB);
-        // testCopyIntSize1Impl2(0, SrcType.MMAP2_NONE, 0, fileTwoPlusGiB, twoPlusGiB);
+        if( !manualTest && Platform.OSType.MACOS == Platform.getOSType() ) {
+            testCopyIntSize1Impl2(0, SrcType.MMAP2_NONE, 0, fileOneMiB, oneMiB);
+        } else {
+            testCopyIntSize1Impl2(0, SrcType.MMAP2_NONE, 0, fileOneGiB, oneGiB);
+            // testCopyIntSize1Impl2(0, SrcType.MMAP2_NONE, 0, fileTwoPlusGiB, twoPlusGiB);
+        }
     }
 
     @Test
     public void test12MMap1GiBFlushSoft() throws IOException {
-        testCopyIntSize1Impl2(0, SrcType.MMAP2_SOFT, 0, fileOneGiB, oneGiB);
-        // testCopyIntSize1Impl2(0, SrcType.MMAP2_SOFT, 0, fileTwoPlusGiB, twoPlusGiB);
+        if( !manualTest && Platform.OSType.MACOS == Platform.getOSType() ) {
+            testCopyIntSize1Impl2(0, SrcType.MMAP2_SOFT, 0, fileOneMiB, oneMiB);
+        } else {
+            testCopyIntSize1Impl2(0, SrcType.MMAP2_SOFT, 0, fileOneGiB, oneGiB);
+            // testCopyIntSize1Impl2(0, SrcType.MMAP2_SOFT, 0, fileTwoPlusGiB, twoPlusGiB);
+        }
     }
 
     @Test
     public void test13MMap2GiBFlushHard() throws IOException {
-        // testCopyIntSize1Impl2(0, SrcType.MMAP2_HARD, 0, fileOneGiB, oneGiB);
-        testCopyIntSize1Impl2(0, SrcType.MMAP2_HARD, 0, fileTwoPlusGiB, twoPlusGiB);
+        if( !manualTest && Platform.OSType.MACOS == Platform.getOSType() ) {
+            testCopyIntSize1Impl2(0, SrcType.MMAP2_HARD, 0, fileOneMiB, oneMiB);
+        } else {
+            // testCopyIntSize1Impl2(0, SrcType.MMAP2_HARD, 0, fileOneGiB, oneGiB);
+            testCopyIntSize1Impl2(0, SrcType.MMAP2_HARD, 0, fileTwoPlusGiB, twoPlusGiB);
+        }
     }
 
     void testCopyIntSize1Impl(final String testFileName, final long expSize) throws IOException {
@@ -336,7 +349,14 @@ public class TestByteBufferInputStream extends SingletonJunitCase {
         System.err.println(" MiB"); */
     }
 
+    static boolean manualTest = false;
+
     public static void main(final String args[]) throws IOException {
+        for(int i=0; i<args.length; i++) {
+            if(args[i].equals("-manual")) {
+                manualTest = true;
+            }
+        }
         final String tstname = TestByteBufferInputStream.class.getName();
         org.junit.runner.JUnitCore.main(tstname);
     }
diff --git a/src/junit/com/jogamp/common/nio/TestByteBufferOutputStream.java b/src/junit/com/jogamp/common/nio/TestByteBufferOutputStream.java
index 8686b46..b0d7baf 100644
--- a/src/junit/com/jogamp/common/nio/TestByteBufferOutputStream.java
+++ b/src/junit/com/jogamp/common/nio/TestByteBufferOutputStream.java
@@ -284,7 +284,14 @@ public class TestByteBufferOutputStream extends SingletonJunitCase {
         testImpl(getSimpleTestName(".")+".bin", payLoad, 3021L, 6301L, "EOF".getBytes(), sliceShift);
     }
 
+    static boolean manualTest = false;
+
     public static void main(final String args[]) throws IOException {
+        for(int i=0; i<args.length; i++) {
+            if(args[i].equals("-manual")) {
+                manualTest = true;
+            }
+        }
         final String tstname = TestByteBufferOutputStream.class.getName();
         org.junit.runner.JUnitCore.main(tstname);
     }