db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From myrn...@apache.org
Subject svn commit: r551006 - in /db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi: ParameterMetaDataJdbc30Test.java _Suite.java
Date Wed, 27 Jun 2007 01:59:09 GMT
Author: myrnavl
Date: Tue Jun 26 18:59:08 2007
New Revision: 551006

URL: http://svn.apache.org/viewvc?view=rev&rev=551006
Log:
DERBY-2862: backport change 550990 because ParameterMetaData is not supported
   by JSR169, so test ParameterMetaDataJdbc30Test.java cannot run with that jvm.

Modified:
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java
    db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java?view=diff&rev=551006&r1=551005&r2=551006
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/ParameterMetaDataJdbc30Test.java
Tue Jun 26 18:59:08 2007
@@ -58,13 +58,14 @@
       	// to run all tests in this class
 	public static Test suite() {
         	TestSuite suite = new TestSuite("ParameterMetaDataJdbc30Test");
-
-        	suite.addTest(baseSuite("ParameterMetaDataJdbc30Test:embedded"));
-
-        	suite.addTest(
-                	TestConfiguration.clientServerDecorator(
-                        	baseSuite("ParameterMetaDataJdbc30Test:client")));
-		
+		 if (JDBC.vmSupportsJSR169())
+			return new TestSuite("Empty ParameterMetaDataJDBC30. JSR169 does not support ParameterMetaData");
+		else {	
+        		suite.addTest(baseSuite("ParameterMetaDataJdbc30Test:embedded"));
+        		suite.addTest(
+                		TestConfiguration.clientServerDecorator(
+                        		baseSuite("ParameterMetaDataJdbc30Test:client")));
+		}
         	return suite;
     	}
 

Modified: db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
URL: http://svn.apache.org/viewvc/db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java?view=diff&rev=551006&r1=551005&r2=551006
==============================================================================
--- db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
(original)
+++ db/derby/code/branches/10.3/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/_Suite.java
Tue Jun 26 18:59:08 2007
@@ -75,7 +75,6 @@
 		suite.addTest(SetTransactionIsolationTest.suite());
 		suite.addTest(AuthenticationTest.suite());
 		suite.addTest(DriverTest.suite());
-		suite.addTest(ParameterMetaDataJdbc30Test.suite());
         suite.addTest(ClobTest.suite());
         suite.addTest(BlobUpdatableStreamTest.suite());
         suite.addTest(AIjdbcTest.suite());
@@ -119,6 +118,9 @@
             
             //truncate test for clob
             suite.addTest (ClobTruncateTest.suite());
+
+	    //JSR169 does not support ParameterMetaData
+	    suite.addTest(ParameterMetaDataJdbc30Test.suite());
         }
 		
         return suite;



Mime
View raw message