diff options
7 files changed, 8 insertions, 8 deletions
diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectByteBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectByteBufferTest.java index 517973c7b9..642688ff5c 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectByteBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectByteBufferTest.java @@ -25,7 +25,7 @@ public class DirectByteBufferTest extends ByteBufferTest { protected void setUp() throws Exception { super.setUp(); - buf = ByteBuffer.allocateDirect(BUFFER_LENGTH); + buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*Byte.BYTES); baseBuf = buf; } diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java index a276b02110..6d25de93c8 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectCharBufferTest.java @@ -24,7 +24,7 @@ import java.nio.NIOAccess; public class DirectCharBufferTest extends CharBufferTest { public void setUp(){ - buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*2).asCharBuffer(); + buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*Character.BYTES).asCharBuffer(); super.loadTestData1(buf); baseBuf = buf; } diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java index dff392b8b9..cd99312a21 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectDoubleBufferTest.java @@ -23,7 +23,7 @@ import java.nio.NIOAccess; public class DirectDoubleBufferTest extends DoubleBufferTest { public void setUp(){ - buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*8).asDoubleBuffer(); + buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*Double.BYTES).asDoubleBuffer(); loadTestData1(buf); baseBuf = buf; } diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java index c52065cca0..0812d53272 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectFloatBufferTest.java @@ -23,7 +23,7 @@ import java.nio.NIOAccess; public class DirectFloatBufferTest extends FloatBufferTest { public void setUp(){ - buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*4).asFloatBuffer(); + buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*Float.BYTES).asFloatBuffer(); loadTestData1(buf); baseBuf = buf; } diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java index 0a66e7261c..68bd896ce0 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectIntBufferTest.java @@ -23,7 +23,7 @@ import java.nio.NIOAccess; public class DirectIntBufferTest extends IntBufferTest { public void setUp(){ - buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*4).asIntBuffer(); + buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*Integer.BYTES).asIntBuffer(); loadTestData1(buf); baseBuf = buf; } diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java index bd54ee469d..ef017f4763 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectLongBufferTest.java @@ -23,7 +23,7 @@ import java.nio.NIOAccess; public class DirectLongBufferTest extends LongBufferTest { public void setUp(){ - buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*8).asLongBuffer(); + buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*Long.BYTES).asLongBuffer(); loadTestData1(buf); baseBuf = buf; } diff --git a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java index e84eb66659..a3ce9958d7 100644 --- a/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java +++ b/harmony-tests/src/test/java/org/apache/harmony/tests/java/nio/DirectShortBufferTest.java @@ -23,7 +23,7 @@ import java.nio.ShortBuffer; public class DirectShortBufferTest extends ShortBufferTest { public void setUp(){ - buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*2).asShortBuffer(); + buf = ByteBuffer.allocateDirect(BUFFER_LENGTH*Short.BYTES).asShortBuffer(); loadTestData1(buf); baseBuf = buf; } @@ -55,7 +55,7 @@ public class DirectShortBufferTest extends ShortBufferTest { } // http://b/28964300 - public void testJNIAccessByAddress() throws Exception { + public void testJNIAccessByAddress() { DirectByteBuffer directByteBuffer = (DirectByteBuffer) ByteBuffer.allocateDirect(10); directByteBuffer.put((byte)'a'); ShortBuffer shortBuffer = directByteBuffer.asShortBuffer(); |