8257212: (bf spec) Clarify byte order of the buffer returned by CharB…

…uffer.subsequence(int,int)
openjdk · Jan 12, 2021 · f194a7d · f194a7d
1 parent 4697cfa
commit f194a7d
Show file tree

Hide file tree

Showing 8 changed files with 186 additions and 3 deletions.
diff --git a/src/java.base/share/classes/java/nio/X-Buffer.java.template b/src/java.base/share/classes/java/nio/X-Buffer.java.template
@@ -1835,9 +1835,10 @@ public abstract class $Type$Buffer
      * content of this buffer is mutable then modifications to one buffer will
      * cause the other to be modified.  The new buffer's capacity will be that
      * of this buffer, its position will be
-     * {@code position()}&nbsp;+&nbsp;{@code start}, and its limit will be
-     * {@code position()}&nbsp;+&nbsp;{@code end}.  The new buffer will be
-     * direct if, and only if, this buffer is direct, and it will be read-only
+     * {@code position()}&nbsp;+&nbsp;{@code start}, its limit will be
+     * {@code position()}&nbsp;+&nbsp;{@code end}, and its byte order
+     * will be identical to that of this buffer. The new buffer will be direct
+     * if, and only if, this buffer is direct, and it will be read-only
      * if, and only if, this buffer is read-only.  </p>
      *
      * @param  start

diff --git a/test/jdk/java/nio/Buffer/Order-X.java.template b/test/jdk/java/nio/Buffer/Order-X.java.template
@@ -37,6 +37,10 @@ public class Order$Type$ extends Order {
         ck(buf.asReadOnlyBuffer().order(), expected);
         ck(buf.duplicate().order(), expected);
         ck(buf.slice().order(), expected);
+#if[char]
+        ck(buf.subSequence(buf.position(), buf.remaining()).order(), expected);
+        ck(buf.subSequence(buf.position(), buf.position()).order(), expected);
+#end[char]
     }
 
     static void ck$Type$Buffer() {
@@ -52,5 +56,27 @@ public class Order$Type$ extends Order {
         buf = $Type$Buffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ck$Type$Buffer(buf, nord);
+#if[char]
+        buf = $Type$Buffer.wrap("abcdefghijk");
+        ck(buf.order(), nord);
+        ck$Type$Buffer(buf, nord);
+
+        buf = $Type$Buffer.wrap("abcdefghijk", 0, 5);
+        ck(buf.order(), nord);
+        ck$Type$Buffer(buf, nord);
+
+        buf = $Type$Buffer.wrap(array).subSequence(0, LENGTH);
+        ck(buf.order(), nord);
+        ck$Type$Buffer(buf, nord);
+
+        buf = ByteBuffer.wrap(new byte[LENGTH]).as$Type$Buffer();
+        ck(buf.order(), be);
+        ck$Type$Buffer(buf, be);
+
+        buf = ByteBuffer.wrap(new byte[LENGTH]).order(le).as$Type$Buffer();
+        ck(buf.order(), le);
+        ck$Type$Buffer(buf, le);
+#end[char]
     }
 }
+
diff --git a/test/jdk/java/nio/Buffer/OrderChar.java b/test/jdk/java/nio/Buffer/OrderChar.java
@@ -37,6 +37,10 @@ private static void ckCharBuffer(CharBuffer buf, ByteOrder expected) {
         ck(buf.asReadOnlyBuffer().order(), expected);
         ck(buf.duplicate().order(), expected);
         ck(buf.slice().order(), expected);
+
+        ck(buf.subSequence(buf.position(), buf.remaining()).order(), expected);
+        ck(buf.subSequence(buf.position(), buf.position()).order(), expected);
+
     }
 
     static void ckCharBuffer() {
@@ -52,5 +56,27 @@ static void ckCharBuffer() {
         buf = CharBuffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ckCharBuffer(buf, nord);
+
+        buf = CharBuffer.wrap("abcdefghijk");
+        ck(buf.order(), nord);
+        ckCharBuffer(buf, nord);
+
+        buf = CharBuffer.wrap("abcdefghijk", 0, 5);
+        ck(buf.order(), nord);
+        ckCharBuffer(buf, nord);
+
+        buf = CharBuffer.wrap(array).subSequence(0, LENGTH);
+        ck(buf.order(), nord);
+        ckCharBuffer(buf, nord);
+
+        buf = ByteBuffer.wrap(new byte[LENGTH]).asCharBuffer();
+        ck(buf.order(), be);
+        ckCharBuffer(buf, be);
+
+        buf = ByteBuffer.wrap(new byte[LENGTH]).order(le).asCharBuffer();
+        ck(buf.order(), le);
+        ckCharBuffer(buf, le);
+
     }
 }
