db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d..@apache.org
Subject svn commit: r468067 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/arithmetic.out master/bit2.out master/case.out master/depend.out master/derived.out master/union.out util/CanonTestCase.java
Date Thu, 26 Oct 2006 17:19:22 GMT
Author: djd
Date: Thu Oct 26 10:19:21 2006
New Revision: 468067

URL: http://svn.apache.org/viewvc?view=rev&rev=468067
Log:
DERBY-1952 (partial) Change CanonTestCase to not ignore blank lines in the output. The skipping
of blank lines in
the old harness was probably due to the use of sed. Skipping blank lines makes it harder to
create a new master
file from the output.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/arithmetic.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bit2.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/case.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derived.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/union.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/CanonTestCase.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/arithmetic.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/arithmetic.out?view=diff&rev=468067&r1=468066&r2=468067
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/arithmetic.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/arithmetic.out
Thu Oct 26 10:19:21 2006
@@ -17,6 +17,7 @@
 --
 -- Test the arithmetic operators
 --
+
 create table t (i int, j int);
 0 rows inserted/updated/deleted
 ij> insert into t values (null, null);
@@ -553,6 +554,7 @@
 -- The result is the same regardless of order of evaluation, so test it
 -- by causing an overflow.  The first test should get an overflow, and the
 -- second one shouldn't.
+
 select 1 + 2147483647 - 2 from r;
 1          
 -----------
