Skip to content

Commit

Permalink
[hotfix][tests] move assertions out of the finally block
Browse files Browse the repository at this point in the history
There was a potential for them to mask exceptions.
  • Loading branch information
Nico Kruber authored and StefanRRichter committed Jan 9, 2018
1 parent 3345aa7 commit 50f09ad
Showing 1 changed file with 31 additions and 20 deletions.
Expand Up @@ -413,10 +413,10 @@ private void testAddOnFinishedPartition(boolean spilled) throws Exception {
buffer.recycle();
Assert.fail("buffer not recycled");
}
// still same statistics
assertEquals(1, partition.getTotalNumberOfBuffers());
assertEquals(4, partition.getTotalNumberOfBytes());
}
// still same statistics
assertEquals(1, partition.getTotalNumberOfBuffers());
assertEquals(4, partition.getTotalNumberOfBytes());
}

/**
Expand Down Expand Up @@ -451,16 +451,20 @@ private void testAddOnReleasedPartition(boolean spilled) throws Exception {

Buffer buffer = new Buffer(MemorySegmentFactory.allocateUnpooledSegment(4096),
FreeingBufferRecycler.INSTANCE);
boolean bufferRecycled;
try {
partition.add(buffer);
} finally {
if (!buffer.isRecycled()) {
bufferRecycled = buffer.isRecycled();
if (!bufferRecycled) {
buffer.recycle();
Assert.fail("buffer not recycled");
}
assertEquals(0, partition.getTotalNumberOfBuffers());
assertEquals(0, partition.getTotalNumberOfBytes());
}
if (!bufferRecycled) {
Assert.fail("buffer not recycled");
}
assertEquals(0, partition.getTotalNumberOfBuffers());
assertEquals(0, partition.getTotalNumberOfBytes());
}

/**
Expand All @@ -476,17 +480,21 @@ public void testAddOnSpilledPartitionWithSlowWriter() throws Exception {

Buffer buffer = new Buffer(MemorySegmentFactory.allocateUnpooledSegment(4096),
FreeingBufferRecycler.INSTANCE);
boolean bufferRecycled;
try {
partition.add(buffer);
} finally {
ioManager.shutdown();
if (buffer.isRecycled()) {
Assert.fail("buffer recycled before the write operation completed");
bufferRecycled = buffer.isRecycled();
if (!bufferRecycled) {
buffer.recycle();
}
buffer.recycle();
assertEquals(1, partition.getTotalNumberOfBuffers());
assertEquals(4096, partition.getTotalNumberOfBytes());
}
if (bufferRecycled) {
Assert.fail("buffer recycled before the write operation completed");
}
assertEquals(1, partition.getTotalNumberOfBuffers());
assertEquals(4096, partition.getTotalNumberOfBytes());
}

/**
Expand Down Expand Up @@ -549,10 +557,10 @@ private void testReleaseOnSpillablePartitionWithSlowWriter(boolean createView) t
if (!buffer2.isRecycled()) {
buffer2.recycle();
}
// note: a view requires a finished partition which has an additional EndOfPartitionEvent
assertEquals(2 + (createView ? 1 : 0), partition.getTotalNumberOfBuffers());
assertEquals(4096 * 2 + (createView ? 4 : 0), partition.getTotalNumberOfBytes());
}
// note: a view requires a finished partition which has an additional EndOfPartitionEvent
assertEquals(2 + (createView ? 1 : 0), partition.getTotalNumberOfBuffers());
assertEquals(4096 * 2 + (createView ? 4 : 0), partition.getTotalNumberOfBytes());
}

/**
Expand All @@ -569,18 +577,21 @@ public void testAddOnSpilledPartitionWithFailingWriter() throws Exception {

Buffer buffer = new Buffer(MemorySegmentFactory.allocateUnpooledSegment(4096),
FreeingBufferRecycler.INSTANCE);
boolean bufferRecycled;
try {
partition.add(buffer);
} finally {
ioManager.shutdown();

if (!buffer.isRecycled()) {
bufferRecycled = buffer.isRecycled();
if (!bufferRecycled) {
buffer.recycle();
Assert.fail("buffer not recycled");
}
assertEquals(0, partition.getTotalNumberOfBuffers());
assertEquals(0, partition.getTotalNumberOfBytes());
}
if (!bufferRecycled) {
Assert.fail("buffer not recycled");
}
assertEquals(0, partition.getTotalNumberOfBuffers());
assertEquals(0, partition.getTotalNumberOfBytes());
}

private static class AwaitableBufferAvailablityListener implements BufferAvailabilityListener {
Expand Down

0 comments on commit 50f09ad

Please sign in to comment.