master - fixed off-by-one in buffer state tail index.

masterwok · Jul 31, 2018 · 1e6351c · 1e6351c
1 parent 454b5fd
commit 1e6351c
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...roid/src/main/java/com/masterwok/simpletorrentandroid/models/TorrentSessionBufferState.kt b/...roid/src/main/java/com/masterwok/simpletorrentandroid/models/TorrentSessionBufferState.kt
@@ -24,7 +24,7 @@ class TorrentSessionBufferState constructor(
             field = value
         }
 
-    var bufferTailIndex = startIndex + bufferSize
+    var bufferTailIndex = startIndex + bufferSize - 1
         @Synchronized
         get() = field
         private set(value) {

diff --git a/...android/src/test/java/com/masterwok/simpletorrentandroid/TorrentSessionBufferStateTest.kt b/...android/src/test/java/com/masterwok/simpletorrentandroid/TorrentSessionBufferStateTest.kt
@@ -22,7 +22,7 @@ class TorrentSessionBufferStateTest {
             bufferHeadIndex: Int
             , endIndex: Int
             , bufferSize: Int
-    ): Int = Math.min(bufferHeadIndex + bufferSize, endIndex)
+    ): Int = Math.min(bufferHeadIndex + bufferSize - 1, endIndex)
 
     private fun IntRange.random(): Int {
         return Random().nextInt((endInclusive + 1) - start) + start
@@ -185,8 +185,14 @@ class TorrentSessionBufferStateTest {
 
         underTest.setPieceDownloaded(0)
 
+        val expectedTail = getExpectedTailIndex(
+                underTest.bufferHeadIndex
+                , underTest.endIndex
+                , bufferSize
+        )
+
         assertEquals(underTest.bufferHeadIndex, 30)
-        assertEquals(underTest.bufferTailIndex, Math.min(underTest.bufferHeadIndex + bufferSize, endIndex))
+        assertEquals(underTest.bufferTailIndex, Math.min(expectedTail, endIndex))
     }
 
     @Test