< prev index next >

test/java/nio/Buffer/Basic-X.java.template

Print this page

        

@@ -29,11 +29,10 @@
  */
 
 #warn This file is preprocessed before being compiled
 
 import java.nio.*;
-import java.lang.reflect.Method;
 
 
 public class Basic$Type$
     extends Basic
 {

@@ -58,74 +57,79 @@
 #end[double]
     };
 
     private static void relGet($Type$Buffer b) {
         int n = b.capacity();
-        $type$ v;
-        for (int i = 0; i < n; i++)
+        for (int i = 0; i < n; i++) {
             ck(b, (long)b.get(), (long)(($type$)ic(i)));
+        }
         b.rewind();
     }
 
     private static void relGet($Type$Buffer b, int start) {
         int n = b.remaining();
-        $type$ v;
-        for (int i = start; i < n; i++)
+        for (int i = start; i < n; i++) {
             ck(b, (long)b.get(), (long)(($type$)ic(i)));
+        }
         b.rewind();
     }
 
     private static void absGet($Type$Buffer b) {
         int n = b.capacity();
-        $type$ v;
-        for (int i = 0; i < n; i++)
+        for (int i = 0; i < n; i++) {
             ck(b, (long)b.get(), (long)(($type$)ic(i)));
+        }
         b.rewind();
     }
 
     private static void bulkGet($Type$Buffer b) {
         int n = b.capacity();
         $type$[] a = new $type$[n + 7];
         b.get(a, 7, n);
-        for (int i = 0; i < n; i++)
+        for (int i = 0; i < n; i++) {
             ck(b, (long)a[i + 7], (long)(($type$)ic(i)));
     }
+    }
 
     private static void relPut($Type$Buffer b) {
         int n = b.capacity();
         b.clear();
-        for (int i = 0; i < n; i++)
+        for (int i = 0; i < n; i++) {
             b.put(($type$)ic(i));
+        }
         b.flip();
     }
 
     private static void absPut($Type$Buffer b) {
         int n = b.capacity();
         b.clear();
-        for (int i = 0; i < n; i++)
+        for (int i = 0; i < n; i++) {
             b.put(i, ($type$)ic(i));
+        }
         b.limit(n);
         b.position(0);
     }
 
     private static void bulkPutArray($Type$Buffer b) {
         int n = b.capacity();
         b.clear();
         $type$[] a = new $type$[n + 7];
-        for (int i = 0; i < n; i++)
+        for (int i = 0; i < n; i++) {
             a[i + 7] = ($type$)ic(i);
+        }
         b.put(a, 7, n);
         b.flip();
     }
 
     private static void bulkPutBuffer($Type$Buffer b) {
         int n = b.capacity();
         b.clear();
         $Type$Buffer c = $Type$Buffer.allocate(n + 7);
         c.position(7);
-        for (int i = 0; i < n; i++)
+        for (int i = 0; i < n; i++) {
             c.put(($type$)ic(i));
+        }
         c.flip();
         c.position(7);
         b.put(c);
         b.flip();
         try {

@@ -176,64 +180,67 @@
 #if[char]
 
     private static void bulkPutString($Type$Buffer b) {
         int n = b.capacity();
         b.clear();
-        StringBuffer sb = new StringBuffer(n + 7);
+        StringBuilder sb = new StringBuilder(n + 7);
         sb.append("1234567");
-        for (int i = 0; i < n; i++)
+        for (int i = 0; i < n; i++) {
             sb.append((char)ic(i));
+        }
         b.put(sb.toString(), 7, 7 + n);
         b.flip();
     }
 
 #end[char]
 
     private static void checkSlice($Type$Buffer b, $Type$Buffer slice) {
         ck(slice, 0, slice.position());
         ck(slice, b.remaining(), slice.limit());
         ck(slice, b.remaining(), slice.capacity());
-        if (b.isDirect() != slice.isDirect())
+        if (b.isDirect() != slice.isDirect()) {
             fail("Lost direction", slice);
-        if (b.isReadOnly() != slice.isReadOnly())
+        }
+        if (b.isReadOnly() != slice.isReadOnly()) {
             fail("Lost read-only", slice);
     }
+    }
 
 #if[byte]
 
     private static void checkBytes(ByteBuffer b, byte[] bs) {
         int n = bs.length;
         int p = b.position();
-        byte v;
         if (b.order() == ByteOrder.BIG_ENDIAN) {
-            for (int i = 0; i < n; i++)
+            for (int i = 0; i < n; i++) {
                 ck(b, b.get(), bs[i]);
+            }
         } else {
-            for (int i = n - 1; i >= 0; i--)
+            for (int i = n - 1; i >= 0; i--) {
                 ck(b, b.get(), bs[i]);
         }
+        }
         b.position(p);
     }
 
     private static void compact(Buffer b) {
         try {
             Class<?> cl = b.getClass();
-            Method m = cl.getDeclaredMethod("compact");
+            java.lang.reflect.Method m = cl.getDeclaredMethod("compact");
             m.setAccessible(true);
             m.invoke(b);
         } catch (Exception e) {
             fail(e.getMessage(), b);
         }
     }
 
     private static void checkInvalidMarkException(final Buffer b) {
-        tryCatch(b, InvalidMarkException.class, new Runnable() {
-            public void run() {
+        tryCatch(b, InvalidMarkException.class, () -> {
                 b.mark();
                 compact(b);
                 b.reset();
-            }});
+            });
     }
 
     private static void testViews(int level, ByteBuffer b, boolean direct) {
 
         ShortBuffer sb = b.asShortBuffer();

@@ -362,79 +369,86 @@
         int longMisalignmentAtZero = empty.alignmentOffset(0, 8);
 
         if (direct) {
             // Freshly created direct byte buffers should be aligned at index 0
             // for ref and primitive values (see Unsafe.allocateMemory)
-            if (longMisalignmentAtZero != 0)
-                fail("Direct byte buffer misalligned at index 0 for ref and primitive values " + longMisalignmentAtZero);
+            if (longMisalignmentAtZero != 0) {
+                fail("Direct byte buffer misaligned at index 0 for ref and primitive values " + longMisalignmentAtZero);
+            }
         } else {
             // For heap byte buffers misalignment may occur on 32-bit systems
             // where Unsafe.ARRAY_BYTE_BASE_OFFSET % 8 == 4 and not 0
             // Note the GC will preserve alignment of the base address of the
             // array
-            if (jdk.internal.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET % 8 != longMisalignmentAtZero)
-                fail("Heap byte buffer misalligned at index 0 for ref and primitive values " + longMisalignmentAtZero);
+            if (jdk.internal.misc.Unsafe.ARRAY_BYTE_BASE_OFFSET % 8 != longMisalignmentAtZero) {
+                fail("Heap byte buffer misaligned at index 0 for ref and primitive values " + longMisalignmentAtZero);
+            }
         }
 
         // Ensure test buffer is correctly aligned at index 0
-        if (b.alignmentOffset(0, 8) != longMisalignmentAtZero)
+        if (b.alignmentOffset(0, 8) != longMisalignmentAtZero) {
             fail("Test input buffer not correctly aligned at index 0", b);
-
+        }
         // Test misalignment values
         for (int us : new int[]{1, 2, 4, 8}) {
             for (int i = 0; i < us * 2; i++) {
                 int am = b.alignmentOffset(i, us);
                 int expectedAm = (longMisalignmentAtZero + i) % us;
 
-                if (am != expectedAm)
+                if (am != expectedAm) {
                     fail(String.format("b.alignmentOffset(%d, %d) == %d incorrect, expected %d", i, us, am, expectedAm));
             }
         }
+        }
 
         // Created aligned slice to test against
         int ap = 8 - longMisalignmentAtZero;
         int al = b.limit() - b.alignmentOffset(b.limit(), 8);
         ByteBuffer ab = b.position(ap).limit(al).
                 slice();
-        if (ab.limit() == 0)
+        if (ab.limit() == 0) {
             fail("Test input buffer not sufficiently sized to cover an aligned region for all values", b);
-        if (ab.alignmentOffset(0, 8) != 0)
+        }
+        if (ab.alignmentOffset(0, 8) != 0) {
             fail("Aligned test input buffer not correctly aligned at index 0", ab);
+        }
 
         for (int us : new int[]{1, 2, 4, 8}) {
             for (int p = 1; p < 16; p++) {
                 int l = ab.limit() - p;
 
                 ByteBuffer as = ab.slice().position(p).limit(l).
                         alignedSlice(us);
 
                 ck(as, 0, as.position());
                 ck(as, as.capacity(), as.limit());
-                if (b.isDirect() != as.isDirect())
+                if (b.isDirect() != as.isDirect()) {
                     fail("Lost direction", as);
-                if (b.isReadOnly() != as.isReadOnly())
+                }
+                if (b.isReadOnly() != as.isReadOnly()) {
                     fail("Lost read-only", as);
-
-                if (as.alignmentOffset(0, us) != 0)
+                }
+                if (as.alignmentOffset(0, us) != 0) {
                     fail("Buffer not correctly aligned at index 0", as);
-
-                if (as.alignmentOffset(as.limit(), us) != 0)
+                }
+                if (as.alignmentOffset(as.limit(), us) != 0) {
                     fail("Buffer not correctly aligned at limit", as);
-
+                }
                 int p_mod = ab.alignmentOffset(p, us);
                 int l_mod = ab.alignmentOffset(l, us);
                 // Round up position
                 p = (p_mod > 0) ? p + (us - p_mod) : p;
                 // Round down limit
                 l = l - l_mod;
 
                 int ec = l - p;
-                if (as.limit() != ec)
+                if (as.limit() != ec) {
                     fail("Buffer capacity incorrect, expected: " + ec, as);
             }
         }
     }
+    }
 #end[byte]
 
     private static void fail(String problem,
                              $Type$Buffer xb, $Type$Buffer yb,
                              $type$ x, $type$ y) {

@@ -450,24 +464,26 @@
                 caught = true;
             } else {
                 fail(x.getMessage() + " not expected");
             }
         }
-        if (!caught)
+        if (!caught) {
             fail(ex.getName() + " not thrown", b);
     }
+    }
 
     private static void tryCatch($type$ [] t, Class<?> ex, Runnable thunk) {
         tryCatch($Type$Buffer.wrap(t), ex, thunk);
     }
 
     public static void test(int level, final $Type$Buffer b, boolean direct) {
 
         show(level, b);
 
-        if (direct != b.isDirect())
+        if (direct != b.isDirect()) {
             fail("Wrong direction", b);
+        }
 
         // Gets and puts
 
         relPut(b);
         relGet(b);

@@ -511,15 +527,14 @@
         // String ops
 
         // 7190219
         b.clear();
         int pos = b.position();
-        tryCatch(b, BufferOverflowException.class, new Runnable() {
-            public void run() {
+        tryCatch(b, BufferOverflowException.class, () ->
                 b.put(String.valueOf(new char[b.capacity() + 1]), 0,
-                        b.capacity() + 1);
-            }});
+                        b.capacity() + 1)
+            );
         ck(b, b.position(), pos);
         relGet(b);
 
 #end[char]
 

