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/03/27 16:21:40 UTC
svn commit: r522923 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
master/ master/DerbyNet/ master/DerbyNet/ibm14/
master/DerbyNet/ibm14/ver2.6/ master/DerbyNet/jdk14/ver2.8/
master/DerbyNet/ver2.6/ master/DerbyNet/ver2.8...
Author: myrnavl
Date: Tue Mar 27 07:21:36 2007
New Revision: 522923
URL: http://svn.apache.org/viewvc?view=rev&rev=522923
Log:
DERBY-1496 - removing
jdbcapi/users.sql
jdbcapi/users2.sql
jdbcapi/secureUsers.sql
jdbcapi/secureUsers1.sql
jdbcapi/dataSourcePermissions.java
derbynet/dataSourcePermissions_net.java
derbynet/testSecMec.java
They've been replaced by junit tests:
jdbcapi/AuthenticationTest.java
jdbcapi/DriverMgrAuthenticationTest.java
jdbcapi/PoolDSAuthenticationTest.java
jdbcapi/XADSAuthenticationTest.java
derbynet/NSSecurityMechanismTest.java
(some test cases from dataSourcePermissions_net were moved to checkDataSource.java)
Removed:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/dataSourcePermissions_net.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ibm14/testSecMec.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ibm14/ver2.6/testSecMec.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/jdk14/ver2.8/testSecMec.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsers1.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/secureUsersldap.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/testSecMec.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/users2.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ver2.6/testSecMec.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/ver2.8/testSecMec.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/dataSourcePermissions_net.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/ibm14/testSecMec.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/jdk14/testSecMec.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsers1.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/secureUsersldap.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/testSecMec.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/users2.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/dataSourcePermissions.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/users.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/j9_foundation/users2.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/secureUsers.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/secureUsers1.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/users.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/users2.out
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/dataSourcePermissions_net_sed.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/testSecMec_sed.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/dataSourcePermissions.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers.sql
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers1.policy
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers1.sql
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers1_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers1_derby.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers1_sed.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers_derby.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/secureUsers_sed.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users.sql
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users2.sql
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users2_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users2_derby.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users2_sed.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users_derby.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/users_sed.properties
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.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/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/suites/jdbcapi.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
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=522923&r1=522922&r2=522923
==============================================================================
--- 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 Tue Mar 27 07:21:36 2007
@@ -5,23 +5,16 @@
# excluding test - because...
# store/bootLock.java - this test uses local connections to make sure
# a database cannot be loaded by 2 different instances.
-# jdbcapi/secureUsers,secureUsers1, users and users2.sql
-# because they expect the server to have been started with special derby.properties
-# this test can be made to work by changing the properties from system properties
-# i.e. set in a derby.properties file - to be database properties - i.e. set using
-# SYSCS_SET_ procedure.
# derbynet/dblook_test_net because it tries to search derby.log, which is on
# the server machine
# derbynet/getCurrentProperties for it exercises NetworkServerControl statements
# that are only supported on localhost
# derbynet/NSinSameJVM - tries to start the server
-# derbynet/DataSourcePermissions_net - tries to use NetworkServerControl statements
# derbynet/maxthreads - tries to use NetworkServerControl statements
# derbynet/runtimeinfo - tries to use NetworkServerControl statements
# derbynet/sysinfo - tries to use NetworkServerControl statements
# derbynet/sysinfo_withproperties - tries to use NetworkServerControl statements and for the test, server needs to be
# started with specific property set - DERBY928 for reference
-# derbynet/testSecMec - this test requires property to be set when server is started with derby.drda.securityMechanism
# thus not suitable for remote server testing in its current form. - DERBY-928
# derbynet/testProperties - tries to use NetworkServerControl statements
# derbynet/timeslice - tries to use NetworkServerControl statements
@@ -35,20 +28,14 @@
# stress/stress.multi - attempts to connect to localhost.
#
store/bootLock.java
-jdbcapi/secureUsers.sql
-jdbcapi/secureUsers1.sql
-jdbcapi/users.sql
-jdbcapi/users2.sql
derbynet/dblook_test_net.java
derbynet/getCurrentProperties.java
derbynet/NSinSameJVM.java
-derbynet/DataSourcePermissions_net.java
derbynet/maxthreads.java
derbynet/runtimeinfo.java
derbynet/sysinfo.java
derbynet/sysinfo_withproperties.java
derbynet/testProperties.java
-derbynet/testSecMec.java
derbynet/timeslice.java
derbynet/DerbyNetAutoStart.java
tools/ieptests.sql
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?view=diff&rev=522923&r1=522922&r2=522923
==============================================================================
--- 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 Tue Mar 27 07:21:36 2007
@@ -6,8 +6,6 @@
# java.lang.ExceptionInInitializerError
# and access denied (java.lang.RuntimePermission loadLibrary.db2jcct2). (????!)
# jdbcapi/checkDriver.java subtest createdbwithspaces fails, probably expecting different dir
-# jdbcapi/*sers* these tests log on to wombat with different permissions and users
-# test could possibly be rewritten to use another database
# junitTests/derbyNet/CompatibilityTest.java - exits the suite
# derbynet/DerbyNetAutoStart.java - exits the suite...
# derbynet/NSinSameJVM.java - fails with different thread names. probably ok...
@@ -32,10 +30,6 @@
jdbcapi/HoldabilityTest.junit
jdbcapi/bestrowidentifier.sql
jdbcapi/checkDriver.java
-jdbcapi/users.sql
-jdbcapi/users2.sql
-jdbcapi/secureUsers.sql
-jdbcapi/secureUsers1.sql
junitTests/derbyNet/CompatibilityTest.java
derbynet/DerbyNetAutoStart.java
derbynet/NSinSameJVM.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude?view=diff&rev=522923&r1=522922&r2=522923
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude Tue Mar 27 07:21:36 2007
@@ -5,22 +5,15 @@
# excluding test - because...
# store/bootLock.java - this test uses local connections to make sure
# a database cannot be loaded by 2 different instances.
-# jdbcapi/secureUsers,secureUsers1, users and users2.sql
-# because they expect the server to have been started with special derby.properties
-# this test can be made to work by changing the properties from system properties
-# i.e. set in a derby.properties file - to be database properties - i.e. set using
-# SYSCS_SET_ procedure.
# derbynet/dblook_test_net because it tries to search derby.log, which is on
# the server machine
# derbynet/getCurrentProperties for it exercises NetworkServerControl statements
# that are only supported on localhost
# derbynet/NSinSameJVM - tries to start the server
-# derbynet/DataSourcePermissions_net - tries to use NetworkServerControl statements
# derbynet/maxthreads - tries to use NetworkServerControl statements
# derbynet/runtimeinfo - tries to use NetworkServerControl statements
# derbynet/sysinfo - tries to use NetworkServerControl statements
# derbynet/testProperties - tries to use NetworkServerControl statements
-# derbynet/testSecMec - this test requires property to be set when server is started with derby.drda.securityMechanism
# thus not suitable for remote server testing in its current form. - DERBY-928
# derbynet/timeslice - tries to use NetworkServerControl statements
# derbynet/DerbyNetAutoStart - tries to start networkserver
@@ -31,20 +24,14 @@
# junitTests/derbyNet/CompatibilityTest.java - tries to start and shutdown the server
#
store/bootLock.java
-jdbcapi/secureUsers.sql
-jdbcapi/secureUsers1.sql
-jdbcapi/users.sql
-jdbcapi/users2.sql
derbynet/dblook_test_net.java
derbynet/getCurrentProperties.java
derbynet/NSinSameJVM.java
-derbynet/DataSourcePermissions_net.java
derbynet/maxthreads.java
derbynet/runtimeinfo.java
derbynet/sysinfo.java
derbynet/sysinfo_withproperties.java
derbynet/testProperties.java
-derbynet/testSecMec.java
derbynet/timeslice.java
derbynet/DerbyNetAutoStart.java
tools/ieptests.sql
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?view=diff&rev=522923&r1=522922&r2=522923
==============================================================================
--- 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 Tue Mar 27 07:21:36 2007
@@ -7,8 +7,6 @@
# java.lang.ExceptionInInitializerError
# and access denied (java.lang.RuntimePermission loadLibrary.db2jcct2). (????!)
# jdbcapi/checkDriver.java - subtest createdbwithspaces fails, probably expecting different dir
-# jdbcapi/*sers* - these tests log on to wombat with different permissions and users
-# test could possibly be rewritten to use another database
# derbynet/NSinSameJVM.java - diff between thread and main. kind of ok, but fails.
# derbynet/DerbyNetAutoStart.java - exits suite...
# derbynet/getCurrentProperties.java - fails with different sessions
@@ -29,10 +27,6 @@
jdbcapi/HoldabilityTest.junit
jdbcapi/bestrowidentifier.sql
jdbcapi/checkDriver.java
-jdbcapi/users.sql
-jdbcapi/users2.sql
-jdbcapi/secureUsers.sql
-jdbcapi/secureUsers1.sql
derbynet/testij.java
derbynet/NSinSameJVM.java
derbynet/DerbyNetAutoStart.java
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?view=diff&rev=522923&r1=522922&r2=522923
==============================================================================
--- 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 Tue Mar 27 07:21:36 2007
@@ -2,7 +2,6 @@
derbynet/checkSecMgr.java
derbynet/csPrepStmt.java
derbynet/dblook_test_net.java
-derbynet/dataSourcePermissions_net.java
derbynet/DerbyNetAutoStart.java
derbynet/getCurrentProperties.java
derbynet/maxthreads.java
@@ -14,7 +13,6 @@
derbynet/testconnection.java
derbynet/testij.java
derbynet/timeslice.java
-derbynet/testSecMec.java
jdbcapi/metadata.java
jdbcapi/metadataMultiConn.java
jdbcapi/odbc_metadata.java
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?view=diff&rev=522923&r1=522922&r2=522923
==============================================================================
--- 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 Tue Mar 27 07:21:36 2007
@@ -1,7 +1,6 @@
derbynet/NSinSameJVM.java
derbynet/csPrepStmt.java
derbynet/dblook_test_net.java
-derbynet/dataSourcePermissions_net.java
derbynet/getCurrentProperties.java
derbynet/maxthreads.java
derbynet/runtimeinfo.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall?view=diff&rev=522923&r1=522922&r2=522923
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/jdbcapi.runall Tue Mar 27 07:21:36 2007
@@ -2,10 +2,6 @@
jdbcapi/checkDriver.java
jdbcapi/nullSQLText.java
jdbcapi/resultsetStream.java
-jdbcapi/users.sql
-jdbcapi/users2.sql
-jdbcapi/secureUsers.sql
-jdbcapi/secureUsers1.sql
jdbcapi/LOBTest.java
jdbcapi/parameterMapping.java
jdbcapi/testRelative.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=522923&r1=522922&r2=522923
==============================================================================
--- 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 Tue Mar 27 07:21:36 2007
@@ -1,5 +1,4 @@
jdbcapi/checkDataSource.java
-jdbcapi/dataSourcePermissions.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=522923&r1=522922&r2=522923
==============================================================================
--- 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 Mar 27 07:21:36 2007
@@ -77,7 +77,6 @@
// from old xa.runall
//"checkDataSource", TODO: investigate failure/convert
- // "dataSourcePermissions", TODO: passes embedded, fails client - investigate failure/convert
//"XATest" TODO: investigate failure/convert
};
@@ -107,7 +106,6 @@
// Tests that pass on embedded but fail on client
"parameterMetaDataJdbc30",
- "dataSourcePermissions",
};