Simplify asset reader (#408)

Author: EranBoudjnah

app/src/androidTest/java/com/mitteloupe/whoami/localstore/AppKeyValueStore.kt

@@ -1,7 +1,7 @@
 package com.mitteloupe.whoami.localstore
 
 import com.mitteloupe.whoami.datasource.local.LocalStoreKey.KEY_HISTORY_RECORDS
-import com.mitteloupe.whoami.test.asset.assetReader
+import com.mitteloupe.whoami.test.asset.getAssetAsString
 import com.mitteloupe.whoami.test.localstore.KeyValueStore
 
 const val KEY_VALUE_SAVED_HISTORY = "Saved history"
@@ -15,5 +15,5 @@ class AppKeyValueStore : KeyValueStore() {
             (KEY_HISTORY_RECORDS to assetAsString("localstore/history_no_records.json"))
     )
 
-    private fun assetAsString(assetName: String) = assetReader.getAssetAsString(assetName)
+    private fun assetAsString(assetName: String) = getAssetAsString(assetName)
 }

architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/asset/AssetReader.kt

@@ -2,25 +2,12 @@ package com.mitteloupe.whoami.test.asset
 
 import androidx.test.platform.app.InstrumentationRegistry
 import java.io.InputStream
-import java.io.InputStreamReader
 
-val assetReader = AssetReader()
-
-class AssetReader {
-    fun getAssetAsString(name: String): String =
-        javaClass.classLoader!!.getResourceAsStream("assets/$name").use { stream ->
-            InputStreamReader(stream).use { reader ->
-                reader.readText()
-            }
-        }
-}
+fun getAssetAsString(name: String): String =
+    processAssetStream(name) { stream -> stream.bufferedReader().readText() }
 
 fun <OUTPUT> processAssetStream(
     filename: String,
-    performOnStream: (inputString: InputStream) -> OUTPUT
-): OUTPUT {
-    val stream = InstrumentationRegistry.getInstrumentation().context.assets.open(filename)
-    val result = performOnStream(stream)
-    stream.close()
-    return result
-}
+    performOnStream: (inputStream: InputStream) -> OUTPUT
+): OUTPUT = InstrumentationRegistry.getInstrumentation().context.assets.open(filename)
+    .use { stream -> performOnStream(stream) }

architecture/instrumentation-test/src/main/java/com/mitteloupe/whoami/test/server/response/SimpleResponseFactory.kt

@@ -1,6 +1,6 @@
 package com.mitteloupe.whoami.test.server.response
 
-import com.mitteloupe.whoami.test.asset.assetReader
+import com.mitteloupe.whoami.test.asset.getAssetAsString
 import com.mitteloupe.whoami.test.server.MockResponse
 
 data class SimpleResponseFactory(
@@ -12,7 +12,7 @@ data class SimpleResponseFactory(
         if (bodyFileName == null) {
             ""
         } else {
-            assetReader.getAssetAsString(bodyFileName)
+            getAssetAsString(bodyFileName)
         }
     }