svn commit: r529758 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNet/ master/DerbyNetClient/ suites/ tests/lang/ tests/tools/

[km...@apache.org]

Author: kmarsden
Date: Tue Apr 17 13:44:46 2007
New Revision: 529758

URL: http://svn.apache.org/viewvc?view=rev&rev=529758
Log:
DERBY-2554 convert lang/supersimple.sql to JUnit


Removed:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/supersimple.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/supersimple.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/supersimple.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/supersimple.sql
Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij2.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij2.out
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij2.out?view=diff&rev=529758&r1=529757&r2=529758
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij2.out (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/ij2.out Tue Apr 17 13:44:46 2007
@@ -118,8 +118,21 @@
 1          
 ij> drop table t;
 0 rows inserted/updated/deleted
-ij> -- show that long fields now don't take forever...
-create table t ( c char(50));
+ij> -- Bug 4694 Test automatic rollback with close of connection
+-- in ij
+connect 'wombat';
+ij(CONNECTION1)> autocommit off;
+ij(CONNECTION1)> create table a (a int);
+0 rows inserted/updated/deleted
+ij(CONNECTION1)> select count(*) from a;
+1          
+-----------
+0          
+ij(CONNECTION1)> disconnect;
+ij> set connection connection0;
+ij> select count(*) from a;
+ERROR 42X05: Table/View 'A' does not exist.
+ij> create table t ( c char(50));
 0 rows inserted/updated/deleted
 ij> insert into t values('hello');
 1 row inserted/updated/deleted

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall?view=diff&rev=529758&r1=529757&r2=529758
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbylang.runall Tue Apr 17 13:44:46 2007
@@ -66,7 +66,6 @@
 lang/subquery.sql
 lang/subquery2.sql
 lang/subqueryFlattening.sql
-lang/supersimple.sql
 lang/timestampArith.java
 lang/triggerBeforeTrig.sql
 lang/triggerGeneral.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall?view=diff&rev=529758&r1=529757&r2=529758
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/derbynetmats.runall Tue Apr 17 13:44:46 2007
@@ -20,7 +20,6 @@
 lang/forupdate.sql
 lang/holdCursorIJ.sql
 lang/simpleScroll.sql
-lang/supersimple.sql
 lang/wisconsin.java
 lang/ShutdownDatabase.java
 store/holdCursorExternalSortJDBC30.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall?view=diff&rev=529758&r1=529757&r2=529758
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/suites/j9derbynetmats.runall Tue Apr 17 13:44:46 2007
@@ -14,7 +14,6 @@
 lang/forupdate.sql
 lang/holdCursorIJ.sql
 lang/simpleScroll.sql
-lang/supersimple.sql
 store/holdCursorExternalSortJDBC30.sql
 store/holdCursorJDBC30.sql
 tools/ieptests.sql

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java?view=diff&rev=529758&r1=529757&r2=529758
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java Tue Apr 17 13:44:46 2007
@@ -97,6 +97,7 @@
         suite.addTest(ProcedureInTriggerTest.suite());
         suite.addTest(CollationTest.suite());
         suite.addTest(ScrollCursors1.suite());
+        suite.addTest(SimpleTest.suite());
 
         // Add the XML tests, which exist as a separate suite
         // so that users can "run all XML tests" easily.

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2.sql
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2.sql?view=diff&rev=529758&r1=529757&r2=529758
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2.sql (original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/tools/ij2.sql Tue Apr 17 13:44:46 2007
@@ -79,7 +79,17 @@
 execute 'select * from t where c1=?' using 'select * from t where c1>=1';
 drop table t;
 
--- show that long fields now don't take forever...
+-- Bug 4694 Test automatic rollback with close of connection
+-- in ij
+connect 'wombat';
+autocommit off;
+create table a (a int);
+select count(*) from a;
+
+disconnect;
+set connection connection0;
+select count(*) from a;
+
 
 create table t ( c char(50));
 insert into t values('hello');
@@ -106,4 +116,5 @@
 set connection connection0;
 
 show connections;
+