harmony-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ndbe...@apache.org
Subject svn commit: r471120 [1/2] - in /incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests: ./ java/sql/ javax/sql/
Date Sat, 04 Nov 2006 05:10:51 GMT
Author: ndbeyer
Date: Fri Nov  3 21:10:50 2006
New Revision: 471120

URL: http://svn.apache.org/viewvc?view=rev&rev=471120
Log:
Test cleanup
* Remove unnecessary tests of interfaces
* Remove unused helper classes
* Simplify RowSetEentTest
* Simplify ConnectionEventTest

Removed:
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/AllTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/AllTests.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventListenerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionPoolDataSourceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/DataSourceTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_ConnectionEventListener.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_ConnectionPoolDataSource.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_DataSource.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSetInternal.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSetListener.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSetMetaData.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSetReader.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSetWriter.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_XAConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_XADataSource.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/PooledConnectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetInternalTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetListenerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetMetaDataTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetReaderTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetWriterTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/XAConnectionTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/XADataSourceTest.java
Modified:
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Array.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Connection.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_ResultSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_RowSet.java
    incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/RowSetEventTest.java

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java?view=diff&rev=471120&r1=471119&r2=471120
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/DriverManagerTest.java Fri Nov  3 21:10:50 2006
@@ -326,8 +326,6 @@
 	static int timeout1 = 25;
 
 	public void testGetLoginTimeout() {
-		int theTimeout = DriverManager.getLoginTimeout();
-		// System.out.println("Default Login Timeout: " + theTimeout );
 		DriverManager.setLoginTimeout(timeout1);
 		assertEquals(timeout1, DriverManager.getLoginTimeout());
 	} // end method testGetLoginTimeout()

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Array.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Array.java?view=diff&rev=471120&r1=471119&r2=471120
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Array.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Array.java Fri Nov  3 21:10:50 2006
@@ -19,63 +19,53 @@
 
 import java.sql.Array;
 import java.sql.ResultSet;
+import java.sql.SQLException;
 import java.util.Map;
 
 public class Impl_Array implements Array {
-
-	public Impl_Array() {
-		super();
-	} // end constructor
-
-	public String getBaseTypeName() {
-
-		return null;
-	} // end method getBaseTypeName
-
-	public int getBaseType() {
-
-		return 2000135303;
-	} // end method getBaseType
-
-	public Object getArray() {
-
-		return null;
-	} // end method getArray
-
-	public Object getArray(Map parm1) {
-
-		return null;
-	} // end method getArray
-
-	public Object getArray(long parm1, int parm2) {
-
-		return null;
-	} // end method getArray
-
-	public Object getArray(long parm1, int parm2, Map parm3) {
-
-		return null;
-	} // end method getArray
-
-	public ResultSet getResultSet() {
-
-		return null;
-	} // end method getResultSet
-
-	public ResultSet getResultSet(Map parm1) {
-
-		return null;
-	} // end method getResultSet
-
-	public ResultSet getResultSet(long parm1, int parm2) {
-
-		return null;
-	} // end method getResultSet
-
-	public ResultSet getResultSet(long parm1, int parm2, Map parm3) {
-
-		return null;
-	} // end method getResultSet
-
-} // end class ArrayTest
-
+    public Impl_Array() {
+        super();
+    }
+
+    public String getBaseTypeName() {
+        return null;
+    }
+
+    public int getBaseType() {
+        return 2000135303;
+    }
+
+    public Object getArray() {
+        return null;
+    }
+
+    public Object getArray(Map<String, Class<?>> map) throws SQLException {
+        return null;
+    }
+
+    public Object getArray(long parm1, int parm2) {
+        return null;
+    }
+
+    public Object getArray(long index, int count, Map<String, Class<?>> map)
+            throws SQLException {
+        return null;
+    }
+
+    public ResultSet getResultSet() {
+        return null;
+    }
+
+    public ResultSet getResultSet(Map<String, Class<?>> map) throws SQLException {
+        return null;
+    }
+
+    public ResultSet getResultSet(long parm1, int parm2) {
+        return null;
+    }
+
+    public ResultSet getResultSet(long index, int count, Map<String, Class<?>> map)
+            throws SQLException {
+        return null;
+    }
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Connection.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Connection.java?view=diff&rev=471120&r1=471119&r2=471120
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Connection.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_Connection.java Fri Nov  3 21:10:50 2006
@@ -21,186 +21,146 @@
 import java.sql.Connection;
 import java.sql.DatabaseMetaData;
 import java.sql.PreparedStatement;
+import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Savepoint;
 import java.sql.Statement;
 import java.util.Map;
 
 public class Impl_Connection implements Connection {
+    public Impl_Connection() {
+        super();
+    }
 
-	public Impl_Connection() {
-		super();
-	} // end constructor
+    public Statement createStatement() {
+        return null;
+    }
 
-	public Statement createStatement() {
+    public PreparedStatement prepareStatement(String parm1) {
+        return null;
+    }
 
-		return null;
-	} // end method createStatement
+    public CallableStatement prepareCall(String parm1) {
+        return null;
+    }
 
-	public PreparedStatement prepareStatement(String parm1) {
+    public String nativeSQL(String parm1) {
+        return null;
+    }
 
-		return null;
-	} // end method prepareStatement
+    public void setAutoCommit(boolean parm1) {
+    }
 
-	public CallableStatement prepareCall(String parm1) {
+    public boolean getAutoCommit() {
+        return false;
+    }
 
-		return null;
-	} // end method prepareCall
+    public void commit() {
+    }
 
-	public String nativeSQL(String parm1) {
+    public void rollback() {
+    }
 
-		return null;
-	} // end method nativeSQL
+    public void close() {
+    }
 
-	public void setAutoCommit(boolean parm1) {
+    public boolean isClosed() {
+        return false;
+    }
 
-	} // end method setAutoCommit
+    public DatabaseMetaData getMetaData() {
+        return null;
+    }
 
-	public boolean getAutoCommit() {
+    public void setReadOnly(boolean parm1) {
+    }
 
-		return false;
-	} // end method getAutoCommit
+    public boolean isReadOnly() {
+        return true;
+    }
 
-	public void commit() {
+    public void setCatalog(String parm1) {
+    }
 
-	} // end method commit
+    public String getCatalog() {
+        return null;
+    }
 
-	public void rollback() {
+    public void setTransactionIsolation(int parm1) {
+    }
 
-	} // end method rollback
+    public int getTransactionIsolation() {
+        return -1980410800;
+    }
 
-	public void close() {
+    public SQLWarning getWarnings() {
+        return null;
+    }
 
-	} // end method close
+    public void clearWarnings() {
+    }
 
-	public boolean isClosed() {
+    public Statement createStatement(int parm1, int parm2) {
+        return null;
+    }
 
-		return false;
-	} // end method isClosed
+    public PreparedStatement prepareStatement(String parm1, int parm2, int parm3) {
+        return null;
+    }
 
-	public DatabaseMetaData getMetaData() {
+    public CallableStatement prepareCall(String parm1, int parm2, int parm3) {
+        return null;
+    }
 
-		return null;
-	} // end method getMetaData
+    public Map<String, Class<?>> getTypeMap() throws SQLException {
+        return null;
+    }
 
-	public void setReadOnly(boolean parm1) {
+    public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
+    }
 
-	} // end method setReadOnly
+    public void setHoldability(int parm1) {
+    }
 
-	public boolean isReadOnly() {
+    public int getHoldability() {
+        return 632720050;
+    }
 
-		return true;
-	} // end method isReadOnly
+    public Savepoint setSavepoint() {
+        return null;
+    }
 
-	public void setCatalog(String parm1) {
+    public Savepoint setSavepoint(String parm1) {
+        return null;
+    }
 
-	} // end method setCatalog
+    public void rollback(Savepoint parm1) {
+    }
 
-	public String getCatalog() {
+    public void releaseSavepoint(Savepoint parm1) {
+    }
 
-		return null;
-	} // end method getCatalog
+    public Statement createStatement(int parm1, int parm2, int parm3) {
+        return null;
+    }
 
-	public void setTransactionIsolation(int parm1) {
+    public PreparedStatement prepareStatement(String parm1, int parm2, int parm3, int parm4) {
+        return null;
+    }
 
-	} // end method setTransactionIsolation
+    public CallableStatement prepareCall(String parm1, int parm2, int parm3, int parm4) {
+        return null;
+    }
 
