nastra commented on code in PR #9341:
URL: https://github.com/apache/iceberg/pull/9341#discussion_r1432755921
##########
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/TestHelpers.java:
##########
@@ -304,86 +294,77 @@ private static void assertEqualsUnsafe(Type type, Object
expected, Object actual
switch (type.typeId()) {
case LONG:
- Assertions.assertThat(actual).as("Should be a
long").isInstanceOf(Long.class);
+ assertThat(actual).as("Should be a long").isInstanceOf(Long.class);
if (expected instanceof Integer) {
- Assert.assertEquals("Values didn't match", ((Number)
expected).longValue(), actual);
+ assertThat(actual).as("Values didn't match").isEqualTo(((Number)
expected).longValue());
} else {
- Assert.assertEquals("Primitive value should be equal to expected",
expected, actual);
+ assertThat(actual).as("Primitive value should be equal to
expected").isEqualTo(expected);
}
break;
case DOUBLE:
- Assertions.assertThat(actual).as("Should be a
double").isInstanceOf(Double.class);
+ assertThat(actual).as("Should be a double").isInstanceOf(Double.class);
if (expected instanceof Float) {
- Assert.assertEquals(
- "Values didn't match",
- Double.doubleToLongBits(((Number) expected).doubleValue()),
- Double.doubleToLongBits((double) actual));
+ assertThat(Double.doubleToLongBits((double) actual))
+ .as("Values didn't match")
+ .isEqualTo(Double.doubleToLongBits(((Number)
expected).doubleValue()));
} else {
- Assert.assertEquals("Primitive value should be equal to expected",
expected, actual);
+ assertThat(actual).as("Primitive value should be equal to
expected").isEqualTo(expected);
}
break;
case INTEGER:
case FLOAT:
case BOOLEAN:
case DATE:
case TIMESTAMP:
- Assert.assertEquals("Primitive value should be equal to expected",
expected, actual);
+ assertThat(actual).as("Primitive value should be equal to
expected").isEqualTo(expected);
break;
case STRING:
- Assertions.assertThat(actual).as("Should be a
UTF8String").isInstanceOf(UTF8String.class);
- Assert.assertEquals("Strings should be equal", expected,
actual.toString());
+ assertThat(actual).as("Should be a
UTF8String").isInstanceOf(UTF8String.class);
+ assertThat(actual.toString()).as("Strings should be
equal").isEqualTo(expected);
break;
case UUID:
- Assertions.assertThat(expected).as("Should expect a
UUID").isInstanceOf(UUID.class);
- Assertions.assertThat(actual).as("Should be a
UTF8String").isInstanceOf(UTF8String.class);
- Assert.assertEquals(
- "UUID string representation should match", expected.toString(),
actual.toString());
+ assertThat(expected).as("Should expect a
UUID").isInstanceOf(UUID.class);
+ assertThat(actual).as("Should be a
UTF8String").isInstanceOf(UTF8String.class);
+ assertThat(actual.toString())
+ .as("UUID string representation should match")
+ .isEqualTo(String.valueOf(expected));
break;
case FIXED:
- Assertions.assertThat(expected)
- .as("Should expect a Fixed")
- .isInstanceOf(GenericData.Fixed.class);
- Assertions.assertThat(actual).as("Should be a
byte[]").isInstanceOf(byte[].class);
- Assert.assertArrayEquals(
- "Bytes should match", ((GenericData.Fixed) expected).bytes(),
(byte[]) actual);
+ assertThat(expected).as("Should expect a
Fixed").isInstanceOf(GenericData.Fixed.class);
+ assertThat(actual).as("Should be a byte[]").isInstanceOf(byte[].class);
+ assertThat((byte[]) actual)
Review Comment:
I think this cast isn't needed
##########
spark/v3.5/spark/src/test/java/org/apache/iceberg/spark/data/TestHelpers.java:
##########
@@ -304,86 +294,77 @@ private static void assertEqualsUnsafe(Type type, Object
expected, Object actual
switch (type.typeId()) {
case LONG:
- Assertions.assertThat(actual).as("Should be a
long").isInstanceOf(Long.class);
+ assertThat(actual).as("Should be a long").isInstanceOf(Long.class);
if (expected instanceof Integer) {
- Assert.assertEquals("Values didn't match", ((Number)
expected).longValue(), actual);
+ assertThat(actual).as("Values didn't match").isEqualTo(((Number)
expected).longValue());
} else {
- Assert.assertEquals("Primitive value should be equal to expected",
expected, actual);
+ assertThat(actual).as("Primitive value should be equal to
expected").isEqualTo(expected);
}
break;
case DOUBLE:
- Assertions.assertThat(actual).as("Should be a
double").isInstanceOf(Double.class);
+ assertThat(actual).as("Should be a double").isInstanceOf(Double.class);
if (expected instanceof Float) {
- Assert.assertEquals(
- "Values didn't match",
- Double.doubleToLongBits(((Number) expected).doubleValue()),
- Double.doubleToLongBits((double) actual));
+ assertThat(Double.doubleToLongBits((double) actual))
+ .as("Values didn't match")
+ .isEqualTo(Double.doubleToLongBits(((Number)
expected).doubleValue()));
} else {
- Assert.assertEquals("Primitive value should be equal to expected",
expected, actual);
+ assertThat(actual).as("Primitive value should be equal to
expected").isEqualTo(expected);
}
break;
case INTEGER:
case FLOAT:
case BOOLEAN:
case DATE:
case TIMESTAMP:
- Assert.assertEquals("Primitive value should be equal to expected",
expected, actual);
+ assertThat(actual).as("Primitive value should be equal to
expected").isEqualTo(expected);
break;
case STRING:
- Assertions.assertThat(actual).as("Should be a
UTF8String").isInstanceOf(UTF8String.class);
- Assert.assertEquals("Strings should be equal", expected,
actual.toString());
+ assertThat(actual).as("Should be a
UTF8String").isInstanceOf(UTF8String.class);
+ assertThat(actual.toString()).as("Strings should be
equal").isEqualTo(expected);
break;
case UUID:
- Assertions.assertThat(expected).as("Should expect a
UUID").isInstanceOf(UUID.class);
- Assertions.assertThat(actual).as("Should be a
UTF8String").isInstanceOf(UTF8String.class);
- Assert.assertEquals(
- "UUID string representation should match", expected.toString(),
actual.toString());
+ assertThat(expected).as("Should expect a
UUID").isInstanceOf(UUID.class);
+ assertThat(actual).as("Should be a
UTF8String").isInstanceOf(UTF8String.class);
+ assertThat(actual.toString())
+ .as("UUID string representation should match")
+ .isEqualTo(String.valueOf(expected));
break;
case FIXED:
- Assertions.assertThat(expected)
- .as("Should expect a Fixed")
- .isInstanceOf(GenericData.Fixed.class);
- Assertions.assertThat(actual).as("Should be a
byte[]").isInstanceOf(byte[].class);
- Assert.assertArrayEquals(
- "Bytes should match", ((GenericData.Fixed) expected).bytes(),
(byte[]) actual);
+ assertThat(expected).as("Should expect a
Fixed").isInstanceOf(GenericData.Fixed.class);
+ assertThat(actual).as("Should be a byte[]").isInstanceOf(byte[].class);
+ assertThat((byte[]) actual)
+ .as("Bytes should match")
+ .isEqualTo(((GenericData.Fixed) expected).bytes());
break;
case BINARY:
- Assertions.assertThat(expected)
- .as("Should expect a ByteBuffer")
- .isInstanceOf(ByteBuffer.class);
- Assertions.assertThat(actual).as("Should be a
byte[]").isInstanceOf(byte[].class);
- Assert.assertArrayEquals(
- "Bytes should match", ((ByteBuffer) expected).array(), (byte[])
actual);
+ assertThat(expected).as("Should expect a
ByteBuffer").isInstanceOf(ByteBuffer.class);
+ assertThat(actual).as("Should be a byte[]").isInstanceOf(byte[].class);
+ assertThat((byte[]) actual)
Review Comment:
same here
--
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: issues-unsubscr...@iceberg.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
---------------------------------------------------------------------
To unsubscribe, e-mail: issues-unsubscr...@iceberg.apache.org
For additional commands, e-mail: issues-h...@iceberg.apache.org
