Add tests

Author: Artem Labazin

pom.xml

@@ -24,7 +24,7 @@ limitations under the License.
 
   <groupId>io.appulse</groupId>
   <artifactId>utils-java</artifactId>
-  <version>1.13.1</version>
+  <version>1.14.0</version>
   <packaging>jar</packaging>
 
   <properties>
@@ -66,7 +66,7 @@ limitations under the License.
     <url>https://github.com/appulse-projects/utils-java</url>
     <connection>scm:git:https://github.com/appulse-projects/utils-java.git</connection>
     <developerConnection>scm:git:https://github.com/appulse-projects/utils-java.git</developerConnection>
-    <tag>1.13.1</tag>
+    <tag>1.14.0</tag>
   </scm>
 
   <distributionManagement>

src/main/java/io/appulse/utils/ReadBytesUtils.java

@@ -200,23 +200,28 @@ public static int read (@NonNull InputStream inputStream, @NonNull ByteBuffer bu
   @SneakyThrows
   public static int read (@NonNull InputStream inputStream, @NonNull byte[] bytes, int offset, int length) {
     if (offset < 0 || offset >= bytes.length) {
-      val msg = String.format(ENGLISH, "Invalid offset %d. The offset must be equal or greater than 0 and less than byte array length", offset);
+      val msg = String.format(ENGLISH,
+          "Invalid offset %d. The offset must be equal or greater than 0 and less than byte array length",
+          offset
+      );
       throw new IndexOutOfBoundsException(msg);
     }
     if (length < 0) {
       val msg = String.format(ENGLISH, "Invalid length %d. The length must be greater or equal 0", length);
       throw new IndexOutOfBoundsException(msg);
     }
 
+    int position = offset;
     int remaining = Math.min(bytes.length - offset, length);
     while (remaining > 0) {
-      val readed = inputStream.read(bytes, offset + length - remaining, remaining);
+      val readed = inputStream.read(bytes, position, remaining);
       if (readed < 0) {
         break;
       }
+      position += readed;
       remaining -= readed;
     }
-    return offset + length - remaining;
+    return position - offset;
   }
 
   /**
@@ -263,7 +268,10 @@ public static int read (ReadableByteChannel channel, byte[] buffer, int length)
   @SneakyThrows
   public static int read (@NonNull ReadableByteChannel channel, @NonNull byte[] bytes, int offset, int length) {
     if (offset < 0 || offset >= bytes.length) {
-      val msg = String.format(ENGLISH, "Invalid offset %d. The offset must be equal or greater than 0 and less than byte array length", offset);
+      val msg = String.format(ENGLISH,
+          "Invalid offset %d. The offset must be equal or greater than 0 and less than byte array length",
+          offset
+      );
       throw new IndexOutOfBoundsException(msg);
     }
     if (length < 0) {
@@ -277,7 +285,7 @@ public static int read (@NonNull ReadableByteChannel channel, @NonNull byte[] by
     byteBuffer.limit(limit);
 
     int totalReaded = 0;
-    while (true) {
+    while (byteBuffer.hasRemaining()) {
       val readed = channel.read(byteBuffer);
       if (readed < 0) {
         break;

src/main/java/io/appulse/utils/WriteBytesUtils.java

@@ -50,7 +50,10 @@ public static int write (OutputStream outputStream, byte[] buffer, int length) {
   @SneakyThrows
   public static int write (@NonNull OutputStream outputStream, @NonNull byte[] bytes, int offset, int length) {
     if (offset < 0 || offset >= bytes.length) {
-      val msg = String.format(ENGLISH, "Invalid offset %d. The offset must be equal or greater than 0 and less than byte array length", offset);
+      val msg = String.format(ENGLISH,
+          "Invalid offset %d. The offset must be equal or greater than 0 and less than byte array length (%d)",
+          offset, bytes.length
+      );
       throw new IndexOutOfBoundsException(msg);
     }
     if (length < 0) {
@@ -81,13 +84,13 @@ public static int write (@NonNull OutputStream outputStream, @NonNull ByteBuffer
   }
 
   public static int write (OutputStream outputStream, @NonNull Bytes buffer) {
-    return write(outputStream, buffer, buffer.writableBytes());
+    return write(outputStream, buffer, buffer.readableBytes());
   }
 
   public static int write (@NonNull OutputStream outputStream, @NonNull Bytes buffer, int length) {
     val bytes = buffer.array();
-    val written = write(outputStream, bytes, buffer.writerIndex(), length);
-    buffer.writerIndex(buffer.writerIndex() + written);
+    val written = write(outputStream, bytes, buffer.readerIndex(), length);
+    buffer.readerIndex(buffer.readerIndex() + written);
     return written;
   }
 
@@ -102,7 +105,10 @@ public static int write (WritableByteChannel channel, byte[] buffer, int length)
   @SneakyThrows
   public static int write (@NonNull WritableByteChannel channel, @NonNull byte[] bytes, int offset, int length) {
     if (offset < 0 || offset >= bytes.length) {
-      val msg = String.format(ENGLISH, "Invalid offset %d. The offset must be equal or greater than 0 and less than byte array length", offset);
+      val msg = String.format(ENGLISH,
+          "Invalid offset %d. The offset must be equal or greater than 0 and less than byte array length (%d)",
+          offset, bytes.length
+      );
       throw new IndexOutOfBoundsException(msg);
     }
     if (length < 0) {
@@ -121,6 +127,7 @@ public static int write (@NonNull WritableByteChannel channel, @NonNull byte[] b
       if (written < 0) {
         break;
       }
+      totalWritten += written;
     }
     return totalWritten;
   }
@@ -137,13 +144,13 @@ public static int write (@NonNull WritableByteChannel channel, @NonNull ByteBuff
   }
 
   public static int write (WritableByteChannel channel, @NonNull Bytes buffer) {
-    return write(channel, buffer, buffer.writableBytes());
+    return write(channel, buffer, buffer.readableBytes());
   }
 
   public static int write (@NonNull WritableByteChannel channel, @NonNull Bytes buffer, int length) {
     val bytes = buffer.array();
-    val written = write(channel, bytes, buffer.writerIndex(), length);
-    buffer.writerIndex(buffer.writerIndex() + written);
+    val written = write(channel, bytes, buffer.readerIndex(), length);
+    buffer.readerIndex(buffer.readerIndex() + written);
     return written;
   }
 
@@ -168,7 +175,7 @@ public static int write (@NonNull File file, ByteBuffer buffer, int length) {
   }
 
   public static int write (File file, @NonNull Bytes buffer) {
-    return write(file, buffer, buffer.writableBytes());
+    return write(file, buffer, buffer.readableBytes());
   }
 
   public static int write (@NonNull File file, Bytes buffer, int length) {
@@ -202,7 +209,7 @@ public static int write (@NonNull Path path, ByteBuffer buffer, int length) {
   }
 
   public static int write (Path path, @NonNull Bytes buffer) {
-    return write(path, buffer, buffer.writableBytes());
+    return write(path, buffer, buffer.readableBytes());
   }
 
   @SneakyThrows