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 CFE52DEFA for ; Fri, 14 Dec 2012 16:46:19 +0000 (UTC) Received: (qmail 78071 invoked by uid 500); 14 Dec 2012 16:46:19 -0000 Delivered-To: apmail-db-derby-commits-archive@db.apache.org Received: (qmail 77912 invoked by uid 500); 14 Dec 2012 16:46:15 -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 77881 invoked by uid 99); 14 Dec 2012 16:46:13 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 14 Dec 2012 16:46:13 +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, 14 Dec 2012 16:46:10 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2D8C82388962; Fri, 14 Dec 2012 16:45:49 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1421972 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ij.out tests/derbynet/NetworkServerControlApiTest.java tests/tools/derbyrunjartest.java Date: Fri, 14 Dec 2012 16:45:48 -0000 To: derby-commits@db.apache.org From: rhillegas@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20121214164549.2D8C82388962@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rhillegas Date: Fri Dec 14 16:45:45 2012 New Revision: 1421972 URL: http://svn.apache.org/viewvc?rev=1421972&view=rev Log: DERBY-5832: Fix some test canons to align them with the new translations which were just checked in. Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out?rev=1421972&r1=1421971&r2=1421972&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij.out Fri Dec 14 16:45:45 2012 @@ -103,7 +103,7 @@ help; -- each column to integerValue ASYNC name 'SQL-J text'; -- run the command in another thread WAIT FOR name; -- wait for result of ASYNC'd command - GET [SCROLL INSENSITIVE] [WITH {HOLD | NOHOLD}] CURSOR name AS 'SQL-J query'; + GET [SCROLL INSENSITIVE] [WITH { HOLD | NOHOLD }] CURSOR name AS 'SQL-J query'; -- gets a cursor (JDBC result set) on the query -- the default is a forward-only cursor with holdability NEXT name; -- gets the next row from the named cursor Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java?rev=1421972&r1=1421971&r2=1421972&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/derbynet/NetworkServerControlApiTest.java Fri Dec 14 16:45:45 2012 @@ -383,10 +383,10 @@ public class NetworkServerControlApiTest "ping [-h ][-p ] [-ssl ]", "sysinfo [-h ][-p ] [-ssl ]", "runtimeinfo [-h ][-p ] [-ssl ]", - "logconnections {on|off} [-h ][-p ] [-ssl ]", + "logconnections { on|off } [-h ][-p ] [-ssl ]", "maxthreads [-h ][-p ] [-ssl ]", "timeslice [-h ][-p ] [-ssl ]", - "trace {on|off} [-s ][-h ][-p ] [-ssl ]", + "trace { on|off } [-s ][-h ][-p ] [-ssl ]", "tracedirectory [-h ][-p ] [-ssl ]", }, maxthreadsCmd3, 1); int maxValue = server.getMaxThreads(); @@ -433,10 +433,10 @@ public class NetworkServerControlApiTest "ping [-h ][-p ] [-ssl ]", "sysinfo [-h ][-p ] [-ssl ]", "runtimeinfo [-h ][-p ] [-ssl ]", - "logconnections {on|off} [-h ][-p ] [-ssl ]", + "logconnections { on|off } [-h ][-p ] [-ssl ]", "maxthreads [-h ][-p ] [-ssl ]", "timeslice [-h ][-p ] [-ssl ]", - "trace {on|off} [-s ][-h ][-p ] [-ssl ]", + "trace { on|off } [-s ][-h ][-p ] [-ssl ]", "tracedirectory [-h ][-p ] [-ssl ]",}, maxthreadsCmd6, 1); @@ -522,10 +522,10 @@ public class NetworkServerControlApiTest "ping [-h ][-p ] [-ssl ]", "sysinfo [-h ][-p ] [-ssl ]", "runtimeinfo [-h ][-p ] [-ssl ]", - "logconnections {on|off} [-h ][-p ] [-ssl ]", + "logconnections { on|off } [-h ][-p ] [-ssl ]", "maxthreads [-h ][-p ] [-ssl ]", "timeslice [-h ][-p ] [-ssl ]", - "trace {on|off} [-s ][-h ][-p ] [-ssl ]", + "trace { on|off } [-s ][-h ][-p ] [-ssl ]", "tracedirectory [-h ][-p ] [-ssl ]"}, timesliceCmd3, 1); int timeSliceValue = server.getTimeSlice(); assertEquals(value, timeSliceValue); @@ -569,10 +569,10 @@ public class NetworkServerControlApiTest "ping [-h ][-p ] [-ssl ]", "sysinfo [-h ][-p ] [-ssl ]", "runtimeinfo [-h ][-p ] [-ssl ]", - "logconnections {on|off} [-h ][-p ] [-ssl ]", + "logconnections { on|off } [-h ][-p ] [-ssl ]", "maxthreads [-h ][-p ] [-ssl ]", "timeslice [-h ][-p ] [-ssl ]", - "trace {on|off} [-s ][-h ][-p ] [-ssl ]", + "trace { on|off } [-s ][-h ][-p ] [-ssl ]", "tracedirectory [-h ][-p ] [-ssl ]"}, timesliceCmd6, 1); timeSliceValue = server.getTimeSlice(); assertEquals(value, timeSliceValue); Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java?rev=1421972&r1=1421971&r2=1421972&view=diff ============================================================================== --- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java (original) +++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/derbyrunjartest.java Fri Dec 14 16:45:45 2012 @@ -148,10 +148,10 @@ public class derbyrunjartest extends Bas "ping [-h ][-p ] [-ssl ]", "sysinfo [-h ][-p ] [-ssl ]", "runtimeinfo [-h ][-p ] [-ssl ]", - "logconnections {on|off} [-h ][-p ] [-ssl ]", + "logconnections { on|off } [-h ][-p ] [-ssl ]", "maxthreads [-h ][-p ] [-ssl ]", "timeslice [-h ][-p ] [-ssl ]", - "trace {on|off} [-s ][-h ][-p ] [-ssl ]", + "trace { on|off } [-s ][-h ][-p ] [-ssl ]", "tracedirectory [-h ][-p ] [-ssl ]", }; runtool(cmd, output, 1);