Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

Commit06ec904

Browse files
author
Dave Cramer
committed
patch to indicate why test cases failed from Oliver Jowett
1 parent8727029 commit06ec904

File tree

1 file changed

+22
-22
lines changed

1 file changed

+22
-22
lines changed

‎src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
*
1010
* PS: Do you know how difficult it is to type on a train? ;-)
1111
*
12-
* $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java,v 1.21 2003/12/11 15:50:20 davec Exp $
12+
* $PostgreSQL: pgsql/src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java,v 1.22 2003/12/12 18:30:27 davec Exp $
1313
*/
1414

1515
publicclassDatabaseMetaDataTestextendsTestCase
@@ -52,28 +52,28 @@ public void testTables()
5252
ResultSetrs =dbmd.getTables(null,null,"testmetadat%",newString[] {"TABLE"});
5353
assertTrue(rs.next() );
5454
StringtableName =rs.getString("TABLE_NAME");
55-
assertTrue(tableName.equals("testmetadata") );
55+
assertEquals("testmetadata",tableName );
5656
StringtableType =rs.getString("TABLE_TYPE");
57-
assertTrue(tableType.equals("TABLE") );
57+
assertEquals("TABLE",tableType );
5858
//There should only be one row returned
5959
assertTrue("getTables() returned too many rows",rs.next() ==false);
6060
rs.close();
6161

6262
rs =dbmd.getColumns("","","test%","%" );
6363
assertTrue(rs.next() );
64-
assertTrue(rs.getString("TABLE_NAME").equals("testmetadata") );
65-
assertTrue(rs.getString("COLUMN_NAME").equals("id") );
66-
assertTrue(rs.getInt("DATA_TYPE") ==java.sql.Types.INTEGER );
64+
assertEquals("testmetadata",rs.getString("TABLE_NAME") );
65+
assertEquals("id",rs.getString("COLUMN_NAME") );
66+
assertEquals(java.sql.Types.INTEGER,rs.getInt("DATA_TYPE") );
6767

6868
assertTrue(rs.next() );
69-
assertTrue(rs.getString("TABLE_NAME").equals("testmetadata") );
70-
assertTrue(rs.getString("COLUMN_NAME").equals("name") );
71-
assertTrue(rs.getInt("DATA_TYPE") ==java.sql.Types.VARCHAR );
69+
assertEquals("testmetadata",rs.getString("TABLE_NAME") );
70+
assertEquals("name",rs.getString("COLUMN_NAME") );
71+
assertEquals(java.sql.Types.VARCHAR,rs.getInt("DATA_TYPE") );
7272

7373
assertTrue(rs.next() );
74-
assertTrue(rs.getString("TABLE_NAME").equals("testmetadata") );
75-
assertTrue(rs.getString("COLUMN_NAME").equals("updated") );
76-
assertTrue(rs.getInt("DATA_TYPE") ==java.sql.Types.TIMESTAMP );
74+
assertEquals("testmetadata",rs.getString("TABLE_NAME") );
75+
assertEquals("updated",rs.getString("COLUMN_NAME") );
76+
assertEquals(java.sql.Types.TIMESTAMP,rs.getInt("DATA_TYPE") );
7777

7878
}
7979
catch (SQLExceptionex)
@@ -102,13 +102,13 @@ public void testCrossReference()
102102
{
103103

104104
StringpkTableName =rs.getString("PKTABLE_NAME" );
105-
assertTrue (pkTableName.equals("vv") );
105+
assertEquals ("vv",pkTableName );
106106

107107
StringpkColumnName =rs.getString("PKCOLUMN_NAME" );
108108
assertTrue(pkColumnName.equals("a") ||pkColumnName.equals("b"));
109109

110110
StringfkTableName =rs.getString("FKTABLE_NAME" );
111-
assertTrue(fkTableName.equals("ww" ) );
111+
assertEquals("ww",fkTableName );
112112

113113
StringfkColumnName =rs.getString("FKCOLUMN_NAME" );
114114
assertTrue(fkColumnName.equals("m" ) ||fkColumnName.equals("n" ) ) ;
@@ -121,10 +121,10 @@ public void testCrossReference()
121121
}
122122

123123
StringpkName =rs.getString("PK_NAME" );
124-
assertTrue(pkName.equals("vv_pkey") );
124+
assertEquals("vv_pkey",pkName );
125125

126126
intkeySeq =rs.getInt("KEY_SEQ" );
127-
assertTrue(keySeq ==j );
127+
assertEquals(j,keySeq );
128128
}
129129

130130

@@ -263,10 +263,10 @@ public void testForeignKeys()
263263
assertTrue (pkTableName.equals("people") ||pkTableName.equals("policy") );
264264

265265
StringpkColumnName =rs.getString("PKCOLUMN_NAME" );
266-
assertTrue(pkColumnName.equals("id") );
266+
assertEquals("id",pkColumnName );
267267

268268
StringfkTableName =rs.getString("FKTABLE_NAME" );
269-
assertTrue(fkTableName.equals("users" ) );
269+
assertEquals("users",fkTableName );
270270

271271
StringfkColumnName =rs.getString("FKCOLUMN_NAME" );
272272
assertTrue(fkColumnName.equals("people_id" ) ||fkColumnName.equals("policy_id" ) ) ;
@@ -286,11 +286,11 @@ public void testForeignKeys()
286286
// this is hacky, but it will serve the purpose
287287
assertTrue (rs.next() );
288288

289-
assertTrue(rs.getString("PKTABLE_NAME" ).equals("people" ) );
290-
assertTrue(rs.getString("PKCOLUMN_NAME" ).equals("id" ) );
289+
assertEquals("people",rs.getString("PKTABLE_NAME" ) );
290+
assertEquals("id",rs.getString("PKCOLUMN_NAME" ) );
291291

292-
assertTrue(rs.getString("FKTABLE_NAME" ).equals("users" ) );
293-
assertTrue(rs.getString("FKCOLUMN_NAME" ).equals("people_id" ) );
292+
assertEquals("users",rs.getString("FKTABLE_NAME" ) );
293+
assertEquals("people_id",rs.getString("FKCOLUMN_NAME" ) );
294294

295295
assertTrue(rs.getString("FK_NAME" ).startsWith("people" ) );
296296

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp