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 ka...@apache.org on 2014/02/19 10:09:43 UTC

svn commit: r1569662 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/SimpleApp.out suites/simpledemo.properties

Author: kahatlen
Date: Wed Feb 19 09:09:42 2014
New Revision: 1569662

URL: http://svn.apache.org/r1569662
Log:
DERBY-6459: Fix SimpleApp test failures

Update canon to match the changed demo.

Make the simpledemo suite use old-style JDBC driver autoloading (by
setting the jdbc.drivers property) so that it succeeds when running
from classes without reintroducing Class.forName() in SimpleApp.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SimpleApp.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.properties

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SimpleApp.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SimpleApp.out?rev=1569662&r1=1569661&r2=1569662&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SimpleApp.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/SimpleApp.out Wed Feb 19 09:09:42 2014
@@ -1,5 +1,4 @@
 SimpleApp starting in embedded mode
-Loaded the appropriate driver
 Connected to and created database derbyDB
 Created table location
 Inserted 1956 Webster

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.properties
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.properties?rev=1569662&r1=1569661&r2=1569662&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.properties (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/simpledemo.properties Wed Feb 19 09:09:42 2014
@@ -16,4 +16,8 @@
 ij.defaultResourcePackage=/
 
 #Exclude for J2ME/Foundation - test requires java.sql.Driver
-runwithfoundation=false
\ No newline at end of file
+runwithfoundation=false
+
+# SimpleApp relies on JDBC driver autoloading. Set the jdbc.drivers property
+# to make autoloading work when the tests run from classes instead of jars.
+jvmflags=-Djdbc.drivers=org.apache.derby.jdbc.EmbeddedDriver