Update test code for off-heap feature

In TestUnsafeCopyMemory.testCopyLargeArrayIntoRawMemory(), arrayBaseOffset has been used to generate the arbitrary arrayOffsets for copy, the original test assume that arrayBaseOffset is positive number( array header size), but for off-heap enabled case arrayBaseOffset =0, which could cause negative offset for testing copy(trigger exceptions), update the test code to avoid negative offset for copying. Signed-off-by: lhu <[email protected]>
eclipse-openj9 · Oct 15, 2024 · 2cc2a95 · 2cc2a95
1 parent c2b29a6
commit 2cc2a95
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 3 deletions.
diff --git a/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeCopyMemory.java b/test/functional/UnsafeTest/src_80/org/openj9/test/unsafe/TestUnsafeCopyMemory.java
@@ -967,7 +967,12 @@ private void testCopyLargeArrayIntoRawMemory(Class arrayClass) {
 			Array.setByte(array, i, (byte) (i % Byte.SIZE));
 		}
 
-		for (long arrayOffset = baseOffset; arrayOffset < (baseOffset + maxNumBytes); arrayOffset = arrayOffset * 11 - 1) {
+		/* 
+			For off-heap eanbled case initial arrayOffset would be 0 (baseOffset=0), 
+			cause the next arrayOffset in loop become to negative (arrayOffset*11-1),
+			update logic for the next arrayOffset to avoid negative offset test case.
+		*/
+		for (long arrayOffset = baseOffset; arrayOffset < (baseOffset + maxNumBytes); arrayOffset = ((arrayOffset==0) ? 16 : arrayOffset) * 11 - 1 ) {
 			long maxNumBytesLeft = ((baseOffset + maxNumBytes) - arrayOffset);
 			for (long numBytesToCopy = 1; numBytesToCopy < maxNumBytesLeft; numBytesToCopy = (numBytesToCopy + 1)
 					* numBytesToCopy) {

diff --git a/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCopyMemory.java b/test/functional/UnsafeTest/src_90/org/openj9/test/unsafe/TestUnsafeCopyMemory.java
@@ -967,7 +967,12 @@ private void testCopyLargeArrayIntoRawMemory(Class arrayClass) {
 			Array.setByte(array, i, (byte) (i % Byte.SIZE));
 		}
 
-		for (long arrayOffset = baseOffset; arrayOffset < (baseOffset + maxNumBytes); arrayOffset = arrayOffset * 11 - 1) {
+		/* 
+			For off-heap eanbled case initial arrayOffset would be 0 (baseOffset=0), 
+			cause the next arrayOffset in loop become to negative (arrayOffset*11-1),
+			update logic for the next arrayOffset to avoid negative offset test case.
+		*/
+		for (long arrayOffset = baseOffset; arrayOffset < (baseOffset + maxNumBytes); arrayOffset = ((arrayOffset==0) ? 16 : arrayOffset) * 11 - 1 ) {
 			long maxNumBytesLeft = ((baseOffset + maxNumBytes) - arrayOffset);
 			for (long numBytesToCopy = 1; numBytesToCopy < maxNumBytesLeft; numBytesToCopy = (numBytesToCopy + 1)
 					* numBytesToCopy) {

diff --git a/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeCopyMemoryTest.java b/test/functional/VM_Test/src/j9vm/test/unsafe/UnsafeCopyMemoryTest.java
@@ -390,7 +390,12 @@ public void testCopyLargeArrayIntoRawMemory(Class arrayClass) {
 			Array.setByte(array, i, (byte)(i % Byte.SIZE));	
 		}
 
-		for (long arrayOffset = baseOffset ; arrayOffset < (baseOffset + maxNumBytes) ; arrayOffset = arrayOffset * 11 - 1 ) {
+		/* 
+			For off-heap eanbled case initial arrayOffset would be 0 (baseOffset=0), 
+			cause the next arrayOffset in loop become to negative (arrayOffset*11-1),
+			update logic for the next arrayOffset to avoid negative offset test case.
+		*/
+		for (long arrayOffset = baseOffset; arrayOffset < (baseOffset + maxNumBytes); arrayOffset = ((arrayOffset==0) ? 16 : arrayOffset) * 11 - 1 ) {
 			long maxNumBytesLeft = ((baseOffset + maxNumBytes) - arrayOffset) ;
 			for (long numBytesToCopy = 1 ; numBytesToCopy < maxNumBytesLeft ; numBytesToCopy = (numBytesToCopy + 1) * numBytesToCopy) {
 				long memoryPointer = myUnsafe.allocateMemory(maxNumBytes);