db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mi...@apache.org
Subject svn commit: r449500 - in /db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests: master/ master/DerbyNet/ master/DerbyNetClient/ tests/lang/
Date Sun, 24 Sep 2006 21:57:55 GMT
Author: mikem
Date: Sun Sep 24 14:57:54 2006
New Revision: 449500

URL: http://svn.apache.org/viewvc?view=rev&rev=449500
Log:
DERBY-1830
contributed by Sunitha Kambhampati
merging test only change from trunk to 10.2 branch:

The testcase added for derby-1660 in optimizerOverrides.sql uses jdbc:default:co
nnection and does not work with wctme5.7 foundation causing the diff mentioned i
n this jira. This testcase needs to be excluded and should run only in environme
nts that have support for DriverManager.

This patch (derby1830.diff.txt) converts this particular testcase into a junit t
est.

1. Add a new Junit test in lang suite - VTITest.java
2. Conditionally add the test fixture bulkInsertVtiTest if JDBC.vmSupportsJDBC2(
) is true.
3. Since the problematic testcase is converted to junit test, remove this test f
rom optimizerOverrides.sql and update the master files for embedded and server f
rameworks.


Added:
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/VTITest.java
  (props changed)
      - copied unchanged from r449116, db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/VTITest.java
Modified:
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/optimizerOverrides.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/optimizerOverrides.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/optimizerOverrides.out
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
    db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/optimizerOverrides.sql

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/optimizerOverrides.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/optimizerOverrides.out?view=diff&rev=449500&r1=449499&r2=449500
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/optimizerOverrides.out
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/optimizerOverrides.out
Sun Sep 24 14:57:54 2006
@@ -1769,26 +1769,4 @@
 ij> drop table temp1;
 0 rows inserted/updated/deleted
 ij> commit;
-ij> -- Test that SYSCS_BULK_INSERT works (DERBY-1660)
-create table warehouse(t1 int);
-0 rows inserted/updated/deleted
-ij> -- bulk insert 10 rows
-call  SYSCS_UTIL.SYSCS_BULK_INSERT('APP','WAREHOUSE','org.apache.derbyTesting.functionTests.tests.lang.WarehouseVTI','10');
-Statement executed.
-ij> select * from warehouse order by t1;
-T1         
------
-1          
-2          
-3          
-4          
-5          
-6          
-7          
-8          
-9          
-10         
-ij> -- cleanup
-drop table warehouse;
-0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/optimizerOverrides.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/optimizerOverrides.out?view=diff&rev=449500&r1=449499&r2=449500
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/optimizerOverrides.out
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/optimizerOverrides.out
Sun Sep 24 14:57:54 2006
@@ -1780,26 +1780,4 @@
 ij> drop table temp1;
 0 rows inserted/updated/deleted
 ij> commit;
-ij> -- Test that SYSCS_BULK_INSERT works (DERBY-1660)
-create table warehouse(t1 int);
-0 rows inserted/updated/deleted
-ij> -- bulk insert 10 rows
-call  SYSCS_UTIL.SYSCS_BULK_INSERT('APP','WAREHOUSE','org.apache.derbyTesting.functionTests.tests.lang.WarehouseVTI','10');
-Statement executed.
-ij> select * from warehouse order by t1;
-T1         
------
-1          
-2          
-3          
-4          
-5          
-6          
-7          
-8          
-9          
-10         
-ij> -- cleanup
-drop table warehouse;
-0 rows inserted/updated/deleted
 ij> 

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/optimizerOverrides.out
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/optimizerOverrides.out?view=diff&rev=449500&r1=449499&r2=449500
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/optimizerOverrides.out
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/master/optimizerOverrides.out
Sun Sep 24 14:57:54 2006
@@ -1792,26 +1792,4 @@
 ij> drop table temp1;
 0 rows inserted/updated/deleted
 ij> commit;
-ij> -- Test that SYSCS_BULK_INSERT works (DERBY-1660)
-create table warehouse(t1 int);
-0 rows inserted/updated/deleted
-ij> -- bulk insert 10 rows
-call  SYSCS_UTIL.SYSCS_BULK_INSERT('APP','WAREHOUSE','org.apache.derbyTesting.functionTests.tests.lang.WarehouseVTI','10');
-0 rows inserted/updated/deleted
-ij> select * from warehouse order by t1;
-T1         
------------
-1          
-2          
-3          
-4          
-5          
-6          
-7          
-8          
-9          
-10         
-ij> -- cleanup
-drop table warehouse;
-0 rows inserted/updated/deleted
 ij> 

Propchange: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/VTITest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java?view=diff&rev=449500&r1=449499&r2=449500
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/_Suite.java
Sun Sep 24 14:57:54 2006
@@ -62,6 +62,7 @@
         suite.addTest(GroupByExpressionTest.suite());
         suite.addTest(MathTrigFunctionsTest.suite());
         suite.addTest(TimeHandlingTest.suite());
+        suite.addTest(VTITest.suite());        
         
         // This test internally sets derby.database.sqlAuthorization to true
         // This property is not resettable and hence may affect other tests 

Modified: db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/optimizerOverrides.sql
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/optimizerOverrides.sql?view=diff&rev=449500&r1=449499&r2=449500
==============================================================================
--- db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/optimizerOverrides.sql
(original)
+++ db/derby/code/branches/10.2/java/testing/org/apache/derbyTesting/functionTests/tests/lang/optimizerOverrides.sql
Sun Sep 24 14:57:54 2006
@@ -249,10 +249,3 @@
 drop table temp1;
 commit;
 
--- Test that SYSCS_BULK_INSERT works (DERBY-1660)
-create table warehouse(t1 int);
--- bulk insert 10 rows
-call  SYSCS_UTIL.SYSCS_BULK_INSERT('APP','WAREHOUSE','org.apache.derbyTesting.functionTests.tests.lang.WarehouseVTI','10');
-select * from warehouse order by t1;
--- cleanup
-drop table warehouse;



Mime
View raw message