1996fanrui commented on code in PR #24613:
URL: https://github.com/apache/flink/pull/24613#discussion_r1599716736
##########
flink-core/src/test/java/org/apache/flink/types/StringValueSerializationTest.java:
##########
@@ -22,96 +22,71 @@
import org.apache.flink.core.memory.DataOutputViewStreamWrapper;
import org.apache.flink.util.StringUtils;
-import org.junit.Test;
+import org.junit.jupiter.api.Test;
import java.io.ByteArrayInputStream;
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.util.Random;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
/** Test for the serialization of StringValue. */
public class StringValueSerializationTest {
Review Comment:
```suggestion
class StringValueSerializationTest {
```
##########
flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java:
##########
@@ -134,106 +129,82 @@ public void testStringValue() {
StringValue string6 = (StringValue) string0.subSequence(0,
string0.length());
StringValue string7 = (StringValue) string0.subSequence(5, 9);
StringValue string8 = (StringValue) string0.subSequence(0, 0);
- Assert.assertTrue(string0.compareTo(string0) == 0);
- Assert.assertTrue(string0.compareTo(string1) == 0);
- Assert.assertTrue(string0.compareTo(string2) > 0);
- Assert.assertTrue(string0.compareTo(string3) < 0);
- Assert.assertTrue(stringThis.equals(chars5));
- Assert.assertTrue(stringThis.compareTo(string5) == 0);
- Assert.assertTrue(string0.compareTo(string6) == 0);
- Assert.assertTrue(stringIsA.compareTo(string7) == 0);
+ assertThat(string0.compareTo(string0)).isZero();
+ assertThat(string0.compareTo(string1)).isZero();
+ assertThat(string0.compareTo(string2)).isPositive();
+ assertThat(string0.compareTo(string3)).isNegative();
+ assertThat(chars5).isEqualTo(stringThis);
+ assertThat(stringThis.compareTo(string5)).isZero();
+ assertThat(string0.compareTo(string6)).isZero();
+ assertThat(stringIsA.compareTo(string7)).isZero();
string7.setValue("This is a test");
- Assert.assertTrue(stringIsA.compareTo(string7) > 0);
- Assert.assertTrue(string0.compareTo(string7) == 0);
+ assertThat(stringIsA.compareTo(string7)).isPositive();
+ assertThat(string0.compareTo(string7)).isZero();
string7.setValue("is a");
- Assert.assertTrue(stringIsA.compareTo(string7) == 0);
- Assert.assertTrue(string0.compareTo(string7) < 0);
- Assert.assertEquals(stringIsA.hashCode(), string7.hashCode());
- Assert.assertEquals(string7.length(), 4);
- Assert.assertEquals("is a", string7.getValue());
- Assert.assertEquals(string8.length(), 0);
- Assert.assertEquals("", string8.getValue());
- Assert.assertEquals('s', string7.charAt(1));
- try {
- string7.charAt(5);
- Assert.fail(
- "Exception should have been thrown when accessing
characters out of bounds.");
- } catch (IndexOutOfBoundsException iOOBE) {
- // expected
- }
+ assertThat(stringIsA.compareTo(string7)).isZero();
+ assertThat(string0.compareTo(string7)).isNegative();
+ assertThat(string7.hashCode()).isEqualTo(stringIsA.hashCode());
Review Comment:
assertThatComparable and hasSameHashCode
##########
flink-core/src/test/java/org/apache/flink/types/PrimitiveDataTypeTest.java:
##########
@@ -134,106 +129,82 @@ public void testStringValue() {
StringValue string6 = (StringValue) string0.subSequence(0,
string0.length());
StringValue string7 = (StringValue) string0.subSequence(5, 9);
StringValue string8 = (StringValue) string0.subSequence(0, 0);
- Assert.assertTrue(string0.compareTo(string0) == 0);
- Assert.assertTrue(string0.compareTo(string1) == 0);
- Assert.assertTrue(string0.compareTo(string2) > 0);
- Assert.assertTrue(string0.compareTo(string3) < 0);
- Assert.assertTrue(stringThis.equals(chars5));
- Assert.assertTrue(stringThis.compareTo(string5) == 0);
- Assert.assertTrue(string0.compareTo(string6) == 0);
- Assert.assertTrue(stringIsA.compareTo(string7) == 0);
+ assertThat(string0.compareTo(string0)).isZero();
+ assertThat(string0.compareTo(string1)).isZero();
+ assertThat(string0.compareTo(string2)).isPositive();
+ assertThat(string0.compareTo(string3)).isNegative();
+ assertThat(chars5).isEqualTo(stringThis);
+ assertThat(stringThis.compareTo(string5)).isZero();
+ assertThat(string0.compareTo(string6)).isZero();
+ assertThat(stringIsA.compareTo(string7)).isZero();
Review Comment:
assertThatComparable(string0).isEqualByComparingTo(string0);
We can use `assertThatComparable` here.
##########
flink-core/src/test/java/org/apache/flink/types/StringSerializationTest.java:
##########
@@ -33,226 +33,166 @@
import java.util.function.BiConsumer;
import java.util.function.Function;
-import static org.junit.Assert.assertArrayEquals;
-import static org.junit.Assert.assertEquals;
-import static org.junit.Assert.fail;
+import static org.assertj.core.api.Assertions.assertThat;
/** Test for the serialization of Strings through the StringValue class. */
public class StringSerializationTest {
Review Comment:
```suggestion
class StringSerializationTest {
```
--
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]
