Skip to content

Commit 7373387

Browse files
JingsongLiJingsongLi
committed
Fix tests
Signed-off-by: JingsongLi <jingsonglee0@gmail.com>
1 parent 0bdf9d4 commit 7373387

2 files changed

Lines changed: 50 additions & 58 deletions

File tree

‎java/vortex-jni/src/test/java/dev/vortex/api/DTypeTest.java‎

Lines changed: 38 additions & 44 deletions
Original file line numberDiff line numberDiff line change
@@ -11,71 +11,65 @@ public final class DTypeTest {
1111

1212
@Test
1313
public void testNewFixedSizeListNonNullable() {
14-
try (var elementType = DType.newInt(false);
15-
var fslType = DType.newFixedSizeList(elementType, 3, false)) {
16-
assertEquals(DType.Variant.FIXED_SIZE_LIST, fslType.getVariant());
17-
assertFalse(fslType.isNullable());
18-
assertEquals(3, fslType.getFixedSizeListSize());
14+
var elementType = DType.newInt(false);
15+
var fslType = DType.newFixedSizeList(elementType, 3, false);
16+
assertEquals(DType.Variant.FIXED_SIZE_LIST, fslType.getVariant());
17+
assertFalse(fslType.isNullable());
18+
assertEquals(3, fslType.getFixedSizeListSize());
1919

20-
var innerType = fslType.getElementType();
21-
assertEquals(DType.Variant.PRIMITIVE_I32, innerType.getVariant());
22-
}
20+
var innerType = fslType.getElementType();
21+
assertEquals(DType.Variant.PRIMITIVE_I32, innerType.getVariant());
2322
}
2423

2524
@Test
2625
public void testNewFixedSizeListNullable() {
27-
try (var elementType = DType.newUtf8(true);
28-
var fslType = DType.newFixedSizeList(elementType, 5, true)) {
29-
assertEquals(DType.Variant.FIXED_SIZE_LIST, fslType.getVariant());
30-
assertTrue(fslType.isNullable());
31-
assertEquals(5, fslType.getFixedSizeListSize());
26+
var elementType = DType.newUtf8(true);
27+
var fslType = DType.newFixedSizeList(elementType, 5, true);
28+
assertEquals(DType.Variant.FIXED_SIZE_LIST, fslType.getVariant());
29+
assertTrue(fslType.isNullable());
30+
assertEquals(5, fslType.getFixedSizeListSize());
3231

33-
var innerType = fslType.getElementType();
34-
assertEquals(DType.Variant.UTF8, innerType.getVariant());
35-
}
32+
var innerType = fslType.getElementType();
33+
assertEquals(DType.Variant.UTF8, innerType.getVariant());
3634
}
3735

3836
@Test
3937
public void testNewListGetElementType() {
40-
try (var elementType = DType.newDouble(false);
41-
var listType = DType.newList(elementType, false)) {
42-
assertEquals(DType.Variant.LIST, listType.getVariant());
38+
var elementType = DType.newDouble(false);
39+
var listType = DType.newList(elementType, false);
40+
assertEquals(DType.Variant.LIST, listType.getVariant());
4341

44-
var innerType = listType.getElementType();
45-
assertEquals(DType.Variant.PRIMITIVE_F64, innerType.getVariant());
46-
}
42+
var innerType = listType.getElementType();
43+
assertEquals(DType.Variant.PRIMITIVE_F64, innerType.getVariant());
4744
}
4845

4946
@Test
5047
public void testNestedFixedSizeList() {
51-
try (var innerElement = DType.newLong(false);
52-
var innerFsl = DType.newFixedSizeList(innerElement, 2, false);
53-
var outerFsl = DType.newFixedSizeList(innerFsl, 4, true)) {
54-
assertEquals(DType.Variant.FIXED_SIZE_LIST, outerFsl.getVariant());
55-
assertTrue(outerFsl.isNullable());
56-
assertEquals(4, outerFsl.getFixedSizeListSize());
48+
var innerElement = DType.newLong(false);
49+
var innerFsl = DType.newFixedSizeList(innerElement, 2, false);
50+
var outerFsl = DType.newFixedSizeList(innerFsl, 4, true);
51+
assertEquals(DType.Variant.FIXED_SIZE_LIST, outerFsl.getVariant());
52+
assertTrue(outerFsl.isNullable());
53+
assertEquals(4, outerFsl.getFixedSizeListSize());
5754

58-
var inner = outerFsl.getElementType();
59-
assertEquals(DType.Variant.FIXED_SIZE_LIST, inner.getVariant());
60-
}
55+
var inner = outerFsl.getElementType();
56+
assertEquals(DType.Variant.FIXED_SIZE_LIST, inner.getVariant());
6157
}
6258

6359
@Test
6460
public void testFixedSizeListInStruct() {
65-
try (var elementType = DType.newFloat(false);
66-
var fslType = DType.newFixedSizeList(elementType, 3, false);
67-
var structType = DType.newStruct(
68-
new String[] {"id", "embedding"},
69-
new DType[] {DType.newInt(false), fslType},
70-
false)) {
71-
assertEquals(DType.Variant.STRUCT, structType.getVariant());
61+
var elementType = DType.newFloat(false);
62+
var fslType = DType.newFixedSizeList(elementType, 3, false);
63+
var structType = DType.newStruct(
64+
new String[] {"id", "embedding"},
65+
new DType[] {DType.newInt(false), fslType},
66+
false);
67+
assertEquals(DType.Variant.STRUCT, structType.getVariant());
7268

73-
var fieldTypes = structType.getFieldTypes();
74-
assertEquals(2, fieldTypes.size());
69+
var fieldTypes = structType.getFieldTypes();
70+
assertEquals(2, fieldTypes.size());
7571

76-
try (var embeddingType = fieldTypes.get(1)) {
77-
assertEquals(DType.Variant.FIXED_SIZE_LIST, embeddingType.getVariant());
78-
}
79-
}
72+
var embeddingType = fieldTypes.get(1);
73+
assertEquals(DType.Variant.FIXED_SIZE_LIST, embeddingType.getVariant());
8074
}
8175
}

