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 949F4445F for ; Fri, 8 Jul 2011 01:41:32 +0000 (UTC) Received: (qmail 90729 invoked by uid 500); 8 Jul 2011 01:41:32 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 90679 invoked by uid 500); 8 Jul 2011 01:41:32 -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 90672 invoked by uid 99); 8 Jul 2011 01:41:31 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 08 Jul 2011 01:41:31 +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; Fri, 08 Jul 2011 01:41:29 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 00EE623888FE; Fri, 8 Jul 2011 01:41:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1144123 - in /db/derby/code/trunk/java: testing/org/apache/derbyTesting/functionTests/suites/ testing/org/apache/derbyTesting/functionTests/tests/tools/ tools/org/apache/derby/iapi/tools/i18n/ Date: Fri, 08 Jul 2011 01:41:07 -0000 To: derby-commits@db.apache.org From: bpendleton@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20110708014108.00EE623888FE@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: bpendleton Date: Fri Jul 8 01:41:07 2011 New Revision: 1144123 URL: http://svn.apache.org/viewvc?rev=1144123&view=rev Log: DERBY-5303: Convert tools/URLCheck.sql to junit This patch was contributed by Houx Zhang (houxzhang at gmail dot com) This patch moves the execution of URLCheck.sql from the old derbytools suite to the ToolScripts JUnit test suite. The patch includes a modification to the LocalizedResource class in the tools.jar library to ensure that if getNewOutput is called, then subsequent uses of OutputWriter send their output to that output stream. Removed: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/URLCheck_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/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java 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=1144123&r1=1144122&r2=1144123&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 Fri Jul 8 01:41:07 2011 @@ -5,5 +5,4 @@ tools/ij.sql tools/ij2.sql tools/ij3.sql tools/ij5.sql -tools/ij6.sql -tools/URLCheck.sql +tools/ij6.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=1144123&r1=1144122&r2=1144123&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 Fri Jul 8 01:41:07 2011 @@ -53,7 +53,7 @@ public final class ToolScripts extends S * */ private static final String[] CLIENT_AND_EMBEDDED_TESTS = { - "ij4", "ij7", + "ij4", "ij7", "URLCheck" }; /** Modified: db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java?rev=1144123&r1=1144122&r2=1144123&view=diff ============================================================================== --- db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java (original) +++ db/derby/code/trunk/java/tools/org/apache/derby/iapi/tools/i18n/LocalizedResource.java Fri Jul 8 01:41:07 2011 @@ -266,7 +266,8 @@ public final class LocalizedResource im */ public LocalizedOutput getNewEncodedOutput(OutputStream o, String encoding) throws UnsupportedEncodingException{ - return new LocalizedOutput(o, encoding); + out = new LocalizedOutput(o, encoding); + return out; } public String getTextMessage(String key ) { return getTextMessage(key, new Object[0]);