db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From rhille...@apache.org
Subject svn commit: r909123 - /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java
Date Thu, 11 Feb 2010 19:53:34 GMT
Author: rhillegas
Date: Thu Feb 11 19:53:34 2010
New Revision: 909123

URL: http://svn.apache.org/viewvc?rev=909123&view=rev
Log:
DERBY-4545: Fix UDTTest to run cleanly on small devices.

Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java
URL: http://svn.apache.org/viewvc/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java?rev=909123&r1=909122&r2=909123&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/lang/UDTTest.java
Thu Feb 11 19:53:34 2010
@@ -779,6 +779,11 @@
      */
     public void test_11_tableFunctionColumns() throws Exception
     {
+        //
+        // This test uses DriverManager.
+        //
+        if ( JDBC.vmSupportsJSR169() ) { return; }
+
         Connection conn = getConnection();
 
         goodStatement( conn, "create type hashmap_11 external name 'java.util.HashMap' language
java\n" );
@@ -909,6 +914,11 @@
      */
     public void test_13_sqlData() throws Exception
     {
+        //
+        // SQLData not defined in JSR 169.
+        //
+        if ( JDBC.vmSupportsJSR169() ) { return; }
+
         Connection conn = getConnection();
 
         goodStatement( conn, "create type SampleSQLData external name 'org.apache.derbyTesting.functionTests.tests.lang.SampleSQLData'
language java\n" );
@@ -1005,8 +1015,8 @@
         expectCompilationError( ILLEGAL_AGG, "select min( a ) from t_15\n" );
         expectCompilationError( ILLEGAL_AGG, "select avg( a ) from t_15\n" );
         expectCompilationError( FORBIDDEN_ORDERING_OPERATION, "select * from t_15 union select
* from t_15\n" );
-        expectCompilationError( ILLEGAL_COMPARISON, "select * from t_15 where a = makeIntArray(
3 )\n" );
-        expectCompilationError( ILLEGAL_COMPARISON, "select * from t_15 where a between makeIntArray(
2 ) and makeIntArray( 4 )\n" );
+        expectCompilationError( ILLEGAL_COMPARISON, "select * from t_15 where a = makeIntArray_15(
3 )\n" );
+        expectCompilationError( ILLEGAL_COMPARISON, "select * from t_15 where a between makeIntArray_15(
2 ) and makeIntArray_15( 4 )\n" );
         expectCompilationError( ILLEGAL_COMPARISON, "select * from t_15 l, t_15 r where l.a
= r.a\n" );
         expectCompilationError( ILLEGAL_COMPARISON, "select * from t_15 l, t_15 r where l.a
< r.a\n" );
         expectCompilationError( ILLEGAL_COMPARISON, "select * from t_15 l, t_15 r where l.a
> r.a\n" );



Mime
View raw message