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 dj...@apache.org on 2006/08/13 19:08:05 UTC
svn commit: r431195 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
suites/ tests/jdbcapi/
Author: djd
Date: Sun Aug 13 10:08:04 2006
New Revision: 431195
URL: http://svn.apache.org/viewvc?rev=431195&view=rev
Log:
Have the test harness jdbcapi run a single JUnit suite jdbcapi._Suite that includes most of the JUnit tests
that were run individually. Tests in this suite that were excluded in derby net or had _app.properties file
now self-exclude themselves based upon the JUnit utility methods indicating which JDBC client they are running.
Remaining JUnit tests should be included in jdbcapi._Suite, think they were added after I has started the _Suite
work.
Removed:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest_app.properties
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest_app.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/jdbcapi.runall
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/HoldabilityTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdateXXXTest.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.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?rev=431195&r1=431194&r2=431195&view=diff
==============================================================================
--- 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 Sun Aug 13 10:08:04 2006
@@ -35,14 +35,6 @@
# excluding jdbcapi/derbyStress.java - jcc runs out of memory with this test
jdbcapi/derbyStress.java
largedata/LobLimits.java
-# These next five tests fail since the
-# db2 driver produces statements which Derby cannot compile in
-# ResultSet.updateRow()
-jdbcapi/UpdateXXXTest.junit
-jdbcapi/SURQueryMixTest.junit
-jdbcapi/SURTest.junit
-jdbcapi/ConcurrencyTest.junit
-jdbcapi/HoldabilityTest.junit
# Excluding checkDataSource and checkDataSource30 because JCC has no XA
jdbcapi/checkDataSource30.java
jdbcapi/checkDataSource.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?rev=431195&r1=431194&r2=431195&view=diff
==============================================================================
--- 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 Sun Aug 13 10:08:04 2006
@@ -1,4 +1,3 @@
-jdbcapi/HoldabilityTest.junit
jdbcapi/bestrowidentifier.sql
jdbcapi/characterStreams.java
jdbcapi/checkDriver.java
@@ -16,17 +15,12 @@
jdbcapi/LOBTest.java
jdbcapi/blobclob4BLOB.java
jdbcapi/parameterMapping.java
-jdbcapi/ProcedureTest.junit
jdbcapi/setTransactionIsolation.java
jdbcapi/SetQueryTimeoutTest.java
jdbcapi/prepStmtNull.java
jdbcapi/testRelative.java
jdbcapi/rsgetXXXcolumnNames.java
jdbcapi/Stream.java
-jdbcapi/UpdateXXXTest.junit
-jdbcapi/SURQueryMixTest.junit
-jdbcapi/SURTest.junit
-jdbcapi/ScrollResultSetTest.junit
-jdbcapi/URCoveringIndexTest.junit
jdbcapi/SURTest_ij.sql
jdbcapi/ResultSetCloseTest.junit
+jdbcapi/_Suite.junit
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java?rev=431195&r1=431194&r2=431195&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ConcurrencyTest.java Sun Aug 13 10:08:04 2006
@@ -814,6 +814,11 @@
public static Test suite() {
TestSuite suite = new TestSuite();
+
+ // DB2 client doesn't support this functionality
+ if (usingDerbyNet())
+ return suite;
+
// Requires holdability
if (JDBC.vmSupportsJDBC3() || JDBC.vmSupportsJSR169()) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/HoldabilityTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/HoldabilityTest.java?rev=431195&r1=431194&r2=431195&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/HoldabilityTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/HoldabilityTest.java Sun Aug 13 10:08:04 2006
@@ -30,6 +30,19 @@
public HoldabilityTest(String name) {
super(name, 1000); // We will use 1000 records
}
+
+ public static Test suite() {
+ TestSuite suite = new TestSuite();
+
+ // DB2 client doesn't support this functionality
+ if (usingDerbyNet())
+ return suite;
+
+ suite.addTestSuite(HoldabilityTest.class);
+
+ return suite;
+
+ }
/**
* Sets up the connection, then create the data model
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java?rev=431195&r1=431194&r2=431195&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURQueryMixTest.java Sun Aug 13 10:08:04 2006
@@ -539,6 +539,11 @@
{
TestSuite mainSuite = new TestSuite();
+ // DB2 client doesn't support this functionality
+ if (usingDerbyNet())
+ return mainSuite;
+
+
// Iterate over all data models and decorate the tests:
for (Iterator i = SURDataModelSetup.SURDataModel.values().iterator();
i.hasNext();) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java?rev=431195&r1=431194&r2=431195&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/SURTest.java Sun Aug 13 10:08:04 2006
@@ -1527,6 +1527,10 @@
TestSuite mainSuite = new TestSuite();
+ // DB2 client doesn't support this functionality
+ if (usingDerbyNet())
+ return mainSuite;
+
// Iterate over all data models and decorate the tests:
for (Iterator i = SURDataModelSetup.SURDataModel.values().iterator();
i.hasNext();) {
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdateXXXTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdateXXXTest.java?rev=431195&r1=431194&r2=431195&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdateXXXTest.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/UpdateXXXTest.java Sun Aug 13 10:08:04 2006
@@ -53,6 +53,10 @@
public static Test suite() {
TestSuite suite = new TestSuite();
+ // DB2 client doesn't support this functionality
+ if (usingDerbyNet())
+ return suite;
+
suite.addTest(new UpdateXXXTest("testUpdateShort"));
suite.addTest(new UpdateXXXTest("testUpdateInt"));
suite.addTest(new UpdateXXXTest("testUpdateLong"));
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java?rev=431195&r1=431194&r2=431195&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java Sun Aug 13 10:08:04 2006
@@ -46,7 +46,7 @@
TestSuite suite = new TestSuite("jdbcapi");
suite.addTest(ConcurrencyTest.suite());
- suite.addTestSuite(HoldabilityTest.class);
+ suite.addTest(HoldabilityTest.suite());
suite.addTest(ProcedureTest.suite());
suite.addTest(SURQueryMixTest.suite());
suite.addTest(SURTest.suite());