Skip to content

Commit 2d45c7c

Browse files
committed
test: add more accessor tests
1 parent 023405d commit 2d45c7c

File tree

4 files changed

+34
-4
lines changed

4 files changed

+34
-4
lines changed

jdbc-core/src/test/java/com/salesforce/datacloud/jdbc/core/DataCloudDatabaseMetadataTest.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import java.sql.SQLFeatureNotSupportedException;
2323
import java.sql.Statement;
2424
import java.util.Arrays;
25+
import java.util.HashMap;
2526
import java.util.UUID;
2627
import java.util.stream.Collectors;
2728
import lombok.SneakyThrows;
@@ -1078,6 +1079,7 @@ public void testMetadataColumnAccessors() throws SQLException {
10781079

10791080
assertThat(columnResultSet.getObject("TYPE_NAME")).isEqualTo("VARCHAR");
10801081
assertThat(columnResultSet.getObject("DATA_TYPE")).isEqualTo(12);
1082+
assertThat(columnResultSet.getObject("DATA_TYPE", new HashMap<>())).isEqualTo(12);
10811083
assertThat(columnResultSet.getObject("TYPE_NAME", String.class)).isEqualTo("VARCHAR");
10821084

10831085
assertThrows(SQLException.class, () -> columnResultSet.getObject("ORDINAL_POSITION", Boolean.class));

jdbc-core/src/test/java/com/salesforce/datacloud/jdbc/core/metadata/SimpleResultSetMetaDataTest.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88

99
import com.salesforce.datacloud.jdbc.core.QueryDBMetadata;
1010
import com.salesforce.datacloud.jdbc.core.SimpleMetadataResultSet;
11+
12+
import java.math.BigDecimal;
1113
import java.sql.JDBCType;
1214
import java.sql.ResultSetMetaData;
1315
import java.sql.SQLException;
@@ -151,11 +153,8 @@ public void isDefinitelyWritable() throws SQLException {
151153
@Test
152154
public void getColumnClassName() throws SQLException {
153155
assertThat(simpleResultSetMetaData.getColumnClassName(1)).isEqualTo("java.lang.String");
154-
}
156+
assertThat(simpleResultSetMetaData.getColumnClassName(17)).isEqualTo("java.lang.Integer");
155157

156-
@Test
157-
public void getWarnings() throws SQLException {
158-
assertThat(simpleResultSetMetaData.getColumnClassName(1)).isEqualTo("java.lang.String");
159158
}
160159

161160
@Test
Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.salesforce.datacloud.jdbc.core.resultset;
2+
3+
import org.junit.jupiter.api.Test;
4+
import org.mockito.Mockito;
5+
6+
import static org.junit.jupiter.api.Assertions.*;
7+
class ColumnAccessorTest {
8+
9+
@Test
10+
public void shouldThrowUnsupportedError() {
11+
ColumnAccessor<SimpleResultSet> columnAccessor = Mockito.mock(ColumnAccessor.class, Mockito.CALLS_REAL_METHODS);
12+
SimpleResultSet resultSet = Mockito.mock(SimpleResultSet.class, Mockito.CALLS_REAL_METHODS);
13+
14+
// Test methods from SimpleResultSet that throw SQLFeatureNotSupportedException
15+
assertThrows(UnsupportedOperationException.class, () -> columnAccessor.getBoolean(resultSet));
16+
assertThrows(UnsupportedOperationException.class, () -> columnAccessor.getAnyInteger(resultSet));
17+
assertThrows(UnsupportedOperationException.class, () -> columnAccessor.getBigDecimal(resultSet));
18+
assertThrows(UnsupportedOperationException.class, () -> columnAccessor.getAnyFloatingPoint(resultSet));
19+
assertThrows(UnsupportedOperationException.class, () -> columnAccessor.getString(resultSet));
20+
assertThrows(UnsupportedOperationException.class, () -> columnAccessor.getBytes(resultSet));
21+
assertThrows(UnsupportedOperationException.class, () -> columnAccessor.getDate(resultSet));
22+
assertThrows(UnsupportedOperationException.class, () -> columnAccessor.getTime(resultSet));
23+
assertThrows(UnsupportedOperationException.class, () -> columnAccessor.getTimestamp(resultSet));
24+
assertThrows(UnsupportedOperationException.class, () -> columnAccessor.getArray(resultSet));
25+
}
26+
}

jdbc-core/src/test/java/com/salesforce/datacloud/jdbc/core/resultset/SimpleResultSetTest.java

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,9 @@ public void shouldThrowUnsupportedError() {
5050
assertThrows(UnsupportedOperationException.class, () -> resultSet.getDate(1, null));
5151
assertThrows(UnsupportedOperationException.class, () -> resultSet.getTimestamp(1, null));
5252
assertThrows(UnsupportedOperationException.class, () -> resultSet.getTime(1, null));
53+
assertThrows(UnsupportedOperationException.class, () -> resultSet.getBigDecimal(1, 1));
54+
assertThrows(UnsupportedOperationException.class, () -> resultSet.getBytes(1));
55+
assertThrows(UnsupportedOperationException.class, () -> resultSet.getArray(1));
5356

5457
// Test methods from ForwardOnlyResultSet interface
5558
assertThrows(SQLFeatureNotSupportedException.class, () -> resultSet.setFetchDirection(ResultSet.FETCH_REVERSE));

0 commit comments

Comments
 (0)