test/jdk/java/nio/Buffer/BasicLong.java

@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2000, 2016, Oracle and/or its affiliates. All rights reserved.
+ * Copyright (c) 2000, 2019, Oracle and/or its affiliates. All rights reserved.
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
  *
  * This code is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License version 2 only, as
  * published by the Free Software Foundation.

@@ -85,10 +85,22 @@
         for (int i = 0; i < n; i++) {
             ck(b, (long)a[i + 7], (long)((long)ic(i)));
         }
     }
 
+    private static void absBulkGet(LongBuffer b) {
+        int n = b.capacity();
+        int len = n - 7*2;
+        long[] a = new long[n + 7];
+        b.position(42);
+        b.get(7, a, 7, len);
+        ck(b, b.position() == 42);
+        for (int i = 0; i < len; i++) {
+            ck(b, (long)a[i + 7], (long)((long)ic(i)));
+        }
+    }
+
     private static void relPut(LongBuffer b) {
         int n = b.capacity();
         b.clear();
         for (int i = 0; i < n; i++)
             b.put((long)ic(i));

@@ -134,10 +146,51 @@
                      + " put into same buffer");
             }
         }
     }
 
+    private static void absBulkPutArray(LongBuffer b) {
+        int n = b.capacity();
+        b.clear();
+        int lim = n - 7;
+        int len = lim - 7;
+        b.limit(lim);
+        long[] a = new long[len + 7];
+        for (int i = 0; i < len; i++)
+            a[i + 7] = (long)ic(i);
+        b.position(42);
+        b.put(7, a, 7, len);
+        ck(b, b.position() == 42);
+    }
+
+    private static void absBulkPutBuffer(LongBuffer b, boolean direct) {
+        int n = b.capacity();
+        b.clear();
+        int lim = n - 7;
+        int len = lim - 7;
+        b.limit(lim);
+        LongBuffer c = direct ?
+
+
+
+            ByteBuffer.allocateDirect(Long.BYTES*(len + 7))
+                .asLongBuffer()
+
+            : LongBuffer.allocate(len + 7);
+
+        if (direct)
+            System.out.println("Direct buffer: " + c.getClass().getName());
+
+        for (int i = 0; i < len; i++)
+            c.put(i + 7, (long)ic(i));
+        b.position(42);
+        c.position(42);
+        b.put(7, c, 7, len);
+        ck(b, b.position() == 42);
+        ck(c, c.position() == 42);
+    }
+
     //6231529
     private static void callReset(LongBuffer b) {
         b.position(0);
         b.mark();
 

@@ -450,10 +503,14 @@
                              LongBuffer xb, LongBuffer yb,
                              long x, long y) {
         fail(problem + String.format(": x=%s y=%s", x, y), xb, yb);
     }
 
+    private static void catchNullArgument(Buffer b, Runnable thunk) {
+        tryCatch(b, NullPointerException.class, thunk);
+    }
+
     private static void catchIllegalArgument(Buffer b, Runnable thunk) {
         tryCatch(b, IllegalArgumentException.class, thunk);
     }
 
     private static void catchReadOnlyBuffer(Buffer b, Runnable thunk) {

@@ -474,11 +531,14 @@
             thunk.run();
         } catch (Throwable x) {
             if (ex.isAssignableFrom(x.getClass())) {
                 caught = true;
             } else {
-                fail(x.getMessage() + " not expected");
+                String s = x.getMessage();
+                if (s == null)
+                    s = x.getClass().getName();
+                fail(s + " not expected");
             }
         }
         if (!caught) {
             fail(ex.getName() + " not thrown", b);
         }

@@ -511,10 +571,19 @@
         relGet(b);
 
         bulkPutBuffer(b);
         relGet(b);
 
+        absBulkPutArray(b);
+        absBulkGet(b);
+
+        absBulkPutBuffer(b, direct);
+        absBulkGet(b);
+
+        absBulkPutBuffer(b, !direct);
+        absBulkGet(b);
+
 
 
 
 
 

@@ -610,10 +679,41 @@
                 fail("Non-null IllegalArgumentException message expected for"
                      + " negative limit");
             }
         }
 
+        // Exceptions in absolute bulk operations
+
+        catchNullArgument(b, () -> b.get(7, null, 0, 42));
+        catchNullArgument(b, () -> b.put(7, (long[])null, 0, 42));
+        catchNullArgument(b, () -> b.put(7, (LongBuffer)null, 0, 42));
+
+        long[] tmpa = new long[42];
+        catchIndexOutOfBounds(b, () -> b.get(7, tmpa, -1, 42));
+        catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 42, 1));
+        catchIndexOutOfBounds(b, () -> b.get(7, tmpa, 41, -1));
+        catchIndexOutOfBounds(b, () -> b.get(-1, tmpa, 0, 1));
+        catchIndexOutOfBounds(b, () -> b.get(b.limit(), tmpa, 0, 1));
+        catchIndexOutOfBounds(b, () -> b.get(b.limit() - 41, tmpa, 0, 42));
+
+        catchIndexOutOfBounds(b, () -> b.put(7, tmpa, -1, 42));
+        catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 42, 1));
+        catchIndexOutOfBounds(b, () -> b.put(7, tmpa, 41, -1));
+        catchIndexOutOfBounds(b, () -> b.put(-1, tmpa, 0, 1));
+        catchIndexOutOfBounds(b, () -> b.put(b.limit(), tmpa, 0, 1));
+        catchIndexOutOfBounds(b, () -> b.put(b.limit() - 41, tmpa, 0, 42));
+
+        LongBuffer tmpb = LongBuffer.allocate(42);
+        catchIndexOutOfBounds(b, () -> b.put(7, tmpb, -1, 42));
+        catchIndexOutOfBounds(b, () -> b.put(7, tmpb, 42, 1));
+        catchIndexOutOfBounds(b, () -> b.put(7, tmpb, 42, -1));
+        catchIndexOutOfBounds(b, () -> b.put(7, tmpb, 41, 2));
+        catchIndexOutOfBounds(b, () -> b.put(-1, tmpb, 0, 1));
+        catchIndexOutOfBounds(b, () -> b.put(b.limit(), tmpb, 0, 1));
+        catchIndexOutOfBounds(b, () -> b.put(0, tmpb, 0, -1));
+        catchIndexOutOfBounds(b, () -> b.put(b.limit() - 41, tmpb, 0, 42));
+
         // Values
 
         b.clear();
         b.put((long)0);
         b.put((long)-1);

@@ -817,10 +917,12 @@
 
         catchReadOnlyBuffer(b, () -> relPut(rb));
         catchReadOnlyBuffer(b, () -> absPut(rb));
         catchReadOnlyBuffer(b, () -> bulkPutArray(rb));
         catchReadOnlyBuffer(b, () -> bulkPutBuffer(rb));
+        catchReadOnlyBuffer(b, () -> absBulkPutArray(rb));
+        catchReadOnlyBuffer(b, () -> absBulkPutBuffer(rb, direct));
 
         // put(LongBuffer) should not change source position
         final LongBuffer src = LongBuffer.allocate(1);
         catchReadOnlyBuffer(b, () -> rb.put(src));
         ck(src, src.position(), 0);