summaryrefslogtreecommitdiff
path: root/src/interfaces/jdbc/org/postgresql/test
diff options
context:
space:
mode:
Diffstat (limited to 'src/interfaces/jdbc/org/postgresql/test')
-rw-r--r--src/interfaces/jdbc/org/postgresql/test/jdbc2/Jdbc2TestSuite.java1
-rw-r--r--src/interfaces/jdbc/org/postgresql/test/jdbc2/SerializeObject.java11
-rw-r--r--src/interfaces/jdbc/org/postgresql/test/jdbc2/SerializeTest.java47
-rw-r--r--src/interfaces/jdbc/org/postgresql/test/jdbc2/optional/BaseDataSourceTest.java4
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)