From 990610ee292f73e3794338dd1f4b96bd192e106e Mon Sep 17 00:00:00 2001
From: Alexander Molochko <alexander@crosp.net>
Date: Mon, 8 Apr 2019 16:37:34 +0300
Subject: [PATCH] Add manual example, fix names

---
 .../inputstream/InputStreamExtension.kt       |  7 +++--
 .../inputstream/InputStreamToStringTest.kt    | 31 +++++++++++++++----
 2 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/core-kotlin-2/src/main/kotlin/com/baeldung/inputstream/InputStreamExtension.kt b/core-kotlin-2/src/main/kotlin/com/baeldung/inputstream/InputStreamExtension.kt
index 2f765b0193..e94a2e84ee 100644
--- a/core-kotlin-2/src/main/kotlin/com/baeldung/inputstream/InputStreamExtension.kt
+++ b/core-kotlin-2/src/main/kotlin/com/baeldung/inputstream/InputStreamExtension.kt
@@ -2,10 +2,10 @@ package com.baeldung.inputstream
 
 import java.io.InputStream
 
-fun InputStream.readUpToNullChar(nullChar: Char = '\n'): String {
+fun InputStream.readUpToChar(stopChar: Char): String {
     val stringBuilder = StringBuilder()
     var currentChar = this.read().toChar()
-    while (currentChar != nullChar) {
+    while (currentChar != stopChar) {
         stringBuilder.append(currentChar)
         currentChar = this.read().toChar()
         if (this.available() <= 0) {
@@ -14,4 +14,5 @@ fun InputStream.readUpToNullChar(nullChar: Char = '\n'): String {
         }
     }
     return stringBuilder.toString()
-}
\ No newline at end of file
+}
+
diff --git a/core-kotlin-2/src/test/kotlin/com/baeldung/inputstream/InputStreamToStringTest.kt b/core-kotlin-2/src/test/kotlin/com/baeldung/inputstream/InputStreamToStringTest.kt
index d7f0401af0..0a053d61ec 100644
--- a/core-kotlin-2/src/test/kotlin/com/baeldung/inputstream/InputStreamToStringTest.kt
+++ b/core-kotlin-2/src/test/kotlin/com/baeldung/inputstream/InputStreamToStringTest.kt
@@ -10,7 +10,7 @@ class InputStreamToStringTest {
     private val fileName = "src/test/resources/inputstream2string.txt"
     private val fileFullContent = "Computer programming can be a hassle\r\n" +
             "It's like trying to take a defended castle"
-    private val fileContentUpToNullChar = "Computer programming can be a hassle\r\n" +
+    private val fileContentUpToStopChar = "Computer programming can be a hassle\r\n" +
             "It"
 
     @Test
@@ -22,18 +22,37 @@ class InputStreamToStringTest {
     }
 
     @Test
-    fun whenReadFileUpToNullChar_thenPartBeforeNullCharIsReadAsString() {
+    fun whenReadFileWithBufferedReaderManually_thenFullFileContentIsReadAsString() {
         val file = File(fileName)
         val inputStream = file.inputStream()
-        val content = inputStream.use { it.readUpToNullChar('\'') }
-        assertEquals(fileContentUpToNullChar, content)
+        val reader = BufferedReader(inputStream.reader())
+        val content = StringBuilder()
+        try {
+            var line = reader.readLine()
+            while (line != null) {
+                content.append(line)
+                line = reader.readLine()
+            }
+        } finally {
+            reader.close()
+        }
+        assertEquals(fileFullContent.replace("\r\n", ""), content.toString())
+
     }
 
     @Test
-    fun whenReadFileWithoutContainingNullChar_thenFullFileContentIsReadAsString() {
+    fun whenReadFileUpToStopChar_thenPartBeforeStopCharIsReadAsString() {
         val file = File(fileName)
         val inputStream = file.inputStream()
-        val content = inputStream.use { it.readUpToNullChar('-') }
+        val content = inputStream.use { it.readUpToChar('\'') }
+        assertEquals(fileContentUpToStopChar, content)
+    }
+
+    @Test
+    fun whenReadFileWithoutContainingStopChar_thenFullFileContentIsReadAsString() {
+        val file = File(fileName)
+        val inputStream = file.inputStream()
+        val content = inputStream.use { it.readUpToChar('-') }
         assertEquals(fileFullContent, content)
     }