+
diff --git a/test/jdk/java/nio/Buffer/OrderDouble.java b/test/jdk/java/nio/Buffer/OrderDouble.java
@@ -37,6 +37,10 @@ private static void ckDoubleBuffer(DoubleBuffer buf, ByteOrder expected) {
         ck(buf.asReadOnlyBuffer().order(), expected);
         ck(buf.duplicate().order(), expected);
         ck(buf.slice().order(), expected);
+
+
+
+
     }
 
     static void ckDoubleBuffer() {
@@ -52,5 +56,27 @@ static void ckDoubleBuffer() {
         buf = DoubleBuffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ckDoubleBuffer(buf, nord);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 }
+
diff --git a/test/jdk/java/nio/Buffer/OrderFloat.java b/test/jdk/java/nio/Buffer/OrderFloat.java
@@ -37,6 +37,10 @@ private static void ckFloatBuffer(FloatBuffer buf, ByteOrder expected) {
         ck(buf.asReadOnlyBuffer().order(), expected);
         ck(buf.duplicate().order(), expected);
         ck(buf.slice().order(), expected);
+
+
+
+
     }
 
     static void ckFloatBuffer() {
@@ -52,5 +56,27 @@ static void ckFloatBuffer() {
         buf = FloatBuffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ckFloatBuffer(buf, nord);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 }
+
diff --git a/test/jdk/java/nio/Buffer/OrderInt.java b/test/jdk/java/nio/Buffer/OrderInt.java
@@ -37,6 +37,10 @@ private static void ckIntBuffer(IntBuffer buf, ByteOrder expected) {
         ck(buf.asReadOnlyBuffer().order(), expected);
         ck(buf.duplicate().order(), expected);
         ck(buf.slice().order(), expected);
+
+
+
+
     }
 
     static void ckIntBuffer() {
@@ -52,5 +56,27 @@ static void ckIntBuffer() {
         buf = IntBuffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ckIntBuffer(buf, nord);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 }
+
diff --git a/test/jdk/java/nio/Buffer/OrderLong.java b/test/jdk/java/nio/Buffer/OrderLong.java
@@ -37,6 +37,10 @@ private static void ckLongBuffer(LongBuffer buf, ByteOrder expected) {
         ck(buf.asReadOnlyBuffer().order(), expected);
         ck(buf.duplicate().order(), expected);
         ck(buf.slice().order(), expected);
+
+
+
+
     }
 
     static void ckLongBuffer() {
@@ -52,5 +56,27 @@ static void ckLongBuffer() {
         buf = LongBuffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ckLongBuffer(buf, nord);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 }
+
diff --git a/test/jdk/java/nio/Buffer/OrderShort.java b/test/jdk/java/nio/Buffer/OrderShort.java
@@ -37,6 +37,10 @@ private static void ckShortBuffer(ShortBuffer buf, ByteOrder expected) {
         ck(buf.asReadOnlyBuffer().order(), expected);
         ck(buf.duplicate().order(), expected);
         ck(buf.slice().order(), expected);
+
+
+
+
     }
 
     static void ckShortBuffer() {
@@ -52,5 +56,27 @@ static void ckShortBuffer() {
         buf = ShortBuffer.allocate(LENGTH);
         ck(buf.order(), nord);
         ckShortBuffer(buf, nord);
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
     }
 }
+