db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r597464 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNet/ master/DerbyNetClient/ suites/ tests/jdbcapi/
Date Thu, 22 Nov 2007 17:39:16 GMT
Author: myrnavl
Date: Thu Nov 22 09:39:11 2007
New Revision: 597464

URL: http://svn.apache.org/viewvc?rev=597464&view=rev
Log:
DERBY-2242 ; remove metadata.java, metadata_test.java and odbc_metadata.java.
  Test has been converted to junit test DatabaseMetaDataTest.
  Also removed master file PhaseTester.out, orphaned from rev 407396 (DERBY-514)

Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/odbc_metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/odbc_metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/odbc_metadata.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/phaseTester.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_derby.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_sed.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/metadata_test.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_app.properties
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/odbc_metadata_sed.properties
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetUseprocess.exclude
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude?rev=597464&r1=597463&r2=597464&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
Thu Nov 22 09:39:11 2007
@@ -12,7 +12,6 @@
 # derbynet/sysinfo.java - needs other properties
 # derbynet/sysinfo_withproperties.java - needs other properties
 # following fail for various reasons, many related to not being able to connect:
-#  jdbcapi/odbc_metadata.java
 #  lang/optimizerOverrides.sql
 #  lang/big.sql
 #  lang/wisconsin.java
@@ -29,7 +28,6 @@
 derbynet/sysinfo.java
 derbynet/sysinfo_withproperties.java
 stress/stress.multi
-jdbcapi/odbc_metadata.java
 lang/optimizerOverrides.sql
 lang/big.sql
 lang/wisconsin.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetUseprocess.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetUseprocess.exclude?rev=597464&r1=597463&r2=597464&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetUseprocess.exclude
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetUseprocess.exclude
Thu Nov 22 09:39:11 2007
@@ -10,7 +10,6 @@
 # derbynet/runtimeinfo.java - fails with already existing threads (maybe intermittent)
 # derbynet/sysinfo.java - fails because not access to java.class.path
 # derbynet/sysinfo_withproperties.java - fails because not access to java.class.path
-# jdbcapi/odbc_metadata.java - fails...
 # lang/optimizerOverrides.sql - fails...
 # lang/big.sql - checks depend on dir structure
 # lang/wisconsin.java - checks depend on dir structure
@@ -25,7 +24,6 @@
 derbynet/runtimeinfo.java
 derbynet/sysinfo.java
 derbynet/sysinfo_withproperties.java
-jdbcapi/odbc_metadata.java
 lang/optimizerOverrides.sql
 lang/big.sql
 lang/wisconsin.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall?rev=597464&r1=597463&r2=597464&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
Thu Nov 22 09:39:11 2007
@@ -1,6 +1,4 @@
-jdbcapi/metadata.java
 jdbcapi/metadataMultiConn.java
-jdbcapi/odbc_metadata.java
 lang/DB2IsolationLevels.sql
 lang/LOBDB2compatibility.sql
 lang/aggregateOptimization.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall?rev=597464&r1=597463&r2=597464&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
Thu Nov 22 09:39:11 2007
@@ -10,9 +10,7 @@
 derbynet/testProperties.java
 derbynet/testconnection.java
 derbynet/timeslice.java
-jdbcapi/metadata.java
 jdbcapi/metadataMultiConn.java
-jdbcapi/odbc_metadata.java
 lang/optimizerOverrides.sql
 lang/big.sql
 lang/holdCursorIJ.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall?rev=597464&r1=597463&r2=597464&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
Thu Nov 22 09:39:11 2007
@@ -6,9 +6,7 @@
 derbynet/testProperties.java
 derbynet/testconnection.java
 derbynet/timeslice.java
-jdbcapi/metadata.java
 jdbcapi/metadataMultiConn.java
-jdbcapi/odbc_metadata.java
 lang/big.sql
 lang/holdCursorIJ.sql
 store/holdCursorExternalSortJDBC30.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java?rev=597464&r1=597463&r2=597464&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/DatabaseMetaDataTest.java
Thu Nov 22 09:39:11 2007
@@ -4251,31 +4251,31 @@
                 "e SMALLINT, f INTEGER, g BIGINT, h FLOAT, i DOUBLE PRECISION, " +
                 "k DATE, l TIME, T TIMESTAMP )"+
                 "language java external name " +
-                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc'" +
+                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest.getpc'"
+
         " parameter style java"); 
         s.execute("create procedure GETPCTEST2 (pa INTEGER, pb BIGINT)"+
                 "language java external name " +
-                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc'" +
+                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest.getpc'"
+
         " parameter style java"); 
         s.execute("create procedure GETPCTEST3A (STRING1 VARCHAR(5), out STRING2 VARCHAR(5))"+
                 "language java external name " +
-                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc'" +
+                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest.getpc'"
+
         " parameter style java"); 
         s.execute("create procedure GETPCTEST3B (in STRING3 VARCHAR(5), inout STRING4 VARCHAR(5))"+
                 "language java external name " +
-                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc'" +
+                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest.getpc'"
+
         " parameter style java"); 
         s.execute("create procedure GETPCTEST4A()  "+
                 "language java external name " +
-                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4a'"+
+                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest.getpc4a'"+
         " parameter style java"); 
         s.execute("create procedure GETPCTEST4B() "+
                 "language java external name " +
-                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b'"
+
+                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest.getpc4b'"
+
         " parameter style java"); 
         s.execute("create procedure GETPCTEST4Bx(out retparam INTEGER) "+
                 "language java external name " +
-                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.getpc4b'"
+
+                "'org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest.getpc4b'"
+
         " parameter style java"); 
         
         ResultSet rs[] = getProcedures(null, "%", "GETPCTEST%");
@@ -4538,7 +4538,7 @@
         // if you do not get an error, the bug does not occur.          
         if(JDBC.vmSupportsJDBC3()){
             s.execute("create procedure isReadO() language java external name " +
-                    "'org.apache.derbyTesting.functionTests.tests.jdbcapi.metadata.isro'"
+
+                    "'org.apache.derbyTesting.functionTests.tests.jdbcapi.DatabaseMetaDataTest.isro'"
+
             " parameter style java"); 
             s.execute("call isReadO()");
         }



Mime
View raw message