Return-Path: X-Original-To: apmail-db-derby-commits-archive@www.apache.org Delivered-To: apmail-db-derby-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 91F9A6464 for ; Wed, 6 Jul 2011 13:55:49 +0000 (UTC) Received: (qmail 80672 invoked by uid 500); 6 Jul 2011 13:55:49 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 80598 invoked by uid 500); 6 Jul 2011 13:55:48 -0000 Mailing-List: contact derby-commits-help@db.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: "Derby Development" List-Id: Delivered-To: mailing list derby-commits@db.apache.org Received: (qmail 80591 invoked by uid 99); 6 Jul 2011 13:55:48 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jul 2011 13:55:48 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 06 Jul 2011 13:55:45 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 92B552388897; Wed, 6 Jul 2011 13:55:24 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: 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 Date: Wed, 06 Jul 2011 13:55:24 -0000 To: derby-commits@db.apache.org From: bpendleton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110706135524.92B552388897@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org 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;