8000 Fix #1532: Fix TypedArrayDoubleBuffer.bytesPerElem. · commonlisp/scala-js@5569496 · GitHub
[go: up one dir, main page]
Skip to content

Commit 5569496

Browse files
sjrdsjrd
committed
Fix scala-js#1532: Fix TypedArrayDoubleBuffer.bytesPerElem.
1 parent c668b6a commit 5569496

File tree

7 files changed

+71
-53
lines changed

7 files changed

+71
-53
lines changed

‎javalib/src/main/scala/java/nio/TypedArrayDoubleBuffer.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ private[nio] final class TypedArrayDoubleBuffer private (
9696
private[nio] object TypedArrayDoubleBuffer {
9797
private[nio] implicit object NewTypedArrayDoubleBuffer
9898
extends GenTypedArrayBuffer.NewTypedArrayBuffer[DoubleBuffer] {
99-
def bytesPerElem = 2
99+
def bytesPerElem = 8
100100

101101
def apply(typedArray: Float64Array,
102102
initialPosition: Int, initialLimit: Int,

‎test-suite/src/test/scala/org/scalajs/testsuite/niobuffer/CharBufferTest.scala

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -43,12 +43,13 @@ object CharBufferTest extends BaseBufferTest {
4343
}
4444

4545
class ByteBufferCharViewFactory(
46-
byteBufferFactory: BufferFactory.ByteBufferFactory)
46+
byteBufferFactory: BufferFactory.ByteBufferFactory,
47+
order: ByteOrder)
4748
extends Factory with BufferFactory.ByteBufferViewFactory {
4849
require(!byteBufferFactory.createsReadOnly)
4950

5051
def baseAllocBuffer(capacity: Int): CharBuffer =
51-
byteBufferFactory.allocBuffer(capacity * 2).asCharBuffer()
52+
byteBufferFactory.allocBuffer(capacity * 2).order(order).asCharBuffer()
5253
}
5354

5455
describe("Allocated CharBuffer") {
@@ -69,13 +70,15 @@ object CharBufferTest extends BaseBufferTest {
6970
}
7071

7172
for ((description, byteBufferFactory) <- ByteBufferFactories.WriteableByteBufferFactories) {
72-
describe("Char view of " + description) {
73-
defineTests(new ByteBufferCharViewFactory(byteBufferFactory))
74-
}
73+
for (order <- Seq(ByteOrder.BIG_ENDIAN, ByteOrder.LITTLE_ENDIAN)) {
74+
describe("Char view of " + description + " - " + order) {
75+
defineTests(new ByteBufferCharViewFactory(byteBufferFactory, order))
76+
}
7577

76-
describe("Read-only Char view of " + description) {
77-
defineTests(new ByteBufferCharViewFactory(byteBufferFactory)
78-
with BufferFactory.ReadOnlyBufferFactory)
78+
describe("Read-only Char view of " + description + " - " + order) {
79+
defineTests(new ByteBufferCharViewFactory(byteBufferFactory, order)
80+
with BufferFactory.ReadOnlyBufferFactory)
81+
}
7982
}
8083
}
8184

‎test-suite/src/test/scala/org/scalajs/testsuite/niobuffer/DoubleBufferTest.scala

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ object DoubleBufferTest extends BaseBufferTest {
4040
}
4141

4242
class ByteBufferDoubleViewFactory(
43-
byteBufferFactory: BufferFactory.ByteBufferFactory)
43+
byteBufferFactory: BufferFactory.ByteBufferFactory,
44+
order: ByteOrder)
4445
extends Factory with BufferFactory.ByteBufferViewFactory {
4546
require(!byteBufferFactory.createsReadOnly)
4647

4748
def baseAllocBuffer(capacity: Int): DoubleBuffer =
48-
byteBufferFactory.allocBuffer(capacity * 8).asDoubleBuffer()
49+
byteBufferFactory.allocBuffer(capacity * 8).order(order).asDoubleBuffer()
4950
}
5051

5152
describe("Allocated DoubleBuffer") {
@@ -70,13 +71,15 @@ object DoubleBufferTest extends BaseBufferTest {
7071
}
7172

7273
for ((description, byteBufferFactory) <- ByteBufferFactories.WriteableByteBufferFactories) {
73-
describe("Double view of " + description) {
74-
defineTests(new ByteBufferDoubleViewFactory(byteBufferFactory))
75-
}
76-
77-
describe("Read-only Double view of " + description) {
78-
defineTests(new ByteBufferDoubleViewFactory(byteBufferFactory)
79-
with BufferFactory.ReadOnlyBufferFactory)
74+
for (order <- Seq(ByteOrder.BIG_ENDIAN, ByteOrder.LITTLE_ENDIAN)) {
75+
describe("Double view of " + description + " - " + order) {
76+
defineTests(new ByteBufferDoubleViewFactory(byteBufferFactory, order))
77+
}
78+
79+
describe("Read-only Double view of " + description + " - " + order) {
80+
defineTests(new ByteBufferDoubleViewFactory(byteBufferFactory, order)
81+
with BufferFactory.ReadOnlyBufferFactory)
82+
}
8083
}
8184
}
8285
}

‎test-suite/src/test/scala/org/scalajs/testsuite/niobuffer/FloatBufferTest.scala

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ object FloatBufferTest extends BaseBufferTest {
4040
}
4141

4242
class ByteBufferFloatViewFactory(
43-
byteBufferFactory: BufferFactory.ByteBufferFactory)
43+
byteBufferFactory: BufferFactory.ByteBufferFactory,
44+
order: ByteOrder)
4445
extends Factory with BufferFactory.ByteBufferViewFactory {
4546
require(!byteBufferFactory.createsReadOnly)
4647

4748
def baseAllocBuffer(capacity: Int): FloatBuffer =
48-
byteBufferFactory.allocBuffer(capacity * 4).asFloatBuffer()
49+
byteBufferFactory.allocBuffer(capacity * 4).order(order).asFloatBuffer()
4950
}
5051

5152
describe("Allocated FloatBuffer") {
@@ -70,13 +71,15 @@ object FloatBufferTest extends BaseBufferTest {
7071
}
7172

7273
for ((description, byteBufferFactory) <- ByteBufferFactories.WriteableByteBufferFactories) {
73-
describe("Float view of " + description) {
74-
defineTests(new ByteBufferFloatViewFactory(byteBufferFactory))
75-
}
76-
77-
describe("Read-only Float view of " + description) {
78-
defineTests(new ByteBufferFloatViewFactory(byteBufferFactory)
79-
with BufferFactory.ReadOnlyBufferFactory)
74+
for (order <- Seq(ByteOrder.BIG_ENDIAN, ByteOrder.LITTLE_ENDIAN)) {
75+
describe("Float view of " + description + " - " + order) {
76+
defineTests(new ByteBufferFloatViewFactory(byteBufferFactory, order))
77+
}
78+
79+
describe("Read-only Float view of " + description + " - " + order) {
80+
defineTests(new ByteBufferFloatViewFactory(byteBufferFactory, order)
81+
with BufferFactory.ReadOnlyBufferFactory)
82+
}
8083
}
8184
}
8285
}

‎test-suite/src/test/scala/org/scalajs/testsuite/niobuffer/IntBufferTest.scala

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ object IntBufferTest extends BaseBufferTest {
4040
}
4141

4242
class ByteBufferIntViewFactory(
43-
byteBufferFactory: BufferFactory.ByteBufferFactory)
43+
byteBufferFactory: BufferFactory.ByteBufferFactory,
44+
order: ByteOrder)
4445
extends Factory with BufferFactory.ByteBufferViewFactory {
4546
require(!byteBufferFactory.createsReadOnly)
4647

4748
def baseAllocBuffer(capacity: Int): IntBuffer =
48-
byteBufferFactory.allocBuffer(capacity * 4).asIntBuffer()
49+
byteBufferFactory.allocBuffer(capacity * 4).order(order).asIntBuffer()
4950
}
5051

5152
describe("Allocated IntBuffer") {
@@ -70,13 +71,15 @@ object IntBufferTest extends BaseBufferTest {
7071
}
7172

7273
for ((description, byteBufferFactory) <- ByteBufferFactories.WriteableByteBufferFactories) {
73-
describe("Int view of " + description) {
74-
defineTests(new ByteBufferIntViewFactory(byteBufferFactory))
75-
}
76-
77-
describe("Read-only Int view of " + description) {
78-
defineTests(new ByteBufferIntViewFactory(byteBufferFactory)
79-
with BufferFactory.ReadOnlyBufferFactory)
74+
for (order <- Seq(ByteOrder.BIG_ENDIAN, ByteOrder.LITTLE_ENDIAN)) {
75+
describe("Int view of " + description + " - " + order) {
76+
defineTests(new ByteBufferIntViewFactory(byteBufferFactory, order))
77+
}
78+
79+
describe("Read-only Int view of " + description + " - " + order) {
80+
defineTests(new ByteBufferIntViewFactory(byteBufferFactory, order)
81+
with BufferFactory.ReadOnlyBufferFactory)
82+
}
8083
}
8184
}
8285
}

‎test-suite/src/test/scala/org/scalajs/testsuite/niobuffer/LongBufferTest.scala

Lines changed: 11 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,12 +33,13 @@ object LongBufferTest extends BaseBufferTest {
3333
}
3434

3535
class ByteBufferLongViewFactory(
36-
byteBufferFactory: BufferFactory.ByteBufferFactory)
36+
byteBufferFactory: BufferFactory.ByteBufferFactory,
37+
order: ByteOrder)
3738
extends Factory with BufferFactory.ByteBufferViewFactory {
3839
require(!byteBufferFactory.createsReadOnly)
3940

4041
def baseAllocBuffer(capacity: Int): LongBuffer =
41-
byteBufferFactory.allocBuffer(capacity * 8).asLongBuffer()
42+
byteBufferFactory.allocBuffer(capacity * 8).order(order).asLongBuffer()
4243
}
4344

4445
describe("Allocated LongBuffer") {
@@ -58,13 +59,15 @@ object LongBufferTest extends BaseBufferTest {
5859
}
5960

6061
for ((description, byteBufferFactory) <- ByteBufferFactories.WriteableByteBufferFactories) {
61-
describe("Long view of " + description) {
62-
defineTests(new ByteBufferLongViewFactory(byteBufferFactory))
63-
}
62+
for (order <- Seq(ByteOrder.BIG_ENDIAN, ByteOrder.LITTLE_ENDIAN)) {
63+
describe("Long view of " + description + " - " + order) {
64+
defineTests(new ByteBufferLongViewFactory(byteBufferFactory, order))
65+
}
6466

65-
describe("Read-only Long view of " + description) {
66-
defineTests(new ByteBufferLongViewFactory(byteBufferFactory)
67-
with BufferFactory.ReadOnlyBufferFactory)
67+
describe("Read-only Long view of " + description + " - " + order) {
68+
defineTests(new ByteBufferLongViewFactory(byteBufferFactory, order)
69+
with BufferFactory.ReadOnlyBufferFactory)
70+
}
6871
}
6972
}
7073
}

‎test-suite/src/test/scala/org/scalajs/testsuite/niobuffer/ShortBufferTest.scala

Lines changed: 12 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -40,12 +40,13 @@ object ShortBufferTest extends BaseBufferTest {
4040
}
4141

4242
class ByteBufferShortViewFactory(
43-
byteBufferFactory: BufferFactory.ByteBufferFactory)
43+
byteBufferFactory: BufferFactory.ByteBufferFactory,
44+
order: ByteOrder)
4445
extends Factory with BufferFactory.ByteBufferViewFactory {
4546
require(!byteBufferFactory.createsReadOnly)
4647

4748
def baseAllocBuffer(capacity: Int): ShortBuffer =
48-
byteBufferFactory.allocBuffer(capacity * 2).asShortBuffer()
49+
byteBufferFactory.allocBuffer(capacity * 2).order(order).asShortBuffer()
4950
}
5051

5152
describe("Allocated ShortBuffer") {
@@ -70,13 +71,15 @@ object ShortBufferTest extends BaseBufferTest {
7071
}
7172

7273
for ((description, byteBufferFactory) <- ByteBufferFactories.WriteableByteBufferFactories) {
73-
describe("Short view of " + description) {
74-
defineTests(new ByteBufferShortViewFactory(byteBufferFactory))
75-
}
76-
77-
describe("Read-only Short view of " + description) {
78-
defineTests(new ByteBufferShortViewFactory(byteBufferFactory)
79-
with BufferFactory.ReadOnlyBufferFactory)
74+
for (order <- Seq(ByteOrder.BIG_ENDIAN, ByteOrder.LITTLE_ENDIAN)) {
75+
describe("Short view of " + description + " - " + order) {
76+
defineTests(new ByteBufferShortViewFactory(byteBufferFactory, order))
77+
}
78+
79+
describe("Read-only Short view of " + description + " - " + order) {
80+
defineTests(new ByteBufferShortViewFactory(byteBufferFactory, order)
81+
with BufferFactory.ReadOnlyBufferFactory)
82+
}
8083
}
8184
}
8285
}

0 commit comments

Comments
 (0)
0