db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r648413 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/DerbyNet/ master/DerbyNetClient/ suites/ tests/jdbcapi/
Date Tue, 15 Apr 2008 21:08:19 GMT
Author: myrnavl
Date: Tue Apr 15 14:08:15 2008
New Revision: 648413

URL: http://svn.apache.org/viewvc?rev=648413&view=rev
Log:
DERBY-3568; removing orphaned files/references for old savepointJdbc30_* tests.

Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/savepointJdbc30_JSR169.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/savepointJdbc30_JSR169.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/savepointJdbc30_XA.out
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude?rev=648413&r1=648412&r2=648413&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
Tue Apr 15 14:08:15 2008
@@ -1,22 +1,12 @@
-# excluding resultsetStream.java because this test uses java.io.FileInputStream throughout
the test
-# excluding TestErrorStreamTarget.java since it's not relevant for clients
 # excluding jdbcapi/testRelative.java because this is a new test contributed by Shreyas Kaushik
and needs to be debugged with JCC  in order to get it running with network server
 # excluding jdbcapi/SetQueryTimeoutTest.java because neither the JCC driver nor the ClientDriver
support setQueryTimeout() yet.
 # excluding jdbcapi/rsgetXXXcolumnNames.java as it fails incorrectly, according to JDBC spec.
Forwarding test case to JCC team.
-#           regardless of framework
 # excluding largedata/LobLimits.java to run with the network server because currently lobs
are materialized and this test tests for 2G lobs.
 # 			see DERBY-326 and DERBY-550 issues
-jdbcapi/resultsetStream.java
 jdbcapi/testRelative.java
 jdbcapi/rsgetXXXcolumnNames.java
 jdbcapi/SetQueryTimeoutTest.java
-jdbcapi/blobSetBinaryStream.java
-#no XA for JCC
-jdbcapi/savepointJdbc30_XA.java
 # excluding jdbcapi/derbyStress.java - jcc runs out of memory with this test
 jdbcapi/derbyStress.java
 largedata/LobLimits.java
 jdbcapi/SURTest_ij.sql
-# Excluding ResultSetClose test since an exception in a statement results in all
-# the result sets associated with the connection closing
-jdbcapi/ResultSetCloseTest.junit

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java?rev=648413&r1=648412&r2=648413&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java
Tue Apr 15 14:08:15 2008
@@ -51,7 +51,6 @@
             // from old jdbcapi.runall
             // "derbyStress",       TODO: Need a way to control heap size from Junit tests
             // "prepStmtMetaData",  TODO: convert - different canon for client
-            // "resultsetStream", TODO: investigate failure/convert needs ext files
             "maxfieldsize",
             //"LOBTest", TODO: investigate failure/convert
             "SetQueryTimeoutTest",
@@ -69,16 +68,6 @@
         "testRelative",
     };
     
-//    /**
-//     * Tests that require JDBC 3.
-//     */
-//    private static final String[] JDBCAPI_TESTS_EMEBDDED_JDBC3 =
-//    {
-//        // Tests that run ok in embedded but have a different client master file.
-//        "savepointJdbc30_XA",
-//    };
-    
-    
     private JDBCHarnessJavaTest(String name) {
         super(name);
      }
@@ -92,12 +81,6 @@
         TestSuite suite = new TestSuite("jdbcapi: old harness java tests");
         suite.addTest(baseSuite("embedded", JDBCAPI_TESTS_BOTH));
         suite.addTest(baseSuite("embedded", JDBCAPI_TESTS_EMEBDDED));
-//        if (JDBC.vmSupportsJDBC3())
-//        {
-//            suite.addTest(baseSuite("embedded_JDBC3",
-//                    JDBCAPI_TESTS_EMEBDDED_JDBC3));
-//        }
-        
         suite.addTest(TestConfiguration.clientServerDecorator(
                 baseSuite("clientserver", JDBCAPI_TESTS_BOTH)));
         return suite;



Mime
View raw message