@@ -535,42 +550,17 @@
 
         relPut(b);
         b.limit(b.capacity() / 2);
         b.position(b.limit());
 
-        tryCatch(b, BufferUnderflowException.class, new Runnable() {
-                public void run() {
-                    b.get();
-                }});
-
-        tryCatch(b, BufferOverflowException.class, new Runnable() {
-                public void run() {
-                    b.put(($type$)42);
-                }});
-
-        // The index must be non-negative and lesss than the buffer's limit.
-        tryCatch(b, IndexOutOfBoundsException.class, new Runnable() {
-                public void run() {
-                    b.get(b.limit());
-                }});
-        tryCatch(b, IndexOutOfBoundsException.class, new Runnable() {
-                public void run() {
-                    b.get(-1);
-                }});
-
-        tryCatch(b, IndexOutOfBoundsException.class, new Runnable() {
-                public void run() {
-                    b.put(b.limit(), ($type$)42);
-                }});
-
-        tryCatch(b, InvalidMarkException.class, new Runnable() {
-                public void run() {
-                    b.position(0);
-                    b.mark();
-                    b.compact();
-                    b.reset();
-                }});
+        tryCatch(b, BufferUnderflowException.class, () -> b.get());
+        tryCatch(b, BufferOverflowException.class, () -> b.put(($type$)42));
+        // The index must be non-negative and less than the buffer's limit.
+        tryCatch(b, IndexOutOfBoundsException.class, () -> b.get(b.limit()));
+        tryCatch(b, IndexOutOfBoundsException.class, () -> b.get(-1));
+        tryCatch(b, IndexOutOfBoundsException.class, () -> b.put(b.limit(), ($type$)42));
+        tryCatch(b, InvalidMarkException.class, () -> b.position(0).mark().compact().reset());
 
         try {
             b.position(b.limit() + 1);
             fail("IllegalArgumentException expected for position beyond limit");
         } catch (IllegalArgumentException e) {

@@ -633,36 +623,39 @@
         b.put(Double.POSITIVE_INFINITY);
         b.put(Double.NaN);
         b.put(0.5121609353879392);      // Changes value if incorrectly swapped
 #end[double]
 
-        $type$ v;
         b.flip();
         ck(b, b.get(), 0);
         ck(b, b.get(), ($type$)-1);
         ck(b, b.get(), 1);
         ck(b, b.get(), $Fulltype$.MAX_VALUE);
         ck(b, b.get(), $Fulltype$.MIN_VALUE);
 
 #if[float]
+        $type$ v;
         ck(b, b.get(), -Float.MAX_VALUE);
         ck(b, b.get(), -Float.MIN_VALUE);
         ck(b, b.get(), Float.NEGATIVE_INFINITY);
         ck(b, b.get(), Float.POSITIVE_INFINITY);
         if (Float.floatToRawIntBits(v = b.get()) !=
-            Float.floatToRawIntBits(Float.NaN))
+            Float.floatToRawIntBits(Float.NaN)) {
             fail(b, (long)Float.NaN, (long)v);
+        }
         ck(b, b.get(), 0.91697687f);
 #end[float]
 #if[double]
