Closes issue mozilla-mobile#8202: Increase downloadJobState.currentBy…

…tesCopied in copyInChunks.
Amejia481 · Aug 24, 2020 · 051ce48 · 051ce48
1 parent 3d47143
commit 051ce48
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 2 deletions.
diff --git a/...nloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt b/...nloads/src/main/java/mozilla/components/feature/downloads/AbstractFetchDownloadService.kt
@@ -621,7 +621,8 @@ abstract class AbstractFetchDownloadService : Service() {
         }
     }
 
-    private fun copyInChunks(downloadJobState: DownloadJobState, inStream: InputStream, outStream: OutputStream) {
+    @VisibleForTesting
+    internal fun copyInChunks(downloadJobState: DownloadJobState, inStream: InputStream, outStream: OutputStream) {
         val data = ByteArray(CHUNK_SIZE)
         logger.debug("starting copyInChunks ${downloadJobState.state.url}" +
                 " currentBytesCopied ${downloadJobState.currentBytesCopied}")
@@ -632,9 +633,10 @@ abstract class AbstractFetchDownloadService : Service() {
 
             // If bytesRead is -1, there's no data left to read from the stream
             if (bytesRead == -1) { break }
+            downloadJobState.currentBytesCopied += bytesRead
 
             val newState = downloadJobState.state.copy(
-                currentBytesCopied = downloadJobState.currentBytesCopied + bytesRead
+                currentBytesCopied = downloadJobState.currentBytesCopied
             )
             updateDownloadState(newState)
 

diff --git a/...ds/src/test/java/mozilla/components/feature/downloads/AbstractFetchDownloadServiceTest.kt b/...ds/src/test/java/mozilla/components/feature/downloads/AbstractFetchDownloadServiceTest.kt
@@ -1375,4 +1375,19 @@ class AbstractFetchDownloadServiceTest {
 
         assertTrue(downloadJobState.canUpdateNotification())
     }
+
+    @Test
+    fun `copyInChunks must alter download currentBytesCopied`() = runBlocking {
+        val downloadJobState = DownloadJobState(state = mock(), status = DOWNLOADING)
+        val inputStream = mock<InputStream>()
+
+        assertEquals(0, downloadJobState.currentBytesCopied)
+
+        doReturn(15, -1).`when`(inputStream).read(any())
+        doNothing().`when`(service).updateDownloadState(any())
+
+        service.copyInChunks(downloadJobState, inputStream, mock())
+
+        assertEquals(15, downloadJobState.currentBytesCopied)
+    }
 }