@@ -590,6 +592,7 @@
 -- use a trick.  The value -1073741824 is the minimum integer divided by 2.
 -- So, 1073741824 * 2 will overflow, but (-1073741824) * 2 will not (because
 -- of two's complement arithmetic.
+
 select -1073741824 * 2 from r;
 1          
 -----------
@@ -658,4 +661,4 @@
 0 rows inserted/updated/deleted
 ij> drop table bigint_r;
 0 rows inserted/updated/deleted
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bit2.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bit2.out?view=diff&rev=468067&r1=468066&r2=468067
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bit2.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/bit2.out
Thu Oct 26 10:19:21 2006
@@ -16,7 +16,9 @@
 --
 -- the following test causes an out of memory error in jdk118, so only run
 -- the test in jdk12.  
+
 -- Test for really big literals. Throw an error for now. beetle 2758
+

[... 6 lines stripped ...]
Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/case.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/case.out?view=diff&rev=468067&r1=468066&r2=468067
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/case.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/case.out
Thu Oct 26 10:19:21 2006
@@ -14,11 +14,14 @@
 --   See the License for the specific language governing permissions and
 --   limitations under the License.
 --
+
 --
 -- this test is for keyword case insensitivity
 --
+
 -- Try some of the keywords with mixed case. Don't do all of the keywords, as
 -- that would be overkill (either that, or I'm too lazy).
+
 cReAtE tAbLe T (x InT);
 0 rows inserted/updated/deleted
 ij> CrEaTe TaBlE s (X iNt);
@@ -39,4 +42,4 @@
 0 rows inserted/updated/deleted
 ij> drop table t;
 0 rows inserted/updated/deleted
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out?view=diff&rev=468067&r1=468066&r2=468067
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/depend.out
Thu Oct 26 10:19:21 2006
@@ -14,9 +14,11 @@
 --   See the License for the specific language governing permissions and
 --   limitations under the License.
 --
+
 --
 -- this test shows the dependency system in action;
 --
+
 autocommit off;
 ij> create table t(i int);
 0 rows inserted/updated/deleted
@@ -184,6 +186,7 @@
 rollback;
 ij> -- verify that create index invalidates based on table and
 -- drop index invalidates based on the index
+
 create table t1(c1 int, c2 int);
 0 rows inserted/updated/deleted
 ij> insert into t1 values (1,1), (2, 1), (3,3);
@@ -239,4 +242,4 @@
 4          |4          
 ij> -- cleanup, roll everything back to the beginning
 rollback;
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derived.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derived.out?view=diff&rev=468067&r1=468066&r2=468067
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derived.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/derived.out
Thu Oct 26 10:19:21 2006
@@ -17,6 +17,7 @@
 --
 -- this tests derived column lists and derived tables
 --
+
 create table s (a int, b int, c int, d int, e int, f int);
 0 rows inserted/updated/deleted
 ij> create table t (aa int, bb int, cc int, dd int, ee int, ff int);
@@ -26,6 +27,7 @@
 ij> insert into s values (10,11,12,13,14,15);
 1 row inserted/updated/deleted
 ij> -- tests without a derived table
+
 -- negative tests
 -- # of columns does not match
 select aa from s ss (aa);
@@ -88,6 +90,7 @@
 ij> delete from t;
 2 rows inserted/updated/deleted
 ij> -- derived tables
+
 -- negative tests
 -- no correlation name
 select * from (select * from s);
@@ -118,6 +121,7 @@
 select a from (select * from s a, s b) ss;
 ERROR 42Y34: Column name 'A' matches more than one result column in table 'SS'.
 ij> -- positive tests
+
 -- simple derived table
 select a from (select a from s) a;
 A          
@@ -485,4 +489,4 @@
 0 rows inserted/updated/deleted
 ij> drop table t;
 0 rows inserted/updated/deleted
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/union.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/union.out?view=diff&rev=468067&r1=468066&r2=468067
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/union.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/union.out
Thu Oct 26 10:19:21 2006
@@ -17,6 +17,7 @@
 --
 -- this test shows union functionality
 --
+
 -- create the tables
 create table t1 (i int, s smallint, d double precision, r real, c10 char(10),
 				c30 char(30), vc10 varchar(10), vc30 varchar(30));
@@ -256,6 +257,7 @@
 NULL       |4          
 NULL       |NULL       
 ij> -- non-correlated subqueries
+
 -- positive tests
 select i from t1 where i = (values 1 union values 1);
 I          
@@ -491,6 +493,7 @@
 --  type dominance
 --  correlated subqueries
 --  table constructors
+
 -- create the tables
 create table t1 (i int, s smallint, d double precision, r real, c10 char(10),
 				 c30 char(30), vc10 varchar(10), vc30 varchar(30));
@@ -516,6 +519,7 @@
 	'44444      44');
 1 row inserted/updated/deleted
 ij> -- negative tests
+
 -- non matching number of columns
 select * from t1 union all select * from t1, t2;
 ERROR 42X58: The number of columns on the left and right sides of the UNION must be the same.
@@ -661,7 +665,9 @@
 select date('9999-11-11') from t1 union all select time('11:11:11') from t2;
 ERROR 42X61: Types 'DATE' and 'TIME' are not UNION compatible.
 ij> -- non-correlated subqueries
+
 -- negative tests
+
 -- select * in subquery
 select i from t1 where i = (select * from t2 union all select 1 from t1);
 ERROR 42X38: 'SELECT *' only allowed in EXISTS and NOT EXISTS subqueries.
@@ -679,6 +685,7 @@
 select i from t1 where i in (select date('1999-02-04') from t2 union all select date('1999-03-08')
from t2);
 ERROR 42818: Comparisons between 'INTEGER' and 'DATE' are not supported.
 ij> -- positive tests
+
 -- expression subquery
 select i from t1 where i = (select i from t2 where 1 = 0 union all values 1);
 I          
@@ -929,6 +936,7 @@
 0 rows inserted/updated/deleted
 ij> -- DERBY-1967
 -- NULLIF with UNION throws SQLSTATE 23502.
+
 create table a (f1 varchar(10));
 0 rows inserted/updated/deleted
 ij> create table b (f2 varchar(10));
@@ -963,4 +971,4 @@
 0 rows inserted/updated/deleted
 ij> drop table b;
 0 rows inserted/updated/deleted
-ij> 
+ij> 
\ No newline at end of file

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/CanonTestCase.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/CanonTestCase.java?view=diff&rev=468067&r1=468066&r2=468067
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/CanonTestCase.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/util/CanonTestCase.java
Thu Oct 26 10:19:21 2006
@@ -85,10 +85,6 @@
             for (int lineNumber = 1;; lineNumber++) {
                 String testLine = testOutput.readLine();
 
-                // Skip blank lines.
-                if ("".equals(testLine))
-                    continue;
-
                 String canonLine = cannonReader.readLine();
 
                 if (canonLine == null && testLine == null)



Mime
View raw message