1996fanrui commented on code in PR #23200:
URL: https://github.com/apache/flink/pull/23200#discussion_r1292790559
##########
flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/BatchShuffleReadBufferPoolTest.java:
##########
@@ -172,20 +171,20 @@ public void testBufferFulfilledByRecycledBuffers() throws
Exception {
requestThread.join();
}
- assertNull(exception.get());
- assertEquals(0, bufferPool.getAvailableBuffers());
- assertEquals(8, buffers.size());
+ assertThat(exception.get()).isNull();
+ assertThat(bufferPool.getAvailableBuffers()).isEqualTo(0);
Review Comment:
```suggestion
assertThat(bufferPool.getAvailableBuffers()).isZero();
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/SpillingBufferTest.java:
##########
@@ -196,11 +199,12 @@ public void testWriteReadTooMuchInMemory() throws
Exception {
int k2 = readRec.f0;
String v2 = readRec.f1;
- Assert.assertTrue(
- "The re-generated and the notifyNonEmpty record do not
match.",
- k1 == k2 && v1.equals(v2));
+ assertThat(k1 == k2 && v1.equals(v2))
+ .withFailMessage(
+ "The re-generated and the notifyNonEmpty
record do not match.")
+ .isTrue();
}
- Assert.fail("Read too much, expected EOFException.");
+ fail("Read too much, expected EOFException.");
} catch (EOFException eofex) {
Review Comment:
Could using the `assertThatThrownBy` instead of `fail` and `catch`?
##########
flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/FileChannelManagerImplTest.java:
##########
@@ -130,24 +132,27 @@ private void testDirectoriesCleanupOnKill(boolean
callerHasHook) throws Exceptio
Runtime.getRuntime()
.exec("kill " +
fileChannelManagerTestProcess.getProcessId());
kill.waitFor();
- assertEquals("Failed to send SIG_TERM to process", 0,
kill.exitValue());
+ assertThat(kill.exitValue())
+ .withFailMessage("Failed to send SIG_TERM to process")
+ .isEqualTo(0);
Review Comment:
```suggestion
.isZero();
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/BatchShuffleReadBufferPoolTest.java:
##########
@@ -220,52 +219,52 @@ public void testMultipleThreadRequestAndRecycle() throws
Exception {
requestThread.join();
}
- assertNull(exception.get());
- assertEquals(bufferPool.getNumTotalBuffers(),
bufferPool.getAvailableBuffers());
+ assertThat(exception.get()).isNull();
+
assertThat(bufferPool.getAvailableBuffers()).isEqualTo(bufferPool.getNumTotalBuffers());
} finally {
bufferPool.destroy();
}
}
@Test
- public void testDestroy() throws Exception {
+ void testDestroy() throws Exception {
BatchShuffleReadBufferPool bufferPool = createBufferPool();
List<MemorySegment> buffers = bufferPool.requestBuffers();
bufferPool.recycle(buffers);
- assertFalse(bufferPool.isDestroyed());
- assertEquals(bufferPool.getNumTotalBuffers(),
bufferPool.getAvailableBuffers());
+ assertThat(bufferPool.isDestroyed()).isFalse();
+
assertThat(bufferPool.getAvailableBuffers()).isEqualTo(bufferPool.getNumTotalBuffers());
buffers = bufferPool.requestBuffers();
- assertEquals(
- bufferPool.getNumTotalBuffers() - buffers.size(),
bufferPool.getAvailableBuffers());
+ assertThat(bufferPool.getAvailableBuffers())
+ .isEqualTo(bufferPool.getNumTotalBuffers() - buffers.size());
bufferPool.destroy();
- assertTrue(bufferPool.isDestroyed());
- assertEquals(0, bufferPool.getAvailableBuffers());
+ assertThat(bufferPool.isDestroyed()).isTrue();
+ assertThat(bufferPool.getAvailableBuffers()).isEqualTo(0);
}
- @Test(expected = IllegalStateException.class)
- public void testRequestBuffersAfterDestroyed() throws Exception {
+ @Test
+ void testRequestBuffersAfterDestroyed() throws Exception {
BatchShuffleReadBufferPool bufferPool = createBufferPool();
bufferPool.requestBuffers();
bufferPool.destroy();
- bufferPool.requestBuffers();
+
assertThatThrownBy(bufferPool::requestBuffers).isInstanceOf(IllegalStateException.class);
}
@Test
- public void testRecycleAfterDestroyed() throws Exception {
+ void testRecycleAfterDestroyed() throws Exception {
BatchShuffleReadBufferPool bufferPool = createBufferPool();
List<MemorySegment> buffers = bufferPool.requestBuffers();
bufferPool.destroy();
bufferPool.recycle(buffers);
- assertEquals(0, bufferPool.getAvailableBuffers());
+ assertThat(bufferPool.getAvailableBuffers()).isEqualTo(0);
Review Comment:
```suggestion
assertThat(bufferPool.getAvailableBuffers()).isZero();
```
##########
flink-runtime/src/test/java/org/apache/flink/runtime/io/disk/BatchShuffleReadBufferPoolTest.java:
##########
@@ -220,52 +219,52 @@ public void testMultipleThreadRequestAndRecycle() throws
Exception {
requestThread.join();
}
- assertNull(exception.get());
- assertEquals(bufferPool.getNumTotalBuffers(),
bufferPool.getAvailableBuffers());
+ assertThat(exception.get()).isNull();
+
assertThat(bufferPool.getAvailableBuffers()).isEqualTo(bufferPool.getNumTotalBuffers());
} finally {
bufferPool.destroy();
}
}
@Test
- public void testDestroy() throws Exception {
+ void testDestroy() throws Exception {
BatchShuffleReadBufferPool bufferPool = createBufferPool();
List<MemorySegment> buffers = bufferPool.requestBuffers();
bufferPool.recycle(buffers);
- assertFalse(bufferPool.isDestroyed());
- assertEquals(bufferPool.getNumTotalBuffers(),
bufferPool.getAvailableBuffers());
+ assertThat(bufferPool.isDestroyed()).isFalse();
+
assertThat(bufferPool.getAvailableBuffers()).isEqualTo(bufferPool.getNumTotalBuffers());
buffers = bufferPool.requestBuffers();
- assertEquals(
- bufferPool.getNumTotalBuffers() - buffers.size(),
bufferPool.getAvailableBuffers());
+ assertThat(bufferPool.getAvailableBuffers())
+ .isEqualTo(bufferPool.getNumTotalBuffers() - buffers.size());
bufferPool.destroy();
- assertTrue(bufferPool.isDestroyed());
- assertEquals(0, bufferPool.getAvailableBuffers());
+ assertThat(bufferPool.isDestroyed()).isTrue();
+ assertThat(bufferPool.getAvailableBuffers()).isEqualTo(0);
Review Comment:
```suggestion
assertThat(bufferPool.getAvailableBuffers()).isZero();
```
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
