Skip to content

Commit 1855cfd

Browse files
SNOW-1960848 - fix tests after MaxLobSize changes
1 parent 8e4b350 commit 1855cfd

File tree

1 file changed

+20
-20
lines changed

1 file changed

+20
-20
lines changed

src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataInternalLatestIT.java

+20-20
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22

33
import static net.snowflake.client.jdbc.DatabaseMetaDataInternalIT.endMetaData;
44
import static net.snowflake.client.jdbc.DatabaseMetaDataInternalIT.initMetaData;
5+
import static org.hamcrest.MatcherAssert.assertThat;
56
import static org.junit.jupiter.api.Assertions.assertEquals;
67
import static org.junit.jupiter.api.Assertions.assertFalse;
7-
import static org.junit.jupiter.api.Assertions.assertTrue;
88

99
import java.sql.Connection;
1010
import java.sql.DatabaseMetaData;
@@ -177,12 +177,12 @@ public void testGetFunctionColumns() throws SQLException {
177177
databaseMetaData.getMaxCharLiteralLength(), resultSet.getInt("CHAR_OCTET_LENGTH"));
178178
assertEquals(1, resultSet.getInt("ORDINAL_POSITION"));
179179
assertEquals("", resultSet.getString("IS_NULLABLE"));
180-
assertTrue(
181-
resultSet
182-
.getString("SPECIFIC_NAME")
183-
.replaceAll("\\s", "")
184-
.matches(
185-
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
180+
assertThat("Columns metadata SPECIFIC_NAME should contains expected columns ",
181+
resultSet
182+
.getString("SPECIFIC_NAME")
183+
.replaceAll("\\s", "")
184+
.matches(
185+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
186186
resultSet.next();
187187
assertEquals("JDBC_DB1", resultSet.getString("FUNCTION_CAT"));
188188
assertEquals("JDBC_SCHEMA11", resultSet.getString("FUNCTION_SCHEM"));
@@ -200,12 +200,12 @@ public void testGetFunctionColumns() throws SQLException {
200200
assertEquals(0, resultSet.getInt("CHAR_OCTET_LENGTH"));
201201
assertEquals(2, resultSet.getInt("ORDINAL_POSITION"));
202202
assertEquals("", resultSet.getString("IS_NULLABLE"));
203-
assertTrue(
204-
resultSet
205-
.getString("SPECIFIC_NAME")
206-
.replaceAll("\\s", "")
207-
.matches(
208-
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
203+
assertThat("Columns metadata SPECIFIC_NAME should contains expected columns ",
204+
resultSet
205+
.getString("SPECIFIC_NAME")
206+
.replaceAll("\\s", "")
207+
.matches(
208+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
209209
resultSet.next();
210210
assertEquals("JDBC_DB1", resultSet.getString("FUNCTION_CAT"));
211211
assertEquals("JDBC_SCHEMA11", resultSet.getString("FUNCTION_SCHEM"));
@@ -224,12 +224,12 @@ public void testGetFunctionColumns() throws SQLException {
224224
databaseMetaData.getMaxBinaryLiteralLength(), resultSet.getInt("CHAR_OCTET_LENGTH"));
225225
assertEquals(3, resultSet.getInt("ORDINAL_POSITION"));
226226
assertEquals("", resultSet.getString("IS_NULLABLE"));
227-
assertTrue(
228-
resultSet
229-
.getString("SPECIFIC_NAME")
230-
.replaceAll("\\s", "")
231-
.matches(
232-
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
227+
assertThat("Columns metadata SPECIFIC_NAME should contains expected columns ",
228+
resultSet
229+
.getString("SPECIFIC_NAME")
230+
.replaceAll("\\s", "")
231+
.matches(
232+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
233233
resultSet.next();
234234
assertEquals("JDBC_DB1", resultSet.getString("FUNCTION_CAT"));
235235
assertEquals("JDBC_SCHEMA11", resultSet.getString("FUNCTION_SCHEM"));
@@ -247,7 +247,7 @@ public void testGetFunctionColumns() throws SQLException {
247247
assertEquals(0, resultSet.getInt("CHAR_OCTET_LENGTH"));
248248
assertEquals(4, resultSet.getInt("ORDINAL_POSITION"));
249249
assertEquals("", resultSet.getString("IS_NULLABLE"));
250-
assertTrue(
250+
assertThat("Columns metadata SPECIFIC_NAME should contains expected columns ",
251251
resultSet
252252
.getString("SPECIFIC_NAME")
253253
.replaceAll("\\s", "")

0 commit comments

Comments
 (0)