Improve tests

- got rid of duplicate checks
- started verifying segment's content for bulk reads

Author: fzhinkin

core/common/test/unsafe/UnsafeBufferOperationsReadTest.kt

@@ -25,7 +25,6 @@ class UnsafeBufferOperationsReadTest {
         val head = buffer.head!!
         UnsafeBufferOperations.readFromHead(buffer) { data, startIndex, endIndex ->
             assertTrue(endIndex <= data.size)
-            assertEquals(head.size, endIndex - startIndex)
             assertEquals(0, startIndex)
             assertEquals(head.size, endIndex)
             0
@@ -75,17 +74,21 @@ class UnsafeBufferOperationsReadTest {
 
     @Test
     fun readFromTheSegmentEnd() {
-        val buffer = Buffer().apply { write(ByteArray(9000) { 0xff.toByte() }) }
-        buffer.skip(8190)
+        val segmentSize = UnsafeBufferOperations.maxSafeWriteCapacity
+        val extraBytesCount = 128
+        val bytesToSkip = segmentSize - 2
+
+        val buffer = Buffer().apply { write(ByteArray(segmentSize + extraBytesCount) { 0xff.toByte() }) }
+        buffer.skip(bytesToSkip.toLong())
         val head = buffer.head!!
-        assertEquals(8190, head.pos)
+        assertEquals(bytesToSkip, head.pos)
 
         UnsafeBufferOperations.readFromHead(buffer) { _, startIndex, endIndex ->
             assertEquals(2, endIndex - startIndex)
             2
         }
 
-        assertEquals(9000 - 8192, buffer.size.toInt())
+        assertEquals(extraBytesCount, buffer.size.toInt())
     }
 
 

core/common/test/unsafe/UnsafeBufferOperationsWriteTest.kt

@@ -19,7 +19,7 @@ class UnsafeBufferOperationsWriteTest {
         UnsafeBufferOperations.writeToTail(buffer, 1) { data, startIndex, endIndex ->
             // Unsafe check, head is not committed yet
             assertSame(buffer.head!!.data, data)
-            assertEquals(buffer.head!!.data.size, (endIndex - startIndex))
+
             assertEquals(0, startIndex)
             assertEquals(buffer.head!!.data.size, endIndex)
             0
@@ -128,4 +128,16 @@ class UnsafeBufferOperationsWriteTest {
 
         assertTrue(buffer.exhausted())
     }
+
+    @Test
+    fun returnLessBytesThanItWasActuallyWritten() {
+        val buffer = Buffer()
+
+        UnsafeBufferOperations.writeToTail(buffer, 42) { data, pos, limit ->
+            data.fill(0xab.toByte(), pos, limit)
+            4
+        }
+        assertEquals(4, buffer.size)
+        assertEquals(0xababababu, buffer.readUInt())
+    }
 }

core/jvm/test/unsafe/UnsafeBufferOperationsJvmReadBulkTest.kt

@@ -90,9 +90,20 @@ class UnsafeBufferOperationsJvmReadBulkTest {
             assertEquals(4, iovecLen)
 
             assertEquals(Segment.SIZE, array[0]!!.remaining())
+            val tmpBuffer = ByteArray(Segment.SIZE)
+            array[0]!!.get(tmpBuffer)
+            assertContentEquals(ByteArray(Segment.SIZE) { 1 }, tmpBuffer)
+
             assertEquals(Segment.SIZE, array[1]!!.remaining())
+            array[1]!!.get(tmpBuffer)
+            assertContentEquals(ByteArray(Segment.SIZE) { 2 }, tmpBuffer)
+
             assertEquals(Segment.SIZE, array[2]!!.remaining())
+            array[2]!!.get(tmpBuffer)
+            assertContentEquals(ByteArray(Segment.SIZE) { 3 }, tmpBuffer)
+
             assertEquals(1, array[3]!!.remaining())
+            assertEquals(3, array[3]!!.get())
 
             buffer.size
         }
@@ -112,9 +123,20 @@ class UnsafeBufferOperationsJvmReadBulkTest {
             assertEquals(4, iovecLen)
 
             assertEquals(Segment.SIZE, array[0]!!.remaining())
+            val tmpBuffer = ByteArray(Segment.SIZE)
+            array[0]!!.get(tmpBuffer)
+            assertContentEquals(ByteArray(Segment.SIZE) { 1 }, tmpBuffer)
+
             assertEquals(Segment.SIZE, array[1]!!.remaining())
+            array[1]!!.get(tmpBuffer)
+            assertContentEquals(ByteArray(Segment.SIZE) { 2 }, tmpBuffer)
+
             assertEquals(Segment.SIZE, array[2]!!.remaining())
+            array[2]!!.get(tmpBuffer)
+            assertContentEquals(ByteArray(Segment.SIZE) { 3 }, tmpBuffer)
+
             assertEquals(1, array[3]!!.remaining())
+            assertEquals(3, array[3]!!.get())
 
             0
         }

core/jvm/test/unsafe/UnsafeBufferOperationsJvmReadFromHeadTest.kt

@@ -84,17 +84,21 @@ class UnsafeBufferOperationsJvmReadFromHeadTest {
 
     @Test
     fun readFromTheSegmentEnd() {
-        val buffer = Buffer().apply { write(ByteArray(9000) { 0xff.toByte() }) }
-        buffer.skip(8190)
+        val segmentSize = UnsafeBufferOperations.maxSafeWriteCapacity
+        val extraBytesCount = 128
+        val bytesToSkip = segmentSize - 2
+
+        val buffer = Buffer().apply { write(ByteArray(segmentSize + extraBytesCount) { 0xff.toByte() }) }
+        buffer.skip(bytesToSkip.toLong())
         val head = buffer.head!!
-        assertEquals(8190, head.pos)
+        assertEquals(bytesToSkip, head.pos)
 
         UnsafeBufferOperations.readFromHead(buffer) { bb ->
-            assertEquals(2, bb.remaining())
+            assertEquals(segmentSize - bytesToSkip, bb.remaining())
             bb.getShort()
         }
 
-        assertEquals(9000 - 8192, buffer.size.toInt())
+        assertEquals(extraBytesCount, buffer.size.toInt())
     }
 
     @Test