db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
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 GMT
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 <host>][-p <port number>] [-ssl <ssl mode>]",
                 "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
-                "logconnections {on|off} [-h <host>][-p <port number>] [-ssl
<ssl mode>]",
+                "logconnections { on|off } [-h <host>][-p <port number>] [-ssl
<ssl mode>]",
                 "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl
mode>]",
                 "timeslice <milliseconds>[-h <host>][-p <port number>]
[-ssl <ssl mode>]",
-                "trace {on|off} [-s <session id>][-h <host>][-p <port number>]
[-ssl <ssl mode>]",
+                "trace { on|off } [-s <session id>][-h <host>][-p <port number>]
[-ssl <ssl mode>]",
                 "tracedirectory <trace directory>[-h <host>][-p <port number>]
[-ssl <ssl mode>]",
         }, maxthreadsCmd3, 1);
         int maxValue = server.getMaxThreads();
@@ -433,10 +433,10 @@ public class NetworkServerControlApiTest
                 "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
-                "logconnections {on|off} [-h <host>][-p <port number>] [-ssl
<ssl mode>]",
+                "logconnections { on|off } [-h <host>][-p <port number>] [-ssl
<ssl mode>]",
                 "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl
mode>]",
                 "timeslice <milliseconds>[-h <host>][-p <port number>]
[-ssl <ssl mode>]",
-                "trace {on|off} [-s <session id>][-h <host>][-p <port number>]
[-ssl <ssl mode>]",
+                "trace { on|off } [-s <session id>][-h <host>][-p <port number>]
[-ssl <ssl mode>]",
                 "tracedirectory <trace directory>[-h <host>][-p <port number>]
[-ssl <ssl mode>]",}, maxthreadsCmd6, 1);
 
 
@@ -522,10 +522,10 @@ public class NetworkServerControlApiTest
                 "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
-                "logconnections {on|off} [-h <host>][-p <port number>] [-ssl
<ssl mode>]",
+                "logconnections { on|off } [-h <host>][-p <port number>] [-ssl
<ssl mode>]",
                 "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl
mode>]",
                 "timeslice <milliseconds>[-h <host>][-p <port number>]
[-ssl <ssl mode>]",
-                "trace {on|off} [-s <session id>][-h <host>][-p <port number>]
[-ssl <ssl mode>]",
+                "trace { on|off } [-s <session id>][-h <host>][-p <port number>]
[-ssl <ssl mode>]",
                 "tracedirectory <trace directory>[-h <host>][-p <port number>]
[-ssl <ssl mode>]"}, timesliceCmd3, 1);
         int timeSliceValue = server.getTimeSlice();
         assertEquals(value, timeSliceValue);
@@ -569,10 +569,10 @@ public class NetworkServerControlApiTest
                 "ping [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
                 "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
-                "logconnections {on|off} [-h <host>][-p <port number>] [-ssl
<ssl mode>]",
+                "logconnections { on|off } [-h <host>][-p <port number>] [-ssl
<ssl mode>]",
                 "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl
mode>]",
                 "timeslice <milliseconds>[-h <host>][-p <port number>]
[-ssl <ssl mode>]",
-                "trace {on|off} [-s <session id>][-h <host>][-p <port number>]
[-ssl <ssl mode>]",
+                "trace { on|off } [-s <session id>][-h <host>][-p <port number>]
[-ssl <ssl mode>]",
                 "tracedirectory <trace directory>[-h <host>][-p <port number>]
[-ssl <ssl mode>]"}, 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 <host>][-p <port number>] [-ssl <ssl mode>]",
             "sysinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
             "runtimeinfo [-h <host>][-p <port number>] [-ssl <ssl mode>]",
-            "logconnections {on|off} [-h <host>][-p <port number>] [-ssl <ssl
mode>]",
+            "logconnections { on|off } [-h <host>][-p <port number>] [-ssl <ssl
mode>]",
             "maxthreads <max>[-h <host>][-p <port number>] [-ssl <ssl
mode>]",
             "timeslice <milliseconds>[-h <host>][-p <port number>] [-ssl
<ssl mode>]",
-            "trace {on|off} [-s <session id>][-h <host>][-p <port number>]
[-ssl <ssl mode>]",
+            "trace { on|off } [-s <session id>][-h <host>][-p <port number>]
[-ssl <ssl mode>]",
             "tracedirectory <trace directory>[-h <host>][-p <port number>]
[-ssl <ssl mode>]",
         };
         runtool(cmd, output, 1);



Mime
View raw message