jdk-sandbox: comparison jdk/test/java/nio/Buffer/BasicShort.java

equal deleted inserted replaced

-:80b046f15b53
+:3cc95b690353
 */
 // -- This file was mechanically generated: Do not edit! -- //
 import java.nio.*;
-import java.lang.reflect.Method;
 public class BasicShort
 extends Basic
 {
 };
 private static void relGet(ShortBuffer b) {
 int n = b.capacity();
-short v;
 for (int i = 0; i < n; i++)
 ck(b, (long)b.get(), (long)((short)ic(i)));
 b.rewind();
 }
 private static void relGet(ShortBuffer b, int start) {
 int n = b.remaining();
-short v;
 for (int i = start; i < n; i++)
 ck(b, (long)b.get(), (long)((short)ic(i)));
 b.rewind();
 }
 private static void absGet(ShortBuffer b) {
 int n = b.capacity();
-short v;
 for (int i = 0; i < n; i++)
 ck(b, (long)b.get(), (long)((short)ic(i)));
 b.rewind();
 }
 private static void bulkGet(ShortBuffer b) {
 int n = b.capacity();
 short[] a = new short[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)((short)ic(i)));
+}
 }
 private static void relPut(ShortBuffer b) {
 int n = b.capacity();
 b.clear();
 private static void fail(String problem,
 ShortBuffer xb, ShortBuffer yb,
 short x, short y) {
 fail(problem + String.format(": x=%s y=%s", x, y), xb, yb);
+}
+private static void catchIllegalArgument(Buffer b, Runnable thunk) {
+tryCatch(b, IllegalArgumentException.class, thunk);
+}
+private static void catchReadOnlyBuffer(Buffer b, Runnable thunk) {
+tryCatch(b, ReadOnlyBufferException.class, thunk);
+}
+private static void catchIndexOutOfBounds(Buffer b, Runnable thunk) {
+tryCatch(b, IndexOutOfBoundsException.class, thunk);
+}
+private static void catchIndexOutOfBounds(short[] t, Runnable thunk) {
+tryCatch(t, IndexOutOfBoundsException.class, thunk);
 }
 private static void tryCatch(Buffer b, Class<?> ex, Runnable thunk) {
 boolean caught = false;
 try {
 caught = true;
 } else {
 fail(x.getMessage() + " not expected");
 }
 }
-if (!caught)
+if (!caught) {
 fail(ex.getName() + " not thrown", b);
 }
+}
-private static void tryCatch(short [] t, Class<?> ex, Runnable thunk) {
+private static void tryCatch(short[] t, Class<?> ex, Runnable thunk) {
 tryCatch(ShortBuffer.wrap(t), ex, thunk);
 }
 public static void test(int level, final ShortBuffer b, boolean direct) {
 bulkPutArray(b);
 relGet(b);
 bulkPutBuffer(b);
 relGet(b);
 relPut(b);
 b.limit(b.capacity() / 2);
 b.position(b.limit());
-tryCatch(b, BufferUnderflowException.class, new Runnable() {
+tryCatch(b, BufferUnderflowException.class, () -> b.get());
-public void run() {
+tryCatch(b, BufferOverflowException.class, () -> b.put((short)42));
-b.get();
+// The index must be non-negative and less than the buffer's limit.
-}});
+catchIndexOutOfBounds(b, () -> b.get(b.limit()));
+catchIndexOutOfBounds(b, () -> b.get(-1));
-tryCatch(b, BufferOverflowException.class, new Runnable() {
+catchIndexOutOfBounds(b, () -> b.put(b.limit(), (short)42));
-public void run() {
+tryCatch(b, InvalidMarkException.class,
-b.put((short)42);
+() -> b.position(0).mark().compact().reset());
-}});
-// 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(), (short)42);
-}});
-tryCatch(b, InvalidMarkException.class, new Runnable() {
-public void run() {
-b.position(0);
-b.mark();
-b.compact();
-b.reset();
-}});
 try {
 b.position(b.limit() + 1);
 fail("IllegalArgumentException expected for position beyond limit");
 } catch (IllegalArgumentException e) {
-short v;
 b.flip();
 ck(b, b.get(), 0);
 ck(b, b.get(), (short)-1);
 ck(b, b.get(), 1);
 ck(b, b.get(), Short.MAX_VALUE);
 ck(b, b.get(), Short.MIN_VALUE);
-)
+) {
 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((short)99);
 b.rewind();
 b2.rewind();
 for (short x : VALUES) {
 ShortBuffer xb = ShortBuffer.wrap(new short[] { 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 (short y : VALUES) {
 ShortBuffer yb = ShortBuffer.wrap(new short[] { y });
 if (xb.compareTo(yb) != - yb.compareTo(xb)) {
 ShortBuffer sb2 = sb.slice();
 checkSlice(sb, 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);
+}
 final ShortBuffer rb = b.asReadOnlyBuffer();
 if (!b.equals(rb))
 fail("Buffer not equal to read-only view", b, rb);
 show(level + 1, rb);
-tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
+catchReadOnlyBuffer(b, () -> relPut(rb));
-public void run() {
+catchReadOnlyBuffer(b, () -> absPut(rb));
-relPut(rb);
+catchReadOnlyBuffer(b, () -> bulkPutArray(rb));
-}});
+catchReadOnlyBuffer(b, () -> bulkPutBuffer(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);
-}});
 // put(ShortBuffer) should not change source position
 final ShortBuffer src = ShortBuffer.allocate(1);
-tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
+catchReadOnlyBuffer(b, () -> rb.put(src));
-public void run() {
-rb.put(src);
-}});
 ck(src, src.position(), 0);
-tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
+catchReadOnlyBuffer(b, () -> rb.compact());
-public void run() {
-rb.compact();
-}});
 if (rb.getClass().getName().startsWith("java.nio.Heap")) {
+catchReadOnlyBuffer(b, () -> rb.array());
-tryCatch(b, ReadOnlyBufferException.class, new Runnable() {
+catchReadOnlyBuffer(b, () -> rb.arrayOffset());
-public void run() {
+if (rb.hasArray()) {
-rb.array();
+fail("Read-only heap buffer's backing array is accessible", rb);
-}});
+}
-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);
 }
 // Bulk puts from read-only buffers
 b.clear();
 }
 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() {
+catchIndexOutOfBounds(ba, () -> ShortBuffer.wrap(ba, -1, ba.length));
-public void run() {
+catchIndexOutOfBounds(ba, () -> ShortBuffer.wrap(ba, ba.length + 1, ba.length));
-ShortBuffer.wrap(ba, -1, ba.length);
+catchIndexOutOfBounds(ba, () -> ShortBuffer.wrap(ba, 0, -1));
-}});
+catchIndexOutOfBounds(ba, () -> ShortBuffer.wrap(ba, 0, ba.length + 1));
-tryCatch(ba, IndexOutOfBoundsException.class, new Runnable() {
-public void run() {
-ShortBuffer.wrap(ba, ba.length + 1, ba.length);
-}});
-tryCatch(ba, IndexOutOfBoundsException.class, new Runnable() {
-public void run() {
-ShortBuffer.wrap(ba, 0, -1);
-}});
-tryCatch(ba, IndexOutOfBoundsException.class, new Runnable() {
-public void run() {
-ShortBuffer.wrap(ba, 0, ba.length + 1);
-}});
 // A NullPointerException will be thrown if the array is null.
-tryCatch(ba, NullPointerException.class, new Runnable() {
+tryCatch(ba, NullPointerException.class,
-public void run() {
+() -> ShortBuffer.wrap((short []) null, 0, 5));
-ShortBuffer.wrap((short []) null, 0, 5);
+tryCatch(ba, NullPointerException.class,
-}});
+() -> ShortBuffer.wrap((short []) null));
-tryCatch(ba, NullPointerException.class, new Runnable() {
-public void run() {
-ShortBuffer.wrap((short []) null);
-}});
 }
 private static void testAllocate() {
 // An IllegalArgumentException will be thrown for negative capacities.
-tryCatch((Buffer) null, IllegalArgumentException.class, new Runnable() {
+catchIllegalArgument((Buffer) null, () -> ShortBuffer.allocate(-1));
-public void run() {
-ShortBuffer.allocate(-1);
-}});
 try {
 ShortBuffer.allocate(-1);
 } catch (IllegalArgumentException e) {
 if (e.getMessage() == null) {
 fail("Non-null IllegalArgumentException message expected for"
 }
 public static void test() {
 testAllocate();
 test(0, ShortBuffer.allocate(7 * 1024), false);

changeset 37913	3cc95b690353
parent 36933	3e6453e2d833