+        $type$ v;
         ck(b, b.get(), -Double.MAX_VALUE);
         ck(b, b.get(), -Double.MIN_VALUE);
         ck(b, b.get(), Double.NEGATIVE_INFINITY);
         ck(b, b.get(), Double.POSITIVE_INFINITY);
         if (Double.doubleToRawLongBits(v = b.get())
-            != Double.doubleToRawLongBits(Double.NaN))
+            != Double.doubleToRawLongBits(Double.NaN)) {
             fail(b, (long)Double.NaN, (long)v);
+        }
         ck(b, b.get(), 0.5121609353879392);
 #end[double]
 
 
         // Comparison

@@ -681,42 +674,47 @@
                     || Double.compare(x, y) != 0
 #end[double]
 #if[float]
                     || Float.compare(x, y) != 0
 #end[float]
-                    )
+                    ) {
                     out.println("[" + i + "] " + x + " != " + y);
             }
+            }
             fail("Identical buffers not equal", b, b2);
         }
-        if (b.compareTo(b2) != 0)
+        if (b.compareTo(b2) != 0) {
             fail("Comparison to identical buffer != 0", b, b2);
-
+        }
         b.limit(b.limit() + 1);
         b.position(b.limit() - 1);
         b.put(($type$)99);
         b.rewind();
         b2.rewind();
