--- a/jdk/test/java/nio/Buffer/BasicByte.java Fri Jul 24 18:57:04 2015 +0200
+++ b/jdk/test/java/nio/Buffer/BasicByte.java Fri Jul 24 11:52:30 2015 -0700
@@ -128,6 +128,15 @@
c.position(7);
b.put(c);
b.flip();
+ try {
+ b.put(b);
+ fail("IllegalArgumentException expected for put into same buffer");
+ } catch (IllegalArgumentException e) {
+ if (e.getMessage() == null) {
+ fail("Non-null IllegalArgumentException message expected from"
+ + " put into same buffer");
+ }
+ }
}
//6231529
@@ -464,6 +473,46 @@
b.reset();
}});
+ try {
+ b.position(b.limit() + 1);
+ fail("IllegalArgumentException expected for position beyond limit");
+ } catch (IllegalArgumentException e) {
+ if (e.getMessage() == null) {
+ fail("Non-null IllegalArgumentException message expected for"
+ + " position beyond limit");
+ }
+ }
+
+ try {
+ b.position(-1);
+ fail("IllegalArgumentException expected for negative position");
+ } catch (IllegalArgumentException e) {
+ if (e.getMessage() == null) {
+ fail("Non-null IllegalArgumentException message expected for"
+ + " negative position");
+ }
+ }
+
+ try {
+ b.limit(b.capacity() + 1);
+ fail("IllegalArgumentException expected for limit beyond capacity");
+ } catch (IllegalArgumentException e) {
+ if (e.getMessage() == null) {
+ fail("Non-null IllegalArgumentException message expected for"
+ + " limit beyond capacity");
+ }
+ }
+
+ try {
+ b.limit(-1);
+ fail("IllegalArgumentException expected for negative limit");
+ } catch (IllegalArgumentException e) {
+ if (e.getMessage() == null) {
+ fail("Non-null IllegalArgumentException message expected for"
+ + " negative limit");
+ }
+ }
+
// Values
b.clear();
@@ -518,6 +567,7 @@
+
// Comparison
b.rewind();
ByteBuffer b2 = ByteBuffer.allocate(b.capacity());
@@ -934,11 +984,27 @@
public void run() {
ByteBuffer.allocate(-1);
}});
+ try {
+ ByteBuffer.allocate(-1);
+ } catch (IllegalArgumentException e) {
+ if (e.getMessage() == null) {
+ fail("Non-null IllegalArgumentException message expected for"
+ + " attempt to allocate negative capacity buffer");
+ }
+ }
tryCatch((Buffer) null, IllegalArgumentException.class, new Runnable() {
public void run() {
ByteBuffer.allocateDirect(-1);
}});
+ try {
+ ByteBuffer.allocateDirect(-1);
+ } catch (IllegalArgumentException e) {
+ if (e.getMessage() == null) {
+ fail("Non-null IllegalArgumentException message expected for"
+ + " attempt to allocate negative capacity direct buffer");
+ }
+ }
}