db-derby-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kmars...@apache.org
Subject svn commit: r330705 - in /db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests: master/DerbyNet/nullSQLText.out master/DerbyNetClient/nullSQLText.out master/nullSQLText.out tests/jdbcapi/nullSQLText.java
Date Fri, 04 Nov 2005 04:58:09 GMT
Author: kmarsden
Date: Thu Nov  3 20:58:01 2005
New Revision: 330705

URL: http://svn.apache.org/viewcvs?rev=330705&view=rev
Log:
DERBY-389 Fix nullSQLText.java for J2ME

 Attaching a patch for the test jdbcapi/nullSQLText.java. This test fails in J2ME because
it uses a stored procedure with server-side JDBC. As I understand, the purpose of the test
is only to test any stored procedure call. So I replaced the stored procedure in this test
with a procedure in org.apache.derbyTesting.functionTests.util.ProcedureTest. Also changed
the master files.

With this patch, I have run jdbcapi/nullSQLText.java in embedded, client and jcc frameworks.
Also run this test in CDC/FP. This patch changes only tests. Please review/commit this patch.


Modified:
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/nullSQLText.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/nullSQLText.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nullSQLText.out
    db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/nullSQLText.java

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/nullSQLText.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/nullSQLText.out?rev=330705&r1=330704&r2=330705&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/nullSQLText.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNet/nullSQLText.out
Thu Nov  3 20:58:01 2005
@@ -53,7 +53,7 @@
 [ Results ]: (NO RESULT SET)
 [ Test Statement ]:
  --singleword
-call proc1()
+call za()
 [ Results ]: (NO RESULT SET)
 [ Test Statement ]:
  -- leading comment

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/nullSQLText.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/nullSQLText.out?rev=330705&r1=330704&r2=330705&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/nullSQLText.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/DerbyNetClient/nullSQLText.out
Thu Nov  3 20:58:01 2005
@@ -53,8 +53,8 @@
 [ Results ]: (NO RESULT SET)
 [ Test Statement ]:
  --singleword
-call proc1()
-[ Results ]:  1 2 3 4 5 6 7 8
+call za()
+[ Results ]: (NO RESULT SET)
 [ Test Statement ]:
  -- leading comment
 (

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nullSQLText.out
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nullSQLText.out?rev=330705&r1=330704&r2=330705&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nullSQLText.out
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/master/nullSQLText.out
Thu Nov  3 20:58:01 2005
@@ -53,8 +53,9 @@
 [ Results ]: (NO RESULT SET)
 [ Test Statement ]:
  --singleword
-call proc1()
-[ Results ]:  1 2 3 4 5 6 7 8
+call za()
+zeroArg() called
+[ Results ]: (NO RESULT SET)
 [ Test Statement ]:
  -- leading comment
 (

Modified: db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/nullSQLText.java
URL: http://svn.apache.org/viewcvs/db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/nullSQLText.java?rev=330705&r1=330704&r2=330705&view=diff
==============================================================================
--- db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/nullSQLText.java
(original)
+++ db/derby/code/trunk/java/testing/org/apache/derbyTesting/functionTests/tests/jdbcapi/nullSQLText.java
Thu Nov  3 20:58:01 2005
@@ -142,11 +142,10 @@
 
 		st.execute("create table t1 (i int)");
 		st.execute("insert into t1 values 1, 2, 3, 4, 5, 6, 7");
-		st.execute("create procedure proc1() language java " +
-			"parameter style java dynamic result sets 1 " +
-			"external name 'org.apache.derbyTesting.functionTests." +
-			"tests.jdbcapi.nullSQLText.sp1'");
-
+		st.execute("create procedure za() language java external name " +
+			"'org.apache.derbyTesting.functionTests.util.ProcedureTest.zeroArg'" +
+			" parameter style java");
+		
 		// These we expect to fail with syntax errors, as in embedded mode.
 		testCommentStmt(st, " --", true);
 		testCommentStmt(st, " -- ", true);
@@ -175,7 +174,7 @@
 			" --singleword\n insert into t1 values (8)",
 			TestUtil.isJCCFramework());
 		testCommentStmt(st,
-			" --singleword\ncall proc1()",
+			" --singleword\ncall za()",
 			TestUtil.isJCCFramework());
 		testCommentStmt(st,
 			" -- leading comment\n(\nvalues 4, 8)",
@@ -239,19 +238,4 @@
 		}
 
 	}
-
-	/* ****
-	 * Helper method for derby522.
-	 */
-	public static void sp1(ResultSet [] rs) throws SQLException {
-
-		Connection conn = DriverManager.getConnection(
-			"jdbc:default:connection");
-
-		Statement st = conn.createStatement();
-		rs[0] = st.executeQuery("select i from t1");
-		return;
-
-	}
-
 }



Mime
View raw message