-        if (b.equals(b2))
+        if (b.equals(b2)) {
             fail("Non-identical buffers equal", b, b2);
-        if (b.compareTo(b2) <= 0)
+        }
+        if (b.compareTo(b2) <= 0) {
             fail("Comparison to shorter buffer <= 0", b, b2);
+        }
         b.limit(b.limit() - 1);
 
         b.put(2, ($type$)42);
-        if (b.equals(b2))
+        if (b.equals(b2)) {
             fail("Non-identical buffers equal", b, b2);
-        if (b.compareTo(b2) <= 0)
+        }
+        if (b.compareTo(b2) <= 0) {
             fail("Comparison to lesser buffer <= 0", b, b2);
+        }
 
         // Check equals and compareTo with interesting values
         for ($type$ x : VALUES) {
             $Type$Buffer xb = $Type$Buffer.wrap(new $type$[] { x });
             if (xb.compareTo(xb) != 0) {
                 fail("compareTo not reflexive", xb, xb, x, x);
             }
-            if (! xb.equals(xb)) {
+            if (!xb.equals(xb)) {
                 fail("equals not reflexive", xb, xb, x, x);
             }
             for ($type$ y : VALUES) {
                 $Type$Buffer yb = $Type$Buffer.wrap(new $type$[] { y });
                 if (xb.compareTo(yb) != - yb.compareTo(xb)) {

@@ -761,15 +759,17 @@
         checkSlice(b, sb);
         b.position(0);
         $Type$Buffer sb2 = sb.slice();
         checkSlice(sb, sb2);
 
-        if (!sb.equals(sb2))
+        if (!sb.equals(sb2)) {
             fail("Sliced slices do not match", sb, sb2);
-        if ((sb.hasArray()) && (sb.arrayOffset() != sb2.arrayOffset()))
+        }
+        if ((sb.hasArray()) && (sb.arrayOffset() != sb2.arrayOffset())) {
             fail("Array offsets do not match: "
                  + sb.arrayOffset() + " != " + sb2.arrayOffset(), sb, sb2);
+        }
 
 #if[byte]
 
         // Views
 

@@ -802,102 +802,41 @@
 
         // Read-only views
 
         b.rewind();
         final $Type$Buffer rb = b.asReadOnlyBuffer();
-        if (!b.equals(rb))
+        if (!b.equals(rb)) {
             fail("Buffer not equal to read-only view", b, rb);
+        }
         show(level + 1, rb);
 
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    relPut(rb);
-                }});
-
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    absPut(rb);
-                }});
-
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    bulkPutArray(rb);
-                }});
-
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    bulkPutBuffer(rb);
-                }});
+        tryCatch(b, ReadOnlyBufferException.class, () -> relPut(rb));
+        tryCatch(b, ReadOnlyBufferException.class, () -> absPut(rb));
+        tryCatch(b, ReadOnlyBufferException.class, () -> bulkPutArray(rb));
+        tryCatch(b, ReadOnlyBufferException.class, () -> bulkPutBuffer(rb));
 
         // put($Type$Buffer) should not change source position
         final $Type$Buffer src = $Type$Buffer.allocate(1);
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.put(src);
-                 }});
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.put(src));
         ck(src, src.position(), 0);
 
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.compact();
-                }});
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.compact());
 
 #if[byte]
 
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.putChar((char)1);
-                }});
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.putChar(0, (char)1);
-                }});
-
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.putShort((short)1);
-                }});
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.putShort(0, (short)1);
-                }});
-
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.putInt(1);
-                }});
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.putInt(0, 1);
-                }});
-
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.putLong((long)1);
-                }});
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.putLong(0, (long)1);
-                }});
-
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.putFloat((float)1);
-                }});
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.putFloat(0, (float)1);
-                }});
-
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.putDouble((double)1);
-                }});
-        tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                public void run() {
-                    rb.putDouble(0, (double)1);
-                }});
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.putChar((char)1));
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.putChar(0, (char)1));
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.putShort((short)1));
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.putShort(0, (short)1));
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.putInt(1));
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.putInt(0, 1));
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.putLong((long)1));
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.putLong(0, (long)1));
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.putFloat((float)1));
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.putFloat(0, (float)1));
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.putDouble((double)1));
+        tryCatch(b, ReadOnlyBufferException.class, () -> rb.putDouble(0, (double)1));
 
 #end[byte]
 
 #if[char]
 

