SQuirreL SQL Client

Update of /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/sql
In directory sc8-pr-cvs8.sourceforge.net:/tmp/cvs-serv15944/test/src/net/sourceforge/squirrel_sql/fw/sql

Modified Files:
	SQLUtil.java ResultSetReaderTest.java 
Log Message:
1761706 (Miscellaneous Java 5 Generics) from patch submitted by Bron Eubanks

Index: SQLUtil.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/sql/SQLUtil.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -C2 -d -r1.2 -r1.3
*** SQLUtil.java	6 May 2007 01:46:49 -0000	1.2
--- SQLUtil.java	31 Jul 2007 01:06:20 -0000	1.3
***************
*** 18,30 ****
   * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
   */
- import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.ANON_PROC_EXEC;
- import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.CREATE_FUNCTION_SQL;
- import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.CREATE_OR_REPLACE_STORED_PROC;
- import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.CREATE_STORED_PROC;
- import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.NO_SEP_SLASH_SQL;
- import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.SELECT_DUAL;
- import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.STUDENTS_NOT_TAKING_CS112;
- import static net.sourceforge.squirrel_sql.fw.sql.OracleSQL.UPDATE_TEST;
- 
  import java.io.File;
  import java.io.FileWriter;
--- 18,21 ----

Index: ResultSetReaderTest.java
===================================================================
RCS file: /cvsroot/squirrel-sql/sql12/test/src/net/sourceforge/squirrel_sql/fw/sql/ResultSetReaderTest.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** ResultSetReaderTest.java	13 Apr 2007 10:53:38 -0000	1.1
--- ResultSetReaderTest.java	31 Jul 2007 01:06:20 -0000	1.2
***************
*** 1,8 ****
  package net.sourceforge.squirrel_sql.fw.sql;
  
  import java.sql.SQLException;
  import java.sql.Timestamp;
  import java.util.Calendar;
- import java.util.Date;
  
  import net.sourceforge.squirrel_sql.BaseSQuirreLTestCase;
--- 1,8 ----
  package net.sourceforge.squirrel_sql.fw.sql;
  
+ import java.sql.Date;
  import java.sql.SQLException;
  import java.sql.Timestamp;
  import java.util.Calendar;
  
  import net.sourceforge.squirrel_sql.BaseSQuirreLTestCase;
***************
*** 14,17 ****
--- 14,20 ----
  public class ResultSetReaderTest extends BaseSQuirreLTestCase {
  
+     private static final String dateClassName = 
+         "net.sourceforge.squirrel_sql.fw.datasetviewer.cellcomponent.DataTypeDate";
+     
      protected void setUp() throws Exception {
          super.setUp();
***************
*** 22,33 ****
      }
  
!     public void testReadRow() throws SQLException {
!         MockResultSet rs = new MockResultSet();
!         Date d = Calendar.getInstance().getTime();
!         DTProperties props = new DTProperties();
!         props.setDataArray(new String[] {"DataTypeDate readDateAsTimestamp=true"});
  
          rs.addRow(new Object[]{ new Integer(1), d });      
-         // TODO: Need to set the ResultSetMetaData in rs here
          MockResultSetMetaData rsmd = new MockResultSetMetaData();
          rsmd.setupAddColumnTypes(new int[] { 4, 91 });
--- 25,58 ----
      }
  
!     public void testReadDateAsTimestamp() throws SQLException {
!         testReadType(Timestamp.class.getName(), "true"); 
!     }
!     
!     public void testReadDateAsDate() throws SQLException {
!         testReadType(Date.class.getName(), "false");        
!     }
! 
!     public void testReadDateAsDefault() throws SQLException {
!         testReadType(Date.class.getName(), null);        
!     }
  
+     private void testReadType(String type,  String readDatePropVal) throws SQLException {
+         if (readDatePropVal != null) {
+             DTProperties.put(dateClassName, "readDateAsTimestamp", readDatePropVal);
+         }
+         ResultSetReader reader = getDateResultSetReader();
+         Object[] result = reader.readRow();
+         if (result[1].getClass().getName().equals(type)) {
+             // 
+         } else {
+             fail("result[1] not a Date: "+result[1].getClass().getName());
+         }                
+     }
+     
+     private ResultSetReader getDateResultSetReader() throws SQLException {
+         MockResultSet rs = new MockResultSet();
+         Date d = new Date(Calendar.getInstance().getTimeInMillis());
+         
          rs.addRow(new Object[]{ new Integer(1), d });      
          MockResultSetMetaData rsmd = new MockResultSetMetaData();
          rsmd.setupAddColumnTypes(new int[] { 4, 91 });
***************
*** 36,46 ****
          
          ResultSetReader reader = new ResultSetReader(rs);
!         Object[] result = reader.readRow();
!         if (result[1] instanceof Timestamp) {
!             // 
!         } else {
!             fail("result[1] not a timestamp: "+result[1].getClass().getName());
!         }
!         
      }
  }
--- 61,67 ----
          
          ResultSetReader reader = new ResultSetReader(rs);
!         return reader;
      }
+     
+     
  }