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 mi...@apache.org on 2009/06/10 23:52:40 UTC
svn commit: r783532 - in
/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests:
master/ suites/ tests/derbynet/
Author: mikem
Date: Wed Jun 10 21:52:40 2009
New Revision: 783532
URL: http://svn.apache.org/viewvc?rev=783532&view=rev
Log:
DERBY-3717; convert derbynet/getCurrentProperties to junit
Patch contributed by Manjula Kutty
backporting fix from trunk to 10.4 branch.
Added:
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java
- copied unchanged from r685946, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.java
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy
- copied unchanged from r685946, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/GetCurrentPropertiesTest.policy
Removed:
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/master/getCurrentProperties.out
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties.java
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties.policy
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties_app.properties
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/getCurrentProperties_sed.properties
Modified:
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetUseprocess.exclude
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude?rev=783532&r1=783531&r2=783532&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientRemote.exclude Wed Jun 10 21:52:40 2009
@@ -9,8 +9,6 @@
# the server machine
# derbynet/dblook_test_net_territory 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/maxthreads - tries to use NetworkServerControl statements
# derbynet/runtimeinfo - tries to use NetworkServerControl statements
# derbynet/sysinfo - tries to use NetworkServerControl statements
@@ -26,7 +24,6 @@
store/bootLock.java
derbynet/dblook_test_net.java
derbynet/dblook_test_net_territory.java
-derbynet/getCurrentProperties.java
derbynet/maxthreads.java
derbynet/runtimeinfo.java
derbynet/sysinfo.java
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude?rev=783532&r1=783531&r2=783532&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetClientUseprocess.exclude Wed Jun 10 21:52:40 2009
@@ -7,7 +7,6 @@
# derbynet/dblook_test_net.java - expects different dir structure
# derbynet/dblook_test_net_territory.java - expects different dir structure
# stress/stress.multi - exits suite
-# derbynet/getCurrentProperties.java - fails, different sessions
# derbynet/runtimeinfo.java - different sessions
# derbynet/sysinfo.java - needs other properties
# derbynet/sysinfo_withproperties.java - needs other properties
@@ -23,7 +22,6 @@
derbynet/DerbyNetAutoStart.java
derbynet/dblook_test_net.java
derbynet/dblook_test_net_territory.java
-derbynet/getCurrentProperties.java
derbynet/runtimeinfo.java
derbynet/sysinfo.java
derbynet/sysinfo_withproperties.java
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude?rev=783532&r1=783531&r2=783532&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetRemote.exclude Wed Jun 10 21:52:40 2009
@@ -9,8 +9,6 @@
# the server machine
# derbynet/dblook_test_net_territory 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/maxthreads - tries to use NetworkServerControl statements
# derbynet/runtimeinfo - tries to use NetworkServerControl statements
# derbynet/sysinfo - tries to use NetworkServerControl statements
@@ -25,7 +23,6 @@
store/bootLock.java
derbynet/dblook_test_net.java
derbynet/dblook_test_net_territory.java
-derbynet/getCurrentProperties.java
derbynet/maxthreads.java
derbynet/runtimeinfo.java
derbynet/sysinfo.java
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetUseprocess.exclude
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetUseprocess.exclude?rev=783532&r1=783531&r2=783532&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetUseprocess.exclude (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/DerbyNetUseprocess.exclude Wed Jun 10 21:52:40 2009
@@ -4,7 +4,6 @@
# jdbcapi/HoldabilityTest.junit - causes subsequent tests to fail because of missing
# File permissions
# derbynet/DerbyNetAutoStart.java - exits suite...
-# derbynet/getCurrentProperties.java - fails with different sessions
# derbynet/dblook_test_net.java - fails, test misses properties
# derbynet/dblook_test_net_territory.java - fails, test misses properties
# derbynet/runtimeinfo.java - fails with already existing threads (maybe intermittent)
@@ -18,7 +17,6 @@
jdbcapi/maxfieldsize.java
jdbcapi/HoldabilityTest.junit
derbynet/DerbyNetAutoStart.java
-derbynet/getCurrentProperties.java
derbynet/dblook_test_net.java
derbynet/dblook_test_net_territory.java
derbynet/runtimeinfo.java
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall?rev=783532&r1=783531&r2=783532&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall Wed Jun 10 21:52:40 2009
@@ -1,7 +1,6 @@
derbynet/dblook_test_net.java
derbynet/dblook_test_net_territory.java
derbynet/DerbyNetAutoStart.java
-derbynet/getCurrentProperties.java
derbynet/maxthreads.java
derbynet/runtimeinfo.java
derbynet/sysinfo.java
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall?rev=783532&r1=783531&r2=783532&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall Wed Jun 10 21:52:40 2009
@@ -1,6 +1,5 @@
derbynet/dblook_test_net.java
derbynet/dblook_test_net_territory.java
-derbynet/getCurrentProperties.java
derbynet/maxthreads.java
derbynet/runtimeinfo.java
derbynet/timeslice.java
Modified: db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java?rev=783532&r1=783531&r2=783532&view=diff
==============================================================================
--- db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java (original)
+++ db/derby/code/branches/10.4/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/_Suite.java Wed Jun 10 21:52:40 2009
@@ -59,8 +59,8 @@
suite.addTest(NetworkServerControlClientCommandTest.suite());
suite.addTest(ServerPropertiesTest.suite());
suite.addTest(LOBLocatorReleaseTest.suite());
-
-
+ suite.addTest(GetCurrentPropertiesTest.suite());
+
// Disabled due to "java.sql.SQLSyntaxErrorException: The class
// 'org.apache.derbyTesting.functionTests.tests.derbynet.checkSecMgr'
// does not exist or is inaccessible. This can happen if the class is not public."