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 2013/10/13 20:38:56 UTC
svn commit: r1531729 - in /db/derby/code/trunk/java/testing: ./
org/apache/derbyTesting/functionTests/suites/
org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/
org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/ org/apa...
Author: myrnavl
Date: Sun Oct 13 18:38:56 2013
New Revision: 1531729
URL: http://svn.apache.org/r1531729
Log:
DERBY-2446; Remove notion of the old test harness from TestConfiguration
Removing remaining references, and also removing remaining files from tests/junitTests
Removed:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/embeddedUseprocess.exclude
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/compatibility/
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/junitTests/derbyNet/
Modified:
db/derby/code/trunk/java/testing/build.xml
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/derbynetclientmats.runall
db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
Modified: db/derby/code/trunk/java/testing/build.xml
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/build.xml?rev=1531729&r1=1531728&r2=1531729&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/build.xml (original)
+++ db/derby/code/trunk/java/testing/build.xml Sun Oct 13 18:38:56 2013
@@ -62,9 +62,7 @@
<ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/util"/>
<ant dir="${derby.testing.src.dir}/${derby.testing.unittest.dir}"/>
<ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/multi/stress"/>
- <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/junitTests/compatibility"/>
<ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/compatibility"/>
- <ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/junitTests/derbyNet"/>
<ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/jdbcapi"/>
<ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/lang"/>
<ant dir="${derby.testing.src.dir}/${derby.testing.functest.dir}/tests/store"/>
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?rev=1531729&r1=1531728&r2=1531729&view=diff
==============================================================================
--- 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 Sun Oct 13 18:38:56 2013
@@ -3,25 +3,15 @@
# DerbyNetClient.exclude when the property -DhostName is set to something else than the localhost
#
# excluding test - because...
-# store/bootLock.java - this test uses local connections to make sure
# a database cannot be loaded by 2 different instances.
# derbynet/dblook_test_net because it tries to search derby.log, which is on
# the server machine
# derbynet/dblook_test_net_territory because it tries to search derby.log, which is on
# the server machine
-# derbynet/maxthreads - tries to use NetworkServerControl statements
# started with specific property set - DERBY928 for reference
# thus not suitable for remote server testing in its current form. - DERBY-928
-# derbynet/timeslice - tries to use NetworkServerControl statements
# lang/wisconsin - optimization is quite different when running remote server.
-# junitTests/derbyNet/CompatibilityTest.java - tries to start and shutdown the server.
-# stress/stress.multi - attempts to connect to localhost.
#
-store/bootLock.java
derbynet/dblook_test_net.java
derbynet/dblook_test_net_territory.java
-derbynet/maxthreads.java
-derbynet/timeslice.java
lang/wisconsin.java
-junitTests/derbyNet/CompatibilityTest.java
-stress/stress.multi
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=1531729&r1=1531728&r2=1531729&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 Sun Oct 13 18:38:56 2013
@@ -1,19 +1,11 @@
# identifies tests that fail when run in a suite with useprocess=false with DerbyNetClient
#
-# jdbcapi/HoldabilityTest.junit - test causes subsequent tests to fail because of missing
# File permission
-# junitTests/derbyNet/CompatibilityTest.java - exits the suite
# derbynet/dblook_test_net.java - expects different dir structure
# derbynet/dblook_test_net_territory.java - expects different dir structure
-# stress/stress.multi - exits suite
# following fail for various reasons, many related to not being able to connect:
# lang/wisconsin.java
-# jdbcapi/maxfieldsize.java
#
-jdbcapi/HoldabilityTest.junit
-junitTests/derbyNet/CompatibilityTest.java
derbynet/dblook_test_net.java
derbynet/dblook_test_net_territory.java
-stress/stress.multi
lang/wisconsin.java
-jdbcapi/maxfieldsize.java
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?rev=1531729&r1=1531728&r2=1531729&view=diff
==============================================================================
--- 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 Sun Oct 13 18:38:56 2013
@@ -1,4 +1,3 @@
-junitTests/derbyNet/CompatibilityTest.java
derbynet/dblook_test_net.java
derbynet/dblook_test_net_territory.java
lang/wisconsin.java
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java?rev=1531729&r1=1531728&r2=1531729&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/junit/TestConfiguration.java Sun Oct 13 18:38:56 2013
@@ -132,13 +132,6 @@ public final class TestConfiguration {
private static ReleaseRepository releaseRepository;
/**
- * Default Derby test configuration object based
- * upon system properties set by the old harness.
- */
- private static final TestConfiguration DERBY_HARNESS_CONFIG =
- new TestConfiguration(getSystemProperties());
-
- /**
* Default configuration for standalone JUnit tests,
* an embedded configuration.
*/
@@ -149,43 +142,14 @@ public final class TestConfiguration {
* The default configuration.
*/
private static final TestConfiguration DEFAULT_CONFIG;
-
- /**
- * Are we running in the harness, assume so if framework
- * was set so the
- */
- private static final boolean runningInDerbyHarness;
-
- static {
- boolean assumeHarness = false;
- // In the harness if the default configuration according
- // to system properties is not embedded.
- if (!DERBY_HARNESS_CONFIG.getJDBCClient().isEmbedded())
- assumeHarness = true;
-
- // Assume harness if database name is not default
- if (!DERBY_HARNESS_CONFIG.getDefaultDatabaseName().equals(DEFAULT_DBNAME))
- assumeHarness = true;
-
- // Assume harness if user name is not default
- if (!DERBY_HARNESS_CONFIG.getUserName().equals(DEFAULT_USER_NAME))
- assumeHarness = true;
-
- // If derby.system.home set externally at startup assume
- // running in harness
- if (BaseTestCase.getSystemProperty("derby.system.home") != null)
- assumeHarness = true;
-
- DEFAULT_CONFIG = assumeHarness ? DERBY_HARNESS_CONFIG : JUNIT_CONFIG;
- runningInDerbyHarness = assumeHarness;
+ static {
+ DEFAULT_CONFIG = JUNIT_CONFIG;
- if (!assumeHarness) {
- final File dsh = new File("system");
+ final File dsh = new File("system");
- BaseTestCase.setSystemProperty(
- "derby.system.home", dsh.getAbsolutePath());
- }
+ BaseTestCase.setSystemProperty(
+ "derby.system.home", dsh.getAbsolutePath());
}
/**
@@ -1999,10 +1963,10 @@ public final class TestConfiguration {
* suites to alter their behaviour based upon the
* need to still run under the old harness.
*/
- public static boolean runningInDerbyHarness()
- {
- return runningInDerbyHarness;
- }
+ //public static boolean runningInDerbyHarness()
+ //{
+ // return runningInDerbyHarness;
+ //}
/**
* Get a folder already created where a test can