‎java/vortex-spark/src/test/java/dev/vortex/spark/SparkTypesTest.java‎

Lines changed: 12 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -23,24 +23,22 @@ public static void loadLibrary() {
2323
@Test
2424
@DisplayName("toDataType should convert FIXED_SIZE_LIST to Spark ArrayType")
2525
public void testFixedSizeListToDataType() {
26-
try (var elementType = DType.newInt(false);
27-
var fslType = DType.newFixedSizeList(elementType, 3, true)) {
28-
var sparkType = SparkTypes.toDataType(fslType);
29-
assertInstanceOf(ArrayType.class, sparkType);
30-
ArrayType arrayType = (ArrayType) sparkType;
31-
assertEquals(DataTypes.IntegerType, arrayType.elementType());
32-
}
26+
var elementType = DType.newInt(false);
27+
var fslType = DType.newFixedSizeList(elementType, 3, true);
28+
var sparkType = SparkTypes.toDataType(fslType);
29+
assertInstanceOf(ArrayType.class, sparkType);
30+
ArrayType arrayType = (ArrayType) sparkType;
31+
assertEquals(DataTypes.IntegerType, arrayType.elementType());
3332
}
3433

3534
@Test
3635
@DisplayName("toDataType should convert LIST to Spark ArrayType")
3736
public void testListToDataType() {
38-
try (var elementType = DType.newDouble(false);
39-
var listType = DType.newList(elementType, true)) {
40-
var sparkType = SparkTypes.toDataType(listType);
41-
assertInstanceOf(ArrayType.class, sparkType);
42-
ArrayType arrayType = (ArrayType) sparkType;
43-
assertEquals(DataTypes.DoubleType, arrayType.elementType());
44-
}
37+
var elementType = DType.newDouble(false);
38+
var listType = DType.newList(elementType, true);
39+
var sparkType = SparkTypes.toDataType(listType);
40+
assertInstanceOf(ArrayType.class, sparkType);
41+
ArrayType arrayType = (ArrayType) sparkType;
42+
assertEquals(DataTypes.DoubleType, arrayType.elementType());
4543
}
4644
}

0 commit comments

Comments
 (0)