-	public int getTransactionIsolation() {
+    public PreparedStatement prepareStatement(String parm1, int parm2) {
+        return null;
+    }
 
-		return -1980410800;
-	} // end method getTransactionIsolation
-
-	public SQLWarning getWarnings() {
-
-		return null;
-	} // end method getWarnings
-
-	public void clearWarnings() {
-
-	} // end method clearWarnings
-
-	public Statement createStatement(int parm1, int parm2) {
-
-		return null;
-	} // end method createStatement
-
-	public PreparedStatement prepareStatement(String parm1, int parm2, int parm3) {
-
-		return null;
-	} // end method prepareStatement
-
-	public CallableStatement prepareCall(String parm1, int parm2, int parm3) {
-
-		return null;
-	} // end method prepareCall
-
-	public Map getTypeMap() {
-
-		return null;
-	} // end method getTypeMap
-
-	public void setTypeMap(Map parm1) {
-
-	} // end method setTypeMap
-
-	public void setHoldability(int parm1) {
-
-	} // end method setHoldability
-
-	public int getHoldability() {
-
-		return 632720050;
-	} // end method getHoldability
-
-	public Savepoint setSavepoint() {
-
-		return null;
-	} // end method setSavepoint
-
-	public Savepoint setSavepoint(String parm1) {
-
-		return null;
-	} // end method setSavepoint
-
-	public void rollback(Savepoint parm1) {
-
-	} // end method rollback
-
-	public void releaseSavepoint(Savepoint parm1) {
-
-	} // end method releaseSavepoint
-
-	public Statement createStatement(int parm1, int parm2, int parm3) {
-
-		return null;
-	} // end method createStatement
-
-	public PreparedStatement prepareStatement(String parm1, int parm2,
-			int parm3, int parm4) {
-
-		return null;
-	} // end method prepareStatement
-
-	public CallableStatement prepareCall(String parm1, int parm2, int parm3,
-			int parm4) {
-
-		return null;
-	} // end method prepareCall
-
-	public PreparedStatement prepareStatement(String parm1, int parm2) {
-
-		return null;
-	} // end method prepareStatement
-
-	public PreparedStatement prepareStatement(String parm1, int[] parm2) {
-
-		return null;
-	} // end method prepareStatement
-
-	public PreparedStatement prepareStatement(String parm1, String[] parm2) {
-
-		return null;
-	} // end method prepareStatement
-
-} // end class ConnectionTest
+    public PreparedStatement prepareStatement(String parm1, int[] parm2) {
+        return null;
+    }
 
+    public PreparedStatement prepareStatement(String parm1, String[] parm2) {
+        return null;
+    }
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_ResultSet.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_ResultSet.java?view=diff&rev=471120&r1=471119&r2=471120
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_ResultSet.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/Impl_ResultSet.java Fri Nov  3 21:10:50 2006
@@ -28,6 +28,7 @@
 import java.sql.Ref;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
 import java.sql.SQLWarning;
 import java.sql.Statement;
 import java.sql.Time;
@@ -35,647 +36,506 @@
 import java.util.Calendar;
 import java.util.Map;
 
