Skip to content

Commit 93e2415

Browse files
sfc-gh-pmotackisfc-gh-pmotacki
authored
SNOW-1960848 - fix tests after MaxLobSize changes (#2109)
1 parent c71218f commit 93e2415

File tree

3 files changed

+61
-26
lines changed

3 files changed

+61
-26
lines changed

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

+29-12
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
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;
78

@@ -176,9 +177,13 @@ public void testGetFunctionColumns() throws SQLException {
176177
databaseMetaData.getMaxCharLiteralLength(), resultSet.getInt("CHAR_OCTET_LENGTH"));
177178
assertEquals(1, resultSet.getInt("ORDINAL_POSITION"));
178179
assertEquals("", resultSet.getString("IS_NULLABLE"));
179-
assertEquals(
180-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
181-
resultSet.getString("SPECIFIC_NAME"));
180+
assertThat(
181+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
182+
resultSet
183+
.getString("SPECIFIC_NAME")
184+
.replaceAll("\\s", "")
185+
.matches(
186+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
182187
resultSet.next();
183188
assertEquals("JDBC_DB1", resultSet.getString("FUNCTION_CAT"));
184189
assertEquals("JDBC_SCHEMA11", resultSet.getString("FUNCTION_SCHEM"));
@@ -196,9 +201,13 @@ public void testGetFunctionColumns() throws SQLException {
196201
assertEquals(0, resultSet.getInt("CHAR_OCTET_LENGTH"));
197202
assertEquals(2, resultSet.getInt("ORDINAL_POSITION"));
198203
assertEquals("", resultSet.getString("IS_NULLABLE"));
199-
assertEquals(
200-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
201-
resultSet.getString("SPECIFIC_NAME"));
204+
assertThat(
205+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
206+
resultSet
207+
.getString("SPECIFIC_NAME")
208+
.replaceAll("\\s", "")
209+
.matches(
210+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
202211
resultSet.next();
203212
assertEquals("JDBC_DB1", resultSet.getString("FUNCTION_CAT"));
204213
assertEquals("JDBC_SCHEMA11", resultSet.getString("FUNCTION_SCHEM"));
@@ -217,9 +226,13 @@ public void testGetFunctionColumns() throws SQLException {
217226
databaseMetaData.getMaxBinaryLiteralLength(), resultSet.getInt("CHAR_OCTET_LENGTH"));
218227
assertEquals(3, resultSet.getInt("ORDINAL_POSITION"));
219228
assertEquals("", resultSet.getString("IS_NULLABLE"));
220-
assertEquals(
221-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
222-
resultSet.getString("SPECIFIC_NAME"));
229+
assertThat(
230+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
231+
resultSet
232+
.getString("SPECIFIC_NAME")
233+
.replaceAll("\\s", "")
234+
.matches(
235+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
223236
resultSet.next();
224237
assertEquals("JDBC_DB1", resultSet.getString("FUNCTION_CAT"));
225238
assertEquals("JDBC_SCHEMA11", resultSet.getString("FUNCTION_SCHEM"));
@@ -237,9 +250,13 @@ public void testGetFunctionColumns() throws SQLException {
237250
assertEquals(0, resultSet.getInt("CHAR_OCTET_LENGTH"));
238251
assertEquals(4, resultSet.getInt("ORDINAL_POSITION"));
239252
assertEquals("", resultSet.getString("IS_NULLABLE"));
240-
assertEquals(
241-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
242-
resultSet.getString("SPECIFIC_NAME"));
253+
assertThat(
254+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
255+
resultSet
256+
.getString("SPECIFIC_NAME")
257+
.replaceAll("\\s", "")
258+
.matches(
259+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
243260
// setting catalog to % will result in 0 columns. % does not apply for catalog, only for
244261
// other
245262
// params

‎src/test/java/net/snowflake/client/jdbc/DatabaseMetaDataLatestIT.java

+28-14
Original file line numberDiff line numberDiff line change
@@ -889,13 +889,16 @@ public void testGetFunctionColumns() throws Exception {
889889
assertEquals(DatabaseMetaData.functionNullableUnknown, resultSet.getInt("NULLABLE"));
890890
assertEquals("returns table of 4 columns", resultSet.getString("REMARKS"));
891891
// char octet length column is not supported and always returns 0
892-
assertEquals(EXPECTED_MAX_CHAR_LENGTH, resultSet.getInt("CHAR_OCTET_LENGTH"));
893892
assertEquals(1, resultSet.getInt("ORDINAL_POSITION"));
894893
// is_nullable column is not supported and always returns empty string
895894
assertEquals("", resultSet.getString("IS_NULLABLE"));
896-
assertEquals(
897-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
898-
resultSet.getString("SPECIFIC_NAME"));
895+
assertThat(
896+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
897+
resultSet
898+
.getString("SPECIFIC_NAME")
899+
.replaceAll("\\s", "")
900+
.matches(
901+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
899902
resultSet.next();
900903
assertEquals(database, resultSet.getString("FUNCTION_CAT"));
901904
assertEquals(schema, resultSet.getString("FUNCTION_SCHEM"));
@@ -918,9 +921,13 @@ public void testGetFunctionColumns() throws Exception {
918921
assertEquals(2, resultSet.getInt("ORDINAL_POSITION"));
919922
// is_nullable column is not supported and always returns empty string
920923
assertEquals("", resultSet.getString("IS_NULLABLE"));
921-
assertEquals(
922-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
923-
resultSet.getString("SPECIFIC_NAME"));
924+
assertThat(
925+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
926+
resultSet
927+
.getString("SPECIFIC_NAME")
928+
.replaceAll("\\s", "")
929+
.matches(
930+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
924931
resultSet.next();
925932
assertEquals(database, resultSet.getString("FUNCTION_CAT"));
926933
assertEquals(schema, resultSet.getString("FUNCTION_SCHEM"));
@@ -939,13 +946,16 @@ public void testGetFunctionColumns() throws Exception {
939946
assertEquals(DatabaseMetaData.functionNullableUnknown, resultSet.getInt("NULLABLE"));
940947
assertEquals("returns table of 4 columns", resultSet.getString("REMARKS"));
941948
// char octet length column is not supported and always returns 0
942-
assertEquals(EXPECTED_MAX_BINARY_LENGTH, resultSet.getInt("CHAR_OCTET_LENGTH"));
943949
assertEquals(3, resultSet.getInt("ORDINAL_POSITION"));
944950
// is_nullable column is not supported and always returns empty string
945951
assertEquals("", resultSet.getString("IS_NULLABLE"));
946-
assertEquals(
947-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
948-
resultSet.getString("SPECIFIC_NAME"));
952+
assertThat(
953+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
954+
resultSet
955+
.getString("SPECIFIC_NAME")
956+
.replaceAll("\\s", "")
957+
.matches(
958+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
949959
resultSet.next();
950960
assertEquals(database, resultSet.getString("FUNCTION_CAT"));
951961
assertEquals(schema, resultSet.getString("FUNCTION_SCHEM"));
@@ -968,9 +978,13 @@ public void testGetFunctionColumns() throws Exception {
968978
assertEquals(4, resultSet.getInt("ORDINAL_POSITION"));
969979
// is_nullable column is not supported and always returns empty string
970980
assertEquals("", resultSet.getString("IS_NULLABLE"));
971-
assertEquals(
972-
"FUNC112() RETURN TABLE (COLA VARCHAR, COLB NUMBER, BIN2 BINARY, SHAREDCOL NUMBER)",
973-
resultSet.getString("SPECIFIC_NAME"));
981+
assertThat(
982+
"Columns metadata SPECIFIC_NAME should contains expected columns ",
983+
resultSet
984+
.getString("SPECIFIC_NAME")
985+
.replaceAll("\\s", "")
986+
.matches(
987+
"^FUNC112.*RETURNTABLE.*COLAVARCHAR.*,COLBNUMBER,BIN2BINARY.*,SHAREDCOLNUMBER.?$"));
974988
assertFalse(resultSet.next());
975989
}
976990

‎src/test/java/net/snowflake/client/jdbc/LobSizeLatestIT.java

+4
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import java.util.logging.Level;
2121
import java.util.logging.Logger;
2222
import java.util.stream.Stream;
23+
import net.snowflake.client.annotations.DontRunOnJenkins;
2324
import net.snowflake.client.category.TestTags;
2425
import net.snowflake.client.core.ObjectMapperFactory;
2526
import net.snowflake.client.core.UUIDUtils;
@@ -132,6 +133,7 @@ public static void tearDown() throws SQLException {
132133

133134
@ParameterizedTest
134135
@ArgumentsSource(DataProvider.class)
136+
@DontRunOnJenkins // the MxLobParameters isn't configured properly on new environment
135137
public void testStandardInsertAndSelectWithMaxLobSizeEnabled(int lobSize, String resultFormat)
136138
throws SQLException {
137139
try (Connection con = BaseJDBCTest.getConnection();
@@ -154,6 +156,7 @@ public void testStandardInsertAndSelectWithMaxLobSizeEnabled(int lobSize, String
154156

155157
@ParameterizedTest
156158
@ArgumentsSource(DataProvider.class)
159+
@DontRunOnJenkins // the MxLobParameters isn't configured properly on new environment
157160
public void testPreparedInsertWithMaxLobSizeEnabled(int lobSize, String resultFormat)
158161
throws SQLException {
159162
try (Connection con = BaseJDBCTest.getConnection();
@@ -176,6 +179,7 @@ public void testPreparedInsertWithMaxLobSizeEnabled(int lobSize, String resultFo
176179

177180
@ParameterizedTest
178181
@ArgumentsSource(DataProvider.class)
182+
@DontRunOnJenkins // the MxLobParameters isn't configured properly on new environment
179183
public void testPutAndGet(int lobSize, String resultFormat) throws IOException, SQLException {
180184
File tempFile = File.createTempFile("LobSizeTest", ".csv");
181185
// Delete file when JVM shuts down

0 commit comments

Comments
 (0)