database/postgres
database/postgres
1
0
Fork 0
mirror of https://github.com/postgres/postgres.git synced 2025-05-21 15:54:08 +03:00
Code

patch to indicate why test cases failed from Oliver Jowett

Browse Source
This commit is contained in:
Dave Cramer 2003-12-12 18:37:06 +00:00
parent 2fdcd1aaac
commit 31769dcb02
1 changed files with 22 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
src/interfaces/jdbc/org/postgresql/test/jdbc2/DatabaseMetaDataTest.java
View File

@ -9,7 +9,7 @@ import java.sql.*;
* *
* PS: Do you know how difficult it is to type on a train? ;-) * PS: Do you know how difficult it is to type on a train? ;-)
* *
* $Id: DatabaseMetaDataTest.java,v 1.18.4.1 2003/12/11 19:25:08 davec Exp $ * $Id: DatabaseMetaDataTest.java,v 1.18.4.2 2003/12/12 18:37:06 davec Exp $
*/ */
public class DatabaseMetaDataTest extends TestCase public class DatabaseMetaDataTest extends TestCase
@ -52,28 +52,28 @@ public class DatabaseMetaDataTest extends TestCase
ResultSet rs = dbmd.getTables( null, null, "testmetadat%", new String[] {"TABLE"}); ResultSet rs = dbmd.getTables( null, null, "testmetadat%", new String[] {"TABLE"});
assertTrue( rs.next() ); assertTrue( rs.next() );
String tableName = rs.getString("TABLE_NAME"); String tableName = rs.getString("TABLE_NAME");
assertTrue( tableName.equals("testmetadata") ); assertEquals( "testmetadata", tableName );
String tableType = rs.getString("TABLE_TYPE"); String tableType = rs.getString("TABLE_TYPE");
assertTrue( tableType.equals("TABLE") ); assertEquals( "TABLE", tableType );
//There should only be one row returned //There should only be one row returned
assertTrue( "getTables() returned too many rows", rs.next() == false); assertTrue( "getTables() returned too many rows", rs.next() == false);
rs.close(); rs.close();
rs = dbmd.getColumns("", "", "test%", "%" ); rs = dbmd.getColumns("", "", "test%", "%" );
assertTrue( rs.next() ); assertTrue( rs.next() );
assertTrue( rs.getString("TABLE_NAME").equals("testmetadata") ); assertEquals( "testmetadata", rs.getString("TABLE_NAME") );
assertTrue( rs.getString("COLUMN_NAME").equals("id") ); assertEquals( "id", rs.getString("COLUMN_NAME") );
assertTrue( rs.getInt("DATA_TYPE") == java.sql.Types.INTEGER ); assertEquals( java.sql.Types.INTEGER, rs.getInt("DATA_TYPE") );
assertTrue( rs.next() ); assertTrue( rs.next() );
assertTrue( rs.getString("TABLE_NAME").equals("testmetadata") ); assertEquals( "testmetadata", rs.getString("TABLE_NAME") );
assertTrue( rs.getString("COLUMN_NAME").equals("name") ); assertEquals( "name", rs.getString("COLUMN_NAME") );
assertTrue( rs.getInt("DATA_TYPE") == java.sql.Types.VARCHAR ); assertEquals( java.sql.Types.VARCHAR, rs.getInt("DATA_TYPE") );
assertTrue( rs.next() ); assertTrue( rs.next() );
assertTrue( rs.getString("TABLE_NAME").equals("testmetadata") ); assertEquals( "testmetadata", rs.getString("TABLE_NAME") );
assertTrue( rs.getString("COLUMN_NAME").equals("updated") ); assertEquals( "updated", rs.getString("COLUMN_NAME") );
assertTrue( rs.getInt("DATA_TYPE") == java.sql.Types.TIMESTAMP ); assertEquals( java.sql.Types.TIMESTAMP, rs.getInt("DATA_TYPE") );
} }
catch (SQLException ex) catch (SQLException ex)
@ -102,13 +102,13 @@ public class DatabaseMetaDataTest extends TestCase
{ {
String pkTableName = rs.getString( "PKTABLE_NAME" ); String pkTableName = rs.getString( "PKTABLE_NAME" );
assertTrue ( pkTableName.equals("vv") ); assertEquals ( "vv", pkTableName );
String pkColumnName = rs.getString( "PKCOLUMN_NAME" ); String pkColumnName = rs.getString( "PKCOLUMN_NAME" );
assertTrue( pkColumnName.equals("a") || pkColumnName.equals("b")); assertTrue( pkColumnName.equals("a") || pkColumnName.equals("b"));
String fkTableName = rs.getString( "FKTABLE_NAME" ); String fkTableName = rs.getString( "FKTABLE_NAME" );
assertTrue( fkTableName.equals( "ww" ) ); assertEquals( "ww", fkTableName );
String fkColumnName = rs.getString( "FKCOLUMN_NAME" ); String fkColumnName = rs.getString( "FKCOLUMN_NAME" );
assertTrue( fkColumnName.equals( "m" ) || fkColumnName.equals( "n" ) ) ; assertTrue( fkColumnName.equals( "m" ) || fkColumnName.equals( "n" ) ) ;
@ -121,10 +121,10 @@ public class DatabaseMetaDataTest extends TestCase
} }
String pkName = rs.getString( "PK_NAME" ); String pkName = rs.getString( "PK_NAME" );
assertTrue( pkName.equals("vv_pkey") ); assertEquals( "vv_pkey", pkName );
int keySeq = rs.getInt( "KEY_SEQ" ); int keySeq = rs.getInt( "KEY_SEQ" );
assertTrue( keySeq == j ); assertEquals( j, keySeq );
} }
@ -233,10 +233,10 @@ public class DatabaseMetaDataTest extends TestCase
assertTrue ( pkTableName.equals("people") || pkTableName.equals("policy") ); assertTrue ( pkTableName.equals("people") || pkTableName.equals("policy") );
String pkColumnName = rs.getString( "PKCOLUMN_NAME" ); String pkColumnName = rs.getString( "PKCOLUMN_NAME" );
assertTrue( pkColumnName.equals("id") ); assertEquals( "id", pkColumnName );
String fkTableName = rs.getString( "FKTABLE_NAME" ); String fkTableName = rs.getString( "FKTABLE_NAME" );
assertTrue( fkTableName.equals( "users" ) ); assertEquals( "users", fkTableName );
String fkColumnName = rs.getString( "FKCOLUMN_NAME" ); String fkColumnName = rs.getString( "FKCOLUMN_NAME" );
assertTrue( fkColumnName.equals( "people_id" ) || fkColumnName.equals( "policy_id" ) ) ; assertTrue( fkColumnName.equals( "people_id" ) || fkColumnName.equals( "policy_id" ) ) ;
@ -256,11 +256,11 @@ public class DatabaseMetaDataTest extends TestCase
// this is hacky, but it will serve the purpose // this is hacky, but it will serve the purpose
assertTrue ( rs.next() ); assertTrue ( rs.next() );
assertTrue( rs.getString( "PKTABLE_NAME" ).equals( "people" ) ); assertEquals( "people", rs.getString( "PKTABLE_NAME" ) );
assertTrue( rs.getString( "PKCOLUMN_NAME" ).equals( "id" ) ); assertEquals( "id", rs.getString( "PKCOLUMN_NAME" ) );
assertTrue( rs.getString( "FKTABLE_NAME" ).equals( "users" ) ); assertEquals( "users", rs.getString( "FKTABLE_NAME" ) );
assertTrue( rs.getString( "FKCOLUMN_NAME" ).equals( "people_id" ) ); assertEquals( "people_id", rs.getString( "FKCOLUMN_NAME" ) );
assertTrue( rs.getString( "FK_NAME" ).startsWith( "people" ) ); assertTrue( rs.getString( "FK_NAME" ).startsWith( "people" ) );