+@SuppressWarnings("deprecation")
 public class Impl_ResultSet implements ResultSet {
+    public Impl_ResultSet() {
+        super();
+    }
 
-	public Impl_ResultSet() {
-		super();
-	} // end constructor
+    public boolean next() {
+        return true;
+    }
 
-	public boolean next() {
+    public void close() {
+    }
 
-		return true;
-	} // end method next
+    public boolean wasNull() {
+        return true;
+    }
 
-	public void close() {
+    public String getString(int parm1) {
+        return null;
+    }
 
-	} // end method close
+    public boolean getBoolean(int parm1) {
+        return true;
+    }
 
-	public boolean wasNull() {
+    public byte getByte(int parm1) {
+        return -8;
+    }
 
-		return true;
-	} // end method wasNull
+    public short getShort(int parm1) {
+        return -12790;
+    }
 
-	public String getString(int parm1) {
+    public int getInt(int parm1) {
+        return -1790920813;
+    }
 
-		return null;
-	} // end method getString
+    public long getLong(int parm1) {
+        return -7236492308370801956L;
+    }
 
-	public boolean getBoolean(int parm1) {
+    public float getFloat(int parm1) {
+        return -1.4686295075661984E37F;
+    }
 
-		return true;
-	} // end method getBoolean
+    public double getDouble(int parm1) {
+        return -1.6820553969741622E308;
+    }
 
-	public byte getByte(int parm1) {
+    public BigDecimal getBigDecimal(int parm1, int parm2) {
+        return null;
+    }
 
-		return -8;
-	} // end method getByte
+    public byte[] getBytes(int parm1) {
+        return null;
+    }
 
-	public short getShort(int parm1) {
+    public Date getDate(int parm1) {
+        return null;
+    }
 
-		return -12790;
-	} // end method getShort
+    public Time getTime(int parm1) {
+        return null;
+    }
 
-	public int getInt(int parm1) {
+    public Timestamp getTimestamp(int parm1) {
+        return null;
+    }
 
-		return -1790920813;
-	} // end method getInt
+    public InputStream getAsciiStream(int parm1) {
+        return null;
+    }
 
-	public long getLong(int parm1) {
+    public InputStream getUnicodeStream(int parm1) {
+        return null;
+    }
 
-		return -7236492308370801956L;
-	} // end method getLong
+    public InputStream getBinaryStream(int parm1) {
+        return null;
+    }
 
-	public float getFloat(int parm1) {
+    public String getString(String parm1) {
+        return null;
+    }
 
-		return -1.4686295075661984E37F;
-	} // end method getFloat
+    public boolean getBoolean(String parm1) {
+        return false;
+    }
 
-	public double getDouble(int parm1) {
+    public byte getByte(String parm1) {
+        return -10;
+    }
 
-		return -1.6820553969741622E308;
-	} // end method getDouble
+    public short getShort(String parm1) {
+        return 13590;
+    } // end method getShort
 
-	public BigDecimal getBigDecimal(int parm1, int parm2) {
+    public int getInt(String parm1) {
+        return 522475063;
+    } // end method getInt
 
-		return null;
-	} // end method getBigDecimal
+    public long getLong(String parm1) {
+        return 6637918619301232066L;
+    } // end method getLong
 
-	public byte[] getBytes(int parm1) {
+    public float getFloat(String parm1) {
+        return 8.388008941813566E37F;
+    } // end method getFloat
 
-		return null;
-	} // end method getBytes
+    public double getDouble(String parm1) {
+        return 4.221562126032334E307;
+    } // end method getDouble
 
-	public Date getDate(int parm1) {
+    public BigDecimal getBigDecimal(String parm1, int parm2) {
+        return null;
+    } // end method getBigDecimal
 
-		return null;
-	} // end method getDate
+    public byte[] getBytes(String parm1) {
+        return null;
+    } // end method getBytes
 
-	public Time getTime(int parm1) {
+    public Date getDate(String parm1) {
+        return null;
+    } // end method getDate
 
-		return null;
-	} // end method getTime
+    public Time getTime(String parm1) {
+        return null;
+    } // end method getTime
 
-	public Timestamp getTimestamp(int parm1) {
+    public Timestamp getTimestamp(String parm1) {
+        return null;
+    } // end method getTimestamp
 
-		return null;
-	} // end method getTimestamp
+    public InputStream getAsciiStream(String parm1) {
+        return null;
+    } // end method getAsciiStream
 
-	public InputStream getAsciiStream(int parm1) {
+    public InputStream getUnicodeStream(String parm1) {
+        return null;
+    } // end method getUnicodeStream
 
-		return null;
-	} // end method getAsciiStream
+    public InputStream getBinaryStream(String parm1) {
+        return null;
+    } // end method getBinaryStream
 
-	public InputStream getUnicodeStream(int parm1) {
+    public SQLWarning getWarnings() {
+        return null;
+    } // end method getWarnings
 
-		return null;
-	} // end method getUnicodeStream
+    public void clearWarnings() {
+    } // end method clearWarnings
 
-	public InputStream getBinaryStream(int parm1) {
+    public String getCursorName() {
+        return null;
+    } // end method getCursorName
 
-		return null;
-	} // end method getBinaryStream
+    public ResultSetMetaData getMetaData() {
+        return null;
+    } // end method getMetaData
 
-	public String getString(String parm1) {
+    public Object getObject(int parm1) {
+        return null;
+    } // end method getObject
 
-		return null;
-	} // end method getString
+    public Object getObject(String parm1) {
+        return null;
+    } // end method getObject
 
-	public boolean getBoolean(String parm1) {
+    public int findColumn(String parm1) {
+        return 24975593;
+    } // end method findColumn
 
-		return false;
-	} // end method getBoolean
+    public Reader getCharacterStream(int parm1) {
+        return null;
+    } // end method getCharacterStream
 
-	public byte getByte(String parm1) {
+    public Reader getCharacterStream(String parm1) {
+        return null;
+    } // end method getCharacterStream
 
-		return -10;
-	} // end method getByte
+    public BigDecimal getBigDecimal(int parm1) {
+        return null;
+    } // end method getBigDecimal
 
-	public short getShort(String parm1) {
+    public BigDecimal getBigDecimal(String parm1) {
+        return null;
+    } // end method getBigDecimal
 
-		return 13590;
-	} // end method getShort
+    public boolean isBeforeFirst() {
+        return false;
+    } // end method isBeforeFirst
 
-	public int getInt(String parm1) {
+    public boolean isAfterLast() {
+        return true;
+    } // end method isAfterLast
 
-		return 522475063;
-	} // end method getInt
+    public boolean isFirst() {
+        return true;
+    } // end method isFirst
 
-	public long getLong(String parm1) {
+    public boolean isLast() {
+        return true;
+    } // end method isLast
 
-		return 6637918619301232066L;
-	} // end method getLong
+    public void beforeFirst() {
+    } // end method beforeFirst
 
-	public float getFloat(String parm1) {
+    public void afterLast() {
+    } // end method afterLast
 
-		return 8.388008941813566E37F;
-	} // end method getFloat
+    public boolean first() {
+        return true;
+    } // end method first
 
-	public double getDouble(String parm1) {
+    public boolean last() {
+        return false;
+    } // end method last
 
-		return 4.221562126032334E307;
-	} // end method getDouble
+    public int getRow() {
+        return -1536752422;
+    } // end method getRow
 
-	public BigDecimal getBigDecimal(String parm1, int parm2) {
+    public boolean absolute(int parm1) {
+        return false;
+    } // end method absolute
 
-		return null;
-	} // end method getBigDecimal
+    public boolean relative(int parm1) {
+        return true;
+    } // end method relative
 
-	public byte[] getBytes(String parm1) {
+    public boolean previous() {
+        return true;
+    } // end method previous
 
-		return null;
-	} // end method getBytes
+    public void setFetchDirection(int parm1) {
+    } // end method setFetchDirection
 
-	public Date getDate(String parm1) {
+    public int getFetchDirection() {
+        return -1136843877;
+    } // end method getFetchDirection
 
-		return null;
-	} // end method getDate
+    public void setFetchSize(int parm1) {
+    } // end method setFetchSize
 
-	public Time getTime(String parm1) {
+    public int getFetchSize() {
+        return -2139697329;
+    } // end method getFetchSize
 
-		return null;
-	} // end method getTime
+    public int getType() {
+        return -631961459;
+    } // end method getType
 
-	public Timestamp getTimestamp(String parm1) {
+    public int getConcurrency() {
+        return 6231768;
+    } // end method getConcurrency
 
-		return null;
-	} // end method getTimestamp
+    public boolean rowUpdated() {
+        return true;
+    } // end method rowUpdated
 
-	public InputStream getAsciiStream(String parm1) {
+    public boolean rowInserted() {
+        return true;
+    } // end method rowInserted
 
-		return null;
-	} // end method getAsciiStream
+    public boolean rowDeleted() {
+        return true;
+    } // end method rowDeleted
 
-	public InputStream getUnicodeStream(String parm1) {
+    public void updateNull(int parm1) {
+    } // end method updateNull
 
-		return null;
-	} // end method getUnicodeStream
+    public void updateBoolean(int parm1, boolean parm2) {
+    } // end method updateBoolean
 
-	public InputStream getBinaryStream(String parm1) {
+    public void updateByte(int parm1, byte parm2) {
+    } // end method updateByte
 
-		return null;
-	} // end method getBinaryStream
+    public void updateShort(int parm1, short parm2) {
+    } // end method updateShort
 
-	public SQLWarning getWarnings() {
+    public void updateInt(int parm1, int parm2) {
+    } // end method updateInt
 
-		return null;
-	} // end method getWarnings
+    public void updateLong(int parm1, long parm2) {
+    } // end method updateLong
 
-	public void clearWarnings() {
+    public void updateFloat(int parm1, float parm2) {
+    } // end method updateFloat
 
-	} // end method clearWarnings
+    public void updateDouble(int parm1, double parm2) {
+    } // end method updateDouble
 
-	public String getCursorName() {
+    public void updateBigDecimal(int parm1, BigDecimal parm2) {
+    } // end method updateBigDecimal
 
-		return null;
-	} // end method getCursorName
+    public void updateString(int parm1, String parm2) {
+    } // end method updateString
 
-	public ResultSetMetaData getMetaData() {
+    public void updateBytes(int parm1, byte[] parm2) {
+    } // end method updateBytes
 
-		return null;
-	} // end method getMetaData
+    public void updateDate(int parm1, Date parm2) {
+    } // end method updateDate
 
-	public Object getObject(int parm1) {
+    public void updateTime(int parm1, Time parm2) {
+    } // end method updateTime
 
-		return null;
-	} // end method getObject
+    public void updateTimestamp(int parm1, Timestamp parm2) {
+    } // end method updateTimestamp
 
-	public Object getObject(String parm1) {
+    public void updateAsciiStream(int parm1, InputStream parm2, int parm3) {
+    } // end method updateAsciiStream
 
-		return null;
-	} // end method getObject
+    public void updateBinaryStream(int parm1, InputStream parm2, int parm3) {
+    } // end method updateBinaryStream
 
-	public int findColumn(String parm1) {
+    public void updateCharacterStream(int parm1, Reader parm2, int parm3) {
+    } // end method updateCharacterStream
 
-		return 24975593;
-	} // end method findColumn
+    public void updateObject(int parm1, Object parm2, int parm3) {
+    } // end method updateObject
 
-	public Reader getCharacterStream(int parm1) {
+    public void updateObject(int parm1, Object parm2) {
+    } // end method updateObject
 
-		return null;
-	} // end method getCharacterStream
+    public void updateNull(String parm1) {
+    } // end method updateNull
 
-	public Reader getCharacterStream(String parm1) {
+    public void updateBoolean(String parm1, boolean parm2) {
+    } // end method updateBoolean
 
-		return null;
-	} // end method getCharacterStream
+    public void updateByte(String parm1, byte parm2) {
+    } // end method updateByte
 
-	public BigDecimal getBigDecimal(int parm1) {
+    public void updateShort(String parm1, short parm2) {
+    } // end method updateShort
 
-		return null;
-	} // end method getBigDecimal
+    public void updateInt(String parm1, int parm2) {
+    } // end method updateInt
 
-	public BigDecimal getBigDecimal(String parm1) {
+    public void updateLong(String parm1, long parm2) {
+    } // end method updateLong
 
-		return null;
-	} // end method getBigDecimal
+    public void updateFloat(String parm1, float parm2) {
+    } // end method updateFloat
 
-	public boolean isBeforeFirst() {
+    public void updateDouble(String parm1, double parm2) {
+    } // end method updateDouble
 
-		return false;
-	} // end method isBeforeFirst
+    public void updateBigDecimal(String parm1, BigDecimal parm2) {
+    } // end method updateBigDecimal
 
-	public boolean isAfterLast() {
+    public void updateString(String parm1, String parm2) {
+    } // end method updateString
 
-		return true;
-	} // end method isAfterLast
+    public void updateBytes(String parm1, byte[] parm2) {
+    } // end method updateBytes
 
-	public boolean isFirst() {
+    public void updateDate(String parm1, Date parm2) {
+    } // end method updateDate
 
-		return true;
-	} // end method isFirst
+    public void updateTime(String parm1, Time parm2) {
+    } // end method updateTime
 
-	public boolean isLast() {
+    public void updateTimestamp(String parm1, Timestamp parm2) {
+    } // end method updateTimestamp
 
-		return true;
-	} // end method isLast
+    public void updateAsciiStream(String parm1, InputStream parm2, int parm3) {
+    } // end method updateAsciiStream
 
-	public void beforeFirst() {
+    public void updateBinaryStream(String parm1, InputStream parm2, int parm3) {
+    } // end method updateBinaryStream
 
-	} // end method beforeFirst
+    public void updateCharacterStream(String parm1, Reader parm2, int parm3) {
+    } // end method updateCharacterStream
 
-	public void afterLast() {
+    public void updateObject(String parm1, Object parm2, int parm3) {
+    } // end method updateObject
 
-	} // end method afterLast
+    public void updateObject(String parm1, Object parm2) {
+    } // end method updateObject
 
-	public boolean first() {
+    public void insertRow() {
+    } // end method insertRow
 
-		return true;
-	} // end method first
+    public void updateRow() {
+    } // end method updateRow
 
-	public boolean last() {
+    public void deleteRow() {
+    } // end method deleteRow
 
-		return false;
-	} // end method last
+    public void refreshRow() {
+    } // end method refreshRow
 
-	public int getRow() {
+    public void cancelRowUpdates() {
+    } // end method cancelRowUpdates
 
-		return -1536752422;
-	} // end method getRow
+    public void moveToInsertRow() {
+    } // end method moveToInsertRow
 
-	public boolean absolute(int parm1) {
+    public void moveToCurrentRow() {
+    } // end method moveToCurrentRow
 
-		return false;
-	} // end method absolute
+    public Statement getStatement() {
+        return null;
+    } // end method getStatement
 
-	public boolean relative(int parm1) {
+    public Object getObject(int columnIndex, Map<String, Class<?>> map) throws SQLException {
+        return null;
+    }
 
-		return true;
-	} // end method relative
+    public Ref getRef(int parm1) {
+        return null;
+    } // end method getRef
 
-	public boolean previous() {
+    public Blob getBlob(int parm1) {
+        return null;
+    } // end method getBlob
 
-		return true;
-	} // end method previous
+    public Clob getClob(int parm1) {
+        return null;
+    } // end method getClob
 
-	public void setFetchDirection(int parm1) {
+    public Array getArray(int parm1) {
+        return null;
+    } // end method getArray
 
-	} // end method setFetchDirection
+    public Object getObject(String columnName, Map<String, Class<?>> map) throws SQLException {
+        return null;
+    }
 
-	public int getFetchDirection() {
+    public Ref getRef(String parm1) {
+        return null;
+    } // end method getRef
 
-		return -1136843877;
-	} // end method getFetchDirection
+    public Blob getBlob(String parm1) {
+        return null;
+    } // end method getBlob
 
-	public void setFetchSize(int parm1) {
+    public Clob getClob(String parm1) {
+        return null;
+    } // end method getClob
 
-	} // end method setFetchSize
+    public Array getArray(String parm1) {
+        return null;
+    } // end method getArray
 
-	public int getFetchSize() {
+    public Date getDate(int parm1, Calendar parm2) {
+        return null;
+    } // end method getDate
 
-		return -2139697329;
-	} // end method getFetchSize
+    public Date getDate(String parm1, Calendar parm2) {
+        return null;
+    } // end method getDate
 
-	public int getType() {
+    public Time getTime(int parm1, Calendar parm2) {
+        return null;
+    } // end method getTime
 
-		return -631961459;
-	} // end method getType
+    public Time getTime(String parm1, Calendar parm2) {
+        return null;
+    } // end method getTime
 
-	public int getConcurrency() {
+    public Timestamp getTimestamp(int parm1, Calendar parm2) {
+        return null;
+    } // end method getTimestamp
 
-		return 6231768;
-	} // end method getConcurrency
+    public Timestamp getTimestamp(String parm1, Calendar parm2) {
+        return null;
+    } // end method getTimestamp
 
-	public boolean rowUpdated() {
+    public URL getURL(int parm1) {
+        return null;
+    } // end method getURL
 
-		return true;
-	} // end method rowUpdated
+    public URL getURL(String parm1) {
+        return null;
+    } // end method getURL
 
-	public boolean rowInserted() {
+    public void updateRef(int parm1, Ref parm2) {
+    } // end method updateRef
 
-		return true;
-	} // end method rowInserted
+    public void updateRef(String parm1, Ref parm2) {
+    } // end method updateRef
 
-	public boolean rowDeleted() {
+    public void updateBlob(int parm1, Blob parm2) {
+    } // end method updateBlob
 
-		return true;
-	} // end method rowDeleted
+    public void updateBlob(String parm1, Blob parm2) {
+    } // end method updateBlob
 
-	public void updateNull(int parm1) {
+    public void updateClob(int parm1, Clob parm2) {
+    } // end method updateClob
 
-	} // end method updateNull
+    public void updateClob(String parm1, Clob parm2) {
+    } // end method updateClob
 
-	public void updateBoolean(int parm1, boolean parm2) {
-
-	} // end method updateBoolean
-
-	public void updateByte(int parm1, byte parm2) {
-
-	} // end method updateByte
-
-	public void updateShort(int parm1, short parm2) {
-
-	} // end method updateShort
-
-	public void updateInt(int parm1, int parm2) {
-
-	} // end method updateInt
-
-	public void updateLong(int parm1, long parm2) {
-
-	} // end method updateLong
-
-	public void updateFloat(int parm1, float parm2) {
-
-	} // end method updateFloat
-
-	public void updateDouble(int parm1, double parm2) {
-
-	} // end method updateDouble
-
-	public void updateBigDecimal(int parm1, BigDecimal parm2) {
-
-	} // end method updateBigDecimal
-
-	public void updateString(int parm1, String parm2) {
-
-	} // end method updateString
-
-	public void updateBytes(int parm1, byte[] parm2) {
-
-	} // end method updateBytes
-
-	public void updateDate(int parm1, Date parm2) {
-
-	} // end method updateDate
-
-	public void updateTime(int parm1, Time parm2) {
-
-	} // end method updateTime
-
-	public void updateTimestamp(int parm1, Timestamp parm2) {
-
-	} // end method updateTimestamp
-
-	public void updateAsciiStream(int parm1, InputStream parm2, int parm3) {
-
-	} // end method updateAsciiStream
-
-	public void updateBinaryStream(int parm1, InputStream parm2, int parm3) {
-
-	} // end method updateBinaryStream
-
-	public void updateCharacterStream(int parm1, Reader parm2, int parm3) {
-
-	} // end method updateCharacterStream
-
-	public void updateObject(int parm1, Object parm2, int parm3) {
-
-	} // end method updateObject
-
-	public void updateObject(int parm1, Object parm2) {
-
-	} // end method updateObject
-
-	public void updateNull(String parm1) {
-
-	} // end method updateNull
-
-	public void updateBoolean(String parm1, boolean parm2) {
-
-	} // end method updateBoolean
-
-	public void updateByte(String parm1, byte parm2) {
-
-	} // end method updateByte
-
-	public void updateShort(String parm1, short parm2) {
-
-	} // end method updateShort
-
-	public void updateInt(String parm1, int parm2) {
-
-	} // end method updateInt
-
-	public void updateLong(String parm1, long parm2) {
-
-	} // end method updateLong
-
-	public void updateFloat(String parm1, float parm2) {
-
-	} // end method updateFloat
-
-	public void updateDouble(String parm1, double parm2) {
-
-	} // end method updateDouble
-
-	public void updateBigDecimal(String parm1, BigDecimal parm2) {
-
-	} // end method updateBigDecimal
-
-	public void updateString(String parm1, String parm2) {
-
-	} // end method updateString
-
-	public void updateBytes(String parm1, byte[] parm2) {
-
-	} // end method updateBytes
-
-	public void updateDate(String parm1, Date parm2) {
-
-	} // end method updateDate
-
-	public void updateTime(String parm1, Time parm2) {
-
-	} // end method updateTime
-
-	public void updateTimestamp(String parm1, Timestamp parm2) {
-
-	} // end method updateTimestamp
-
-	public void updateAsciiStream(String parm1, InputStream parm2, int parm3) {
-
-	} // end method updateAsciiStream
-
-	public void updateBinaryStream(String parm1, InputStream parm2, int parm3) {
-
-	} // end method updateBinaryStream
-
-	public void updateCharacterStream(String parm1, Reader parm2, int parm3) {
-
-	} // end method updateCharacterStream
-
-	public void updateObject(String parm1, Object parm2, int parm3) {
-
-	} // end method updateObject
-
-	public void updateObject(String parm1, Object parm2) {
-
-	} // end method updateObject
-
-	public void insertRow() {
-
-	} // end method insertRow
-
-	public void updateRow() {
-
-	} // end method updateRow
-
-	public void deleteRow() {
-
-	} // end method deleteRow
-
-	public void refreshRow() {
-
-	} // end method refreshRow
-
-	public void cancelRowUpdates() {
-
-	} // end method cancelRowUpdates
-
-	public void moveToInsertRow() {
-
-	} // end method moveToInsertRow
-
-	public void moveToCurrentRow() {
-
-	} // end method moveToCurrentRow
-
-	public Statement getStatement() {
-
-		return null;
-	} // end method getStatement
-
-	public Object getObject(int parm1, Map parm2) {
-
-		return null;
-	} // end method getObject
-
-	public Ref getRef(int parm1) {
-
-		return null;
-	} // end method getRef
-
-	public Blob getBlob(int parm1) {
-
-		return null;
-	} // end method getBlob
-
-	public Clob getClob(int parm1) {
-
-		return null;
-	} // end method getClob
-
-	public Array getArray(int parm1) {
-
-		return null;
-	} // end method getArray
-
-	public Object getObject(String parm1, Map parm2) {
-
-		return null;
-	} // end method getObject
-
-	public Ref getRef(String parm1) {
-
-		return null;
-	} // end method getRef
-
-	public Blob getBlob(String parm1) {
-
-		return null;
-	} // end method getBlob
-
-	public Clob getClob(String parm1) {
-
-		return null;
-	} // end method getClob
-
-	public Array getArray(String parm1) {
-
-		return null;
-	} // end method getArray
-
-	public Date getDate(int parm1, Calendar parm2) {
-
-		return null;
-	} // end method getDate
-
-	public Date getDate(String parm1, Calendar parm2) {
-
-		return null;
-	} // end method getDate
-
-	public Time getTime(int parm1, Calendar parm2) {
-
-		return null;
-	} // end method getTime
-
-	public Time getTime(String parm1, Calendar parm2) {
-
-		return null;
-	} // end method getTime
-
-	public Timestamp getTimestamp(int parm1, Calendar parm2) {
-
-		return null;
-	} // end method getTimestamp
-
-	public Timestamp getTimestamp(String parm1, Calendar parm2) {
-
-		return null;
-	} // end method getTimestamp
-
-	public URL getURL(int parm1) {
-
-		return null;
-	} // end method getURL
-
-	public URL getURL(String parm1) {
-
-		return null;
-	} // end method getURL
-
-	public void updateRef(int parm1, Ref parm2) {
-
-	} // end method updateRef
-
-	public void updateRef(String parm1, Ref parm2) {
-
-	} // end method updateRef
-
-	public void updateBlob(int parm1, Blob parm2) {
-
-	} // end method updateBlob
-
-	public void updateBlob(String parm1, Blob parm2) {
-
-	} // end method updateBlob
-
-	public void updateClob(int parm1, Clob parm2) {
-
-	} // end method updateClob
-
-	public void updateClob(String parm1, Clob parm2) {
-
-	} // end method updateClob
-
-	public void updateArray(int parm1, Array parm2) {
-
-	} // end method updateArray
-
-	public void updateArray(String parm1, Array parm2) {
-
-	} // end method updateArray
+    public void updateArray(int parm1, Array parm2) {
+    } // end method updateArray
 
+    public void updateArray(String parm1, Array parm2) {
+    } // end method updateArray
 } // end class ResultSetTest
