2
2
3
3
import static net .snowflake .client .jdbc .DatabaseMetaDataInternalIT .endMetaData ;
4
4
import static net .snowflake .client .jdbc .DatabaseMetaDataInternalIT .initMetaData ;
5
+ import static org .hamcrest .MatcherAssert .assertThat ;
5
6
import static org .junit .jupiter .api .Assertions .assertEquals ;
6
7
import static org .junit .jupiter .api .Assertions .assertFalse ;
7
- import static org .junit .jupiter .api .Assertions .assertTrue ;
8
8
9
9
import java .sql .Connection ;
10
10
import java .sql .DatabaseMetaData ;
@@ -177,12 +177,12 @@ public void testGetFunctionColumns() throws SQLException {
177
177
databaseMetaData .getMaxCharLiteralLength (), resultSet .getInt ("CHAR_OCTET_LENGTH" ));
178
178
assertEquals (1 , resultSet .getInt ("ORDINAL_POSITION" ));
179
179
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.?$" ));
186
186
resultSet .next ();
187
187
assertEquals ("JDBC_DB1" , resultSet .getString ("FUNCTION_CAT" ));
188
188
assertEquals ("JDBC_SCHEMA11" , resultSet .getString ("FUNCTION_SCHEM" ));
@@ -200,12 +200,12 @@ public void testGetFunctionColumns() throws SQLException {
200
200
assertEquals (0 , resultSet .getInt ("CHAR_OCTET_LENGTH" ));
201
201
assertEquals (2 , resultSet .getInt ("ORDINAL_POSITION" ));
202
202
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.?$" ));
209
209
resultSet .next ();
210
210
assertEquals ("JDBC_DB1" , resultSet .getString ("FUNCTION_CAT" ));
211
211
assertEquals ("JDBC_SCHEMA11" , resultSet .getString ("FUNCTION_SCHEM" ));
@@ -224,12 +224,12 @@ public void testGetFunctionColumns() throws SQLException {
224
224
databaseMetaData .getMaxBinaryLiteralLength (), resultSet .getInt ("CHAR_OCTET_LENGTH" ));
225
225
assertEquals (3 , resultSet .getInt ("ORDINAL_POSITION" ));
226
226
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.?$" ));
233
233
resultSet .next ();
234
234
assertEquals ("JDBC_DB1" , resultSet .getString ("FUNCTION_CAT" ));
235
235
assertEquals ("JDBC_SCHEMA11" , resultSet .getString ("FUNCTION_SCHEM" ));
@@ -247,7 +247,7 @@ public void testGetFunctionColumns() throws SQLException {
247
247
assertEquals (0 , resultSet .getInt ("CHAR_OCTET_LENGTH" ));
248
248
assertEquals (4 , resultSet .getInt ("ORDINAL_POSITION" ));
249
249
assertEquals ("" , resultSet .getString ("IS_NULLABLE" ));
250
- assertTrue (
250
+ assertThat ( "Columns metadata SPECIFIC_NAME should contains expected columns " ,
251
251
resultSet
252
252
.getString ("SPECIFIC_NAME" )
253
253
.replaceAll ("\\ s" , "" )
0 commit comments