Skip to content

Commit 9806e94

Browse files
committed
simplify SqlTypesTest
1 parent 8eac1cc commit 9806e94

File tree

1 file changed

+3
-47
lines changed
  • flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils

1 file changed

+3
-47
lines changed

flight/flight-sql-jdbc-core/src/test/java/org/apache/arrow/driver/jdbc/utils/SqlTypesTest.java

Lines changed: 3 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
import static org.apache.arrow.driver.jdbc.utils.SqlTypes.getSqlTypeIdFromArrowType;
2020
import static org.apache.arrow.driver.jdbc.utils.SqlTypes.getSqlTypeNameFromArrowType;
2121
import static org.junit.jupiter.api.Assertions.assertEquals;
22-
import static org.junit.jupiter.api.Assertions.assertFalse;
23-
import static org.junit.jupiter.api.Assertions.assertTrue;
2422

2523
import java.sql.Types;
2624
import org.apache.arrow.vector.extension.UuidType;
@@ -30,8 +28,6 @@
3028
import org.apache.arrow.vector.types.TimeUnit;
3129
import org.apache.arrow.vector.types.UnionMode;
3230
import org.apache.arrow.vector.types.pojo.ArrowType;
33-
import org.apache.arrow.vector.types.pojo.Field;
34-
import org.apache.arrow.vector.types.pojo.FieldType;
3531
import org.junit.jupiter.api.Test;
3632

3733
public class SqlTypesTest {
@@ -88,6 +84,8 @@ public void testGetSqlTypeIdFromArrowType() {
8884
assertEquals(Types.JAVA_OBJECT, getSqlTypeIdFromArrowType(new ArrowType.Map(true)));
8985

9086
assertEquals(Types.NULL, getSqlTypeIdFromArrowType(new ArrowType.Null()));
87+
88+
assertEquals(Types.OTHER, getSqlTypeIdFromArrowType(new UuidType()));
9189
}
9290

9391
@Test
@@ -141,49 +139,7 @@ public void testGetSqlTypeNameFromArrowType() {
141139
assertEquals("JAVA_OBJECT", getSqlTypeNameFromArrowType(new ArrowType.Map(true)));
142140

143141
assertEquals("NULL", getSqlTypeNameFromArrowType(new ArrowType.Null()));
144-
}
145-
146-
@Test
147-
public void testGetSqlTypeIdFromFieldForUuid() {
148-
Field uuidField = new Field("uuid_col", new FieldType(true, UuidType.INSTANCE, null), null);
149-
assertEquals(Types.OTHER, getSqlTypeIdFromArrowType(uuidField.getType()));
150-
}
151-
152-
@Test
153-
public void testGetSqlTypeNameFromFieldForUuid() {
154-
Field uuidField = new Field("uuid_col", new FieldType(true, UuidType.INSTANCE, null), null);
155-
assertEquals("OTHER", getSqlTypeNameFromArrowType(uuidField.getType()));
156-
}
157-
158-
@Test
159-
public void testIsUuidFieldReturnsTrue() {
160-
Field uuidField = new Field("uuid_col", new FieldType(true, UuidType.INSTANCE, null), null);
161-
assertTrue(isUuidField(uuidField));
162-
}
163-
164-
@Test
165-
public void testIsUuidFieldReturnsFalseForNonUuid() {
166-
Field intField = new Field("int_col", FieldType.nullable(new ArrowType.Int(32, true)), null);
167-
assertFalse(isUuidField(intField));
168-
169-
Field binaryField =
170-
new Field("binary_col", FieldType.nullable(new ArrowType.FixedSizeBinary(16)), null);
171-
assertFalse(isUuidField(binaryField));
172-
}
173-
174-
@Test
175-
public void testGetSqlTypeIdFromFieldForNonUuid() {
176-
Field intField = new Field("int_col", FieldType.nullable(new ArrowType.Int(32, true)), null);
177-
assertEquals(Types.INTEGER, getSqlTypeIdFromArrowType(intField.getType()));
178-
}
179-
180-
@Test
181-
public void testGetSqlTypeNameFromFieldForNonUuid() {
182-
Field intField = new Field("int_col", FieldType.nullable(new ArrowType.Int(32, true)), null);
183-
assertEquals("INTEGER", getSqlTypeNameFromArrowType(intField.getType()));
184-
}
185142

186-
static boolean isUuidField(Field field) {
187-
return field.getType() instanceof UuidType;
143+
assertEquals("OTHER", getSqlTypeNameFromArrowType(new UuidType()));
188144
}
189145
}

0 commit comments

Comments
 (0)