Skip to content

Commit deb8b15

Browse files
committed
fix tests
1 parent b78dd8f commit deb8b15

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

net.lecousin.core/src/main/java/net/lecousin/framework/io/PositionKnownWrapper.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -277,6 +277,7 @@ protected long skipSync(long n) throws IOException {
277277
}
278278

279279
protected AsyncWork<Long, IOException> skipAsync(long n, RunnableWithParameter<Pair<Long, IOException>> ondone) {
280+
if (n <= 0) return IOUtil.success(Long.valueOf(0), ondone);
280281
return ((IO.Readable)io).skipAsync(n, (result) -> {
281282
Long nb = result.getValue1();
282283
if (nb != null)

net.lecousin.core/src/test/java/net/lecousin/framework/core/test/io/TestReadable.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -473,8 +473,8 @@ public void testSkipSyncNegativeValue() throws Exception {
473473
}
474474
skipped = io.skipSync(-2 * testBuf.length);
475475
if (io instanceof IO.Readable.Seekable) {
476-
if (skipped != testBuf.length + testBuf.length / 2)
477-
throw new Exception("Skip beyond beginning of IO on Readable.Seekable is supposed to go to the offset 0. Skipping " + (-2 * testBuf.length) + " returned " + skipped + " but expected was " + (testBuf.length + testBuf.length / 2));
476+
if (skipped != -((testBuf.length + testBuf.length / 2) - 10))
477+
throw new Exception("Skip beyond beginning of IO on Readable.Seekable is supposed to go to the offset 0. Skipping " + (-2 * testBuf.length) + " returned " + skipped + " but expected was " + (-((testBuf.length + testBuf.length / 2) - 10)));
478478
} else {
479479
if (skipped != 0)
480480
throw new Exception("Readable is not supposed to be able to skip with a negative value, skipping -10 bytes returned " + skipped + " while 0 was expected.");

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/buffered/TestTwoBuffersIODeterminedSizeReadable.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ public TestTwoBuffersIODeterminedSizeReadable(File testFile, byte[] testBuf, int
2727
@Override
2828
protected TwoBuffersIO createReadableFromFile(FileIO.ReadOnly file, long fileSize) {
2929
if (fileSize <= 40000)
30-
return new TwoBuffersIO.DeterminedSize(file, (int)fileSize, 0);
30+
return new TwoBuffersIO.DeterminedSize(file, (int)fileSize, 10);
3131
return new TwoBuffersIO.DeterminedSize(file, 40000, (int)(fileSize - 40000));
3232
}
3333

net.lecousin.core/src/test/java/net/lecousin/framework/core/tests/io/buffered/TestTwoBuffersIODeterminedSizeReadableBuffered.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public TestTwoBuffersIODeterminedSizeReadableBuffered(File testFile, byte[] test
2828
protected TwoBuffersIO createReadableBufferedFromFile(FileIO.ReadOnly file, long fileSize) {
2929
if (fileSize <= 40000)
3030
return new TwoBuffersIO.DeterminedSize(file, (int)fileSize, 0);
31-
return new TwoBuffersIO.DeterminedSize(file, 40000, (int)(fileSize - 40000));
31+
return new TwoBuffersIO.DeterminedSize(file, 39990, (int)(fileSize - 39990));
3232
}
3333

3434
}

0 commit comments

Comments
 (0)