diff options
author | Barry Lind <barry@xythos.com> | 2003-03-07 18:39:46 +0000 |
---|---|---|
committer | Barry Lind <barry@xythos.com> | 2003-03-07 18:39:46 +0000 |
commit | 6ee060f201c4434157fd5e726e9ecc7b0c14d1dd (patch) | |
tree | 9a7f3ee53fb4cb987f5016205d9cbe612565e5ee /src/interfaces/jdbc/org/postgresql/test | |
parent | 2e6887df6356ff3ef3090ee8418faf269868fe43 (diff) |
Cleanup and reorganization.
- Added a private api layer (org.postgresql.core.Base*)
- Cleaned up public api (org.postgresql.PG*)
- Added consistent headers and copywrite info
- Removed deprecated Serialize functionality
- Cleaned up imports
- Moved some files to more appropriate locations
Modified Files:
jdbc/org/postgresql/Driver.java.in
jdbc/org/postgresql/PGConnection.java
jdbc/org/postgresql/PGNotification.java
jdbc/org/postgresql/PGStatement.java
jdbc/org/postgresql/core/Encoding.java
jdbc/org/postgresql/core/Notification.java
jdbc/org/postgresql/core/QueryExecutor.java
jdbc/org/postgresql/core/StartupPacket.java
jdbc/org/postgresql/fastpath/Fastpath.java
jdbc/org/postgresql/fastpath/FastpathArg.java
jdbc/org/postgresql/geometric/PGbox.java
jdbc/org/postgresql/geometric/PGcircle.java
jdbc/org/postgresql/geometric/PGline.java
jdbc/org/postgresql/geometric/PGlseg.java
jdbc/org/postgresql/geometric/PGpath.java
jdbc/org/postgresql/geometric/PGpoint.java
jdbc/org/postgresql/geometric/PGpolygon.java
jdbc/org/postgresql/jdbc1/AbstractJdbc1Connection.java
jdbc/org/postgresql/jdbc1/AbstractJdbc1DatabaseMetaData.java
jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSet.java
jdbc/org/postgresql/jdbc1/AbstractJdbc1ResultSetMetaData.java
jdbc/org/postgresql/jdbc1/AbstractJdbc1Statement.java
jdbc/org/postgresql/jdbc1/Jdbc1CallableStatement.java
jdbc/org/postgresql/jdbc1/Jdbc1Connection.java
jdbc/org/postgresql/jdbc1/Jdbc1DatabaseMetaData.java
jdbc/org/postgresql/jdbc1/Jdbc1PreparedStatement.java
jdbc/org/postgresql/jdbc1/Jdbc1ResultSet.java
jdbc/org/postgresql/jdbc1/Jdbc1ResultSetMetaData.java
jdbc/org/postgresql/jdbc1/Jdbc1Statement.java
jdbc/org/postgresql/jdbc2/AbstractJdbc2Blob.java
jdbc/org/postgresql/jdbc2/AbstractJdbc2Clob.java
jdbc/org/postgresql/jdbc2/AbstractJdbc2Connection.java
jdbc/org/postgresql/jdbc2/AbstractJdbc2DatabaseMetaData.java
jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSet.java
jdbc/org/postgresql/jdbc2/AbstractJdbc2ResultSetMetaData.java
jdbc/org/postgresql/jdbc2/AbstractJdbc2Statement.java
jdbc/org/postgresql/jdbc2/Array.java
jdbc/org/postgresql/jdbc2/Jdbc2CallableStatement.java
jdbc/org/postgresql/jdbc2/Jdbc2Connection.java
jdbc/org/postgresql/jdbc2/Jdbc2PreparedStatement.java
jdbc/org/postgresql/jdbc2/Jdbc2ResultSet.java
jdbc/org/postgresql/jdbc2/Jdbc2ResultSetMetaData.java
jdbc/org/postgresql/jdbc2/Jdbc2Statement.java
jdbc/org/postgresql/jdbc3/AbstractJdbc3ResultSet.java
jdbc/org/postgresql/jdbc3/Jdbc3CallableStatement.java
jdbc/org/postgresql/jdbc3/Jdbc3Connection.java
jdbc/org/postgresql/jdbc3/Jdbc3PreparedStatement.java
jdbc/org/postgresql/jdbc3/Jdbc3ResultSet.java
jdbc/org/postgresql/jdbc3/Jdbc3ResultSetMetaData.java
jdbc/org/postgresql/jdbc3/Jdbc3Statement.java
jdbc/org/postgresql/largeobject/BlobInputStream.java
jdbc/org/postgresql/largeobject/BlobOutputStream.java
jdbc/org/postgresql/largeobject/LargeObject.java
jdbc/org/postgresql/largeobject/LargeObjectManager.java
jdbc/org/postgresql/test/jdbc2/Jdbc2TestSuite.java
jdbc/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java
jdbc/org/postgresql/util/MD5Digest.java
jdbc/org/postgresql/util/MessageTranslator.java
jdbc/org/postgresql/util/PGbytea.java
jdbc/org/postgresql/util/PGmoney.java
jdbc/org/postgresql/util/PGobject.java
jdbc/org/postgresql/util/PGtokenizer.java
jdbc/org/postgresql/util/PSQLException.java
jdbc/org/postgresql/util/UnixCrypt.java
Added Files:
jdbc/org/postgresql/core/BaseConnection.java
jdbc/org/postgresql/core/BaseResultSet.java
jdbc/org/postgresql/core/BaseStatement.java
jdbc/org/postgresql/core/Field.java
jdbc/org/postgresql/core/PGStream.java
Removed Files:
jdbc/org/postgresql/Field.java
jdbc/org/postgresql/PG_Stream.java
jdbc/org/postgresql/test/jdbc2/SerializeObject.java
jdbc/org/postgresql/test/jdbc2/SerializeTest.java
jdbc/org/postgresql/util/Serialize.java
Diffstat (limited to 'src/interfaces/jdbc/org/postgresql/test')
4 files changed, 2 insertions, 61 deletions
diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/Jdbc2TestSuite.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/Jdbc2TestSuite.java index 1d0b7c3a36a..8976aefe702 100644 --- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/Jdbc2TestSuite.java +++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/Jdbc2TestSuite.java @@ -63,7 +63,6 @@ public class Jdbc2TestSuite extends TestSuite // Fastpath/LargeObject suite.addTestSuite(BlobTest.class); - suite.addTestSuite(SerializeTest.class); suite.addTestSuite(UpdateableResultTest.class ); suite.addTestSuite(CallableStmtTest.class ); diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/SerializeObject.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/SerializeObject.java deleted file mode 100644 index c2dd6ccf489..00000000000 --- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/SerializeObject.java +++ /dev/null @@ -1,11 +0,0 @@ -package org.postgresql.test.jdbc2; - -import java.io.Serializable; - -public class SerializeObject implements Serializable { - - public int intcol; - public double doublecol; - public String stringcol; - -} diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/SerializeTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/SerializeTest.java deleted file mode 100644 index 73d512f5889..00000000000 --- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/SerializeTest.java +++ /dev/null @@ -1,47 +0,0 @@ -package org.postgresql.test.jdbc2; - -import org.postgresql.test.TestUtil; -import junit.framework.TestCase; -import java.sql.*; -import org.postgresql.util.Serialize; - -public class SerializeTest extends TestCase { - - private Connection conn; - private SerializeObject serobj; - private Serialize ser; - - public SerializeTest(String name) { - super(name); - } - - protected void setUp() throws Exception { - conn = TestUtil.openDB(); - serobj = new SerializeObject(); - serobj.intcol = 1; - serobj.doublecol = 3.4; - serobj.stringcol = "Hello"; - TestUtil.dropTable(conn,Serialize.toPostgreSQL(conn,serobj.getClass().getName())); - Serialize.create(conn, serobj); - Serialize.create(conn, serobj); - ser = new Serialize(conn,serobj); - } - - protected void tearDown() throws Exception { - TestUtil.dropTable(conn,Serialize.toPostgreSQL(conn,serobj.getClass().getName())); - } - - public void testCreateSerialize() { - try { - long oid = ser.storeObject(serobj); - SerializeObject serobj2 = (SerializeObject)ser.fetch(oid); - assertNotNull(serobj2); - assertEquals(serobj.intcol,serobj2.intcol); - assertTrue(Math.abs(serobj.doublecol-serobj2.doublecol) < 0.0001); - assertTrue(serobj.stringcol.equals(serobj2.stringcol)); - } catch (SQLException sqle) { - fail(sqle.getMessage()); - } - } - -} diff --git a/src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java b/src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java index 403d9b2b68e..75157a81ccc 100644 --- a/src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java +++ b/src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java @@ -17,7 +17,7 @@ import javax.naming.*; * tests. * * @author Aaron Mulder (ammulder@chariotsolutions.com) - * @version $Revision: 1.5 $ + * @version $Revision: 1.6 $ */ public abstract class BaseDataSourceTest extends TestCase { @@ -189,7 +189,7 @@ public abstract class BaseDataSourceTest extends TestCase try { con = getDataSourceConnection(); - ((PGConnection)con).getEncoding().name(); + ((PGConnection)con).getNotifications(); con.close(); } catch (Exception e) |