-

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java?view=diff&rev=471120&r1=471119&r2=471120
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_ClassLoader.java Fri Nov  3 21:10:50 2006
@@ -24,20 +24,11 @@
 import java.util.jar.JarEntry;
 import java.util.jar.JarFile;
 
-/**
- * TODO Type description
- * 
- */
 public class TestHelper_ClassLoader extends ClassLoader {
 
 	public TestHelper_ClassLoader() {
 		super(null);
-		// System.out.println("Test class loader - loaded.");
-		/*
-		 * System.out.println("Test class loader = " + this );
-		 * System.out.println("Test class loader parent = " + this.getParent() );
-		 */
-	} // end method TestClassLoader
+	}
 
 	/**
 	 * Loads a class specified by its name
@@ -168,7 +159,7 @@
 				return theClass;
 			} // end if
 
-			int theMethod = theEntry.getMethod();
+			theEntry.getMethod();
 			InputStream theStream = theJar.getInputStream(theEntry);
 
 			long size = theEntry.getSize();

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java?view=diff&rev=471120&r1=471119&r2=471120
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Connection1.java Fri Nov  3 21:10:50 2006
@@ -28,385 +28,149 @@
 import java.util.Map;
 
 /**
- * Helper class for the java.sql tests - a skeletong class which implements the
+ * Helper class for the java.sql tests - a skeleton class which implements the
  * java.sql.Connection interface
  * 
  */
 public class TestHelper_Connection1 implements Connection {
+    public void clearWarnings() throws SQLException {
+    }
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#clearWarnings()
-	 */
-	public void clearWarnings() throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#close()
-	 */
-	public void close() throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#commit()
-	 */
-	public void commit() throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#createStatement()
-	 */
-	public Statement createStatement() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#createStatement(int, int)
-	 */
-	public Statement createStatement(int resultSetType, int resultSetConcurrency)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#createStatement(int, int, int)
-	 */
-	public Statement createStatement(int resultSetType,
-			int resultSetConcurrency, int resultSetHoldability)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getAutoCommit()
-	 */
-	public boolean getAutoCommit() throws SQLException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getCatalog()
-	 */
-	public String getCatalog() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getHoldability()
-	 */
-	public int getHoldability() throws SQLException {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getMetaData()
-	 */
-	public DatabaseMetaData getMetaData() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getTransactionIsolation()
-	 */
-	public int getTransactionIsolation() throws SQLException {
-		// TODO Auto-generated method stub
-		return 0;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getTypeMap()
-	 */
-	public Map getTypeMap() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#getWarnings()
-	 */
-	public SQLWarning getWarnings() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#isClosed()
-	 */
-	public boolean isClosed() throws SQLException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#isReadOnly()
-	 */
-	public boolean isReadOnly() throws SQLException {
-		// TODO Auto-generated method stub
-		return false;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#nativeSQL(java.lang.String)
-	 */
-	public String nativeSQL(String sql) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareCall(java.lang.String)
-	 */
-	public CallableStatement prepareCall(String sql) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareCall(java.lang.String, int, int)
-	 */
-	public CallableStatement prepareCall(String sql, int resultSetType,
-			int resultSetConcurrency) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareCall(java.lang.String, int, int, int)
-	 */
-	public CallableStatement prepareCall(String sql, int resultSetType,
-			int resultSetConcurrency, int resultSetHoldability)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareStatement(java.lang.String)
-	 */
-	public PreparedStatement prepareStatement(String sql) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareStatement(java.lang.String, int)
-	 */
-	public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareStatement(java.lang.String, int[])
-	 */
-	public PreparedStatement prepareStatement(String sql, int[] columnIndexes)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareStatement(java.lang.String, int, int)
-	 */
-	public PreparedStatement prepareStatement(String sql, int resultSetType,
-			int resultSetConcurrency) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareStatement(java.lang.String, int, int,
-	 *      int)
-	 */
-	public PreparedStatement prepareStatement(String sql, int resultSetType,
-			int resultSetConcurrency, int resultSetHoldability)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#prepareStatement(java.lang.String,
-	 *      java.lang.String[])
-	 */
-	public PreparedStatement prepareStatement(String sql, String[] columnNames)
-			throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#releaseSavepoint(java.sql.Savepoint)
-	 */
-	public void releaseSavepoint(Savepoint savepoint) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#rollback()
-	 */
-	public void rollback() throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#rollback(java.sql.Savepoint)
-	 */
-	public void rollback(Savepoint savepoint) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setAutoCommit(boolean)
-	 */
-	public void setAutoCommit(boolean autoCommit) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setCatalog(java.lang.String)
-	 */
-	public void setCatalog(String catalog) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setHoldability(int)
-	 */
-	public void setHoldability(int holdability) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setReadOnly(boolean)
-	 */
-	public void setReadOnly(boolean readOnly) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setSavepoint()
-	 */
-	public Savepoint setSavepoint() throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setSavepoint(java.lang.String)
-	 */
-	public Savepoint setSavepoint(String name) throws SQLException {
-		// TODO Auto-generated method stub
-		return null;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setTransactionIsolation(int)
-	 */
-	public void setTransactionIsolation(int level) throws SQLException {
-		// TODO Auto-generated method stub
-
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Connection#setTypeMap(java.util.Map)
-	 */
-	public void setTypeMap(Map map) throws SQLException {
-		// TODO Auto-generated method stub
+    public void close() throws SQLException {
+    }
 
-	}
+    public void commit() throws SQLException {
+    }
 
-}
+    public Statement createStatement() throws SQLException {
+        return null;
+    }
+
+    public Statement createStatement(int resultSetType, int resultSetConcurrency,
+            int resultSetHoldability) throws SQLException {
+        return null;
+    }
+
+    public Statement createStatement(int resultSetType, int resultSetConcurrency)
+            throws SQLException {
+        return null;
+    }
+
+    public boolean getAutoCommit() throws SQLException {
+        return false;
+    }
+
+    public String getCatalog() throws SQLException {
+        return null;
+    }
+
+    public int getHoldability() throws SQLException {
+        return 0;
+    }
+
+    public DatabaseMetaData getMetaData() throws SQLException {
+        return null;
+    }
+
+    public int getTransactionIsolation() throws SQLException {
+        return 0;
+    }
+
+    public Map<String, Class<?>> getTypeMap() throws SQLException {
+        return null;
+    }
+
+    public SQLWarning getWarnings() throws SQLException {
+        return null;
+    }
+
+    public boolean isClosed() throws SQLException {
+        return false;
+    }
+
+    public boolean isReadOnly() throws SQLException {
+        return false;
+    }
+
+    public String nativeSQL(String sql) throws SQLException {
+        return null;
+    }
+
+    public CallableStatement prepareCall(String sql, int resultSetType,
+            int resultSetConcurrency, int resultSetHoldability) throws SQLException {
+        return null;
+    }
+
+    public CallableStatement prepareCall(String sql, int resultSetType, int resultSetConcurrency)
+            throws SQLException {
+        return null;
+    }
+
+    public CallableStatement prepareCall(String sql) throws SQLException {
+        return null;
+    }
+
+    public PreparedStatement prepareStatement(String sql, int resultSetType,
+            int resultSetConcurrency, int resultSetHoldability) throws SQLException {
+        return null;
+    }
+
+    public PreparedStatement prepareStatement(String sql, int resultSetType,
+            int resultSetConcurrency) throws SQLException {
+        return null;
+    }
+
+    public PreparedStatement prepareStatement(String sql, int autoGeneratedKeys)
+            throws SQLException {
+        return null;
+    }
+
+    public PreparedStatement prepareStatement(String sql, int[] columnIndexes)
+            throws SQLException {
+        return null;
+    }
+
+    public PreparedStatement prepareStatement(String sql, String[] columnNames)
+            throws SQLException {
+        return null;
+    }
+
+    public PreparedStatement prepareStatement(String sql) throws SQLException {
+        return null;
+    }
+
+    public void releaseSavepoint(Savepoint savepoint) throws SQLException {
+    }
+
+    public void rollback() throws SQLException {
+    }
+
+    public void rollback(Savepoint savepoint) throws SQLException {
+    }
+
+    public void setAutoCommit(boolean autoCommit) throws SQLException {
+    }
+
+    public void setCatalog(String catalog) throws SQLException {
+    }
+
+    public void setHoldability(int holdability) throws SQLException {
+    }
+
+    public void setReadOnly(boolean readOnly) throws SQLException {
+    }
+
+    public Savepoint setSavepoint() throws SQLException {
+        return null;
+    }
+
+    public Savepoint setSavepoint(String name) throws SQLException {
+        return null;
+    }
+
+    public void setTransactionIsolation(int level) throws SQLException {
+    }
 
+    public void setTypeMap(Map<String, Class<?>> map) throws SQLException {
+    }
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java?view=diff&rev=471120&r1=471119&r2=471120
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver1.java Fri Nov  3 21:10:50 2006
@@ -30,149 +30,102 @@
  * 
  */
 public class TestHelper_Driver1 implements Driver {
+    int majorVersion = 1;
 
-	int majorVersion = 1;
+    int minorVersion = 0;
 
-	int minorVersion = 0;
+    String baseURL = "jdbc:mikes1";
 
-	String baseURL = "jdbc:mikes1";
+    String[] dataSources = { "data1", "data2", "data3" };
 
-	String[] dataSources = { "data1", "data2", "data3" };
+    static Driver theDriver;
+    static {
+        theDriver = new TestHelper_Driver1();
+        try {
+            DriverManager.registerDriver(theDriver);
+        } catch (SQLException e) {
+            System.out.println("Failed to register driver!");
+        }
+    } // end static block initializer
 
-	static Driver theDriver;
-
-	static {
-		theDriver = new TestHelper_Driver1();
-		/*
-		 * System.out.println("Driver1 classloader: " +
-		 * theDriver.getClass().getClassLoader() ); System.out.println("Driver1
-		 * object is: " + theDriver );
-		 */
-		try {
-			DriverManager.registerDriver(theDriver);
-		} catch (SQLException e) {
-			System.out.println("Failed to register driver!");
-		}
-	} // end static block initializer
-
-	protected TestHelper_Driver1() {
-		super();
-	} // end constructor TestHelper_Driver1()
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Driver#acceptsURL(java.lang.String) @param url a url
-	 *      specification for a datasource or a general url for this driver
-	 */
-	public boolean acceptsURL(String url) throws SQLException {
-		// Check on the supplied String...
-		if (url == null) {
+    protected TestHelper_Driver1() {
+        super();
+    } // end constructor TestHelper_Driver1()
+
+    public boolean acceptsURL(String url) throws SQLException {
+        // Check on the supplied String...
+        if (url == null) {
             return false;
         }
-		// Everything's fine if the quoted url starts with the base url for this
-		// driver
-		if (url.startsWith(baseURL)) {
+        // Everything's fine if the quoted url starts with the base url for this
+        // driver
+        if (url.startsWith(baseURL)) {
             return true;
         }
-		return false;
-	} // end method acceptsURL
+        return false;
+    } // end method acceptsURL
+
+    static String validuser = "theuser";
+
+    static String validpassword = "thepassword";
+
+    static String userProperty = "user";
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Driver#connect(java.lang.String, java.util.Properties)
-	 */
-	static String validuser = "theuser";
-
-	static String validpassword = "thepassword";
-
-	static String userProperty = "user";
-
-	static String passwordProperty = "password";
-
-	public Connection connect(String url, Properties info) throws SQLException {
-		// Does the URL have the right form?
-		if (this.acceptsURL(url)) {
-			// The datasource name is the remainder of the url after the ":"
-			String datasource = url.substring(baseURL.length() + 1);
-			for (String element : dataSources) {
-				if (datasource.equals(element)) {
-					// Check for user and password, except for datasource =
-					// data1
-					// which is set up not to require a user/password
-					// combination
-					if (datasource.equals("data1")) {
-						// do nothing...
-					} else {
-						if (info == null) {
+    static String passwordProperty = "password";
+
+    public Connection connect(String url, Properties info) throws SQLException {
+        // Does the URL have the right form?
+        if (this.acceptsURL(url)) {
+            // The datasource name is the remainder of the url after the ":"
+            String datasource = url.substring(baseURL.length() + 1);
+            for (String element : dataSources) {
+                if (datasource.equals(element)) {
+                    /*
+                     * Check for user and password, except for datasource =
+                     * data1 which is set up not to require a user/password
+                     * combination
+                     */
+                    if (datasource.equals("data1")) {
+                        // do nothing...
+                    } else {
+                        if (info == null) {
                             throw new SQLException("Properties bundle is null");
                         }
-						String user = (String) info.get(userProperty);
-						String password = (String) info.get(passwordProperty);
-						if (user == null || password == null) {
-							throw new SQLException(
-									"Userid and/or password not supplied");
-						} else {
-							if (!user.equals(validuser)
-									|| !password.equals(validpassword)) {
-								throw new SQLException(
-										"Userid and/or password not valid");
-							} // end if
-						} // end if
-					} // end if
-					// It all checks out - so return a connection
-					Connection connection = new TestHelper_Connection1();
-					return connection;
-				} // end if
-			} // end for
-		} // end if
-		return null;
-	} // end method connect(String, Properties)
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Driver#getMajorVersion()
-	 */
-	public int getMajorVersion() {
-
-		return majorVersion;
-	} // end method getMajorVersion()
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Driver#getMinorVersion()
-	 */
-	public int getMinorVersion() {
-
-		return minorVersion;
-	} // end method getMinorVersion()
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Driver#getPropertyInfo(java.lang.String,
-	 *      java.util.Properties)
-	 */
-	public DriverPropertyInfo[] getPropertyInfo(String url, Properties info)
-			throws SQLException {
-		DriverPropertyInfo[] theInfos = {
-				new DriverPropertyInfo(userProperty, "*"),
-				new DriverPropertyInfo(passwordProperty, "*"), };
-		return theInfos;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Driver#jdbcCompliant()
-	 */
-	public boolean jdbcCompliant() {
-		// Basic version here returns false
-		return false;
-	}
-
+                        String user = (String) info.get(userProperty);
+                        String password = (String) info.get(passwordProperty);
+                        if (user == null || password == null) {
+                            throw new SQLException("Userid and/or password not supplied");
+                        }
+                        if (!user.equals(validuser) || !password.equals(validpassword)) {
+                            throw new SQLException("Userid and/or password not valid");
+                        } // end if
+                    } // end if
+                    // It all checks out - so return a connection
+                    Connection connection = new TestHelper_Connection1();
+                    return connection;
+                } // end if
+            } // end for
+        } // end if
+        return null;
+    } // end method connect(String, Properties)
+
+    public int getMajorVersion() {
+        return majorVersion;
+    } // end method getMajorVersion()
+
+    public int getMinorVersion() {
+        return minorVersion;
+    } // end method getMinorVersion()
+
+    public DriverPropertyInfo[] getPropertyInfo(String url, Properties info)
+            throws SQLException {
+        DriverPropertyInfo[] theInfos = { new DriverPropertyInfo(userProperty, "*"),
+                new DriverPropertyInfo(passwordProperty, "*"), };
+        return theInfos;
+    }
+
+    public boolean jdbcCompliant() {
+        // Basic version here returns false
+        return false;
+    }
 }
-

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java?view=diff&rev=471120&r1=471119&r2=471120
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/java/sql/TestHelper_Driver4.java Fri Nov  3 21:10:50 2006
@@ -29,143 +29,101 @@
  * 
  */
 public class TestHelper_Driver4 implements Driver {
+    int majorVersion = 1;
 
-	int majorVersion = 1;
+    int minorVersion = 0;
 
-	int minorVersion = 0;
+    String baseURL;
 
-	String baseURL;
-
-	String[] dataSources = { "data1", "data2", "data3" };
+    String[] dataSources = { "data1", "data2", "data3" };
+    static {
+        Driver theDriver = new TestHelper_Driver4();
+        try {
+            DriverManager.registerDriver(theDriver);
+        } catch (SQLException e) {
+            System.out.println("Failed to register driver!");
+        }
+    } // end static block initializer
 
-	static {
-		Driver theDriver = new TestHelper_Driver4();
-		try {
-			DriverManager.registerDriver(theDriver);
-		} catch (SQLException e) {
-			System.out.println("Failed to register driver!");
-		}
-	} // end static block initializer
-
-	protected TestHelper_Driver4() {
-		super();
-		baseURL = "jdbc:mikes4";
-	} // end constructor TestHelper_Driver4()
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Driver#acceptsURL(java.lang.String) @param url a url
-	 *      specification for a datasource or a general url for this driver
-	 */
-	public boolean acceptsURL(String url) throws SQLException {
-		// Check on the supplied String...
-		if (url == null) {
+    protected TestHelper_Driver4() {
+        super();
+        baseURL = "jdbc:mikes4";
+    } // end constructor TestHelper_Driver4()
+
+    public boolean acceptsURL(String url) throws SQLException {
+        // Check on the supplied String...
+        if (url == null) {
             return false;
         }
-		// Everything's fine if the quoted url starts with the base url for this
-		// driver
-		if (url.startsWith(baseURL)) {
+        // Everything's fine if the quoted url starts with the base url for this
+        // driver
+        if (url.startsWith(baseURL)) {
             return true;
         }
-		return false;
-	} // end method acceptsURL
+        return false;
+    } // end method acceptsURL
 
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Driver#connect(java.lang.String, java.util.Properties)
-	 */
-	static String validuser = "theuser";
-
-	static String validpassword = "thepassword";
-
-	static String userProperty = "user";
-
-	static String passwordProperty = "password";
-
-	public Connection connect(String url, Properties info) throws SQLException {
-		// Does the URL have the right form?
-		if (this.acceptsURL(url)) {
-			// The datasource name is the remainder of the url after the ":"
-			String datasource = url.substring(baseURL.length() + 1);
-			for (String element : dataSources) {
-				if (datasource.equals(element)) {
-					// Check for user and password, except for datasource =
-					// data1
-					// which is set up not to require a user/password
-					// combination
-					if (datasource.equals("data1")) {
-						// do nothing...
-					} else {
-						if (info == null) {
-                            throw new SQLException("Properties bundle is null");
-                        }
-						String user = (String) info.get(userProperty);
-						String password = (String) info.get(passwordProperty);
-						if (user == null || password == null) {
-							throw new SQLException(
-									"Userid and/or password not supplied");
-						} else {
-							if (!user.equals(validuser)
-									|| !password.equals(validpassword)) {
-								throw new SQLException(
-										"Userid and/or password not valid");
-							} // end if
-						} // end if
-					} // end if
-					// It all checks out - so return a connection
-					Connection connection = new TestHelper_Connection1();
-					return connection;
-				} // end if
-			} // end for
-		} // end if
-		return null;
-	} // end method connect(String, Properties)
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Driver#getMajorVersion()
-	 */
-	public int getMajorVersion() {
-
-		return majorVersion;
-	} // end method getMajorVersion()
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Driver#getMinorVersion()
-	 */
-	public int getMinorVersion() {
-
-		return minorVersion;
-	} // end method getMinorVersion()
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Driver#getPropertyInfo(java.lang.String,
-	 *      java.util.Properties)
-	 */
-	public DriverPropertyInfo[] getPropertyInfo(String url, Properties info)
-			throws SQLException {
-		DriverPropertyInfo[] theInfos = {
-				new DriverPropertyInfo(userProperty, "*"),
-				new DriverPropertyInfo(passwordProperty, "*"), };
-		return theInfos;
-	}
-
-	/*
-	 * (non-Javadoc)
-	 * 
-	 * @see java.sql.Driver#jdbcCompliant()
-	 */
-	public boolean jdbcCompliant() {
-		// Basic version here returns false
-		return false;
-	}
+    static String validuser = "theuser";
 
-} // end class TestHelper_Driver4
+    static String validpassword = "thepassword";
 
+    static String userProperty = "user";
+
+    static String passwordProperty = "password";
+
+    public Connection connect(String url, Properties info) throws SQLException {
+        // Does the URL have the right form?
+        if (this.acceptsURL(url)) {
+            // The datasource name is the remainder of the url after the ":"
+            String datasource = url.substring(baseURL.length() + 1);
+            for (String element : dataSources) {
+                if (datasource.equals(element)) {
+                    /*
+                     * Check for user and password, except for datasource =
+                     * data1 which is set up not to require a user/password
+                     * combination
+                     */
+                    if (datasource.equals("data1")) {
+                        // do nothing...
+                    } else {
+                        if (info == null) {
+                            throw new SQLException("Properties bundle is null");
+                        }
+                        String user = (String) info.get(userProperty);
+                        String password = (String) info.get(passwordProperty);
+                        if (user == null || password == null) {
+                            throw new SQLException("Userid and/or password not supplied");
+                        }
+                        if (!user.equals(validuser) || !password.equals(validpassword)) {
+                            throw new SQLException("Userid and/or password not valid");
+                        } // end if
+                    } // end if
+                    // It all checks out - so return a connection
+                    Connection connection = new TestHelper_Connection1();
+                    return connection;
+                } // end if
+            } // end for
+        } // end if
+        return null;
+    } // end method connect(String, Properties)
+
+    public int getMajorVersion() {
+        return majorVersion;
+    } // end method getMajorVersion()
+
+    public int getMinorVersion() {
+        return minorVersion;
+    } // end method getMinorVersion()
+
+    public DriverPropertyInfo[] getPropertyInfo(String url, Properties info)
+            throws SQLException {
+        DriverPropertyInfo[] theInfos = { new DriverPropertyInfo(userProperty, "*"),
+                new DriverPropertyInfo(passwordProperty, "*"), };
+        return theInfos;
+    }
+
+    public boolean jdbcCompliant() {
+        // Basic version here returns false
+        return false;
+    }
+}

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java?view=diff&rev=471120&r1=471119&r2=471120
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/ConnectionEventTest.java Fri Nov  3 21:10:50 2006
@@ -18,145 +18,40 @@
 package org.apache.harmony.sql.tests.javax.sql;
 
 import java.sql.SQLException;
-
 import javax.sql.ConnectionEvent;
-import javax.sql.PooledConnection;
-
 import junit.framework.TestCase;
 
-/**
- * JUnit Testcase for the javax.sql.ConnectionEvent class
- * 
- */
-
 public class ConnectionEventTest extends TestCase {
 
-	/*
-	 * ConstructorTest
-	 */
-	public void testConnectionEventPooledConnectionSQLException() {
-
-		PooledConnection[] init1 = { new Impl_PooledConnection(),
-				new Impl_PooledConnection(), null, null };
-		SQLException[] init2 = { new SQLException("Test SQL Exception"), null,
-				new SQLException("Test SQL Exception2"), null };
-
-		PooledConnection[] theFinalStates1 = init1;
-		SQLException[] theFinalStates2 = init2;
-
-		Exception[] theExceptions = { null, null,
-				new IllegalArgumentException("null source"),
-				new IllegalArgumentException("null source") };
-
-		ConnectionEvent aConnectionEvent;
-		int loopCount = init1.length;
-		for (int i = 0; i < loopCount; i++) {
-			try {
-				aConnectionEvent = new ConnectionEvent(init1[i], init2[i]);
-				if (theExceptions[i] != null) {
-                    fail(i + "Exception missed");
-                }
-				assertEquals(i + "Final state mismatch", aConnectionEvent
-						.getSource(), theFinalStates1[i]);
-				assertEquals(i + "Final state mismatch", aConnectionEvent
-						.getSQLException(), theFinalStates2[i]);
-			} catch (Exception e) {
-				if (theExceptions[i] == null) {
-                    fail(i + "Unexpected exception");
-                }
-				assertEquals(i + "Exception mismatch", e.getClass(),
-						theExceptions[i].getClass());
-				// assertEquals( i + "Exception mismatch", e.getMessage(),
-				// theExceptions[i].getMessage() );
-			} // end try
-		} // end for
-
-	} // end method testConnectionEventPooledConnectionSQLException
-
-	/*
-	 * ConstructorTest
-	 */
-	public void testConnectionEventPooledConnection() {
-
-		PooledConnection[] init1 = { new Impl_PooledConnection(), null, };
-
-		PooledConnection[] theFinalStates1 = init1;
-		SQLException[] theFinalStates2 = { null, null };
-
-		Exception[] theExceptions = { null,
-				new IllegalArgumentException("null source") };
-
-		ConnectionEvent aConnectionEvent;
-		int loopCount = init1.length;
-		for (int i = 0; i < loopCount; i++) {
-			try {
-				aConnectionEvent = new ConnectionEvent(init1[i]);
-				if (theExceptions[i] != null) {
-                    fail(i + "Exception missed");
-                }
-				assertEquals(i + "Final state mismatch", aConnectionEvent
-						.getSource(), theFinalStates1[i]);
-				assertEquals(i + "Final state mismatch", aConnectionEvent
-						.getSQLException(), theFinalStates2[i]);
-
-			} catch (Exception e) {
-				if (theExceptions[i] == null) {
-                    fail(i + "Unexpected exception");
-                }
-				assertEquals(i + "Exception mismatch", e.getClass(),
-						theExceptions[i].getClass());
-				// assertEquals( i + "Exception mismatch", e.getMessage(),
-				// theExceptions[i].getMessage() );
-			} // end try
-		} // end for
-
-	} // end method testConnectionEventPooledConnection
-
-	/*
-	 * Method test for getSQLException
-	 */
-	public void testGetSQLException() {
-
-		ConnectionEvent aConnectionEvent;
-		PooledConnection[] init1 = { new Impl_PooledConnection(),
-				new Impl_PooledConnection() };
-		SQLException[] init2 = { new SQLException("Test SQL Exception"), null };
-
-		SQLException theReturn;
-		SQLException[] theReturns = init2;
-
-		PooledConnection[] theFinalStates1 = init1;
-		SQLException[] theFinalStates2 = init2;
-
-		Exception[] theExceptions = { null,
-				new IllegalArgumentException("null source") };
-
-		int loopCount = 1;
-		for (int i = 0; i < loopCount; i++) {
-			try {
-				aConnectionEvent = new ConnectionEvent(init1[i], init2[i]);
-				theReturn = aConnectionEvent.getSQLException();
-				if (theExceptions[i] != null) {
-                    fail(i + "Exception missed");
-                }
-				assertTrue(theReturn.equals(theReturns[i]));
-				assertEquals(i + "Final state mismatch", aConnectionEvent
-						.getSource(), theFinalStates1[i]);
-				assertEquals(i + "Final state mismatch", aConnectionEvent
-						.getSQLException(), theFinalStates2[i]);
-
-			} catch (Exception e) {
-				if (theExceptions[i] == null) {
-                    fail(i + "Unexpected exception");
-                }
-				assertEquals(i + "Exception mismatch", e.getClass(),
-						theExceptions[i].getClass());
-				assertEquals(i + "Exception mismatch", e.getMessage(),
-						theExceptions[i].getMessage());
-			} // end try
-		} // end for
-
-	} // end method testGetSQLException
-
-} // end class ConnectionEventTest
+    public void testConstructorConnection() {
+        try {
+            new ConnectionEvent(null);
+            fail("illegal argument exception expected");
+        } catch (IllegalArgumentException e) {
+        }
+        
+        Impl_PooledConnection ipc = new Impl_PooledConnection();
+        ConnectionEvent ce = new ConnectionEvent(ipc);
+        assertSame(ipc, ce.getSource());
+        assertNull(ce.getSQLException());
+    }
+    
+    public void testConstructorConnectionSQLException() {
+        try {
+            new ConnectionEvent(null, null);
+            fail("illegal argument exception expected");
+        } catch (IllegalArgumentException e) {
+        }
+        
+        Impl_PooledConnection ipc = new Impl_PooledConnection();
+        ConnectionEvent ce = new ConnectionEvent(ipc, null);
+        assertSame(ipc, ce.getSource());
+        assertNull(ce.getSQLException());
+        
+        SQLException e = new SQLException();
+        ce = new ConnectionEvent(ipc, e);
+        assertSame(ipc, ce.getSource());
+        assertSame(e, ce.getSQLException());
+    }
+}   
 

Modified: incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java
URL: http://svn.apache.org/viewvc/incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java?view=diff&rev=471120&r1=471119&r2=471120
==============================================================================
--- incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java (original)
+++ incubator/harmony/enhanced/classlib/trunk/modules/sql/src/test/java/org/apache/harmony/sql/tests/javax/sql/Impl_PooledConnection.java Fri Nov  3 21:10:50 2006
@@ -18,37 +18,21 @@
 package org.apache.harmony.sql.tests.javax.sql;
 
 import java.sql.Connection;
-
+import java.sql.SQLException;
 import javax.sql.ConnectionEventListener;
 import javax.sql.PooledConnection;
 
-import org.apache.harmony.sql.tests.java.sql.TestHelper_Connection1;
-
-/**
- * Helper implementation for the interface javax.sql.PooledConnection
- * 
- */
-
-public class Impl_PooledConnection implements PooledConnection {
-
-	public Impl_PooledConnection() {
-		super();
-	} // end constructor
-
-	public Connection getConnection() {
-		return new TestHelper_Connection1();
-	} // end method getConnection
-
-	public void close() {
-
-	} // end method close
-
-	public void addConnectionEventListener(ConnectionEventListener parm1) {
-
-	} // end method addConnectionEventListener
-
-	public void removeConnectionEventListener(ConnectionEventListener parm1) {
-
-	} // end method removeConnectionEventListener
-
-} // end class PooledConnectionTest
+class Impl_PooledConnection implements PooledConnection {
+    public void addConnectionEventListener(ConnectionEventListener theListener) {
+    }
+
+    public void close() throws SQLException {
+    }
+
+    public Connection getConnection() throws SQLException {
+        return null;
+    }
+
+    public void removeConnectionEventListener(ConnectionEventListener theListener) {
+    }
+}



Mime
View raw message