You are viewing a plain text version of this content. The canonical link for it is here.
Posted to derby-commits@db.apache.org by my...@apache.org on 2007/04/09 17:25:43 UTC
svn commit: r526775 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
master/ master/DerbyNetClient/ suites/ tests/jdbcapi/ util/
Author: myrnavl
Date: Mon Apr 9 08:25:40 2007
New Revision: 526775
URL: http://svn.apache.org/viewvc?view=rev&rev=526775
Log:
DERBY-2492 - removing old checkDataSource* files and references
Removed:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/checkDataSource30.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/checkDataSource30.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource30_derby.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/checkDataSource_derby.properties
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNet.exclude
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/embeddedUseprocess.exclude
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdk14.runall
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/JDBCHarnessJavaTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SecurityCheck.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?view=diff&rev=526775&r1=526774&r2=526775
==============================================================================
--- 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 Mon Apr 9 08:25:40 2007
@@ -4,7 +4,6 @@
# 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.
-# excluding jdbcapi/checkDataSource30.java - Client behaves differently. Need to look into this
# excluding jdbcapi/statementJdbc30.java - Client behaves differently. Need to look into this
# excluding jdbcapi/dataSourceReference.java - client side only tests, tests all data sources
# regardless of framework
@@ -18,7 +17,6 @@
jdbcapi/rsgetXXXcolumnNames.java
jdbcapi/SetQueryTimeoutTest.java
jdbcapi/blobSetBinaryStream.java
-jdbcapi/checkDataSource30.java
jdbcapi/statementJdbc30.java
jdbcapi/dataSourceReference.java
#no XA for JCC
@@ -26,9 +24,6 @@
# excluding jdbcapi/derbyStress.java - jcc runs out of memory with this test
jdbcapi/derbyStress.java
largedata/LobLimits.java
-# Excluding checkDataSource and checkDataSource30 because JCC has no XA
-jdbcapi/checkDataSource30.java
-jdbcapi/checkDataSource.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
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude?view=diff&rev=526775&r1=526774&r2=526775
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude Mon Apr 9 08:25:40 2007
@@ -22,9 +22,6 @@
# tools/ieptests - names files in extin dir, but they are on the server
# lang/wisconsin - optimization is quite different when running remote server.
# junitTests/derbyNet/CompatibilityTest.java - tries to start and shutdown the server.
-# jdbcapi/checkDataSource.java - test leaves things in a bad state, causing the subsequent
-# tests to fail when run on same database. See DERBY-1760.
-# jdbcapi/checkDataSource30.java - ditto to checkDataSource.
# stress/stress.multi - attempts to connect to localhost.
#
store/bootLock.java
@@ -41,6 +38,4 @@
tools/ieptests.sql
lang/wisconsin.java
junitTests/derbyNet/CompatibilityTest.java
-jdbcapi/checkDataSource.java
-jdbcapi/checkDataSource30.java
stress/stress.multi
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall?view=diff&rev=526775&r1=526774&r2=526775
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetclientmats.runall Mon Apr 9 08:25:40 2007
@@ -1,2 +1 @@
junitTests/derbyNet/CompatibilityTest.java
-jdbcapi/checkDataSource.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/embeddedUseprocess.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/embeddedUseprocess.exclude?view=diff&rev=526775&r1=526774&r2=526775
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/embeddedUseprocess.exclude (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/embeddedUseprocess.exclude Mon Apr 9 08:25:40 2007
@@ -6,7 +6,6 @@
# java.lang.ExceptionInInitializerError
# and access denied (java.lang.RuntimePermission loadLibrary.db2jcct2). (????!)
# jdbcapi/getCurConnJdbc20.sql ditto.
-# jdbcapi/checkDataSource30.java problem using reflection (class not found)
# jdbcapi/SURQueryMixTest.junit - fails with severe errors.
# jdbcapi/SURTest.junit - fails with severe errors.
# jdbcapi/UpdateXXXTest.junit - fails with NullPointerExceptions
@@ -15,7 +14,6 @@
jdbcapi/HoldabilityTest.junit
jdbcapi/bestrowidentifier.sql
jdbcapi/getCurConnJdbc20.sql
-jdbcapi/checkDataSource30.java
jdbcapi/SURQueryMixTest.junit
jdbcapi/SURTest.junit
jdbcapi/UpdateXXXTest.junit
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdk14.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdk14.runall?view=diff&rev=526775&r1=526774&r2=526775
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdk14.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdk14.runall Mon Apr 9 08:25:40 2007
@@ -1,4 +1,3 @@
-jdbcapi/checkDataSource30.java
jdbcapi/parameterMetaDataJdbc30.java
jdbcapi/savepointJdbc30_JSR169.java
jdbcapi/savepointJdbc30_XA.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall?view=diff&rev=526775&r1=526774&r2=526775
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/xa.runall Mon Apr 9 08:25:40 2007
@@ -1,4 +1,3 @@
-jdbcapi/checkDataSource.java
jdbcapi/xaAnotherTest.sql
jdbcapi/xaSimpleNegative.sql
store/xaOffline1.sql
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?view=diff&rev=526775&r1=526774&r2=526775
==============================================================================
--- 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 Mon Apr 9 08:25:40 2007
@@ -56,28 +56,20 @@
"derbyStress",
// "nullSQLText", TODO: investigate failure/convert
// "prepStmtMetaData", TODO: convert - different canon for client
- //"resultset", TODO: investigate failure/convert
// "resultsetStream", TODO: investigate failure/convert needs ext files
"maxfieldsize",
//"LOBTest", TODO: investigate failure/convert
- // "parameterMapping", TODO: investigate failure/convert
- //"setTransactionIsolation", TODO: investigate failure
"SetQueryTimeoutTest",
"prepStmtNull",
// "testRelative", TODO: passes embedded, fails client - investigate failure/convert
"rsgetXXXcolumnNames",
// from old jdk14.runall
- //"autoGeneratedJdbc30", TODO: investigate failure/convert
- //"checkDataSource30", TODO: investigate failure/convert
// "parameterMetaDataJdbc30", TODO: passes embedded, fails client - investigate failure/convert
// "statementJdbc30", runs in embedded only
// "savepointJdbc30_JSR169", TODO: convert - different canon for client
// "savepointJdbc30_XA", TODO: convert - different canon for client
- // from old xa.runall
- //"checkDataSource", TODO: investigate failure/convert
- //"XATest" TODO: investigate failure/convert
};
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SecurityCheck.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SecurityCheck.java?view=diff&rev=526775&r1=526774&r2=526775
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SecurityCheck.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/SecurityCheck.java Mon Apr 9 08:25:40 2007
@@ -157,16 +157,6 @@
* @param o Obejct to be inspected
* @param declared the declared type of the object.
*/
- public static void inspect(Object o, String declared)
- {
- if (o == null)
- return;
-
- SecurityCheck.inspectClass(o.getClass(), declared);
- }
-
- // temporary add a method - this will eventually replace inspect
- // method above
public static void assertSourceSecurity(Object o, String declared)
{
Assert.assertNotNull(o);