Fixed possible mistake of CapInputStream

yegor256 · Oct 3, 2024 · c28275d · c28275d
1 parent 3657add
commit c28275d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/src/main/java/org/takes/rq/CapInputStream.java b/src/main/java/org/takes/rq/CapInputStream.java
@@ -96,7 +96,10 @@ public int read(final byte[] buf, final int off,
 
     @Override
     public long skip(final long num) throws IOException {
-        return this.origin.skip(num);
+        final long nskip = Math.min(num, this.more);
+        final long skipped = this.origin.skip(nskip);
+        this.more -= skipped;
+        return skipped;
     }
 
     @Override

diff --git a/src/test/java/org/takes/rq/CapInputStreamTest.java b/src/test/java/org/takes/rq/CapInputStreamTest.java
@@ -67,4 +67,11 @@ void skipsOnStream() throws Exception {
         Mockito.verify(stream, Mockito.times(1)).skip(skip);
     }
 
+    @Test
+    void skipRespectsCap() throws IOException {
+        final InputStream stream = new ByteArrayInputStream(new byte[100]);
+        final CapInputStream wrapper = new CapInputStream(stream, 50L);
+        final long skipped = wrapper.skip(75L);
+        MatcherAssert.assertThat(skipped, Matchers.equalTo(50L));
+    }
 }