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/06 15:55:24 UTC
svn commit: r1143416 - in
/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests:
master/ij4.out tests/tools/ToolScripts.java tests/tools/_Suite.java
tests/tools/ij4.sql tests/tools/ij4Test.java
Author: bpendleton
Date: Wed Jul 6 13:55:24 2011
New Revision: 1143416
URL: http://svn.apache.org/viewvc?rev=1143416&view=rev
Log:
DERBY-5311: Convert tools/ij4.sql to junit
This patch was contributed by Houx Zhang (houxzhang at gmail dot com)
This patch moves the execution of ij4.sql from ij4Test.java to
ToolScripts.java. Improvements in the test harness, and in ij itself,
mean that we no longer need a special test case setup for this script,
so ij4Test.java is deleted from the test tree.
The patch also includes a line to reset maximumdisplaywidth in ij
back to the default setting of 128 at the end of the test, so the
test doesn't disrupt the running of subsequent ij tests.
Removed:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij4Test.java
Modified:
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij4.out
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/_Suite.java
db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij4.sql
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij4.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij4.out?rev=1143416&r1=1143415&r2=1143416&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij4.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij4.out Wed Jul 6 13:55:24 2011
@@ -29,5 +29,6 @@ ij> values cast('1' as varchar(512));
1
----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
1
+ij> maximumdisplaywidth 128;
ij> -- and, the exit command:
exit;
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=1143416&r1=1143415&r2=1143416&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 Wed Jul 6 13:55:24 2011
@@ -53,7 +53,7 @@ public final class ToolScripts extends S
*
*/
private static final String[] CLIENT_AND_EMBEDDED_TESTS = {
- "ij7",
+ "ij4", "ij7",
};
/**
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java?rev=1143416&r1=1143415&r2=1143416&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/_Suite.java Wed Jul 6 13:55:24 2011
@@ -58,7 +58,6 @@ public class _Suite extends BaseTestCase
suite.addTest(IjConnNameTest.suite());
suite.addTest(RollBackWrappingWhenFailOnImportTest.suite());
suite.addTest(ConnectWrongSubprotocolTest.suite());
- suite.addTest(ij4Test.suite());
// SysinfoAPITest currently fails when run against jars, so is
// disabled. Only the first jar file on the classpath properly
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij4.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij4.sql?rev=1143416&r1=1143415&r2=1143416&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij4.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij4.sql Wed Jul 6 13:55:24 2011
@@ -21,6 +21,7 @@ values cast('1' as varchar(512));
maximumdisplaywidth 400;
values cast('1' as varchar(512));
+maximumdisplaywidth 128;
-- and, the exit command:
exit;