@@ -914,25 +853,15 @@
             }});
 
 #end[char]
 
         if (rb.getClass().getName().startsWith("java.nio.Heap")) {
-
-            tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                    public void run() {
-                        rb.array();
-                    }});
-
-            tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
-                    public void run() {
-                        rb.arrayOffset();
-                    }});
-
-            if (rb.hasArray())
-                fail("Read-only heap buffer's backing array is accessible",
-                     rb);
-
+            tryCatch(b, ReadOnlyBufferException.class, () -> rb.array());
+            tryCatch(b, ReadOnlyBufferException.class, () -> rb.arrayOffset());
+            if (rb.hasArray()) {
+                fail("Read-only heap buffer's backing array is accessible", rb);
+            }
         }
 
         // Bulk puts from read-only buffers
 
         b.clear();

@@ -1050,57 +979,33 @@
         ck(b, b.capacity(), ba.length);
         ck(b, b.position(), offset);
         ck(b, b.limit(), offset + length);
 
         // The offset must be non-negative and no larger than <array.length>.
-        tryCatch(ba, IndexOutOfBoundsException.class, new Runnable() {
-                public void run() {
-                    $Type$Buffer.wrap(ba, -1, ba.length);
-                }});
-        tryCatch(ba, IndexOutOfBoundsException.class, new Runnable() {
-                public void run() {
-                    $Type$Buffer.wrap(ba, ba.length + 1, ba.length);
-                }});
-        tryCatch(ba, IndexOutOfBoundsException.class, new Runnable() {
-                public void run() {
-                    $Type$Buffer.wrap(ba, 0, -1);
-                }});
-        tryCatch(ba, IndexOutOfBoundsException.class, new Runnable() {
-                public void run() {
-                    $Type$Buffer.wrap(ba, 0, ba.length + 1);
-                }});
+        tryCatch(ba, IndexOutOfBoundsException.class, () -> $Type$Buffer.wrap(ba, -1, ba.length));
+        tryCatch(ba, IndexOutOfBoundsException.class, () -> $Type$Buffer.wrap(ba, ba.length + 1, ba.length));
+        tryCatch(ba, IndexOutOfBoundsException.class, () -> $Type$Buffer.wrap(ba, 0, -1));
+        tryCatch(ba, IndexOutOfBoundsException.class, () -> $Type$Buffer.wrap(ba, 0, ba.length + 1));
 
         // A NullPointerException will be thrown if the array is null.
