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 bp...@apache.org on 2011/07/12 03:37:01 UTC
svn commit: r1145425 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
suites/derbytools.runall tests/tools/ToolScripts.java tests/tools/ij6.sql
tests/tools/ij6_app.properties
Author: bpendleton
Date: Tue Jul 12 01:37:00 2011
New Revision: 1145425
URL: http://svn.apache.org/viewvc?rev=1145425&view=rev
Log:
DERBY-5326: Convert tools/ij6.sql to junit
This patch was contributed by Houx Zhang (houxzhang at gmail dot com)
This patch moves the execution of ij6.sql from the old derbytools
suite to the ToolScripts.java suite in the tools JUnit suite.
Removed:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij6_app.properties
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij6.sql
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall?rev=1145425&r1=1145424&r2=1145425&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbytools.runall Tue Jul 12 01:37:00 2011
@@ -4,5 +4,4 @@ tools/derbyrunjartest.java
tools/ij.sql
tools/ij2.sql
tools/ij3.sql
-tools/ij5.sql
-tools/ij6.sql
\ No newline at end of file
+tools/ij5.sql
\ No newline at end of file
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java?rev=1145425&r1=1145424&r2=1145425&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ToolScripts.java Tue Jul 12 01:37:00 2011
@@ -53,7 +53,7 @@ public final class ToolScripts extends S
*
*/
private static final String[] CLIENT_AND_EMBEDDED_TESTS = {
- "ij4", "ij7", "URLCheck"
+ "ij4", "ij6", "ij7", "URLCheck"
};
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij6.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij6.sql?rev=1145425&r1=1145424&r2=1145425&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij6.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij6.sql Tue Jul 12 01:37:00 2011
@@ -16,5 +16,4 @@
--
-- 1)no connections made so far at the startup time and hence no information about
-- connections is displayed
-
exit;