-        tryCatch(ba, NullPointerException.class, new Runnable() {
-                public void run() {
-                    $Type$Buffer.wrap(($type$ []) null, 0, 5);
-                }});
-        tryCatch(ba, NullPointerException.class, new Runnable() {
-                public void run() {
-                    $Type$Buffer.wrap(($type$ []) null);
-                }});
+        tryCatch(ba, NullPointerException.class, () -> $Type$Buffer.wrap(($type$ []) null, 0, 5));
+        tryCatch(ba, NullPointerException.class, () -> $Type$Buffer.wrap(($type$ []) null));
     }
 
     private static void testAllocate() {
         // An IllegalArgumentException will be thrown for negative capacities.
-        tryCatch((Buffer) null, IllegalArgumentException.class, new Runnable() {
-                public void run() {
-                    $Type$Buffer.allocate(-1);
-                }});
+        tryCatch((Buffer) null, IllegalArgumentException.class, () -> $Type$Buffer.allocate(-1));
         try {
             $Type$Buffer.allocate(-1);
         } catch (IllegalArgumentException e) {
             if (e.getMessage() == null) {
                 fail("Non-null IllegalArgumentException message expected for"
                      + " attempt to allocate negative capacity buffer");
             }
         }
 #if[byte]
-        tryCatch((Buffer) null, IllegalArgumentException.class, new Runnable() {
-                public void run() {
-                    $Type$Buffer.allocateDirect(-1);
-                }});
+        tryCatch((Buffer) null, IllegalArgumentException.class, () -> $Type$Buffer.allocateDirect(-1));
         try {
             $Type$Buffer.allocateDirect(-1);
         } catch (IllegalArgumentException e) {
             if (e.getMessage() == null) {
                 fail("Non-null IllegalArgumentException message expected for"

@@ -1115,12 +1020,13 @@
         test(0, $Type$Buffer.allocate(7 * 1024), false);
         test(0, $Type$Buffer.wrap(new $type$[7 * 1024], 0, 7 * 1024), false);
         test(new $type$[1024]);
 #if[byte]
         $Type$Buffer b = $Type$Buffer.allocateDirect(7 * 1024);
-        for (b.position(0); b.position() < b.limit(); )
+        for (b.position(0); b.position() < b.limit(); ) {
             ck(b, b.get(), 0);
+        }
         test(0, b, true);
 #end[byte]
 #if[char]
         testStr();
 #end[char]
< prev index next >